summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-accessibility/simon/Manifest1
-rw-r--r--app-accessibility/simon/files/simon-0.4.0-libdir.patch16
-rw-r--r--app-accessibility/simon/files/simon-0.4.0-linguas.patch84
-rw-r--r--app-accessibility/simon/files/simon-0.4.0-opencv.patch11
-rw-r--r--app-accessibility/simon/files/simon-0.4.0-sphinx.patch16
-rw-r--r--app-accessibility/simon/files/simon-0.4.1-opencv-include.patch20
-rw-r--r--app-accessibility/simon/simon-0.4.0.ebuild90
-rw-r--r--app-accessibility/simon/simon-0.4.1.ebuild11
-rw-r--r--app-admin/clustershell/clustershell-1.6-r1.ebuild48
-rw-r--r--app-admin/conserver/conserver-8.1.18-r1.ebuild11
-rw-r--r--app-admin/lastpass-cli/Manifest1
-rw-r--r--app-admin/lastpass-cli/lastpass-cli-0.6.0.ebuild5
-rw-r--r--app-admin/lastpass-cli/lastpass-cli-0.7.1.ebuild34
-rw-r--r--app-admin/logrotate/logrotate-3.9.1-r1.ebuild2
-rw-r--r--app-admin/mongo-tools/Manifest1
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.2.0.ebuild53
-rw-r--r--app-admin/monit/monit-5.15-r1.ebuild51
-rw-r--r--app-admin/monit/monit-5.15.ebuild2
-rw-r--r--app-admin/radmind/radmind-1.14.1-r1.ebuild33
-rw-r--r--app-admin/rsyslog/rsyslog-8.13.0.ebuild2
-rw-r--r--app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild85
-rw-r--r--app-admin/ulogd/files/ulogd.init (renamed from app-admin/ulogd/files/ulogd.init-r2)0
-rw-r--r--app-admin/ulogd/files/ulogd.init-r141
-rw-r--r--app-admin/ulogd/files/ulogd.service (renamed from app-admin/ulogd/files/ulogd.service-r1)0
-rw-r--r--app-admin/ulogd/ulogd-2.0.5-r2.ebuild147
-rw-r--r--app-admin/ulogd/ulogd-2.0.5-r3.ebuild6
-rw-r--r--app-arch/arj/arj-3.10.22-r5.ebuild2
-rw-r--r--app-arch/dpkg/dpkg-1.17.26.ebuild2
-rw-r--r--app-backup/attic/Manifest1
-rw-r--r--app-backup/attic/attic-0.16.ebuild33
-rw-r--r--app-backup/attic/attic-9999.ebuild33
-rw-r--r--app-backup/attic/metadata.xml8
-rw-r--r--app-backup/luckybackup/Manifest1
-rw-r--r--app-backup/luckybackup/luckybackup-0.4.7-r1.ebuild42
-rw-r--r--app-backup/luckybackup/luckybackup-0.4.8.ebuild2
-rw-r--r--app-backup/obnam/files/obnam-1.18.2-obnamlib-sftp-Add-prefetch-size-argument.patch31
-rw-r--r--app-backup/obnam/obnam-1.18.2-r1.ebuild (renamed from app-backup/obnam/obnam-1.18.2.ebuild)6
-rw-r--r--app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild8
-rw-r--r--app-crypt/bestcrypt/Manifest2
-rw-r--r--app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild (renamed from app-crypt/bestcrypt/bestcrypt-2.0.10.ebuild)0
-rw-r--r--app-crypt/loop-aes-losetup/loop-aes-losetup-2.26.ebuild2
-rw-r--r--app-dicts/myspell-en/metadata.xml2
-rw-r--r--app-dicts/myspell-ru/Manifest1
-rw-r--r--app-dicts/myspell-ru/metadata.xml7
-rw-r--r--app-dicts/myspell-ru/myspell-ru-20150711.ebuild26
-rw-r--r--app-dicts/verbiste/Manifest1
-rw-r--r--app-dicts/verbiste/verbiste-0.1.41.ebuild67
-rw-r--r--app-editors/latexila/Manifest1
-rw-r--r--app-editors/latexila/latexila-3.18.2.ebuild57
-rw-r--r--app-editors/nano/nano-2.4.3.ebuild2
-rw-r--r--app-editors/scite/Manifest1
-rw-r--r--app-editors/scite/scite-3.6.2.ebuild85
-rw-r--r--app-emacs/dash/dash-2.12.1.ebuild2
-rw-r--r--app-emacs/magit/magit-2.3.1.ebuild2
-rw-r--r--app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild2
-rw-r--r--app-emulation/docker-machine/Manifest1
-rw-r--r--app-emulation/docker-machine/docker-machine-0.5.4.ebuild41
-rw-r--r--app-emulation/docker-swarm/Manifest1
-rw-r--r--app-emulation/docker-swarm/docker-swarm-1.0.1.ebuild37
-rw-r--r--app-emulation/libvirt-glib/Manifest1
-rw-r--r--app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild53
-rw-r--r--app-emulation/libvirt/Manifest2
-rw-r--r--app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch (renamed from app-emulation/libvirt/files/libvirt-1.2.22-do_not_use_sysconf.patch)16
-rw-r--r--app-emulation/libvirt/files/virtlogd.init-r124
-rw-r--r--app-emulation/libvirt/libvirt-1.2.21-r2.ebuild (renamed from app-emulation/libvirt/libvirt-1.2.21-r1.ebuild)5
-rw-r--r--app-emulation/libvirt/libvirt-1.3.0.ebuild384
-rw-r--r--app-emulation/libvirt/libvirt-9999.ebuild6
-rw-r--r--app-emulation/spice-protocol/spice-protocol-0.12.10.ebuild2
-rw-r--r--app-emulation/vice/vice-2.4.22.ebuild2
-rw-r--r--app-emulation/virt-manager/Manifest2
-rw-r--r--app-emulation/virt-manager/virt-manager-1.3.2.ebuild (renamed from app-emulation/virt-manager/virt-manager-1.3.1.ebuild)2
-rw-r--r--app-emulation/xen/xen-4.5.2-r2.ebuild5
-rw-r--r--app-emulation/xen/xen-4.5.2-r3.ebuild4
-rw-r--r--app-emulation/xen/xen-4.6.0-r3.ebuild4
-rw-r--r--app-emulation/xen/xen-4.6.0-r4.ebuild4
-rw-r--r--app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild25
-rw-r--r--app-eselect/eselect-opencl/Manifest1
-rw-r--r--app-eselect/eselect-opencl/eselect-opencl-1.1.0.ebuild58
-rw-r--r--app-i18n/ibus/ibus-1.5.5.ebuild2
-rw-r--r--app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild2
-rw-r--r--app-misc/birthday/birthday-1.6.2-r1.ebuild32
-rw-r--r--app-misc/birthday/birthday-1.6.2.ebuild10
-rw-r--r--app-misc/c_rehash/c_rehash-1.7-r1.ebuild2
-rw-r--r--app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69-r1.ebuild2
-rw-r--r--app-office/gnumeric/Manifest2
-rw-r--r--app-office/gnumeric/gnumeric-1.12.25.ebuild (renamed from app-office/gnumeric/gnumeric-1.12.23.ebuild)3
-rw-r--r--app-office/wps-office/Manifest4
-rw-r--r--app-office/wps-office/wps-office-10.1.0.5444_alpha20.ebuild (renamed from app-office/wps-office/wps-office-9.1.0.4961_alpha18_p1.ebuild)8
-rw-r--r--app-portage/ufed/ufed-0.92.ebuild2
-rw-r--r--app-shells/bash/bash-4.3_p42.ebuild2
-rw-r--r--app-text/aspell/metadata.xml2
-rw-r--r--app-text/bibletime/bibletime-2.10.1-r1.ebuild (renamed from app-text/bibletime/bibletime-2.10.1.ebuild)5
-rw-r--r--app-text/bibletime/files/bibletime-2.10.1-qt55.patch32
-rw-r--r--app-text/docbook-xsl-stylesheets/Manifest1
-rw-r--r--app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild2
-rw-r--r--app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1.ebuild81
-rw-r--r--app-text/dvipng/dvipng-1.15.ebuild2
-rw-r--r--app-text/fbreader/fbreader-0.99.4-r1.ebuild76
-rw-r--r--app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild2
-rw-r--r--app-text/gtkspell/Manifest1
-rw-r--r--app-text/gtkspell/gtkspell-3.0.7.ebuild47
-rw-r--r--app-text/hunspell/metadata.xml2
-rw-r--r--app-text/jabref-bin/Manifest1
-rw-r--r--app-text/jabref-bin/jabref-bin-3.1.ebuild36
-rw-r--r--app-text/linuxdoc-tools/Manifest1
-rw-r--r--app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-compiler.patch52
-rw-r--r--app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-disable-doc-build.patch28
-rw-r--r--app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild87
-rw-r--r--app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild2
-rw-r--r--app-text/pdf2djvu/Manifest1
-rw-r--r--app-text/pdf2djvu/pdf2djvu-0.9.3.ebuild53
-rw-r--r--app-text/qpdf/Manifest2
-rw-r--r--app-text/qpdf/qpdf-5.1.3.ebuild54
-rw-r--r--app-text/qpdf/qpdf-6.0.0.ebuild54
-rw-r--r--app-text/referencer/referencer-1.2.1.ebuild4
-rw-r--r--app-text/stardict/stardict-3.0.6-r2.ebuild2
-rw-r--r--app-text/sword/Manifest1
-rw-r--r--app-text/sword/sword-1.7.4.ebuild78
-rw-r--r--dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild1
-rw-r--r--dev-cpp/eigen/Manifest1
-rw-r--r--dev-cpp/eigen/eigen-2.0.17.ebuild4
-rw-r--r--dev-cpp/eigen/eigen-3.1.3.ebuild4
-rw-r--r--dev-cpp/eigen/eigen-3.2.5.ebuild2
-rw-r--r--dev-cpp/eigen/eigen-3.2.6.ebuild2
-rw-r--r--dev-cpp/eigen/eigen-3.2.7.ebuild65
-rw-r--r--dev-cpp/eigen/metadata.xml2
-rw-r--r--dev-db/lmdb/Manifest1
-rw-r--r--dev-db/lmdb/lmdb-0.9.14.ebuild6
-rw-r--r--dev-db/lmdb/lmdb-0.9.15.ebuild6
-rw-r--r--dev-db/lmdb/lmdb-0.9.16.ebuild6
-rw-r--r--dev-db/lmdb/lmdb-0.9.17.ebuild49
-rw-r--r--dev-db/mariadb/mariadb-10.0.22.ebuild2
-rw-r--r--dev-db/mongodb/Manifest1
-rw-r--r--dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch30
-rw-r--r--dev-db/mongodb/mongodb-3.2.0.ebuild173
-rw-r--r--dev-db/phpmyadmin/Manifest4
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-4.4.15.2.ebuild (renamed from dev-db/phpmyadmin/phpmyadmin-4.5.1.ebuild)4
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-4.5.3.1.ebuild (renamed from dev-db/phpmyadmin/phpmyadmin-4.4.15.1.ebuild)4
-rw-r--r--dev-db/sqlite/sqlite-3.9.2.ebuild2
-rw-r--r--dev-games/crystalspace/crystalspace-2.0-r1.ebuild2
-rw-r--r--dev-java/commons-email/commons-email-1.4.ebuild17
-rw-r--r--dev-java/glassfish-deployment-api/Manifest1
-rw-r--r--dev-java/glassfish-deployment-api/files/glassfish-deployment-api-1.2-build.xml.patch26
-rw-r--r--dev-java/glassfish-deployment-api/glassfish-deployment-api-1.2.ebuild38
-rw-r--r--dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild2
-rw-r--r--dev-java/icedtea-bin/Manifest16
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.5.6-r1.ebuild179
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.6.2.ebuild185
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild2
-rw-r--r--dev-java/jacl/jacl-1.4.1-r1.ebuild2
-rw-r--r--dev-java/jama/Manifest2
-rw-r--r--dev-java/jama/jama-1.0.3-r1.ebuild8
-rw-r--r--dev-java/javacc/javacc-5.0-r2.ebuild72
-rw-r--r--dev-java/jcmdline/Manifest1
-rw-r--r--dev-java/jcmdline/jcmdline-2.0.0.ebuild30
-rw-r--r--dev-java/jdbc-mysql/Manifest3
-rw-r--r--dev-java/jdbc-mysql/files/5.1.11-java6.patch34
-rw-r--r--dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild81
-rw-r--r--dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild81
-rw-r--r--dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild86
-rw-r--r--dev-java/jline/jline-2.12.1-r1.ebuild23
-rw-r--r--dev-java/jline/jline-2.12.1.ebuild60
-rw-r--r--dev-java/jsr322/Manifest1
-rw-r--r--dev-java/jsr322/jsr322-1.5.ebuild23
-rw-r--r--dev-java/jsr322/metadata.xml5
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.2.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.65.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.28.ebuild2
-rw-r--r--dev-java/vldocking/vldocking-3.0.5.ebuild19
-rw-r--r--dev-lang/mono/files/fix-for-GitExtensions-issue-2710-another-resolution.patch48
-rw-r--r--dev-lang/mono/mono-4.2.2.10-r1.ebuild116
-rw-r--r--dev-lang/ruby/Manifest7
-rw-r--r--dev-lang/ruby/ruby-2.0.0_p645.ebuild230
-rw-r--r--dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild2
-rw-r--r--dev-lang/ruby/ruby-2.1.6-r1.ebuild227
-rw-r--r--dev-lang/ruby/ruby-2.1.7.ebuild2
-rw-r--r--dev-lang/ruby/ruby-2.3.0.ebuild (renamed from dev-lang/ruby/ruby-2.0.0_p647.ebuild)67
-rw-r--r--dev-libs/appstream-glib/Manifest1
-rw-r--r--dev-libs/appstream-glib/appstream-glib-0.5.5.ebuild63
-rw-r--r--dev-libs/cloog/cloog-0.18.1.ebuild2
-rw-r--r--dev-libs/cloog/cloog-0.18.4.ebuild2
-rw-r--r--dev-libs/efl/Manifest4
-rw-r--r--dev-libs/efl/efl-1.12.2.ebuild10
-rw-r--r--dev-libs/efl/efl-1.13.1.ebuild260
-rw-r--r--dev-libs/efl/efl-1.15.0.ebuild258
-rw-r--r--dev-libs/efl/efl-1.15.1.ebuild258
-rw-r--r--dev-libs/efl/efl-1.15.2.ebuild10
-rw-r--r--dev-libs/efl/efl-1.16.1.ebuild (renamed from dev-libs/efl/efl-1.15.1-r1.ebuild)36
-rw-r--r--dev-libs/efl/efl-9999.ebuild37
-rw-r--r--dev-libs/efl/metadata.xml50
-rw-r--r--dev-libs/glib/glib-1.2.10-r6.ebuild1
-rw-r--r--dev-libs/gom/Manifest1
-rw-r--r--dev-libs/gom/gom-0.3.2.ebuild77
-rw-r--r--dev-libs/guiloader-c++/guiloader-c++-2.21.0-r1.ebuild2
-rw-r--r--dev-libs/guiloader-c++/guiloader-c++-2.21.0.ebuild37
-rw-r--r--dev-libs/isl/isl-0.12.2.ebuild2
-rw-r--r--dev-libs/isl/isl-0.15.ebuild2
-rw-r--r--dev-libs/libbsd/libbsd-0.8.0.ebuild2
-rw-r--r--dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild2
-rw-r--r--dev-libs/libgudev/libgudev-230.ebuild2
-rw-r--r--dev-libs/libgusb/Manifest1
-rw-r--r--dev-libs/libgusb/libgusb-0.2.8.ebuild52
-rw-r--r--dev-libs/libindicate/libindicate-12.10.1-r2.ebuild2
-rw-r--r--dev-libs/libinput/Manifest3
-rw-r--r--dev-libs/libinput/libinput-1.1.0.ebuild2
-rw-r--r--dev-libs/libinput/libinput-1.1.2.ebuild53
-rw-r--r--dev-libs/libinput/libinput-1.1.4.ebuild (renamed from dev-libs/libinput/libinput-1.1.1.ebuild)0
-rw-r--r--dev-libs/liblinear/liblinear-210-r1.ebuild2
-rw-r--r--dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild2
-rw-r--r--dev-libs/libnl/libnl-3.2.27.ebuild2
-rw-r--r--dev-libs/libofx/libofx-0.9.10.ebuild2
-rw-r--r--dev-libs/libpcre/libpcre-8.38.ebuild2
-rw-r--r--dev-libs/libxml2/libxml2-2.9.2-r4.ebuild2
-rw-r--r--dev-libs/nspr/nspr-4.10.10.ebuild2
-rw-r--r--dev-libs/nss/files/nss-3.21-hppa-byte_order.patch16
-rw-r--r--dev-libs/nss/nss-3.20.1.ebuild2
-rw-r--r--dev-libs/nss/nss-3.21-r1.ebuild2
-rw-r--r--dev-libs/openssl/openssl-0.9.8z_p8.ebuild2
-rw-r--r--dev-libs/openssl/openssl-1.0.2e.ebuild2
-rw-r--r--dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.200-r1.ebuild17
-rw-r--r--dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild2
-rw-r--r--dev-perl/Algorithm-Diff/Manifest1
-rw-r--r--dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.640.0-r1.ebuild36
-rw-r--r--dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.670.0.ebuild2
-rw-r--r--dev-perl/Alien-wxWidgets/Manifest1
-rw-r--r--dev-perl/AnyEvent-CacheDNS/AnyEvent-CacheDNS-0.80.0.ebuild (renamed from dev-perl/Benchmark-Timer/Benchmark-Timer-0.710.600.ebuild)18
-rw-r--r--dev-perl/AnyEvent-CacheDNS/Manifest1
-rw-r--r--dev-perl/AnyEvent-CacheDNS/metadata.xml5
-rw-r--r--dev-perl/AnyEvent-I3/AnyEvent-I3-0.160.0.ebuild2
-rw-r--r--dev-perl/AnyEvent/AnyEvent-7.110.0.ebuild21
-rw-r--r--dev-perl/AnyEvent/AnyEvent-7.80.0.ebuild2
-rw-r--r--dev-perl/AnyEvent/Manifest1
-rw-r--r--dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.230.0.ebuild2
-rw-r--r--dev-perl/Apache-Reload/Apache-Reload-0.130.0.ebuild2
-rw-r--r--dev-perl/Apache-Session/Apache-Session-1.930.0.ebuild2
-rw-r--r--dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.960.0-r1.ebuild24
-rw-r--r--dev-perl/Apache-SizeLimit/Manifest1
-rw-r--r--dev-perl/Apache-Test/Apache-Test-1.390.0.ebuild2
-rw-r--r--dev-perl/App-Nopaste/App-Nopaste-0.910.0.ebuild36
-rw-r--r--dev-perl/App-Nopaste/App-Nopaste-0.920.0.ebuild36
-rw-r--r--dev-perl/App-Nopaste/Manifest2
-rw-r--r--dev-perl/App-perlbrew/App-perlbrew-0.740.0.ebuild36
-rw-r--r--dev-perl/App-perlbrew/Manifest1
-rw-r--r--dev-perl/AppConfig/AppConfig-1.660.0-r1.ebuild21
-rw-r--r--dev-perl/AppConfig/AppConfig-1.710.0.ebuild2
-rw-r--r--dev-perl/AppConfig/Manifest1
-rw-r--r--dev-perl/Archive-Zip/Archive-Zip-1.370.0.ebuild21
-rw-r--r--dev-perl/Archive-Zip/Archive-Zip-1.500.0.ebuild28
-rw-r--r--dev-perl/Archive-Zip/Archive-Zip-1.530.0.ebuild2
-rw-r--r--dev-perl/Archive-Zip/Archive-Zip-1.560.0.ebuild (renamed from dev-perl/Archive-Zip/Archive-Zip-1.490.0.ebuild)16
-rw-r--r--dev-perl/Archive-Zip/Manifest4
-rw-r--r--dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild2
-rw-r--r--dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.150.0.ebuild2
-rw-r--r--dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.130.0.ebuild22
-rw-r--r--dev-perl/B-Hooks-Parser/Manifest1
-rw-r--r--dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild2
-rw-r--r--dev-perl/B-Keywords/B-Keywords-1.150.0.ebuild19
-rw-r--r--dev-perl/B-Keywords/Manifest1
-rw-r--r--dev-perl/B-OPCheck/B-OPCheck-0.290.0-r1.ebuild23
-rw-r--r--dev-perl/B-OPCheck/Manifest1
-rw-r--r--dev-perl/B-Utils/B-Utils-0.260.0.ebuild30
-rw-r--r--dev-perl/B-Utils/Manifest1
-rw-r--r--dev-perl/Benchmark-Timer/Manifest1
-rw-r--r--dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild2
-rw-r--r--dev-perl/Bio-Graphics/Bio-Graphics-2.370.0-r1.ebuild22
-rw-r--r--dev-perl/Bio-Graphics/Manifest1
-rw-r--r--dev-perl/Bio-SamTools/Bio-SamTools-1.420.0.ebuild (renamed from dev-perl/Bio-SamTools/Bio-SamTools-1.390.0-r1.ebuild)17
-rw-r--r--dev-perl/Bio-SamTools/Manifest2
-rw-r--r--dev-perl/Bit-Vector/Bit-Vector-7.300.0.ebuild21
-rw-r--r--dev-perl/Bit-Vector/Manifest1
-rw-r--r--dev-perl/Business-ISBN-Data/Business-ISBN-Data-20120719.1.0-r1.ebuild25
-rw-r--r--dev-perl/Business-ISBN-Data/Manifest1
-rw-r--r--dev-perl/Business-ISMN/Business-ISMN-1.110.0-r1.ebuild33
-rw-r--r--dev-perl/Business-ISMN/Manifest1
-rw-r--r--dev-perl/Devel-Symdump/Devel-Symdump-2.150.0.ebuild21
-rw-r--r--dev-perl/Devel-Symdump/Manifest1
-rw-r--r--dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild2
-rw-r--r--dev-perl/IO-AIO/IO-AIO-4.310.0.ebuild1
-rw-r--r--dev-perl/IO-AIO/IO-AIO-4.320.0.ebuild1
-rw-r--r--dev-perl/IO-Interactive/IO-Interactive-0.0.6.ebuild22
-rw-r--r--dev-perl/IO-Interactive/Manifest1
-rw-r--r--dev-perl/IO-Interactive/metadata.xml5
-rw-r--r--dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild2
-rw-r--r--dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild2
-rw-r--r--dev-perl/MooX-Types-MooseLike/Manifest2
-rw-r--r--dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0.ebuild (renamed from dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.250.0.ebuild)19
-rw-r--r--dev-perl/MooseX-Types-DateTime-MoreCoercions/Manifest2
-rw-r--r--dev-perl/MooseX-Types-DateTime-MoreCoercions/MooseX-Types-DateTime-MoreCoercions-0.150.0.ebuild (renamed from dev-perl/MooseX-Types-DateTime-MoreCoercions/MooseX-Types-DateTime-MoreCoercions-0.90.0.ebuild)22
-rw-r--r--dev-perl/MooseX-Types-JSON/Manifest1
-rw-r--r--dev-perl/MooseX-Types-JSON/MooseX-Types-JSON-1.0.0.ebuild22
-rw-r--r--dev-perl/Mouse/Manifest2
-rw-r--r--dev-perl/Mouse/Mouse-1.50.0.ebuild36
-rw-r--r--dev-perl/Mouse/Mouse-2.4.5.ebuild35
-rw-r--r--dev-perl/Mozilla-CA/Manifest1
-rw-r--r--dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild20
-rw-r--r--dev-perl/Net-Amazon-S3/Manifest2
-rw-r--r--dev-perl/Net-Amazon-S3/Net-Amazon-S3-0.560.0.ebuild35
-rw-r--r--dev-perl/Net-Amazon-S3/Net-Amazon-S3-0.800.0.ebuild52
-rw-r--r--dev-perl/Net-CIDR/Manifest1
-rw-r--r--dev-perl/Net-CIDR/Net-CIDR-0.180.0.ebuild22
-rw-r--r--dev-perl/Net-DBus/Manifest1
-rw-r--r--dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild29
-rw-r--r--dev-perl/Net-DNS-SEC/Manifest1
-rw-r--r--dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.20.0.ebuild30
-rw-r--r--dev-perl/Net-DNS/Manifest1
-rw-r--r--dev-perl/Net-DNS/Net-DNS-1.40.0.ebuild45
-rw-r--r--dev-perl/Parse-CPAN-Meta/Manifest1
-rw-r--r--dev-perl/Parse-CPAN-Meta/Parse-CPAN-Meta-1.441.700.ebuild24
-rw-r--r--dev-perl/Parse-CPAN-Meta/metadata.xml12
-rw-r--r--dev-perl/Role-Basic/Role-Basic-0.130.0.ebuild5
-rw-r--r--dev-perl/Term-Encoding/Manifest1
-rw-r--r--dev-perl/Term-Encoding/Term-Encoding-0.20.0.ebuild20
-rw-r--r--dev-perl/Term-Encoding/metadata.xml5
-rw-r--r--dev-perl/Term-ProgressBar-Quiet/Manifest1
-rw-r--r--dev-perl/Term-ProgressBar-Quiet/Term-ProgressBar-Quiet-0.310.0.ebuild27
-rw-r--r--dev-perl/Term-ProgressBar-Quiet/metadata.xml5
-rw-r--r--dev-perl/Term-ProgressBar-Simple/Manifest1
-rw-r--r--dev-perl/Term-ProgressBar-Simple/Term-ProgressBar-Simple-0.30.0.ebuild22
-rw-r--r--dev-perl/Term-ProgressBar-Simple/metadata.xml5
-rw-r--r--dev-perl/Test-MockObject/Test-MockObject-1.201.203.10-r1.ebuild1
-rw-r--r--dev-perl/VM-EC2-Security-CredentialCache/Manifest1
-rw-r--r--dev-perl/VM-EC2-Security-CredentialCache/VM-EC2-Security-CredentialCache-0.250.0.ebuild23
-rw-r--r--dev-perl/VM-EC2-Security-CredentialCache/metadata.xml5
-rw-r--r--dev-perl/VM-EC2/Manifest1
-rw-r--r--dev-perl/VM-EC2/VM-EC2-1.280.0.ebuild32
-rw-r--r--dev-perl/VM-EC2/metadata.xml5
-rw-r--r--dev-perl/namespace-autoclean/Manifest1
-rw-r--r--dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild33
-rw-r--r--dev-perl/namespace-clean/Manifest1
-rw-r--r--dev-perl/namespace-clean/namespace-clean-0.260.0.ebuild27
-rw-r--r--dev-php/pecl-apcu/Manifest1
-rw-r--r--dev-php/pecl-apcu/pecl-apcu-4.0.10.ebuild62
-rw-r--r--dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild2
-rw-r--r--dev-python/alabaster/Manifest1
-rw-r--r--dev-python/alabaster/alabaster-0.7.7.ebuild19
-rw-r--r--dev-python/astroid/Manifest1
-rw-r--r--dev-python/astroid/astroid-1.4.3.ebuild42
-rw-r--r--dev-python/asyncio/asyncio-3.4.2.ebuild2
-rw-r--r--dev-python/backports-abc/backports-abc-0.4.ebuild2
-rw-r--r--dev-python/carbon/Manifest1
-rw-r--r--dev-python/carbon/carbon-0.9.14.ebuild65
-rw-r--r--dev-python/carbon/files/carbon-0.9.14-no-data-files.patch32
-rw-r--r--dev-python/cffi/Manifest1
-rw-r--r--dev-python/cffi/cffi-1.4.2.ebuild42
-rw-r--r--dev-python/distlib/distlib-0.2.1-r1.ebuild11
-rw-r--r--dev-python/distlib/files/distlib-0.2.1-online.patch113
-rw-r--r--dev-python/futures/futures-3.0.3.ebuild2
-rw-r--r--dev-python/gst-python/Manifest2
-rw-r--r--dev-python/gst-python/gst-python-1.2.1.ebuild2
-rw-r--r--dev-python/gst-python/gst-python-1.6.2.ebuild (renamed from dev-python/gst-python/gst-python-1.6.0.ebuild)6
-rw-r--r--dev-python/httmock/Manifest1
-rw-r--r--dev-python/httmock/httmock-1.2.3.ebuild25
-rw-r--r--dev-python/httmock/metadata.xml21
-rw-r--r--dev-python/jenkins-webapi/Manifest2
-rw-r--r--dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild60
-rw-r--r--dev-python/jenkins-webapi/metadata.xml21
-rw-r--r--dev-python/jenkinsapi/Manifest2
-rw-r--r--dev-python/jenkinsapi/jenkinsapi-0.2.29.ebuild45
-rw-r--r--dev-python/jenkinsapi/metadata.xml21
-rw-r--r--dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild2
-rw-r--r--dev-python/libvirt-python/Manifest1
-rw-r--r--dev-python/libvirt-python/libvirt-python-1.3.0.ebuild44
-rw-r--r--dev-python/markups/Manifest1
-rw-r--r--dev-python/markups/markups-1.0.1.ebuild32
-rw-r--r--dev-python/matplotlib/matplotlib-1.5.0.ebuild12
-rw-r--r--dev-python/more-itertools/more-itertools-2.2-r1.ebuild35
-rw-r--r--dev-python/more-itertools/more-itertools-2.2.ebuild2
-rw-r--r--dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild4
-rw-r--r--dev-python/nose-exclude/nose-exclude-0.4.1.ebuild2
-rw-r--r--dev-python/nose/nose-1.3.7.ebuild2
-rw-r--r--dev-python/oslotest/oslotest-1.12.0.ebuild2
-rw-r--r--dev-python/pip/pip-7.1.2.ebuild4
-rw-r--r--dev-python/plumbum/Manifest1
-rw-r--r--dev-python/plumbum/plumbum-1.6.0.ebuild15
-rw-r--r--dev-python/pycxx/pycxx-6.2.6.ebuild2
-rw-r--r--dev-python/pyro/Manifest1
-rw-r--r--dev-python/pyro/pyro-3.16-r1.ebuild2
-rw-r--r--dev-python/pyro/pyro-4.25.ebuild2
-rw-r--r--dev-python/pyro/pyro-4.39.ebuild2
-rw-r--r--dev-python/pyro/pyro-4.40.ebuild2
-rw-r--r--dev-python/pyro/pyro-4.41.ebuild78
-rw-r--r--dev-python/pysvn/Manifest2
-rw-r--r--dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch95
-rw-r--r--dev-python/pysvn/files/pysvn-1.7.9-respect_flags.patch96
-rw-r--r--dev-python/pysvn/pysvn-1.7.10.ebuild61
-rw-r--r--dev-python/pysvn/pysvn-1.7.9.ebuild59
-rw-r--r--dev-python/pysvn/pysvn-1.8.0.ebuild2
-rw-r--r--dev-python/python-efl/Manifest1
-rw-r--r--dev-python/python-efl/metadata.xml5
-rw-r--r--dev-python/python-efl/python-efl-1.16.0.ebuild62
-rw-r--r--dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch19
-rw-r--r--dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild2
-rw-r--r--dev-python/python-systemd/python-systemd-230.ebuild2
-rw-r--r--dev-python/requests/Manifest2
-rw-r--r--dev-python/requests/requests-2.9.1.ebuild (renamed from dev-python/requests/requests-2.9.0.ebuild)0
-rw-r--r--dev-python/rpyc/Manifest1
-rw-r--r--dev-python/rpyc/rpyc-3.3.0.ebuild18
-rw-r--r--dev-python/setuptools/Manifest1
-rw-r--r--dev-python/setuptools/setuptools-19.2.ebuild54
-rw-r--r--dev-python/singledispatch/singledispatch-3.4.0.3.ebuild2
-rw-r--r--dev-python/six/six-1.10.0.ebuild10
-rw-r--r--dev-python/snowballstemmer/Manifest1
-rw-r--r--dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild18
-rw-r--r--dev-python/sqlalchemy/Manifest1
-rw-r--r--dev-python/sqlalchemy/sqlalchemy-1.0.11.ebuild86
-rw-r--r--dev-python/urllib3/urllib3-1.12.ebuild2
-rw-r--r--dev-python/whisper/Manifest1
-rw-r--r--dev-python/whisper/whisper-0.9.15.ebuild18
-rw-r--r--dev-python/wrapt/Manifest1
-rw-r--r--dev-python/wrapt/metadata.xml1
-rw-r--r--dev-python/wrapt/wrapt-1.10.6-r1.ebuild48
-rw-r--r--dev-ruby/activesupport/activesupport-4.2.5.ebuild2
-rw-r--r--dev-ruby/asciidoctor/Manifest1
-rw-r--r--dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild46
-rw-r--r--dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch31
-rw-r--r--dev-ruby/asciimath/Manifest1
-rw-r--r--dev-ruby/asciimath/asciimath-1.0.2.ebuild25
-rw-r--r--dev-ruby/asciimath/metadata.xml8
-rw-r--r--dev-ruby/coffee-script-source/Manifest2
-rw-r--r--dev-ruby/coffee-script-source/coffee-script-source-1.7.1.ebuild20
-rw-r--r--dev-ruby/coffee-script-source/coffee-script-source-1.9.1.1.ebuild20
-rw-r--r--dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild2
-rw-r--r--dev-ruby/coffee-script/Manifest1
-rw-r--r--dev-ruby/coffee-script/coffee-script-2.2.0-r1.ebuild23
-rw-r--r--dev-ruby/coffee-script/coffee-script-2.4.1.ebuild2
-rw-r--r--dev-ruby/color/Manifest1
-rw-r--r--dev-ruby/color/color-1.7.1-r1.ebuild29
-rw-r--r--dev-ruby/color/color-1.7.1.ebuild29
-rw-r--r--dev-ruby/color/color-1.8.ebuild2
-rw-r--r--dev-ruby/dalli/dalli-2.7.4.ebuild2
-rw-r--r--dev-ruby/dalli/dalli-2.7.5.ebuild2
-rw-r--r--dev-ruby/did_you_mean/Manifest1
-rw-r--r--dev-ruby/did_you_mean/did_you_mean-1.0.0.ebuild23
-rw-r--r--dev-ruby/did_you_mean/metadata.xml8
-rw-r--r--dev-ruby/execjs/execjs-2.6.0.ebuild2
-rw-r--r--dev-ruby/gruff/Manifest1
-rw-r--r--dev-ruby/gruff/gruff-0.5.1-r1.ebuild46
-rw-r--r--dev-ruby/gruff/gruff-0.5.1.ebuild46
-rw-r--r--dev-ruby/gruff/gruff-0.6.0.ebuild2
-rw-r--r--dev-ruby/heredoc_unindent/Manifest1
-rw-r--r--dev-ruby/heredoc_unindent/heredoc_unindent-1.1.2-r3.ebuild26
-rw-r--r--dev-ruby/heredoc_unindent/heredoc_unindent-1.1.2-r4.ebuild26
-rw-r--r--dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild2
-rw-r--r--dev-ruby/htmlentities/Manifest1
-rw-r--r--dev-ruby/htmlentities/htmlentities-4.3.1-r1.ebuild26
-rw-r--r--dev-ruby/htmlentities/htmlentities-4.3.4.ebuild2
-rw-r--r--dev-ruby/i18n/files/i18n-0.7.0-frozen-classes.patch31
-rw-r--r--dev-ruby/i18n/i18n-0.7.0-r1.ebuild56
-rw-r--r--dev-ruby/json/json-1.8.3.ebuild2
-rw-r--r--dev-ruby/mime-types/Manifest2
-rw-r--r--dev-ruby/mime-types/mime-types-1.23.ebuild26
-rw-r--r--dev-ruby/mime-types/mime-types-1.25.1.ebuild2
-rw-r--r--dev-ruby/mime-types/mime-types-2.4.3.ebuild33
-rw-r--r--dev-ruby/mime-types/mime-types-2.6.2.ebuild2
-rw-r--r--dev-ruby/minitest/minitest-4.7.5-r2.ebuild4
-rw-r--r--dev-ruby/minitest/minitest-5.8.3.ebuild2
-rw-r--r--dev-ruby/narray/narray-0.6.1.1.ebuild2
-rw-r--r--dev-ruby/net-telnet/Manifest1
-rw-r--r--dev-ruby/net-telnet/metadata.xml8
-rw-r--r--dev-ruby/net-telnet/net-telnet-0.1.1.ebuild24
-rw-r--r--dev-ruby/nio4r/Manifest3
-rw-r--r--dev-ruby/nio4r/nio4r-1.0.1.ebuild39
-rw-r--r--dev-ruby/nio4r/nio4r-1.2.0.ebuild (renamed from dev-ruby/nio4r/nio4r-1.1.0.ebuild)4
-rw-r--r--dev-ruby/omniauth/Manifest1
-rw-r--r--dev-ruby/omniauth/omniauth-1.3.1.ebuild46
-rw-r--r--dev-ruby/pkg-config/pkg-config-1.1.6.ebuild2
-rw-r--r--dev-ruby/power_assert/files/power_assert-0.2.6-ruby23-tests.patch53
-rw-r--r--dev-ruby/power_assert/power_assert-0.2.6.ebuild4
-rw-r--r--dev-ruby/racc/racc-1.4.14.ebuild2
-rw-r--r--dev-ruby/rake/rake-10.4.2.ebuild2
-rw-r--r--dev-ruby/rdoc/rdoc-4.2.0.ebuild2
-rw-r--r--dev-ruby/rdoc/rdoc-4.2.1.ebuild2
-rw-r--r--dev-ruby/recog/recog-2.0.14-r1.ebuild2
-rw-r--r--dev-ruby/recog/recog-2.0.6-r1.ebuild2
-rw-r--r--dev-ruby/redcarpet/Manifest1
-rw-r--r--dev-ruby/redcarpet/redcarpet-3.3.4.ebuild42
-rw-r--r--dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild2
-rw-r--r--dev-ruby/ruby-ldap/ruby-ldap-0.9.17.ebuild2
-rw-r--r--dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild2
-rw-r--r--dev-ruby/ruby-opengl/ruby-opengl-0.9.2.ebuild2
-rw-r--r--dev-ruby/ruby-openid/Manifest1
-rw-r--r--dev-ruby/ruby-openid/ruby-openid-2.6.0.ebuild31
-rw-r--r--dev-ruby/ruby-openid/ruby-openid-2.7.0.ebuild2
-rw-r--r--dev-ruby/rubygems/Manifest1
-rw-r--r--dev-ruby/rubygems/rubygems-2.5.1.ebuild111
-rw-r--r--dev-ruby/test-unit/test-unit-3.1.5-r1.ebuild46
-rw-r--r--dev-ruby/test_declarative/test_declarative-0.0.5-r2.ebuild11
-rw-r--r--dev-util/dialog/dialog-1.2.20150920.ebuild2
-rw-r--r--dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild8
-rw-r--r--dev-util/eclipse-sdk/metadata.xml4
-rw-r--r--dev-util/kdevelop-php-docs/Manifest1
-rw-r--r--dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.1.ebuild24
-rw-r--r--dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild2
-rw-r--r--dev-util/kdevelop-php/Manifest1
-rw-r--r--dev-util/kdevelop-php/kdevelop-php-1.7.1.ebuild34
-rw-r--r--dev-util/kdevelop-php/kdevelop-php-1.7.2.ebuild2
-rw-r--r--dev-util/kdevelop-python/Manifest1
-rw-r--r--dev-util/kdevelop-python/kdevelop-python-1.7.1.ebuild44
-rw-r--r--dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild2
-rw-r--r--dev-util/kdevelop/Manifest1
-rw-r--r--dev-util/kdevelop/files/kdevelop-4.7.1-gdb.patch30
-rw-r--r--dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild54
-rw-r--r--dev-util/kdevelop/kdevelop-4.7.2.ebuild2
-rw-r--r--dev-util/kdevplatform/Manifest1
-rw-r--r--dev-util/kdevplatform/files/kdevplatform-1.7.1-boost-1.57.patch45
-rw-r--r--dev-util/kdevplatform/kdevplatform-1.7.1.ebuild59
-rw-r--r--dev-util/kdevplatform/kdevplatform-1.7.2.ebuild2
-rw-r--r--dev-util/osc/Manifest2
-rw-r--r--dev-util/osc/osc-0.152.0.ebuild (renamed from dev-util/osc/osc-0.150.1.ebuild)2
-rw-r--r--dev-util/plan9port/files/plan9port-freebsd-10.patch11
-rw-r--r--dev-util/plan9port/plan9port-20140306-r2.ebuild118
-rw-r--r--dev-util/rebar/Manifest1
-rw-r--r--dev-util/rebar/rebar-2.6.0.ebuild29
-rw-r--r--dev-util/suse-build/Manifest2
-rw-r--r--dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch212
-rw-r--r--dev-util/suse-build/suse-build-2015.11.05.ebuild (renamed from dev-util/suse-build/suse-build-2014.02.20.ebuild)11
-rw-r--r--dev-util/suse-build/suse-build-9999.ebuild4
-rw-r--r--dev-vcs/hg-git/Manifest3
-rw-r--r--dev-vcs/hg-git/hg-git-0.8.0.ebuild26
-rw-r--r--dev-vcs/hg-git/hg-git-0.8.3.ebuild (renamed from dev-vcs/hg-git/hg-git-0.8.1.ebuild)0
-rw-r--r--eclass/fortran-2.eclass19
-rw-r--r--eclass/ghc-package.eclass3
-rw-r--r--eclass/qmake-utils.eclass2
-rw-r--r--eclass/qt4-build-multilib.eclass2
-rw-r--r--eclass/qt4-build.eclass806
-rw-r--r--eclass/qt4-r2.eclass2
-rw-r--r--eclass/qt5-build.eclass2
-rw-r--r--eclass/ruby-ng.eclass1
-rw-r--r--eclass/ruby-utils.eclass6
-rw-r--r--eclass/virtualx.eclass4
-rw-r--r--games-action/supertuxkart/supertuxkart-0.9.1.ebuild2
-rw-r--r--games-arcade/alienwave/alienwave-0.4.0.ebuild2
-rw-r--r--games-board/blokish/blokish-0.9.4-r2.ebuild2
-rw-r--r--games-board/gnuchess/gnuchess-6.2.2-r1.ebuild2
-rw-r--r--games-board/openyahtzee/openyahtzee-1.9.2.ebuild2
-rw-r--r--games-emulation/vbam/vbam-2.0.0_pre1507.ebuild2
-rw-r--r--games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libsigc26.patch17
-rw-r--r--games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild86
-rw-r--r--games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild2
-rw-r--r--games-engines/stratagus/stratagus-2.3.0.ebuild2
-rw-r--r--games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild2
-rw-r--r--games-fps/rott/rott-1.1.2.ebuild2
-rw-r--r--games-puzzle/enigma/enigma-1.21-r2.ebuild2
-rw-r--r--games-roguelike/angband/angband-4.0.3.ebuild2
-rw-r--r--games-roguelike/crossfire-client/crossfire-client-1.71.0-r1.ebuild2
-rw-r--r--games-roguelike/dwarf-fortress/Manifest2
-rw-r--r--games-roguelike/dwarf-fortress/dwarf-fortress-0.42.04.ebuild (renamed from games-roguelike/dwarf-fortress/dwarf-fortress-0.42.03.ebuild)0
-rw-r--r--games-strategy/hedgewars/hedgewars-0.9.22.ebuild2
-rw-r--r--games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild2
-rw-r--r--games-strategy/scorched3d/scorched3d-44-r1.ebuild2
-rw-r--r--games-strategy/wesnoth/wesnoth-1.12.5.ebuild2
-rw-r--r--games-util/gtkevemon/gtkevemon-1.8-r1.ebuild7
-rw-r--r--games-util/nml/nml-0.4.2-r1.ebuild2
-rw-r--r--games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild2
-rw-r--r--gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch171
-rw-r--r--gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch27
-rw-r--r--gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild53
-rw-r--r--gnome-extra/cinnamon/Manifest1
-rw-r--r--gnome-extra/cinnamon/cinnamon-2.8.6.ebuild247
-rw-r--r--gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild1
-rw-r--r--gnome-extra/gnome-calendar/Manifest2
-rw-r--r--gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild32
-rw-r--r--gnome-extra/gnome-calendar/gnome-calendar-3.18.2.ebuild32
-rw-r--r--gnome-extra/gnome-dvb-daemon/Manifest1
-rw-r--r--gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild6
-rw-r--r--gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild66
-rw-r--r--gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu.patch29
-rw-r--r--gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu2.patch44
-rw-r--r--gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-revert-encodings.patch35
-rw-r--r--gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r1.ebuild86
-rw-r--r--gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r2.ebuild86
-rw-r--r--gnome-extra/libgda/libgda-5.2.2.ebuild2
-rw-r--r--gnome-extra/nm-applet/Manifest1
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.0.10.ebuild55
-rw-r--r--kde-base/kinfocenter/kinfocenter-4.11.19.ebuild2
-rw-r--r--kde-base/kinfocenter/kinfocenter-4.11.22.ebuild2
-rw-r--r--kde-misc/colord-kde/colord-kde-0.3.0.ebuild2
-rw-r--r--kde-misc/colord-kde/files/colord-kde-0.3.0-cmake34.patch11
-rw-r--r--kde-plasma/breeze-gtk/breeze-gtk-5.5.0.1.ebuild2
-rw-r--r--kde-plasma/breeze-gtk/breeze-gtk-5.5.1.ebuild2
-rw-r--r--kde-plasma/breeze-gtk/files/breeze-gtk-5.5.2-cmake-version.patch18
-rw-r--r--licenses/Quartus-prime-megacore1828
-rw-r--r--mail-client/claws-mail/claws-mail-3.13.1.ebuild6
-rw-r--r--mail-client/roundcube/roundcube-1.1.3.ebuild2
-rw-r--r--mail-client/thunderbird-bin/thunderbird-bin-38.5.0.ebuild2
-rw-r--r--mail-client/thunderbird/thunderbird-38.4.0.ebuild2
-rw-r--r--mail-client/thunderbird/thunderbird-38.5.0.ebuild2
-rw-r--r--mail-filter/rmilter/Manifest1
-rw-r--r--mail-filter/rmilter/files/rmilter.initd27
-rw-r--r--mail-filter/rmilter/metadata.xml8
-rw-r--r--mail-filter/rmilter/rmilter-1.6.7.ebuild35
-rw-r--r--mail-filter/rspamd/Manifest1
-rw-r--r--mail-filter/rspamd/files/rspamd.init44
-rw-r--r--mail-filter/rspamd/files/rspamd.logrotate12
-rw-r--r--mail-filter/rspamd/metadata.xml8
-rw-r--r--mail-filter/rspamd/rspamd-1.0.11.ebuild56
-rw-r--r--mate-extra/mate-system-monitor/mate-system-monitor-1.8.0.ebuild11
-rw-r--r--media-fonts/cantarell/Manifest2
-rw-r--r--media-fonts/cantarell/cantarell-0.0.19.ebuild (renamed from media-fonts/cantarell/cantarell-0.0.16.ebuild)2
-rw-r--r--media-fonts/symbola/symbola-8.00.ebuild2
-rw-r--r--media-gfx/darktable/darktable-1.6.9.ebuild2
-rw-r--r--media-gfx/gimp/gimp-9999.ebuild49
-rw-r--r--media-libs/elementary/Manifest4
-rw-r--r--media-libs/elementary/elementary-1.13.1.ebuild52
-rw-r--r--media-libs/elementary/elementary-1.15.1.ebuild51
-rw-r--r--media-libs/elementary/elementary-1.15.2.ebuild2
-rw-r--r--media-libs/elementary/elementary-1.16.1.ebuild (renamed from media-libs/elementary/elementary-1.15.0.ebuild)0
-rw-r--r--media-libs/freeverb3/Manifest1
-rw-r--r--media-libs/freeverb3/freeverb3-2.5.13-r2.ebuild58
-rw-r--r--media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild2
-rw-r--r--media-libs/gd/gd-2.1.1.ebuild2
-rw-r--r--media-libs/gnonlin/Manifest2
-rw-r--r--media-libs/gnonlin/gnonlin-0.10.9.ebuild24
-rw-r--r--media-libs/gnonlin/gnonlin-1.2.1.ebuild40
-rw-r--r--media-libs/grilo/Manifest1
-rw-r--r--media-libs/grilo/grilo-0.2.15.ebuild87
-rw-r--r--media-libs/gst-plugins-bad/Manifest3
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.2.4-r1.ebuild56
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild88
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.6.2.ebuild (renamed from media-libs/gst-plugins-bad/gst-plugins-bad-1.6.1.ebuild)16
-rw-r--r--media-libs/gst-plugins-base/Manifest3
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r1.ebuild74
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.2.4-r1.ebuild97
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.6.2.ebuild (renamed from media-libs/gst-plugins-base/gst-plugins-base-1.6.0.ebuild)2
-rw-r--r--media-libs/gst-plugins-good/Manifest4
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-0.10.31.ebuild57
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-1.2.3.ebuild58
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-1.2.4-r1.ebuild58
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-1.6.2.ebuild (renamed from media-libs/gst-plugins-good/gst-plugins-good-1.6.0.ebuild)2
-rw-r--r--media-libs/gst-plugins-ugly/Manifest3
-rw-r--r--media-libs/gst-plugins-ugly/gst-plugins-ugly-1.2.4-r1.ebuild40
-rw-r--r--media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.2.ebuild (renamed from media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.0.ebuild)6
-rw-r--r--media-libs/gst-rtsp-server/Manifest1
-rw-r--r--media-libs/gst-rtsp-server/gst-rtsp-server-1.6.2.ebuild73
-rw-r--r--media-libs/gstreamer-editing-services/Manifest3
-rw-r--r--media-libs/gstreamer-editing-services/gstreamer-editing-services-1.2.1.ebuild57
-rw-r--r--media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild (renamed from media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.0.ebuild)4
-rw-r--r--media-libs/gstreamer/Manifest3
-rw-r--r--media-libs/gstreamer/gstreamer-1.2.4-r2.ebuild90
-rw-r--r--media-libs/gstreamer/gstreamer-1.6.2.ebuild (renamed from media-libs/gstreamer/gstreamer-1.6.0.ebuild)2
-rw-r--r--media-libs/harfbuzz/Manifest1
-rw-r--r--media-libs/harfbuzz/harfbuzz-1.1.2.ebuild98
-rw-r--r--media-libs/harfbuzz/harfbuzz-9999.ebuild9
-rw-r--r--media-libs/imlib2/files/imlib2-1.4.7-headers.patch26
-rw-r--r--media-libs/imlib2/imlib2-1.4.7.ebuild7
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild2
-rw-r--r--media-libs/libpng/libpng-1.6.19.ebuild2
-rw-r--r--media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild2
-rw-r--r--media-libs/libsndfile/libsndfile-1.0.26.ebuild2
-rw-r--r--media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild2
-rw-r--r--media-plugins/audacious-plugins/Manifest1
-rw-r--r--media-plugins/audacious-plugins/audacious-plugins-2.4.4-r1.ebuild125
-rw-r--r--media-plugins/emotion_generic_players/Manifest1
-rw-r--r--media-plugins/emotion_generic_players/emotion_generic_players-1.16.0.ebuild30
-rw-r--r--media-plugins/grilo-plugins/Manifest1
-rw-r--r--media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild94
-rw-r--r--media-plugins/gst-plugins-a52dec/Manifest3
-rw-r--r--media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.2.4-r1.ebuild17
-rw-r--r--media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.2.ebuild (renamed from media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-amr/Manifest4
-rw-r--r--media-plugins/gst-plugins-amr/gst-plugins-amr-0.10.19.ebuild25
-rw-r--r--media-plugins/gst-plugins-amr/gst-plugins-amr-1.2.3.ebuild20
-rw-r--r--media-plugins/gst-plugins-amr/gst-plugins-amr-1.2.4-r1.ebuild21
-rw-r--r--media-plugins/gst-plugins-amr/gst-plugins-amr-1.2.4.ebuild20
-rw-r--r--media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.2.ebuild (renamed from media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-annodex/gst-plugins-annodex-0.10.31.ebuild14
-rw-r--r--media-plugins/gst-plugins-assrender/Manifest1
-rw-r--r--media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.2.ebuild15
-rw-r--r--media-plugins/gst-plugins-cdio/Manifest3
-rw-r--r--media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.2.4-r1.ebuild14
-rw-r--r--media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.2.ebuild (renamed from media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-cdparanoia/Manifest3
-rw-r--r--media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.2.4-r1.ebuild18
-rw-r--r--media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.2.ebuild (renamed from media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.0.ebuild)2
-rw-r--r--media-plugins/gst-plugins-dash/Manifest3
-rw-r--r--media-plugins/gst-plugins-dash/gst-plugins-dash-1.2.4-r1.ebuild28
-rw-r--r--media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.2.ebuild (renamed from media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-dtls/Manifest1
-rw-r--r--media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.2.ebuild (renamed from media-plugins/gst-plugins-faad/gst-plugins-faad-1.4.5.ebuild)7
-rw-r--r--media-plugins/gst-plugins-dts/Manifest3
-rw-r--r--media-plugins/gst-plugins-dts/gst-plugins-dts-1.2.4-r1.ebuild18
-rw-r--r--media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.2.ebuild (renamed from media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-dv/Manifest3
-rw-r--r--media-plugins/gst-plugins-dv/gst-plugins-dv-1.2.4-r1.ebuild17
-rw-r--r--media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.2.ebuild (renamed from media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-dvb/Manifest3
-rw-r--r--media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.2.4-r1.ebuild22
-rw-r--r--media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.2.ebuild (renamed from media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-dvdread/Manifest3
-rw-r--r--media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.2.4-r1.ebuild14
-rw-r--r--media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.2.ebuild (renamed from media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-faac/Manifest3
-rw-r--r--media-plugins/gst-plugins-faac/gst-plugins-faac-1.2.4-r1.ebuild14
-rw-r--r--media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.2.ebuild (renamed from media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-faad/Manifest3
-rw-r--r--media-plugins/gst-plugins-faad/gst-plugins-faad-0.10.23-r1.ebuild14
-rw-r--r--media-plugins/gst-plugins-faad/gst-plugins-faad-1.2.4-r1.ebuild14
-rw-r--r--media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.2.ebuild (renamed from media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild84
-rw-r--r--media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild77
-rw-r--r--media-plugins/gst-plugins-flac/Manifest3
-rw-r--r--media-plugins/gst-plugins-flac/gst-plugins-flac-0.10.31.ebuild14
-rw-r--r--media-plugins/gst-plugins-flac/gst-plugins-flac-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.2.ebuild (renamed from media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31.ebuild40
-rw-r--r--media-plugins/gst-plugins-gdkpixbuf/Manifest3
-rw-r--r--media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.2.4-r1.ebuild18
-rw-r--r--media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.2.ebuild (renamed from media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-gio/gst-plugins-gio-0.10.36.ebuild13
-rw-r--r--media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.36.ebuild20
-rw-r--r--media-plugins/gst-plugins-gsm/gst-plugins-gsm-0.10.23.ebuild14
-rw-r--r--media-plugins/gst-plugins-hls/Manifest3
-rw-r--r--media-plugins/gst-plugins-hls/gst-plugins-hls-1.2.4-r1.ebuild27
-rw-r--r--media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.2.ebuild (renamed from media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-ivorbis/gst-plugins-ivorbis-0.10.36.ebuild23
-rw-r--r--media-plugins/gst-plugins-jack/Manifest3
-rw-r--r--media-plugins/gst-plugins-jack/gst-plugins-jack-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.2.ebuild (renamed from media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-jpeg/Manifest3
-rw-r--r--media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.2.ebuild (renamed from media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-0.10.23.ebuild20
-rw-r--r--media-plugins/gst-plugins-lame/Manifest1
-rw-r--r--media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.2.ebuild14
-rw-r--r--media-plugins/gst-plugins-libav/Manifest2
-rw-r--r--media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild2
-rw-r--r--media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.2.ebuild (renamed from media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.0.ebuild)7
-rw-r--r--media-plugins/gst-plugins-libde265/Manifest1
-rw-r--r--media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.2.ebuild17
-rw-r--r--media-plugins/gst-plugins-libmms/Manifest3
-rw-r--r--media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.2.4-r1.ebuild14
-rw-r--r--media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.2.ebuild (renamed from media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-libnice/Manifest2
-rw-r--r--media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.10-r100.ebuild61
-rw-r--r--media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.10.ebuild61
-rw-r--r--media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.8-r100.ebuild60
-rw-r--r--media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.8.ebuild60
-rw-r--r--media-plugins/gst-plugins-libpng/Manifest3
-rw-r--r--media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.2.ebuild (renamed from media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-libvisual/Manifest3
-rw-r--r--media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.2.4-r1.ebuild21
-rw-r--r--media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.2.ebuild (renamed from media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.0.ebuild)2
-rw-r--r--media-plugins/gst-plugins-mad/Manifest3
-rw-r--r--media-plugins/gst-plugins-mad/gst-plugins-mad-1.2.4-r1.ebuild14
-rw-r--r--media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.2.ebuild (renamed from media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r9.ebuild74
-rw-r--r--media-plugins/gst-plugins-meta/gst-plugins-meta-1.0-r3.ebuild70
-rw-r--r--media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.ebuild70
-rw-r--r--media-plugins/gst-plugins-mimic/Manifest3
-rw-r--r--media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.2.ebuild (renamed from media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-modplug/Manifest3
-rw-r--r--media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.2.ebuild (renamed from media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-mpeg2dec/Manifest3
-rw-r--r--media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.2.ebuild (renamed from media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-mpeg2enc/Manifest3
-rw-r--r--media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.2.ebuild (renamed from media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-mplex/Manifest3
-rw-r--r--media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.2.ebuild (renamed from media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-musepack/gst-plugins-musepack-0.10.23.ebuild13
-rw-r--r--media-plugins/gst-plugins-neon/Manifest3
-rw-r--r--media-plugins/gst-plugins-neon/gst-plugins-neon-0.10.23.ebuild19
-rw-r--r--media-plugins/gst-plugins-neon/gst-plugins-neon-1.2.3.ebuild13
-rw-r--r--media-plugins/gst-plugins-neon/gst-plugins-neon-1.2.4.ebuild13
-rw-r--r--media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.2.ebuild (renamed from media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-ofa/Manifest3
-rw-r--r--media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.2.4-r1.ebuild14
-rw-r--r--media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.2.ebuild (renamed from media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-ogg/gst-plugins-ogg-0.10.36.ebuild19
-rw-r--r--media-plugins/gst-plugins-openh264/Manifest1
-rw-r--r--media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.2.ebuild17
-rw-r--r--media-plugins/gst-plugins-opus/Manifest3
-rw-r--r--media-plugins/gst-plugins-opus/gst-plugins-opus-1.2.4-r1.ebuild17
-rw-r--r--media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.2.ebuild (renamed from media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-oss/Manifest3
-rw-r--r--media-plugins/gst-plugins-oss/gst-plugins-oss-0.10.31.ebuild13
-rw-r--r--media-plugins/gst-plugins-oss/gst-plugins-oss-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.2.ebuild (renamed from media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-pango/gst-plugins-pango-0.10.36.ebuild17
-rw-r--r--media-plugins/gst-plugins-pulse/Manifest3
-rw-r--r--media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.2.ebuild (renamed from media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-raw1394/Manifest3
-rw-r--r--media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.2.4-r1.ebuild22
-rw-r--r--media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.2.ebuild (renamed from media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-resindvd/Manifest3
-rw-r--r--media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.2.4-r1.ebuild17
-rw-r--r--media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.2.ebuild (renamed from media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-rtmp/Manifest3
-rw-r--r--media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.2.ebuild (renamed from media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-schroedinger/Manifest3
-rw-r--r--media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.2.4-r1.ebuild17
-rw-r--r--media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.2.ebuild (renamed from media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-shout2/Manifest3
-rw-r--r--media-plugins/gst-plugins-shout2/gst-plugins-shout2-0.10.31.ebuild14
-rw-r--r--media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.2.ebuild (renamed from media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-sidplay/Manifest3
-rw-r--r--media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.2.4-r1.ebuild14
-rw-r--r--media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.2.ebuild (renamed from media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-smoothstreaming/Manifest3
-rw-r--r--media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.2.4-r1.ebuild27
-rw-r--r--media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.2.ebuild (renamed from media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-soundtouch/Manifest3
-rw-r--r--media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.2.ebuild (renamed from media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-soup/Manifest1
-rw-r--r--media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.2.ebuild17
-rw-r--r--media-plugins/gst-plugins-speex/Manifest3
-rw-r--r--media-plugins/gst-plugins-speex/gst-plugins-speex-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.2.ebuild (renamed from media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-taglib/Manifest3
-rw-r--r--media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.2.ebuild (renamed from media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-theora/gst-plugins-theora-0.10.36.ebuild20
-rw-r--r--media-plugins/gst-plugins-twolame/Manifest3
-rw-r--r--media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.2.4-r1.ebuild14
-rw-r--r--media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.2.ebuild (renamed from media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-v4l2/Manifest3
-rw-r--r--media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.2.4-r1.ebuild28
-rw-r--r--media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.2.ebuild (renamed from media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-vaapi/Manifest2
-rw-r--r--media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.10.ebuild52
-rw-r--r--media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.0.ebuild58
-rw-r--r--media-plugins/gst-plugins-voaacenc/Manifest3
-rw-r--r--media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.2.ebuild (renamed from media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-voamrwbenc/Manifest3
-rw-r--r--media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.2.ebuild (renamed from media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild22
-rw-r--r--media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r2.ebuild25
-rw-r--r--media-plugins/gst-plugins-vpx/Manifest3
-rw-r--r--media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.2.4-r1.ebuild16
-rw-r--r--media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.2.ebuild (renamed from media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-wavpack/Manifest3
-rw-r--r--media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.2.ebuild (renamed from media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild31
-rw-r--r--media-plugins/gst-plugins-x264/Manifest3
-rw-r--r--media-plugins/gst-plugins-x264/gst-plugins-x264-1.2.4-r1.ebuild15
-rw-r--r--media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.2.ebuild (renamed from media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-x265/Manifest1
-rw-r--r--media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.2.ebuild (renamed from media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.2.4-r1.ebuild)9
-rw-r--r--media-plugins/gst-plugins-ximagesrc/Manifest3
-rw-r--r--media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.2.4-r1.ebuild29
-rw-r--r--media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.2.ebuild (renamed from media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.0.ebuild)0
-rw-r--r--media-plugins/gst-plugins-xvid/gst-plugins-xvid-0.10.23.ebuild14
-rw-r--r--media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36.ebuild33
-rw-r--r--media-plugins/live/Manifest1
-rw-r--r--media-plugins/live/live-2015.12.22.ebuild129
-rw-r--r--media-plugins/qmmp-plugin-pack/Manifest4
-rw-r--r--media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.9.3.ebuild (renamed from media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.8.4.ebuild)0
-rw-r--r--media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.0.2.ebuild (renamed from media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.9.0.ebuild)11
-rw-r--r--media-radio/cwdaemon/Manifest1
-rw-r--r--media-radio/cwdaemon/cwdaemon-0.10.2.ebuild18
-rw-r--r--media-radio/grig/Manifest1
-rw-r--r--media-radio/grig/grig-0.8.1.ebuild32
-rw-r--r--media-radio/xlog/Manifest2
-rw-r--r--media-radio/xlog/xlog-2.0.11.ebuild62
-rw-r--r--media-radio/xlog/xlog-2.0.12.ebuild62
-rw-r--r--media-radio/xlog/xlog-2.0.13.ebuild2
-rw-r--r--media-sound/apulse/Manifest1
-rw-r--r--media-sound/apulse/apulse-0.1.7.ebuild41
-rw-r--r--media-sound/audacious/Manifest1
-rw-r--r--media-sound/audacious/audacious-2.4.4.ebuild62
-rw-r--r--media-sound/guimup/guimup-0.3.2.ebuild20
-rw-r--r--media-sound/mumble/Manifest1
-rw-r--r--media-sound/mumble/mumble-1.2.12.ebuild128
-rw-r--r--media-sound/murmur/Manifest1
-rw-r--r--media-sound/murmur/murmur-1.2.12.ebuild134
-rw-r--r--media-sound/pavucontrol/pavucontrol-3.0.ebuild2
-rw-r--r--media-sound/qmmp/Manifest3
-rw-r--r--media-sound/qmmp/qmmp-0.9.5.ebuild128
-rw-r--r--media-sound/qmmp/qmmp-1.0.4.ebuild (renamed from media-sound/qmmp/qmmp-1.0.1.ebuild)0
-rw-r--r--media-tv/me-tv/me-tv-1.4.0.10.ebuild17
-rw-r--r--media-video/aegisub/Manifest3
-rw-r--r--media-video/aegisub/aegisub-2.1.9.ebuild61
-rw-r--r--media-video/aegisub/aegisub-3.1.2.ebuild101
-rw-r--r--media-video/aegisub/aegisub-3.1.3.ebuild98
-rw-r--r--media-video/aegisub/aegisub-3.2.2.ebuild2
-rw-r--r--media-video/aegisub/aegisub-9999.ebuild2
-rw-r--r--media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch36
-rw-r--r--media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch20
-rw-r--r--media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch22
-rw-r--r--media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch35
-rw-r--r--media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch50
-rw-r--r--media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch22
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild2
-rw-r--r--media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch14
-rw-r--r--media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild5
-rw-r--r--media-video/makemkv/Manifest4
-rw-r--r--media-video/makemkv/files/makemkv-qt4.patch34
-rw-r--r--media-video/makemkv/files/makemkv-qt5.patch28
-rw-r--r--media-video/makemkv/makemkv-1.9.8-r1.ebuild (renamed from media-video/makemkv/makemkv-1.9.7.ebuild)31
-rw-r--r--media-video/mkvtoolnix/Manifest6
-rw-r--r--media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch63
-rw-r--r--media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch31
-rw-r--r--media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch52
-rw-r--r--media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch11
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild89
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild123
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-8.3.0.ebuild121
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild116
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild116
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild115
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-8.5.2.ebuild2
-rw-r--r--media-video/mpv/Manifest2
-rw-r--r--media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch37
-rw-r--r--media-video/mpv/files/mpv-0.3.11-libav-9.patch12
-rw-r--r--media-video/mpv/files/mpv-fix-include-in-tests.patch17
-rw-r--r--media-video/mpv/metadata.xml13
-rw-r--r--media-video/mpv/mpv-0.11.0-r1.ebuild (renamed from media-video/mpv/mpv-0.9.2_p20150824.ebuild)209
-rw-r--r--media-video/mpv/mpv-0.11.0.ebuild259
-rw-r--r--media-video/mpv/mpv-0.14.0.ebuild299
-rw-r--r--media-video/mpv/mpv-9999.ebuild228
-rw-r--r--media-video/pitivi/Manifest1
-rw-r--r--media-video/pitivi/files/pitivi-0.94-unittest.patch14
-rw-r--r--media-video/pitivi/pitivi-0.94.ebuild90
-rw-r--r--media-video/subtitleeditor/Manifest1
-rw-r--r--media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch55
-rw-r--r--media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild69
-rw-r--r--media-video/vlc/vlc-2.1.5-r1.ebuild4
-rw-r--r--media-video/vlc/vlc-2.1.9999.ebuild6
-rw-r--r--media-video/vlc/vlc-2.2.1-r1.ebuild4
-rw-r--r--media-video/vlc/vlc-2.2.9999.ebuild6
-rw-r--r--media-video/vlc/vlc-9999.ebuild6
-rw-r--r--net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild156
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild2
-rw-r--r--net-analyzer/nmap/nmap-7.01.ebuild16
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.5.5.ebuild6
-rw-r--r--net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch50
-rw-r--r--net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild (renamed from net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild)29
-rw-r--r--net-analyzer/suricata/Manifest1
-rw-r--r--net-analyzer/suricata/suricata-2.0.10.ebuild3
-rw-r--r--net-analyzer/suricata/suricata-2.0.11.ebuild120
-rw-r--r--net-analyzer/vnstat/Manifest4
-rw-r--r--net-analyzer/vnstat/vnstat-1.11-r2.ebuild78
-rw-r--r--net-analyzer/vnstat/vnstat-1.12.ebuild85
-rw-r--r--net-analyzer/vnstat/vnstat-1.15.ebuild (renamed from net-analyzer/vnstat/vnstat-1.14.ebuild)6
-rw-r--r--net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch10
-rw-r--r--net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch20
-rw-r--r--net-analyzer/wireshark/metadata.xml2
-rw-r--r--net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild279
-rw-r--r--net-analyzer/wireshark/wireshark-2.0.0.ebuild3
-rw-r--r--net-analyzer/wireshark/wireshark-99999999.ebuild13
-rw-r--r--net-analyzer/zabbix/zabbix-2.2.11.ebuild1
-rw-r--r--net-analyzer/zabbix/zabbix-2.2.5.ebuild1
-rw-r--r--net-analyzer/zabbix/zabbix-2.2.9.ebuild1
-rw-r--r--net-analyzer/zabbix/zabbix-2.4.5.ebuild1
-rw-r--r--net-analyzer/zabbix/zabbix-2.4.7.ebuild1
-rw-r--r--net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild2
-rw-r--r--net-dns/bind-tools/Manifest2
-rw-r--r--net-dns/bind-tools/bind-tools-9.10.3_p2.ebuild (renamed from net-dns/bind-tools/bind-tools-9.10.3.ebuild)3
-rw-r--r--net-dns/bind-tools/files/bind-tools-9.10.3_p2-libressl.patch110
-rw-r--r--net-dns/bind/Manifest2
-rw-r--r--net-dns/bind/bind-9.10.3_p2.ebuild (renamed from net-dns/bind/bind-9.10.3.ebuild)14
-rw-r--r--net-dns/bind/files/bind-9.10.3_p2-libressl.patch110
-rw-r--r--net-dns/bind/files/named.cache-r290
-rw-r--r--net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild58
-rw-r--r--net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-1.6.0-r113
-rw-r--r--net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.0-r160
-rw-r--r--net-firewall/fwknop/Manifest1
-rw-r--r--net-firewall/fwknop/fwknop-2.6.8.ebuild131
-rw-r--r--net-firewall/nftables/nftables-0.5-r1.ebuild57
-rw-r--r--net-firewall/nftables/nftables-0.5.ebuild57
-rw-r--r--net-firewall/psad/Manifest1
-rw-r--r--net-firewall/psad/psad-2.4.3.ebuild91
-rw-r--r--net-fs/cifs-utils/cifs-utils-6.4.ebuild2
-rw-r--r--net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild2
-rw-r--r--net-im/ayttm/ayttm-0.6.3-r1.ebuild (renamed from net-im/ayttm/ayttm-0.6.3.ebuild)4
-rw-r--r--net-im/gajim/Manifest1
-rw-r--r--net-im/gajim/files/gajim-0.16.5-desktop.patch29
-rw-r--r--net-im/gajim/gajim-0.16.5.ebuild127
-rw-r--r--net-im/jabber-base/jabber-base-0.01-r1.ebuild52
-rw-r--r--net-im/qwit/qwit-1.1_pre2-r1.ebuild30
-rw-r--r--net-im/simpserver-bin/simpserver-bin-2.1.0-r1.ebuild (renamed from net-im/simpserver-bin/simpserver-bin-2.1.0.ebuild)4
-rw-r--r--net-irc/bip/Manifest1
-rw-r--r--net-irc/bip/bip-0.8.8-r1.ebuild72
-rw-r--r--net-irc/bip/bip-0.8.9.ebuild2
-rw-r--r--net-irc/bip/files/bip-0.8.8-configure.patch50
-rw-r--r--net-irc/bip/files/bip-CVE-2012-0806.patch121
-rw-r--r--net-irc/epic5/epic5-1.1.10.ebuild83
-rw-r--r--net-libs/biblesync/Manifest1
-rw-r--r--net-libs/biblesync/biblesync-1.1.2.ebuild18
-rw-r--r--net-libs/biblesync/metadata.xml11
-rw-r--r--net-libs/gsoap/Manifest1
-rw-r--r--net-libs/gsoap/files/gsoap-2.7-fix-missing-cookie-support.patch24
-rw-r--r--net-libs/gsoap/gsoap-2.7.17-r1.ebuild (renamed from net-libs/gsoap/gsoap-2.8.12.ebuild)35
-rw-r--r--net-libs/gsoap/gsoap-2.7.17-r2.ebuild71
-rw-r--r--net-libs/gsoap/gsoap-2.8.26.ebuild2
-rw-r--r--net-libs/gsoap/gsoap-2.8.27.ebuild2
-rw-r--r--net-libs/libaccounts-glib/libaccounts-glib-1.19.ebuild7
-rw-r--r--net-libs/libetpan/libetpan-1.6.ebuild2
-rw-r--r--net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild2
-rw-r--r--net-libs/libtorrent/libtorrent-0.13.6.ebuild2
-rw-r--r--net-libs/nghttp2/nghttp2-1.6.0.ebuild2
-rw-r--r--net-mail/mailutils/files/hdr.at36
-rw-r--r--net-mail/mailutils/files/mailutils-tcp_wrappers.patch22
-rw-r--r--net-mail/mailutils/files/nohdr.at26
-rw-r--r--net-mail/mailutils/files/twomsg.at73
-rw-r--r--net-mail/mailutils/files/weed.at29
-rw-r--r--net-mail/mailutils/mailutils-2.99.99.ebuild12
-rw-r--r--net-misc/apt-cacher-ng/Manifest1
-rw-r--r--net-misc/apt-cacher-ng/apt-cacher-ng-0.8.8.ebuild119
-rw-r--r--net-misc/networkmanager/Manifest1
-rw-r--r--net-misc/networkmanager/networkmanager-1.0.10.ebuild345
-rw-r--r--net-misc/openntpd/openntpd-5.7_p4-r2.ebuild2
-rw-r--r--net-misc/openvpn/Manifest1
-rw-r--r--net-misc/openvpn/openvpn-2.3.9.ebuild132
-rw-r--r--net-misc/putty/putty-0.66.ebuild2
-rw-r--r--net-misc/r8168/Manifest1
-rw-r--r--net-misc/r8168/r8168-8.041.00.ebuild32
-rw-r--r--net-misc/rsync/rsync-3.1.2.ebuild2
-rw-r--r--net-misc/smb4k/Manifest1
-rw-r--r--net-misc/smb4k/smb4k-1.2.0.ebuild29
-rw-r--r--net-misc/smb4k/smb4k-1.2.1.ebuild2
-rw-r--r--net-misc/spice-gtk/spice-gtk-0.30-r1.ebuild2
-rw-r--r--net-misc/strongswan/Manifest1
-rw-r--r--net-misc/strongswan/strongswan-5.3.2.ebuild302
-rw-r--r--net-misc/strongswan/strongswan-5.3.4.ebuild2
-rw-r--r--net-misc/termtter/Manifest2
-rw-r--r--net-misc/termtter/termtter-2.2.3.ebuild (renamed from net-misc/termtter/termtter-2.2.2.ebuild)7
-rw-r--r--net-misc/vde/vde-2.3.2-r2.ebuild2
-rw-r--r--net-misc/youtube-dl/Manifest3
-rw-r--r--net-misc/youtube-dl/youtube-dl-2015.12.13.ebuild87
-rw-r--r--net-misc/youtube-dl/youtube-dl-2015.12.23.ebuild (renamed from net-misc/youtube-dl/youtube-dl-2015.11.27.1.ebuild)12
-rw-r--r--net-misc/youtube-dl/youtube-dl-99999999.ebuild43
-rw-r--r--net-p2p/classified-ads/Manifest2
-rw-r--r--net-p2p/classified-ads/classified-ads-0.09_p20151220.ebuild78
-rw-r--r--net-p2p/gtk-gnutella/Manifest1
-rw-r--r--net-p2p/gtk-gnutella/gtk-gnutella-1.1.5.ebuild86
-rw-r--r--net-p2p/gtk-gnutella/gtk-gnutella-1.1.6.ebuild2
-rw-r--r--net-p2p/rtorrent/rtorrent-0.9.6.ebuild2
-rw-r--r--net-proxy/bfilter/bfilter-1.1.4-r1.ebuild68
-rw-r--r--net-proxy/bfilter/bfilter-1.1.4-r2.ebuild4
-rw-r--r--net-wireless/spectools/spectools-2011.08.1_p20140618-r1.ebuild7
-rw-r--r--net-wireless/uhd/Manifest2
-rw-r--r--net-wireless/uhd/uhd-3.8.2.ebuild2
-rw-r--r--net-wireless/uhd/uhd-3.8.5.ebuild46
-rw-r--r--perl-core/Devel-PPPort/Devel-PPPort-3.310.0.ebuild17
-rw-r--r--perl-core/Devel-PPPort/Manifest1
-rw-r--r--perl-core/Devel-PPPort/metadata.xml5
-rw-r--r--perl-core/Module-Metadata/Manifest1
-rw-r--r--perl-core/Module-Metadata/Module-Metadata-1.0.26.ebuild20
-rw-r--r--perl-core/Module-Metadata/metadata.xml9
-rw-r--r--profiles/arch/alpha/package.use.mask5
-rw-r--r--profiles/arch/amd64/package.use.mask5
-rw-r--r--profiles/arch/powerpc/ppc64/package.use.mask4
-rw-r--r--profiles/arch/x86/package.use.mask5
-rw-r--r--profiles/base/package.use.mask9
-rw-r--r--profiles/base/use.stable.mask3
-rw-r--r--profiles/desc/ruby_targets.desc1
-rw-r--r--profiles/license_groups2
-rw-r--r--profiles/package.mask32
-rw-r--r--profiles/thirdpartymirrors2
-rw-r--r--sci-astronomy/stellarium/stellarium-0.14.0.ebuild2
-rw-r--r--sci-biology/bfast/bfast-0.7.0a.ebuild6
-rw-r--r--sci-biology/bowtie/Manifest1
-rw-r--r--sci-biology/bowtie/bowtie-0.12.8.ebuild44
-rw-r--r--sci-biology/bowtie/bowtie-1.1.2.ebuild2
-rw-r--r--sci-biology/bowtie/bowtie-2.2.6.ebuild4
-rw-r--r--sci-biology/bowtie/files/bowtie-0.12.8-gcc-47.patch45
-rw-r--r--sci-biology/embassy-vienna/embassy-vienna-1.7.2.650.ebuild7
-rw-r--r--sci-biology/mcl/Manifest1
-rw-r--r--sci-biology/mcl/files/mcl-14.137-qa-implicit-declarations.patch27
-rw-r--r--sci-biology/mcl/mcl-14.137.ebuild36
-rw-r--r--sci-biology/rmblast/rmblast-1.2-r1.ebuild1
-rw-r--r--sci-biology/t-coffee/files/t-coffee-11.00-mayhem.patch25
-rw-r--r--sci-biology/t-coffee/files/t-coffee-11.00-set_proper_dir_permissions.patch35
-rw-r--r--sci-biology/t-coffee/t-coffee-11.00-r1.ebuild (renamed from sci-biology/t-coffee/t-coffee-11.00.ebuild)3
-rw-r--r--sci-biology/vaal/files/vaal-1.2-as-needed.patch22
-rw-r--r--sci-biology/vaal/files/vaal-1.2-gcc-x86-no-autocast.patch39
-rw-r--r--sci-biology/vaal/files/vaal-1.2-respect-flags.patch60
-rw-r--r--sci-biology/vaal/files/vaal-1.6-gcc47.patch153
-rw-r--r--sci-biology/vaal/files/vaal-1.6-respect-flags.patch12
-rw-r--r--sci-biology/vaal/files/vaal-46233_remove-namespace-std.patch911
-rw-r--r--sci-biology/vaal/vaal-46233-r1.ebuild42
-rw-r--r--sci-chemistry/avogadro/Manifest1
-rw-r--r--sci-chemistry/avogadro/avogadro-1.1.0.ebuild1
-rw-r--r--sci-chemistry/avogadro/avogadro-1.1.1.ebuild75
-rw-r--r--sci-chemistry/avogadro/files/avogadro-1.1.1-eigen3.patch51
-rw-r--r--sci-chemistry/avogadro/files/avogadro-1.1.1-mkspecs-dir.patch12
-rw-r--r--sci-chemistry/avogadro/files/avogadro-1.1.1-no-strip.patch12
-rw-r--r--sci-chemistry/avogadro/files/avogadro-1.1.1-openbabel.patch16
-rw-r--r--sci-chemistry/avogadro/files/avogadro-1.1.1-pkgconfig_eigen.patch8
-rw-r--r--sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild6
-rw-r--r--sci-chemistry/gelemental/gelemental-1.2.0.ebuild51
-rw-r--r--sci-chemistry/tm-align/Manifest1
-rw-r--r--sci-chemistry/tm-align/tm-align-20150914.ebuild25
-rw-r--r--sci-electronics/quartus-prime-lite/Manifest1
-rw-r--r--sci-electronics/quartus-prime-lite/metadata.xml8
-rw-r--r--sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185.ebuild49
-rw-r--r--sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild (renamed from sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild)2
-rw-r--r--sci-geosciences/grass/Manifest1
-rw-r--r--sci-geosciences/grass/grass-7.0.1-r5.ebuild (renamed from sci-geosciences/grass/grass-7.0.1-r4.ebuild)4
-rw-r--r--sci-geosciences/grass/grass-7.0.2.ebuild270
-rw-r--r--sci-geosciences/qgis/Manifest1
-rw-r--r--sci-geosciences/qgis/metadata.xml2
-rw-r--r--sci-geosciences/qgis/qgis-2.12.1.ebuild153
-rw-r--r--sci-libs/avogadrolibs/Manifest1
-rw-r--r--sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild56
-rw-r--r--sci-libs/blas-reference/blas-reference-20070226-r4.ebuild70
-rw-r--r--sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild67
-rw-r--r--sci-libs/gdal/Manifest1
-rw-r--r--sci-libs/gdal/gdal-2.0.1.ebuild315
-rw-r--r--sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild101
-rw-r--r--sci-libs/libmems/Manifest1
-rw-r--r--sci-libs/libmems/files/libmems-1.6_p1-broken-constness.patch24
-rw-r--r--sci-libs/libmems/files/libmems-1.6_p1-build.patch10
-rw-r--r--sci-libs/libmems/files/libmems-1.6_p1-format-security.patch16
-rw-r--r--sci-libs/libmems/libmems-1.6.ebuild32
-rw-r--r--sci-libs/libmems/libmems-1.6_p1-r1.ebuild (renamed from sci-libs/libmems/libmems-1.6_p1.ebuild)15
-rw-r--r--sci-libs/libmems/libmems-9999.ebuild16
-rw-r--r--sci-mathematics/cgal/cgal-4.3-r1.ebuild2
-rw-r--r--sci-mathematics/maxima/maxima-5.37.3-r4.ebuild (renamed from sci-mathematics/maxima/maxima-5.37.3-r3.ebuild)2
-rw-r--r--sci-misc/repsnapper/Manifest1
-rw-r--r--sci-misc/repsnapper/files/std-c11.patch31
-rw-r--r--sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild36
-rw-r--r--sci-physics/h2o-gtk/h2o-gtk-0.1.ebuild10
-rw-r--r--sys-apps/biosdevname/Manifest2
-rw-r--r--sys-apps/biosdevname/biosdevname-0.4.1.ebuild42
-rw-r--r--sys-apps/biosdevname/biosdevname-0.7.1.ebuild25
-rw-r--r--sys-apps/busybox/busybox-1.24.1.ebuild2
-rw-r--r--sys-apps/findutils/Manifest5
-rw-r--r--sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch66
-rw-r--r--sys-apps/findutils/findutils-4.5.16.ebuild (renamed from sys-apps/findutils/findutils-4.5.15.ebuild)5
-rw-r--r--sys-apps/findutils/findutils-4.5.17.ebuild (renamed from sys-apps/findutils/findutils-4.5.14-r1.ebuild)18
-rw-r--r--sys-apps/findutils/findutils-4.5.18.ebuild55
-rw-r--r--sys-apps/hwids/hwids-20150717-r1.ebuild2
-rw-r--r--sys-apps/less/less-481.ebuild2
-rw-r--r--sys-apps/net-tools/net-tools-1.60_p20141019041918-r1.ebuild2
-rw-r--r--sys-apps/openrc/openrc-0.18.4.ebuild2
-rw-r--r--sys-apps/portage/portage-2.2.24.ebuild2
-rw-r--r--sys-apps/systemd/systemd-226-r2.ebuild2
-rw-r--r--sys-boot/elilo/Manifest2
-rw-r--r--sys-boot/elilo/elilo-3.16.ebuild86
-rw-r--r--sys-boot/elilo/files/elilo-3.16-elilo-loop.patch15
-rw-r--r--sys-cluster/cinder/Manifest1
-rw-r--r--sys-cluster/cinder/cinder-7.0.1.ebuild266
-rw-r--r--sys-devel/bison/bison-2.7.1.ebuild2
-rw-r--r--sys-devel/gcc/gcc-4.8.3.ebuild2
-rw-r--r--sys-devel/gcc/gcc-4.8.4.ebuild2
-rw-r--r--sys-devel/gcc/gcc-4.8.5.ebuild2
-rw-r--r--sys-devel/gcc/gcc-4.9.3.ebuild2
-rw-r--r--sys-devel/gettext/Manifest3
-rw-r--r--sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch18
-rw-r--r--sys-devel/gettext/gettext-0.19.5.1-r1.ebuild146
-rw-r--r--sys-devel/gettext/gettext-0.19.5.ebuild140
-rw-r--r--sys-devel/gettext/gettext-0.19.7.ebuild (renamed from sys-devel/gettext/gettext-0.19.6.ebuild)76
-rw-r--r--sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch86
-rw-r--r--sys-devel/llvm/files/llvm-3.7-msan-fix.patch79
-rw-r--r--sys-devel/llvm/llvm-3.7.0-r5.ebuild540
-rw-r--r--sys-fs/eudev/eudev-3.1.5.ebuild2
-rw-r--r--sys-fs/lvm2/files/lvm.rc-2.02.116-r3134
-rw-r--r--sys-fs/lvm2/files/lvmetad.initd-2.02.116-r318
-rw-r--r--sys-fs/lvm2/lvm2-2.02.116-r3.ebuild278
-rw-r--r--sys-fs/udev/udev-225.ebuild2
-rw-r--r--sys-kernel/genkernel/Manifest1
-rw-r--r--sys-kernel/genkernel/genkernel-3.4.52.2.ebuild2
-rw-r--r--sys-kernel/genkernel/genkernel-3.4.52.3.ebuild162
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.1.12.ebuild2
-rw-r--r--sys-kernel/git-sources/Manifest1
-rw-r--r--sys-kernel/git-sources/git-sources-4.4_rc7.ebuild40
-rw-r--r--sys-kernel/mips-sources/Manifest3
-rw-r--r--sys-kernel/mips-sources/mips-sources-4.2.8.ebuild (renamed from sys-kernel/mips-sources/mips-sources-4.2.6.ebuild)0
-rw-r--r--sys-kernel/mips-sources/mips-sources-4.3.3.ebuild (renamed from sys-kernel/mips-sources/mips-sources-4.3.0.ebuild)0
-rw-r--r--sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch32
-rw-r--r--sys-libs/glibc/glibc-2.19-r1.ebuild5
-rw-r--r--sys-libs/glibc/glibc-2.20-r2.ebuild2
-rw-r--r--sys-libs/glibc/glibc-2.21-r1.ebuild2
-rw-r--r--sys-libs/glibc/glibc-2.22-r1.ebuild2
-rw-r--r--sys-process/xjobs/xjobs-20140125.ebuild2
-rw-r--r--virtual/libgudev/libgudev-230.ebuild2
-rw-r--r--virtual/perl-podlators/perl-podlators-2.5.3-r1.ebuild2
-rw-r--r--virtual/python-asyncio/python-asyncio-0.ebuild2
-rw-r--r--virtual/python-backports_abc/python-backports_abc-0.ebuild2
-rw-r--r--virtual/python-futures/python-futures-0.ebuild2
-rw-r--r--virtual/python-singledispatch/python-singledispatch-0.ebuild2
-rw-r--r--virtual/rubygems/rubygems-11.ebuild5
-rw-r--r--www-apache/mod_wsgi/Manifest2
-rw-r--r--www-apache/mod_wsgi/mod_wsgi-4.4.21.ebuild (renamed from www-apache/mod_wsgi/mod_wsgi-4.4.10.ebuild)0
-rw-r--r--www-apache/passenger/Manifest1
-rw-r--r--www-apache/passenger/passenger-5.0.23.ebuild118
-rw-r--r--www-apps/icingaweb2/Manifest2
-rw-r--r--www-apps/icingaweb2/icingaweb2-2.1.2.ebuild (renamed from www-apps/icingaweb2/icingaweb2-2.0.0-r1.ebuild)2
-rw-r--r--www-apps/jekyll-sass-converter/Manifest2
-rw-r--r--www-apps/jekyll-sass-converter/jekyll-sass-converter-1.4.0.ebuild (renamed from www-apps/jekyll-sass-converter/jekyll-sass-converter-1.3.0.ebuild)13
-rw-r--r--www-apps/owncloud/Manifest4
-rw-r--r--www-apps/owncloud/owncloud-7.0.12.ebuild45
-rw-r--r--www-apps/owncloud/owncloud-8.0.10.ebuild52
-rw-r--r--www-apps/owncloud/owncloud-8.1.5.ebuild52
-rw-r--r--www-apps/owncloud/owncloud-8.2.2.ebuild52
-rw-r--r--www-client/firefox-bin/firefox-bin-38.5.0.ebuild2
-rw-r--r--www-client/firefox/firefox-38.5.0.ebuild2
-rw-r--r--www-client/jd/jd-2.8.5_p120826.ebuild3
-rw-r--r--www-client/opera-developer/Manifest2
-rw-r--r--www-client/opera-developer/opera-developer-36.0.2079.0.ebuild91
-rw-r--r--www-client/surf/Manifest1
-rw-r--r--www-client/surf/files/surf-0.7-gentoo.patch84
-rw-r--r--www-client/surf/surf-0.6-r1.ebuild2
-rw-r--r--www-client/surf/surf-0.6-r2.ebuild2
-rw-r--r--www-client/surf/surf-0.7.ebuild71
-rw-r--r--www-client/surf/surf-9999.ebuild2
-rw-r--r--www-misc/shellinabox/shellinabox-2.19.ebuild2
-rw-r--r--www-plugins/freshplayerplugin/Manifest1
-rw-r--r--www-plugins/freshplayerplugin/files/0.3.4-cmake.patch70
-rw-r--r--www-plugins/freshplayerplugin/files/0.3.4-git-revision.patch11
-rw-r--r--www-plugins/freshplayerplugin/freshplayerplugin-0.3.4.ebuild80
-rw-r--r--www-servers/tomcat/tomcat-7.0.65.ebuild2
-rw-r--r--www-servers/tomcat/tomcat-8.0.28-r2.ebuild2
-rw-r--r--www-servers/tornado/tornado-4.2.1.ebuild2
-rw-r--r--x11-drivers/xf86-input-libinput/Manifest2
-rw-r--r--x11-drivers/xf86-input-libinput/xf86-input-libinput-0.16.0.ebuild (renamed from x11-drivers/xf86-input-libinput/xf86-input-libinput-0.13.0.ebuild)4
-rw-r--r--x11-libs/goffice/Manifest2
-rw-r--r--x11-libs/goffice/goffice-0.10.25.ebuild (renamed from x11-libs/goffice/goffice-0.10.23.ebuild)2
-rw-r--r--x11-libs/goffice/goffice-0.8.17-r1.ebuild62
-rw-r--r--x11-libs/gtk+/gtk+-1.2.10-r13.ebuild3
-rw-r--r--x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild28
-rw-r--r--x11-misc/tint2/Manifest1
-rw-r--r--x11-misc/tint2/files/0.12.3-no-hardcode-update-icon-cache.patch21
-rw-r--r--x11-misc/tint2/tint2-0.12.3.ebuild67
-rw-r--r--x11-misc/virtualgl/files/vgl.initd-r346
-rw-r--r--x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild86
-rw-r--r--x11-misc/xfe/Manifest1
-rw-r--r--x11-misc/xfe/xfe-1.40.1.ebuild2
-rw-r--r--x11-misc/xfe/xfe-1.40.ebuild73
-rw-r--r--x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.15.ebuild2
-rw-r--r--x11-wm/enlightenment/0001-x11-wm-enlightenment-fix-live-git-keywords.patch121
-rw-r--r--x11-wm/enlightenment/Manifest5
-rw-r--r--x11-wm/enlightenment/enlightenment-0.16.9999.ebuild7
-rw-r--r--x11-wm/enlightenment/enlightenment-0.17.9999.ebuild3
-rw-r--r--x11-wm/enlightenment/enlightenment-0.19.12.ebuild3
-rw-r--r--x11-wm/enlightenment/enlightenment-0.20.1.ebuild91
-rw-r--r--x11-wm/enlightenment/enlightenment-1.0.13.ebuild81
-rw-r--r--x11-wm/enlightenment/enlightenment-1.0.14.ebuild81
-rw-r--r--x11-wm/enlightenment/enlightenment-1.0.15.ebuild80
-rw-r--r--x11-wm/enlightenment/enlightenment-1.0.16.ebuild80
-rw-r--r--x11-wm/enlightenment/enlightenment-1.0.17.ebuild4
1244 files changed, 19562 insertions, 13981 deletions
diff --git a/app-accessibility/simon/Manifest b/app-accessibility/simon/Manifest
index d6f54033a45f..72ab878c0afb 100644
--- a/app-accessibility/simon/Manifest
+++ b/app-accessibility/simon/Manifest
@@ -1,2 +1 @@
-DIST simon-0.4.0.tar.bz2 22139378 SHA256 c7ef35cd28ecf294ceae63f4b0c53384bcf89fc2a6e67916dc9d4116decabc12 SHA512 541c22e09bb4234871707cd73e038a5ab0c68a6cb2a28993571c434edff639e4826554f922a4a188b5c2a70ff9a0d627f53af0954431b561adeedccf9c170c85 WHIRLPOOL c2e0cc8632bf089ed14ef53cae02c51166780692222b7f3c7a3583356e9669cbbcd3222507128b35f282b49de2f10a73c42f63e28596c6e8412ff766bb3febfb
DIST simon-0.4.1.tar.bz2 23856024 SHA256 8d55bc3f607a89e15efd51b844d93daf67d9967ad243f54efae324754859342d SHA512 d7349af3ec2482f18d8407891eeea7beea75630cc85aeade9f4105e3b84e82fde6284338688bbf84824d43c68de102eb34f3c21068cbe8a3307aa0586732b30d WHIRLPOOL 4c512bdfed8676cb5cfb896eacb14c66e3497abebe97a4faeb6804feb8ba36ed9101bc79a6efa573470d4a4d7eb6dfc94e3315dac488554563d35a397a066acb
diff --git a/app-accessibility/simon/files/simon-0.4.0-libdir.patch b/app-accessibility/simon/files/simon-0.4.0-libdir.patch
deleted file mode 100644
index 18e12fccfde3..000000000000
--- a/app-accessibility/simon/files/simon-0.4.0-libdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Mar 29 22:00:19 UTC 2013
-Subject: build system
-
-make libdir modifiable
-
---- simon-0.4.0/cmake/SimonDirs.cmake
-+++ simon-0.4.0/cmake/SimonDirs.cmake
-@@ -29,6 +29,6 @@
- #IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
- #set(SIMON_LIB_INSTALL_DIR lib64)
- #ELSE(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-- set(SIMON_LIB_INSTALL_DIR lib)
-+ set(SIMON_LIB_INSTALL_DIR lib CACHE STRING "libdir")
- #ENDIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
- ENDIF(WIN32)
diff --git a/app-accessibility/simon/files/simon-0.4.0-linguas.patch b/app-accessibility/simon/files/simon-0.4.0-linguas.patch
deleted file mode 100644
index bf60f16c834c..000000000000
--- a/app-accessibility/simon/files/simon-0.4.0-linguas.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- simon-0.4.0/CMakeLists.txt
-+++ simon-0.4.0/CMakeLists.txt
-@@ -14,6 +14,9 @@
-
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-
-+# NLS
-+option(ENABLE_NLS "Enable native language support" 1)
-+
- find_package(KDE4 "4.4" REQUIRED)
- find_package(Qt4 COMPONENTS QtCore QtDbus QtGui QtTest QtXml QtScript QtConcurrent REQUIRED)
- find_package(Qwt6 REQUIRED)
-@@ -143,4 +146,6 @@
- macro_display_feature_log()
-
- include(MacroOptionalAddSubdirectory)
--macro_optional_add_subdirectory( po )
-+if(ENABLE_NLS)
-+ macro_optional_add_subdirectory( po )
-+endif(ENABLE_NLS)
---- simon-0.4.0/po/CMakeLists.txt
-+++ simon-0.4.0/po/CMakeLists.txt
-@@ -11,24 +11,14 @@
- if (NOT GETTEXT_MSGFMT_EXECUTABLE)
- MESSAGE(FATAL_ERROR "Please install msgmerge binary")
- endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
--add_subdirectory(cs)
--add_subdirectory(de)
--add_subdirectory(da)
--add_subdirectory(fr)
--add_subdirectory(nl)
--add_subdirectory(uk)
--add_subdirectory(pt_BR)
--add_subdirectory(pl)
--add_subdirectory(es)
--add_subdirectory(ro)
--add_subdirectory(ca)
--add_subdirectory(sl)
--add_subdirectory(pt)
--add_subdirectory(hu)
--add_subdirectory(gl)
--add_subdirectory(sv)
--add_subdirectory(el)
--add_subdirectory(fi)
--add_subdirectory(it)
--add_subdirectory(zh_TW)
--add_subdirectory(et)
-+
-+# gettext behavior
-+execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
-+ OUTPUT_VARIABLE UNSETLINGUAS)
-+set(langs cs de da fr nl uk pt_BR pl es ro ca sl pt hu gl sv el fi it zh_TW et)
-+
-+foreach(mylang ${langs})
-+ if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
-+ add_subdirectory(${mylang})
-+ endif()
-+endforeach()
---- simon-0.4.0/doc/CMakeLists.txt
-+++ simon-0.4.0/doc/CMakeLists.txt
-@@ -1,9 +1,15 @@
-+if(ENABLE_NLS)
-+ # gettext behavior
-+ execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
-+ OUTPUT_VARIABLE UNSETLINGUAS)
-+set(langs pt_BR ca nl de it pt sv uk)
-+
-+ foreach(mylang ${langs})
-+ if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
-+ add_subdirectory(${mylang})
-+ endif()
-+ endforeach()
-+endif(ENABLE_NLS)
-+
-+# default doc
- add_subdirectory(en_US)
--add_subdirectory(pt_BR)
--add_subdirectory(ca)
--add_subdirectory(nl)
--add_subdirectory(de)
--add_subdirectory(it)
--add_subdirectory(pt)
--add_subdirectory(sv)
--add_subdirectory(uk)
diff --git a/app-accessibility/simon/files/simon-0.4.0-opencv.patch b/app-accessibility/simon/files/simon-0.4.0-opencv.patch
deleted file mode 100644
index bdd4581ceafd..000000000000
--- a/app-accessibility/simon/files/simon-0.4.0-opencv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- simon-0.4.0/CMakeLists.txt
-+++ simon-0.4.0/CMakeLists.txt
-@@ -68,7 +68,7 @@
- "PocketSphinx is a small-footprint continuous speech recognition system"
- "http://cmusphinx.sourceforge.net/" FALSE ""
- "Required to build Pocket Sphinx backend")
--find_package(OpenCV)
-+macro_optional_find_package(OpenCV)
- macro_log_feature(OpenCV_FOUND "OpenCV"
- "OpenCV (Open Source Computer Vision) is a library of programming functions for real time computer vision" "http://http://opencv.willowgarage.com/"
- FALSE "" "Required for Simon Vision")
diff --git a/app-accessibility/simon/files/simon-0.4.0-sphinx.patch b/app-accessibility/simon/files/simon-0.4.0-sphinx.patch
deleted file mode 100644
index 0fe8aa25efa4..000000000000
--- a/app-accessibility/simon/files/simon-0.4.0-sphinx.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- simon-0.4.0/CMakeLists.txt
-+++ simon-0.4.0/CMakeLists.txt
-@@ -59,11 +59,11 @@
- macro_optional_find_package(QAccessibilityClient)
- macro_log_feature(QAccessibilityClient_FOUND "qaccessibilityclient" "KDE client-side accessibility library" "https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient" FALSE "" "Required to enable ATSPI plugin.")
-
--find_package(Sphinxbase)
-+macro_optional_find_package(Sphinxbase)
- macro_log_feature(SphinxBase_LIBRARIES "Sphinxbase"
- "Open source toolkit for speech recognition" "http://cmusphinx.sourceforge.net/"
- FALSE "" "Required to build Sphinx backend")
--find_package(Pocketsphinx)
-+macro_optional_find_package(Pocketsphinx)
- macro_log_feature(POCKETSPHINX_LIBRARIES "PocketSphinx"
- "PocketSphinx is a small-footprint continuous speech recognition system"
- "http://cmusphinx.sourceforge.net/" FALSE ""
diff --git a/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch
new file mode 100644
index 000000000000..b6a7d33c409f
--- /dev/null
+++ b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch
@@ -0,0 +1,20 @@
+From: Peter Grasch <me@bedahr.org>
+Date: Sat, 25 Jul 2015 08:45:03 +0000
+Subject: Adding OpenCV include directories to include path
+X-Git-Url: http://quickgit.kde.org/?p=simon.git&a=commitdiff&h=b4e663e5cc36511b15ef20865c723182cd3d88c9
+---
+Adding OpenCV include directories to include path
+---
+
+
+--- a/cmake/FindOpenCV.cmake
++++ b/cmake/FindOpenCV.cmake
+@@ -61,6 +61,7 @@
+
+ ## Include the standard CMake script
+ include("${OpenCV_DIR}/OpenCVConfig.cmake")
++ include_directories(${OpenCV_INCLUDE_DIRS})
+
+ ## Search for a specific version
+ set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
+
diff --git a/app-accessibility/simon/simon-0.4.0.ebuild b/app-accessibility/simon/simon-0.4.0.ebuild
deleted file mode 100644
index 3a9ecade1b41..000000000000
--- a/app-accessibility/simon/simon-0.4.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# KEEP KDE ECLASSES OUT OF HERE
-
-# TODO: qaccessibilityclient support (not in portage)
-# https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient/repository
-# TODO: julius
-
-EAPI=5
-
-inherit eutils multilib gnome2-utils cmake-utils
-
-DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
-HOMEPAGE="http://simon-listens.org/"
-SRC_URI="mirror://kde/stable/simon/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kdepim libsamplerate nls opencv sphinx"
-
-RDEPEND="
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- dev-qt/qtscript:4
- dev-qt/qtsql:4
- kde-base/kdelibs:4
- media-libs/alsa-lib
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/qwt:6
- kdepim? ( kde-base/kdepimlibs:4 )
- libsamplerate? ( media-libs/libsamplerate )
- nls? (
- kde-apps/kde4-l10n
- virtual/libintl
- )
- opencv? ( media-libs/opencv )
- sphinx? (
- >=app-accessibility/pocketsphinx-0.8
- >=app-accessibility/sphinxbase-0.8
- >=app-accessibility/SphinxTrain-1
- )
- !sphinx? ( app-accessibility/julius )"
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-libdir.patch \
- "${FILESDIR}"/${P}-linguas.patch \
- "${FILESDIR}"/${P}-opencv.patch \
- "${FILESDIR}"/${P}-sphinx.patch
-}
-
-src_configure() {
- local mycmakeargs=(
- -DSIMON_LIB_INSTALL_DIR=/usr/$(get_libdir)
- -DBackendType=$(usex sphinx "both" "jhtk")
- $(cmake-utils_use_with sphinx Sphinxbase)
- $(cmake-utils_use_with sphinx Pocketsphinx)
- $(cmake-utils_use_with kdepim KdepimLibs)
- $(cmake-utils_use_with libsamplerate LibSampleRate)
- $(cmake-utils_use_with opencv OpenCV)
- $(cmake-utils_use_enable nls NLS)
- )
-
- cmake-utils_src_configure
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-
- elog "optional dependencies:"
- elog " kde-apps/jovie (support for Jovie TTS system)"
- use sphinx && elog " app-accessibility/julius (alternative backend)"
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/app-accessibility/simon/simon-0.4.1.ebuild b/app-accessibility/simon/simon-0.4.1.ebuild
index b2b9c344428d..d713e97c7fda 100644
--- a/app-accessibility/simon/simon-0.4.1.ebuild
+++ b/app-accessibility/simon/simon-0.4.1.ebuild
@@ -51,11 +51,12 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-libdir.patch \
- "${FILESDIR}"/${P}-linguas.patch \
- "${FILESDIR}"/${P}-sphinx.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-libdir.patch
+ "${FILESDIR}"/${P}-linguas.patch
+ "${FILESDIR}"/${P}-sphinx.patch
+ "${FILESDIR}"/${P}-opencv-include.patch
+)
src_configure() {
local mycmakeargs=(
diff --git a/app-admin/clustershell/clustershell-1.6-r1.ebuild b/app-admin/clustershell/clustershell-1.6-r1.ebuild
new file mode 100644
index 000000000000..4b2480235471
--- /dev/null
+++ b/app-admin/clustershell/clustershell-1.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: test phase
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit distutils-r1
+
+DESCRIPTION="Python framework for efficient cluster administration"
+HOMEPAGE="https://cea-hpc.github.com/clustershell/"
+SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc libressl"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+ distutils-r1_src_install
+
+ if use doc ; then
+ local i
+ for i in $(ls -I man "${S}"/doc) ; do
+ dodoc -r doc/${i}
+ done
+ fi
+
+ doman doc/man/man*/*
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Some default system-wide config files have been installed into"
+ einfo "/etc/${PN}"
+ einfo
+}
diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 5c918854667a..7e60c04ec17d 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI="5"
inherit ssl-cert eutils pam autotools
@@ -13,9 +13,12 @@ SRC_URI="http://www.conserver.com/${P}.tar.gz"
LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="kerberos pam ssl tcpd debug"
+IUSE="kerberos libressl pam ssl tcpd debug"
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
+DEPEND="ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
pam? ( virtual/pam )
tcpd? ( sys-apps/tcp-wrappers )
debug? ( dev-libs/dmalloc )
diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
index 0cc11340fdde..7d23177972b2 100644
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@@ -1 +1,2 @@
DIST lastpass-cli-0.6.0.tar.gz 65047 SHA256 e48f210b34a030e8b8cef3e1d05957aabe757ea4cd31bf03c46b70ddc830733c SHA512 ceaa660e6a7d3b27b09ce6d1d522af216e2c8357859d87034f7f887b53631bf5214b02400f8cb91d0c0020fcfb7889dd0fd8731b1af76a63f94666de2ac4dcd4 WHIRLPOOL 4554d8576e71a0b4c7d69556614a33f3e34d85aec4dd6aa50973ba8eb212864fc45bf3a7cb4e2847cb60a00546e46652cf5baf7f34872ada23431e78078cc6ed
+DIST lastpass-cli-0.7.1.tar.gz 68232 SHA256 e9e2d1dbbb6be0b0d9ce8d6c24026fc537cadc824528c96ac562737a90152f5c SHA512 c6be9b4cf30165835dd4e8716992d43246c91c4e9177226285b5a5214fd5927774155cc75b9aad66c69ec8b10ca0b0e00485a429e2bd064dd406fc55f275a295 WHIRLPOOL b88d4de9fdb120463a8454c098c12a1e2a366429904dec82d271b4ef287bdce192efef5de297733c3a38be21f3241ff402c8448a96daa195b986c671456b0b1d
diff --git a/app-admin/lastpass-cli/lastpass-cli-0.6.0.ebuild b/app-admin/lastpass-cli/lastpass-cli-0.6.0.ebuild
index e1129508d83e..0e59c0652467 100644
--- a/app-admin/lastpass-cli/lastpass-cli-0.6.0.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-0.6.0.ebuild
@@ -11,11 +11,12 @@ HOMEPAGE="https://github.com/lastpass/lastpass-cli"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
-IUSE="X +pinentry"
+IUSE="libressl X +pinentry"
RDEPEND="
X? ( || ( x11-misc/xclip x11-misc/xsel ) )
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
net-misc/curl
dev-libs/libxml2
pinentry? ( app-crypt/pinentry )
diff --git a/app-admin/lastpass-cli/lastpass-cli-0.7.1.ebuild b/app-admin/lastpass-cli/lastpass-cli-0.7.1.ebuild
new file mode 100644
index 000000000000..ca58fd1d904f
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-0.7.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry"
+
+RDEPEND="
+ X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ net-misc/curl
+ dev-libs/libxml2
+ pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND} app-text/asciidoc"
+
+src_compile() {
+ emake PREFIX="${EPREFIX}/usr"
+ emake PREFIX="${EPREFIX}/usr" doc-man
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-doc
+}
diff --git a/app-admin/logrotate/logrotate-3.9.1-r1.ebuild b/app-admin/logrotate/logrotate-3.9.1-r1.ebuild
index 6f8448ca6a03..4ed3e1b31559 100644
--- a/app-admin/logrotate/logrotate-3.9.1-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.9.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="acl +cron selinux"
CDEPEND="
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index bff25728bde6..f2fba3b99449 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -2,3 +2,4 @@ DIST mongo-tools-3.0.5.tar.gz 2160877 SHA256 a0a46dabe493d32bda8dec4ca2e4b06c150
DIST mongo-tools-3.0.6.tar.gz 2161424 SHA256 ed4ebb42efe99f1eeac5ed128f4ae9b10e172396ad06eaae61d3a30c301c2a12 SHA512 ad9e635a6be911116e4a5ddaa4f509c6418036bf9fa4e1ea3940ce3bcc1a5479b403d26d2865b9938a66ed5b38ec4830b307baa7552cc4cf46cc0353dea8853f WHIRLPOOL 29e5364825795c5661ca595e294115d2a06ea43f0b0039bd56d31fd50c1325709a053ebbfc23d54954c4783229be218a6b426ffc6f301149fd946927aad62283
DIST mongo-tools-3.0.7.tar.gz 2183495 SHA256 3136b8df6e7c81b5cf6609b3cd6113d69ea6c067d5bfd25b2e0dbabef9173ca0 SHA512 ff410f25a42e76f55716e6e478564aaeefd3999cf0e9db718969877709974d099c479690e81d6f639c27b0a4d9b59d193c43f1c31dc027b594f1fef33129cb5a WHIRLPOOL 3e3ac13de56c7abd5fd80dcfe5f94090aa78d240598ed0c879365b275bfab5da07aaf8c5b94ad27e3a6f7c0d24d6a68bbb5e54612b4fa2928efbf880c5c40dfc
DIST mongo-tools-3.0.8.tar.gz 2185550 SHA256 b9860339ed59ed57bb29b26c820578c690baa2aaec98fe743561cc95023815f1 SHA512 95ea8377aef747f66ce827300cbc38bfa5b660ad25e4d66cf0dc9899cfe81ff2a67e9383a22c08158fed2d622a6f4d3b315e1234fb6118f246ef17f9cffa129a WHIRLPOOL 00298e54c8fd17a51a3293101defee94219c46929862695e08b2c21a66e59290b341f07c89add38dacfa8295c3fe83ce61cd3911e7489ddd75c2a65721910cce
+DIST mongo-tools-3.2.0.tar.gz 2216880 SHA256 ab477cd6705116971a021245bd4385957ce2a1867ff04f53d0c709c3a161a4c0 SHA512 8db68d0e89b1e7d7229bcb0a110fcd852cd808d7dbeb28952b5fc8c8a17252c1c65e4beb53f2ce68087c3e8a0ee2778cf7e46b7a2626d432221c8d0279cdddc6 WHIRLPOOL 30460a67b8c363d1f280e7b6c152731c7b8ff90670ce1c35729d70908ede14f46fd258c490798582d3a6ddebfcd14dbf95dae95d79eed519ba82c29b94d58120
diff --git a/app-admin/mongo-tools/mongo-tools-3.2.0.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.0.ebuild
new file mode 100644
index 000000000000..658782fe250e
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+ dev-lang/go:=
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.0.0-build.patch"
+}
+
+src_compile() {
+ local myconf
+
+ if use sasl; then
+ myconf="${myconf} sasl"
+ fi
+
+ if use ssl; then
+ myconf="${myconf} ssl"
+ fi
+
+ ./build.sh ${myconf}
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/monit/monit-5.15-r1.ebuild b/app-admin/monit/monit-5.15-r1.ebuild
new file mode 100644
index 000000000000..cd3f4d32c029
--- /dev/null
+++ b/app-admin/monit/monit-5.15-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit pam systemd
+
+DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="libressl pam ssl"
+
+RDEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl )
+ )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ sys-devel/bison
+ pam? ( virtual/pam )"
+
+src_prepare() {
+ sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+ econf $(use_with ssl) $(use_with pam)
+}
+
+src_install() {
+ default
+
+ dodoc README*
+ dohtml -r doc/*
+
+ insinto /etc; insopts -m600; doins monitrc
+ newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+}
+
+pkg_postinst() {
+ elog "Sample configurations are available at:"
+ elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/monit/monit-5.15.ebuild b/app-admin/monit/monit-5.15.ebuild
index 70f94ad701f5..c3245a4294cb 100644
--- a/app-admin/monit/monit-5.15.ebuild
+++ b/app-admin/monit/monit-5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
IUSE="pam ssl"
RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/app-admin/radmind/radmind-1.14.1-r1.ebuild b/app-admin/radmind/radmind-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..ed0b79ba207e
--- /dev/null
+++ b/app-admin/radmind/radmind-1.14.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="command-line tools and server to remotely administer multiple Unix filesystems"
+HOMEPAGE="http://rsug.itd.umich.edu/software/radmind/"
+SRC_URI="mirror://sourceforge/radmind/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+DEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.7.0-gentoo.patch
+ # remove dnssd as it doesn't compile
+ epatch "${FILESDIR}"/${PN}-1.7.1-dnssd.patch
+ epatch "${FILESDIR}"/${PN}-1.14.0-parallel-make.patch
+}
+
+src_install() {
+ default
+ dodoc README VERSION COPYRIGHT
+}
diff --git a/app-admin/rsyslog/rsyslog-8.13.0.ebuild b/app-admin/rsyslog/rsyslog-8.13.0.ebuild
index fb4227249207..cdeb747671d8 100644
--- a/app-admin/rsyslog/rsyslog-8.13.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.13.0.ebuild
@@ -31,7 +31,7 @@ else
http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
"
- KEYWORDS="~amd64 ~arm hppa ~x86"
+ KEYWORDS="amd64 ~arm hppa x86"
PATCHES+=( "${FILESDIR}"/${BRANCH}/50-${PN}-8.12.0-fix-re_extract.patch )
PATCHES+=( "${FILESDIR}"/${BRANCH}/50-${PN}-8.13.0-lookup-table-reload-bugfix.patch )
diff --git a/app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild b/app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild
new file mode 100644
index 000000000000..7345b9c14ae3
--- /dev/null
+++ b/app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Open Source File Integrity Checker and IDS"
+HOMEPAGE="http://www.tripwire.org/"
+SRC_URI="mirror://sourceforge/tripwire/tripwire-${PV}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="libressl ssl static +tools"
+
+DEPEND="sys-devel/automake
+ sys-devel/autoconf
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+RDEPEND="virtual/cron
+ virtual/mta
+ ssl? ( dev-libs/openssl )"
+PDEPEND="tools? ( app-admin/mktwpol )"
+
+S="${WORKDIR}"/tripwire-"${PV}"-src
+
+src_prepare() {
+ epatch "${FILESDIR}"/"${P}"-fix-configure.patch
+ epatch "${FILESDIR}"/"${P}"-buildnum.patch
+ epatch "${FILESDIR}"/"${P}"-gcc-4.7.patch
+ epatch "${FILESDIR}"/"${PN}"-twpol-GENERIC.patch
+ epatch "${FILESDIR}"/"${P}"-exception-shadowing.patch
+
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ # tripwire can be sensitive to compiler optimisation.
+ # see #32613, #45823, and others.
+ # -taviso@gentoo.org
+ strip-flags
+ append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
+ econf $(use_enable ssl openssl) $(use_enable static)
+}
+
+src_install() {
+ dosbin "${S}"/bin/{siggen,tripwire,twadmin,twprint}
+ doman "${S}"/man/man{4/*.4,5/*.5,8/*.8}
+ dodir /etc/tripwire /var/lib/tripwire{,/report}
+ keepdir /var/lib/tripwire{,/report}
+
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/tripwire
+
+ dodoc ChangeLog policy/policyguide.txt TRADEMARK \
+ "${FILESDIR}"/tripwire.txt
+
+ insinto /etc/tripwire
+ doins "${FILESDIR}"/twcfg.txt policy/twpol-GENERIC.txt
+
+ fperms 750 /etc/cron.daily/tripwire
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "Tripwire needs to be configured before its first run. You can"
+ elog "do this by manually editing the twpol-GENERIC.txt file shipped with"
+ elog "the package to suit your needs. A quickstart guide is provided"
+ elog "in tripwire.txt file to help you with this."
+ elog "To configure tripwire automatically, you can use the twsetup.sh"
+ elog "script provided by the app-admin/mktwpol package. This package is"
+ elog "installed for you by the \"tools\" USE flag (which is enabled by"
+ elog "default."
+else
+ elog "Maintenance of tripwire policy files as packages are added"
+ elog "and deleted from your system can be automated by the mktwpol.sh"
+ elog "script provided by the app-admin/mktwpol package. This package"
+ elog "is installed for you if you append \"tools\" to your USE flags"
+ fi
+}
diff --git a/app-admin/ulogd/files/ulogd.init-r2 b/app-admin/ulogd/files/ulogd.init
index c994507f9935..c994507f9935 100644
--- a/app-admin/ulogd/files/ulogd.init-r2
+++ b/app-admin/ulogd/files/ulogd.init
diff --git a/app-admin/ulogd/files/ulogd.init-r1 b/app-admin/ulogd/files/ulogd.init-r1
deleted file mode 100644
index 47a0674ce334..000000000000
--- a/app-admin/ulogd/files/ulogd.init-r1
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_started_commands="reload reopen"
-
-: ${ULOGD_BINARY:=/usr/sbin/ulogd}
-: ${ULOGD_PIDFILE:=/run/${SVCNAME}.pid}
-: ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}}
-
-depend() {
- before iptables ip6tables ebtables nftables firewall
- after mysql postgresql
-}
-
-start() {
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start \
- --exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} \
- -- ${ULOGD_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --pidfile ${ULOGD_PIDFILE}
- eend $?
-}
-
-reload() {
- ebegin "Reloading ${SVCNAME} configuration"
- start-stop-daemon --signal USR1 --pidfile ${ULOGD_PIDFILE}
- eend $?
-}
-
-reopen() {
- ebegin "Reopening ${SVCNAME} logfiles"
- start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
- eend $?
-}
diff --git a/app-admin/ulogd/files/ulogd.service-r1 b/app-admin/ulogd/files/ulogd.service
index e6c88fb810c3..e6c88fb810c3 100644
--- a/app-admin/ulogd/files/ulogd.service-r1
+++ b/app-admin/ulogd/files/ulogd.service
diff --git a/app-admin/ulogd/ulogd-2.0.5-r2.ebuild b/app-admin/ulogd/ulogd-2.0.5-r2.ebuild
deleted file mode 100644
index 5f6110797dbf..000000000000
--- a/app-admin/ulogd/ulogd-2.0.5-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils eutils flag-o-matic linux-info readme.gentoo systemd user
-
-DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
-SRC_URI="
- https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
- ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
-
-RDEPEND="
- || ( net-firewall/iptables net-firewall/nftables )
- >=net-libs/libnfnetlink-1.0.1
- dbi? ( dev-db/libdbi )
- json? ( dev-libs/jansson )
- nfacct? (
- >=net-libs/libmnl-1.0.3
- >=net-libs/libnetfilter_acct-1.0.1
- )
- nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
- nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
- mysql? ( virtual/mysql )
- pcap? ( net-libs/libpcap )
- postgres? ( dev-db/postgresql:= )
- sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
- doc? (
- app-text/linuxdoc-tools
- app-text/texlive-core
- virtual/latex-base
- )
-"
-
-PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" )
-
-DOCS=( AUTHORS README TODO )
-DOC_CONTENTS="
- You must have at least one logging stack enabled to make ulogd work.
- Please edit example configuration located at /etc/ulogd.conf
-"
-
-pkg_setup() {
- enewgroup ulogd
- enewuser ulogd -1 -1 /var/log/ulogd ulogd
-
- linux-info_pkg_setup
-
- if kernel_is lt 2 6 14; then
- die "ulogd requires kernel newer than 2.6.14"
- fi
-
- if kernel_is lt 2 6 18; then
- ewarn "You are using kernel older than 2.6.18"
- ewarn "Some ulogd features may be unavailable"
- fi
-
- if use nfacct && kernel_is lt 3 3 0; then
- ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
- fi
-
- if use ulog && kernel_is gt 3 17 0; then
- ewarn "ULOG target was removed since 3.17.0 kernel release"
- ewarn "Consider enabling NFACCT, NFCT or NFLOG support"
- fi
-}
-
-src_prepare() {
- # - make all logs to be kept in a single dir /var/log/ulogd
- # - place sockets in /run instead of /tmp
- sed -i \
- -e 's:var/log:var/log/ulogd:g' \
- -e 's:tmp:run:g' \
- ulogd.conf.in || die 'sed on ulogd.conf.in failed'
-
- append-lfs-flags
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with dbi)
- $(use_with json jansson)
- $(use_enable nfacct)
- $(use_enable nfct)
- $(use_enable nflog)
- $(use_with mysql)
- $(use_with pcap)
- $(use_with postgres pgsql)
- $(use_with sqlite)
- $(use_enable ulog)
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use doc; then
- # Prevent access violations from bitmap font files generation
- export VARTEXFONTS="${T}"/fonts
- emake -C doc
- fi
-}
-
-src_install() {
- autotools-utils_src_install
- readme.gentoo_create_doc
- prune_libtool_files --modules
-
- if use doc; then
- dohtml doc/${PN}.html
- dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps
- fi
-
- use sqlite && dodoc doc/sqlite3.table
- use mysql && dodoc doc/mysql-*.sql
- use postgres && dodoc doc/pgsql-*.sql
- doman ${PN}.8
-
- insinto /etc
- doins ${PN}.conf
- fowners root:ulogd /etc/ulogd.conf
- fperms 640 /etc/ulogd.conf
-
- newinitd "${FILESDIR}/${PN}.init-r1" ${PN}
- systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- diropts -o ulogd -g ulogd
- keepdir /var/log/ulogd
-}
diff --git a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
index b39dca2df899..31cbd52ed99c 100644
--- a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~ia64 ppc x86"
IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
RDEPEND="
@@ -137,8 +137,8 @@ src_install() {
fowners root:ulogd /etc/${PN}.conf
fperms 640 /etc/${PN}.conf
- newinitd "${FILESDIR}/${PN}.init-r2" ${PN}
- systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service
+ newinitd "${FILESDIR}/${PN}.init" ${PN}
+ systemd_dounit "${FILESDIR}/${PN}.service"
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotate" ${PN}
diff --git a/app-arch/arj/arj-3.10.22-r5.ebuild b/app-arch/arj/arj-3.10.22-r5.ebuild
index 6bf77b3d607d..ae8ab2163c32 100644
--- a/app-arch/arj/arj-3.10.22-r5.ebuild
+++ b/app-arch/arj/arj-3.10.22-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://debian/pool/main/a/arj/${P/-/_}.orig.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE=""
src_prepare() {
diff --git a/app-arch/dpkg/dpkg-1.17.26.ebuild b/app-arch/dpkg/dpkg-1.17.26.ebuild
index 8befc4afa467..3a128f71a8b2 100644
--- a/app-arch/dpkg/dpkg-1.17.26.ebuild
+++ b/app-arch/dpkg/dpkg-1.17.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
RDEPEND="
diff --git a/app-backup/attic/Manifest b/app-backup/attic/Manifest
new file mode 100644
index 000000000000..1f5d62363ed1
--- /dev/null
+++ b/app-backup/attic/Manifest
@@ -0,0 +1 @@
+DIST attic-0.16.tar.gz 87985 SHA256 ce44800b08540cbe334f0a4f5da49585850c1eea1bf621c2766bbdcc98a13e09 SHA512 16139cd93bff59414cc1ce3fd68e2dd0aed4937a20bd1003880961ad2e239a1e982fd0d4f6b791165464213b88dea6ccd8e5e59d2087809be2e1bfdfd3b3186c WHIRLPOOL e3f0963cca0ede9d5400393cb5aabf66433c87bbc0dd997e2d63991e69d380113c6a25075ecac0ab61e5807676bf2aa87e72257133df0f2ee879ccaef586e5a3
diff --git a/app-backup/attic/attic-0.16.ebuild b/app-backup/attic/attic-0.16.ebuild
new file mode 100644
index 000000000000..b3249988f1c9
--- /dev/null
+++ b/app-backup/attic/attic-0.16.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/jborg/attic.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Attic is a deduplicating backup program written in Python."
+HOMEPAGE="https://attic-backup.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+RDEPEND="
+ dev-python/msgpack[${PYTHON_USEDEP}]
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ dev-python/llfuse[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${RDEPEND}"
diff --git a/app-backup/attic/attic-9999.ebuild b/app-backup/attic/attic-9999.ebuild
new file mode 100644
index 000000000000..b3249988f1c9
--- /dev/null
+++ b/app-backup/attic/attic-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/jborg/attic.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Attic is a deduplicating backup program written in Python."
+HOMEPAGE="https://attic-backup.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+RDEPEND="
+ dev-python/msgpack[${PYTHON_USEDEP}]
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ dev-python/llfuse[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${RDEPEND}"
diff --git a/app-backup/attic/metadata.xml b/app-backup/attic/metadata.xml
new file mode 100644
index 000000000000..1e7587374fdf
--- /dev/null
+++ b/app-backup/attic/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-backup/luckybackup/Manifest b/app-backup/luckybackup/Manifest
index 2fe8344209b1..38e4a28b63d6 100644
--- a/app-backup/luckybackup/Manifest
+++ b/app-backup/luckybackup/Manifest
@@ -1,2 +1 @@
-DIST luckybackup-0.4.7.tar.gz 5393530 SHA256 492f27f9e846d5f11d9a4466aa821803b17eb7c3047f9cf082bc66be3d093f4d SHA512 87c62241327e731cd3b4d230d17e43de48bcf840cac938153b8cf321fe00209a649ff251c0c60eb6feb55582b597eaa3d1f6727d956fe75429ced93920c544ef WHIRLPOOL 4c2bd772d6b1271af3b937a0fbbae56e6ee434a068bb2be94e11cd3d86dfe18c6931bff76921f02f9ecf32cec4cb201e30c1bcfa88048b87db5ead8ba7808ae8
DIST luckybackup-0.4.8.tar.gz 5710203 SHA256 68a8a318a6a32a2395fbaada114973f5a4887846c5c6188b38c175215b3116f6 SHA512 48e73f8b5897a09f64f3755dc094ef50031c607ecfca25c238b45ca5bef7f2645081b7c665a9b7c3c3da2f214f91b229a559d723df8ddb6446aa23e68b266076 WHIRLPOOL ccced074661d4a3764bf6e069aff5877c721ef3ef452490dfb17d292c0ee6cb1f12b995eea40134995c1a8ca935472ffcf28585b28d1d4818f06042e512aacec
diff --git a/app-backup/luckybackup/luckybackup-0.4.7-r1.ebuild b/app-backup/luckybackup/luckybackup-0.4.7-r1.ebuild
deleted file mode 100644
index bdd807860bb5..000000000000
--- a/app-backup/luckybackup/luckybackup-0.4.7-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit qt4-r2
-
-DESCRIPTION="Powerful and flexible backup (and syncing) tool, using RSync and Qt4"
-HOMEPAGE="http://luckybackup.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4"
-RDEPEND="${DEPEND}
- net-misc/rsync"
-
-DOCS="readme/*"
-
-src_prepare() {
- sed -i \
- -e "s:/usr/share/doc/${PN}:/usr/share/doc/${PF}:g" \
- -e "s:/usr/share/doc/packages/${PN}:/usr/share/doc/${PF}:g" \
- luckybackup.pro src/global.h || die "sed failed"
-
- # The su-to-root command is an ubuntu-specific script so it will
- # not work with Gentoo. No reason to have it anyway.
- sed -i -e "/^Exec/s:=.*:=/usr/bin/${PN}:" menu/${PN}-gnome-su.desktop \
- || die "failed to remove su-to-root"
-
- # causes empty directory to be installed
- sed -i -e '/^INSTALLS/s/debianmenu //' luckybackup.pro \
- || die "sed installs failed"
-
- # remove text version - cannot remote HTML version
- # as it's used within the application
- rm license/gpl.txt || die "rm failed"
-}
diff --git a/app-backup/luckybackup/luckybackup-0.4.8.ebuild b/app-backup/luckybackup/luckybackup-0.4.8.ebuild
index b41cdb8f20c6..024e81350259 100644
--- a/app-backup/luckybackup/luckybackup-0.4.8.ebuild
+++ b/app-backup/luckybackup/luckybackup-0.4.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="dev-qt/qtcore:4
diff --git a/app-backup/obnam/files/obnam-1.18.2-obnamlib-sftp-Add-prefetch-size-argument.patch b/app-backup/obnam/files/obnam-1.18.2-obnamlib-sftp-Add-prefetch-size-argument.patch
new file mode 100644
index 000000000000..20a8e7cb6b78
--- /dev/null
+++ b/app-backup/obnam/files/obnam-1.18.2-obnamlib-sftp-Add-prefetch-size-argument.patch
@@ -0,0 +1,31 @@
+From 738e9291ed15980bdac568fc5f9507a43897ba52 Mon Sep 17 00:00:00 2001
+From: Kyle Manna <kyle@kylemanna.com>
+Date: Fri, 6 Nov 2015 08:12:50 -0800
+Subject: [PATCH] obnamlib: sftp: Add prefetch size argument
+
+Paramiko made this argument required in v1.16. Details at
+https://github.com/paramiko/paramiko/commit/49072f3537a8981e9d448c22481a1d2b92c03643
+
+Attempt to fetch the entire file. I'm unsure if this is the original
+intent. If the entire file isn't to be fetched, then the prefetch() is
+probably not needed.
+---
+ obnamlib/plugins/sftp_plugin.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/obnamlib/plugins/sftp_plugin.py b/obnamlib/plugins/sftp_plugin.py
+index c4d5c2f..a5bc72b 100644
+--- a/obnamlib/plugins/sftp_plugin.py
++++ b/obnamlib/plugins/sftp_plugin.py
+@@ -555,7 +555,7 @@ class SftpFS(obnamlib.VirtualFileSystem):
+ def cat(self, pathname):
+ self._delay()
+ f = self.open(pathname, 'rb')
+- f.prefetch()
++ f.prefetch(self.lstat(pathname).st_size)
+ chunks = []
+ while True:
+ chunk = f.read(self.chunk_size)
+--
+2.6.2
+
diff --git a/app-backup/obnam/obnam-1.18.2.ebuild b/app-backup/obnam/obnam-1.18.2-r1.ebuild
index 8b909251b952..dff2085b7a62 100644
--- a/app-backup/obnam/obnam-1.18.2.ebuild
+++ b/app-backup/obnam/obnam-1.18.2-r1.ebuild
@@ -22,13 +22,17 @@ DEPEND="${PYTHON_DEPS}
dev-python/cliapp[${PYTHON_USEDEP}]
dev-python/fuse-python[${PYTHON_USEDEP}]
dev-python/larch[${PYTHON_USEDEP}]
- >dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+ dev-python/paramiko[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/tracing[${PYTHON_USEDEP}]
dev-python/ttystatus[${PYTHON_USEDEP}]
"
RDEPEND="${DEPEND}"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-obnamlib-sftp-Add-prefetch-size-argument.patch"
+}
+
src_compile() {
addwrite /proc/self/comm
distutils-r1_src_compile
diff --git a/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild b/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild
index 95d84255d23f..0b47e700bea7 100644
--- a/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild
+++ b/app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild
@@ -3,8 +3,7 @@
# $Id$
EAPI=5
-
-inherit autotools eutils
+inherit autotools eutils flag-o-matic
DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm GUI"
HOMEPAGE="http://www.coyotegulch.com/products/acovea/"
@@ -22,12 +21,11 @@ DEPEND="${RDEPEND}"
src_prepare() {
use unicode && epatch "${FILESDIR}"/${P}-unicode.patch
epatch "${FILESDIR}"/${P}-{libbrahe,libsigc,gcc4.3}.patch
-
- eautorerconf
+ append-cxxflags -std=c++11
+ eautoreconf
}
src_install() {
- DOCS=( ChangeLog NEWS README )
default
make_desktop_entry "${PN}" Acovea-gtk \
/usr/share/acovea-gtk/pixmaps/acovea_icon_064.png System
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index ca08d24d3cd0..f4d5acc21f59 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,2 +1,2 @@
-DIST BestCrypt-2.0.10.tar.gz 2109094 SHA256 fc41c0208a5e532a0c70614b3f3ef4c235ce19ec19ff2d730c9edd49972d6c7d SHA512 943055efc87dd52be5e6ee56e9fd5e607f17d705ac5335d2124230272cb28339e7d6842ecf523dcb664b99f6111e378e61246be42e4094e16d66cebbf99ea4e6 WHIRLPOOL 0d8428ffb17ac0ea3102ac294a960f62961cc0c816319ea6e65422f14b0b0420db0cf3abbf4537c479bda0481a238831e690002cf0594bf69e919c640bab6e36
+DIST BestCrypt-2.0.11.tar.gz 2191182 SHA256 f6aef665eb8ff5eb1ef0f15ce496d7ac62d13e7dbc3031d5d4555a0a5de22ad0 SHA512 f6848153fc68690c116796bd5feb80dc1776f344327de5ac485dddc5b60280b491e2e5c9f266d6f30b7095396cd06b5bdad5d322b4ac24ab612ec642dbc08fe2 WHIRLPOOL 036e7e967a3ef963b481310aa7732cbb764e0647f05796038892fcdc7ab772c48e5d57476ea7ba293d44a877fb42a55858f92fe018d54729f9845ccfd4f41988
DIST BestCrypt-2.0.9.tar.gz 2109108 SHA256 8bf7e7e0f694668cc36e175226b99daf0149fa60e1f87bfe60ee1495559a01d8 SHA512 76b534c2b41b22d580c051f446dd97dd1de1d0a98f83b0236ac3f7fac2790e37f2e4e55842087102180e61c1bfd2bb6d5f2fee5355c2ac9b34510439a360be1f WHIRLPOOL 76d01e075a5383bb7bfcb90b1aa274e62573d25e279852477a6d1bc0de25a97dd6f49548feb7f8ded775f95a322305c6b9e9c25f75eed3535476cb6df4f28663
diff --git a/app-crypt/bestcrypt/bestcrypt-2.0.10.ebuild b/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild
index 283652a1f90b..283652a1f90b 100644
--- a/app-crypt/bestcrypt/bestcrypt-2.0.10.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-2.0.11.ebuild
diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.26.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.26.ebuild
index e4169623948a..afc58a772b46 100644
--- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.26.ebuild
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.26.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils toolchain-funcs libtool flag-o-matic
MY_PV="${PV/_/-}"
MY_P="util-linux-${MY_PV}"
diff --git a/app-dicts/myspell-en/metadata.xml b/app-dicts/myspell-en/metadata.xml
index 0bf837b891e0..2cfa7063165c 100644
--- a/app-dicts/myspell-en/metadata.xml
+++ b/app-dicts/myspell-en/metadata.xml
@@ -3,8 +3,8 @@
<pkgmetadata>
<herd>proxy-maintainers</herd>
<maintainer>
- <name>Elizabeth Myers</name>
<email>elizabeth@interlinked.me</email>
+ <name>Elizabeth Myers</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
</pkgmetadata>
diff --git a/app-dicts/myspell-ru/Manifest b/app-dicts/myspell-ru/Manifest
index 157f607ba619..f15001a4968d 100644
--- a/app-dicts/myspell-ru/Manifest
+++ b/app-dicts/myspell-ru/Manifest
@@ -1,3 +1,4 @@
+DIST dict_pack_ru-aot-0-4-0.oxt 1509261 SHA256 0d4e15c3eca931e690d6533be8d0b5ce22948f0d45e3df0d1a5e0e870c093db9 SHA512 00e63f5abcfbb2fecd72dc2a2b80dc5ebb4d16aac909b2f63670235edadd0d22a5ed3ae0508bfdb273a85f32ee60df4e84dc620fa1a44f42543848b71a9d1b01 WHIRLPOOL fce8e71e09d0d86375a2648968254a355e0569bd744627abb2ec71c6bb6e34a824dbb5550d79cda0f19539bee210ec0983f64d12ee167f3ed3196c06577dd9b9
DIST myspell-hyph_ru_RU-20060316.zip 11089 SHA256 95b2198f937f1ba1fe2373302c81517ee88a38c237a1ed5557c543a7e2b141df SHA512 4538a4fbdd61adafe321258fb4a9b1896d10747adf8203bd3a5eaa40ee15a9d5d3d8304a19a644f676a1224ac36f5d47ae7a10cbcae22ccbd2f8af49bf5e92ac WHIRLPOOL 46d284df470596c796b436fab9042d8c58625dc3f0c3da41434133afed0eb35b0b2c326005460b9eda4c20499420d7d1bf8d51ac41160f0bfaa125ff45d27baa
DIST myspell-ru_RU-20060316.zip 467216 SHA256 387e9fd6c24c34e27fe5f0eb227beec2522b8855dc44917a37a66571db15ed0d SHA512 2a1d62cd79d58ca093f477006e436e728ff2cf063c3b0e1ce127a0c83835afe7fce7846e9ec3577e848c9d911565b4fdff8475508bbbe29f2d9523fe0a858617 WHIRLPOOL dfe9e19ba00aa5c200073e5da08b9d7d832c002f2e83814b138f40480d04b6dc91b0455cc45e2266d7f77492df767889f2958ba5fb781cb7c362fffc153d263c
DIST myspell-ru_RU_ye-20060316.zip 984889 SHA256 8eecd25a1d16e43dde23fd72deb6c9290e0f328b7fb2956ec3fe07692ce8e653 SHA512 5d1e39166b8666ee2be599cd74872a80b34bba11ff389ca74919a0b2fca7f7e66dfd71188b97f08686161e5af54164b82d0fe86c9097c3aaad6c22432f867e19 WHIRLPOOL 05bb523e3c82a6dee7812c9642aa660998328858dd173af9d73db80c43eb73034aa48fb4e431e280b8d4af81f17c719c0cc3557927cafd35ca864572dc28e738
diff --git a/app-dicts/myspell-ru/metadata.xml b/app-dicts/myspell-ru/metadata.xml
index 4538a68724a6..572cd6519a72 100644
--- a/app-dicts/myspell-ru/metadata.xml
+++ b/app-dicts/myspell-ru/metadata.xml
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>perfect007gentleman@gmail.com</email>
+ <name>Perfect Gentleman</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
</pkgmetadata>
diff --git a/app-dicts/myspell-ru/myspell-ru-20150711.ebuild b/app-dicts/myspell-ru/myspell-ru-20150711.ebuild
new file mode 100644
index 000000000000..9d35c165aebf
--- /dev/null
+++ b/app-dicts/myspell-ru/myspell-ru-20150711.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MYSPELL_DICT=( russian-aot.{dic,aff} )
+
+MYSPELL_HYPH=( hyph_ru_RU.dic )
+
+MYSPELL_THES=( ru_th_aot.{dat,idx} )
+
+inherit myspell-r2
+
+EXT="extension-center"
+DICT="russian-dictionary-pack"
+MY_PN="dict_pack_ru-aot"
+MY_PV="0.4.0"
+
+DESCRIPTION="Russian spellcheck dictionary based on works of AOT group for myspell/hunspell"
+HOMEPAGE="http://extensions.libreoffice.org/extension-center/russian-dictionary-pack"
+SRC_URI="http://extensions.libreoffice.org/${EXT}/${DICT}/releases/${MY_PV}/${MY_PN}-0-4-0.oxt"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd"
diff --git a/app-dicts/verbiste/Manifest b/app-dicts/verbiste/Manifest
index a2cf3d63bb64..2895fdf89893 100644
--- a/app-dicts/verbiste/Manifest
+++ b/app-dicts/verbiste/Manifest
@@ -1 +1,2 @@
DIST verbiste-0.1.38.tar.gz 706222 SHA256 7be13f0cc5c415ea5382ed2ee4391c21c700910eef2771086a28e44ff32817ff SHA512 b5d99d08a9d1a7c91c1dbb86e0d4465a46403db881cd28d2abaf8d376adef6b4d4f5ac93e528d45beb639b77aff7e1730dbb436624674ff21c1f5781173db787 WHIRLPOOL 9e7558e36c33eb7cd89f0cb888c01fb6040292ff7cdaeecd6f9ee51c7354939d5b9d23f769c67462be613abf0e275ab5580539a10fb5d0d8e8eca3489f16b027
+DIST verbiste-0.1.41.tar.gz 751059 SHA256 b4490d99dc768c8947536c01a5fbbecf71d067f472c0bd4d79b828df45d79f9f SHA512 f89bb1074cd8c65f8516004c89aae50c65b5bd426d78a01b5e6b7418d86b5c348d2c554ab202c9f34cc9c5586a54518160fc225afa237cdb140ff99f78563702 WHIRLPOOL 8a3d6a29f0bf428f2ec5f9852bf4381abb02eb4aac16153cd95fda367e1227cca3035a00de02f3d00757b254fba9dcc2d19a0f91454f82097ce4026d84ab83aa
diff --git a/app-dicts/verbiste/verbiste-0.1.41.ebuild b/app-dicts/verbiste/verbiste-0.1.41.ebuild
new file mode 100644
index 000000000000..4155f6484872
--- /dev/null
+++ b/app-dicts/verbiste/verbiste-0.1.41.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils gnome2-utils xdg-utils
+
+DESCRIPTION="French conjugation system"
+HOMEPAGE="http://sarrazip.com/dev/verbiste.html"
+SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="gtk"
+
+RDEPEND="
+ >=dev-libs/libxml2-2.4.0:2
+ gtk? ( >=x11-libs/gtk+-2.6:2 )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_configure() {
+ econf \
+ --with-console-app \
+ --without-gnome-app \
+ --without-gnome-applet \
+ $(use_with gtk gtk-app)
+}
+
+src_install() {
+ default
+ prune_libtool_files
+ dodoc HACKING LISEZMOI
+ # file is only installed with USE=gnome
+ if use gtk; then
+ sed -e 's/Exec=.*/Exec=verbiste-gtk/' \
+ -i src/gnome/verbiste.desktop || die
+ insinto usr/share/applications
+ doins src/gnome/verbiste.desktop
+ fi
+}
+
+pkg_preinst() {
+ if use gtk; then
+ gnome2_icon_savelist
+ fi
+}
+
+pkg_postinst() {
+ if use gtk; then
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use gtk; then
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
diff --git a/app-editors/latexila/Manifest b/app-editors/latexila/Manifest
index 651e7b719660..47bc4511e651 100644
--- a/app-editors/latexila/Manifest
+++ b/app-editors/latexila/Manifest
@@ -1,2 +1,3 @@
DIST latexila-3.16.2.tar.xz 1058776 SHA256 5ad20a2acdb8c93dea5aa175a219e62efe5f4a7ffb67bc52ff6faf0c6f42bad3 SHA512 d9d5c90374d5aa9b2599f90565dde9da1c4dc7713b7be8ffbfac71b5797124142ef46811660f14edfd278ec9d3f3b6b0c56ef325201fb85caf3b7322577e40fc WHIRLPOOL 3fde6abc4979dd9a40cc019e30c8b0e0c55c97fa3a4670d073d1ca6f662342b54923ea263246a169e8944fa3aaba358d6881629e20c6e949b1287e9328c1cdc6
DIST latexila-3.18.1.tar.xz 1092768 SHA256 edfd95f321dfff31fb094c243c358cb78d19904164b9ef4fb37c021113044d0a SHA512 4123cbe4b6df7b493767abbe75ed43e025b640a869a61abec29715f40a3619433bc8300be6a06c8ec5c252215a6b05623d4b7a7f55d7eabbafa6f0ca19a26f92 WHIRLPOOL e1612ba477bef16aaee9f2173f29963c7dab3c0496082fe308ee2bed22b1a6cf9b480f1df1d259a774b593f3c58976de6bc0c3d6757941254abb1a5de067ddb6
+DIST latexila-3.18.2.tar.xz 1094728 SHA256 4bb584ec2c8d2ff8ee91e533ad7cf298f68b4a17c18b5663ea38482095c8773a SHA512 98d927e65c26c883e9f46097c204d612ad7815f1f2ebf73194f56f90ff63ce6e51780e6b7b8f7d5d7c303b52f4dfca3e891f61242fd81ce5898dfef90e15c1b6 WHIRLPOOL fae82e1be3cdee1b67a8ef1cf16d892639bd55b0a485136b4d40ef174bd08921a207c0360a17a85a924d362cd25b437d69dc91c3dac6c973bf6f4d940d7ca775
diff --git a/app-editors/latexila/latexila-3.18.2.ebuild b/app-editors/latexila/latexila-3.18.2.ebuild
new file mode 100644
index 000000000000..eaa433197844
--- /dev/null
+++ b/app-editors/latexila/latexila-3.18.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Integrated LaTeX environment for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection +latexmk rubber"
+
+# gspell-0.1 is required for this cycle
+# https://git.gnome.org/browse/latexila/commit/?h=gnome-3-18&id=fd6b77796e304cfb9e31844cf24432d3b2cb6043
+COMMON_DEPEND="$(vala_depend)
+ app-text/enchant
+ =app-text/gspell-0.1*
+ >=dev-libs/glib-2.40:2[dbus]
+ >=dev-libs/libgee-0.10:0.8=
+ gnome-base/gsettings-desktop-schemas
+ >=x11-libs/gtk+-3.14:3
+ >=x11-libs/gtksourceview-3.18:3.0
+ x11-libs/gdk-pixbuf:2
+ x11-libs/libX11
+ x11-libs/pango
+ introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ virtual/latex-base
+ x11-themes/hicolor-icon-theme
+ latexmk? ( dev-tex/latexmk )
+ rubber? ( dev-tex/rubber )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-doc-am-1.14
+ >=dev-util/intltool-0.50.1
+ dev-util/itstool
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ DOCS="AUTHORS HACKING NEWS README"
+ gnome2_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable introspection)
+}
diff --git a/app-editors/nano/nano-2.4.3.ebuild b/app-editors/nano/nano-2.4.3.ebuild
index 1b00bee948f5..4e4179d873cb 100644
--- a/app-editors/nano/nano-2.4.3.ebuild
+++ b/app-editors/nano/nano-2.4.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P=${PN}-${PV/_}
SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 2591d0a31a86..4064974e8d7e 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,2 +1,3 @@
DIST scite355.tgz 2302137 SHA256 20515597ac986f1727c97bda2c27d88487ddb79cfe330b0b890b5e25330b7d9f SHA512 cdd9d3aa621f5d31632cfb9f71524255a4b47b70a654bf4bc8a25a76f8a2dbe098a48e0cd4587ced8ca8455be7e809973e212fcbcde5b62087aa0f9528f7f40d WHIRLPOOL c901804481042b859be68f44ab728544e97975d61219a4bb576ba3da00bd663c8877e9b23b981a0295d759cae3e9afd037d981923086c6850ff29f01c43ec9f6
DIST scite361.tgz 2347061 SHA256 bdffdc28c501dbb5e3dc6cbfe3808da2d574df983790c6ddfc2643040023a010 SHA512 5ead063ba98798ec5aa188735f219a19e788fbfaf12c84bce61a08c356e85e73cbbac412731cfdec02266bb8fa94d2a461239ffaba14b99ea65c31eb770dfcc3 WHIRLPOOL 8279b3fea54d2ef266dc5d5cb2b16896731e75d20bcdedaa59570e49d8b201fe7085ecac8f63cb06f2511ebd817d137b5189834d19ee7d4ffae43eaf06d465a7
+DIST scite362.tgz 2368491 SHA256 6530d0d86c72485b815663e3b2c2987d59779340a71632ed8bb97a43530737a3 SHA512 cb9618e962a16db7484e16a494b3da39f210250277e9772b112af5e16649b38f27ead0ec61664b1211c9263880cb7f3c34b5b32d94a4e70087fb1503805740c1 WHIRLPOOL 52a31f0e1518a9d8f6107aa22eead7da89e1d1ea6523a2aae57fbd7a3a8ecbd192c124c3d2550acea6383457763d6e501b14791ec6490a54379c5d13356e42da
diff --git a/app-editors/scite/scite-3.6.2.ebuild b/app-editors/scite/scite-3.6.2.ebuild
new file mode 100644
index 000000000000..f17d015193c2
--- /dev/null
+++ b/app-editors/scite/scite-3.6.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs eutils
+
+MY_PV=${PV//./}
+DESCRIPTION="A very powerful editor for programmers"
+HOMEPAGE="http://www.scintilla.org/SciTE.html"
+SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
+
+LICENSE="HPND lua? ( MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="lua"
+
+RDEPEND="dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gtk+:2
+ x11-libs/gdk-pixbuf
+ x11-libs/pango
+ lua? ( >=dev-lang/lua-5:0= )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-apps/sed-4"
+
+S="${WORKDIR}/${PN}/gtk"
+
+src_prepare() {
+ cd "${WORKDIR}/scintilla/gtk"
+ sed -i makefile \
+ -e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+ -e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+ -e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+ -e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
+ -e "s#-Os##" \
+ || die "error patching makefile"
+
+ cd "${WORKDIR}/scite/gtk"
+ sed -i makefile \
+ -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
+ || die "error patching makefile"
+
+ cd "${S}"
+ sed -i makefile \
+ -e 's#usr/local#usr#g' \
+ -e 's#/gnome/apps/Applications#/applications#' \
+ -e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+ -e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+ -e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+ -e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
+ -e 's#${D}##' \
+ -e 's#-g root#-g 0#' \
+ -e "s#-Os##" \
+ || die "error patching makefile"
+}
+
+src_compile() {
+ emake -C ../../scintilla/gtk AR="$(tc-getAR)"
+ if use lua; then
+ emake
+ else
+ emake NO_LUA=1
+ fi
+}
+
+src_install() {
+ dodir /usr/bin
+ dodir /usr/share/{pixmaps,applications}
+
+ emake prefix="${ED}/usr" install
+
+ # we have to keep this because otherwise it'll break upgrading
+ mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
+ dosym /usr/bin/scite /usr/bin/SciTE
+
+ # replace .desktop file with our own working version
+ rm -f "${ED}/usr/share/applications/SciTE.desktop" || die
+ domenu "${FILESDIR}/scite.desktop"
+
+ doman ../doc/scite.1
+ dodoc ../README
+}
diff --git a/app-emacs/dash/dash-2.12.1.ebuild b/app-emacs/dash/dash-2.12.1.ebuild
index 15be9733759d..2c28e3d766b4 100644
--- a/app-emacs/dash/dash-2.12.1.ebuild
+++ b/app-emacs/dash/dash-2.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${PN}.el-${PV}"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/magit/magit-2.3.1.ebuild b/app-emacs/magit/magit-2.3.1.ebuild
index acb718137f8b..5df1d3952619 100644
--- a/app-emacs/magit/magit-2.3.1.ebuild
+++ b/app-emacs/magit/magit-2.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${P}/lisp"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
index 8bcd8326b2ab..4ba95f2e2443 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="
diff --git a/app-emulation/docker-machine/Manifest b/app-emulation/docker-machine/Manifest
index d6a93c85e804..1ef894c1f8d1 100644
--- a/app-emulation/docker-machine/Manifest
+++ b/app-emulation/docker-machine/Manifest
@@ -1,2 +1,3 @@
DIST docker-machine-0.4.1.tar.gz 1620966 SHA256 f089657b2de7a3ce15374e69be3f654b0866f75eb077ca363f8a5933ccf51cda SHA512 29b21c075c7964cce00cda484bb31768988c95d6e1a9c4aa625619bead49aebe5b756fdaee7be07baa469c2a675538e69c1e2d3a33cfd32c0c8b79dd4dc8b6b7 WHIRLPOOL 8f200b43f4d40b170646cd3b96b8dac7ae56014641d30ed82ab53eb38be537a408a45fcef7d1f97eba632c86f471516ca3c7f19c121072a72b19847b9d04fe82
DIST docker-machine-0.5.2.tar.gz 1452215 SHA256 2dd6ed03e546a7c733ec6964b47b85b6d328e830ebca318240f6ddfcaed6f98a SHA512 4a724cc4ad867a2b3b79bd0006b554ae072c142daa7ca29c6430bb6614bc6b971eeca79d93cae98b8f38d97b5a1a5e872f9015cc09200b69551732998b1ba601 WHIRLPOOL 249d9e2456ad79867a0c380c549704b88275a177a78ae610ae207bed5189f20f6279e1f604dc10cbf9fc1feb75bff7460d2eb4a39aaabcc427e8bbaa419e7940
+DIST docker-machine-0.5.4.tar.gz 1586940 SHA256 050640764c9f55e76b9475b04ebd9d6069e63cf7e2b54c2d07eda9254722d90e SHA512 47fcee2d236154be7ca57646620f91b09127918f36d239e79e9381b219791eb67a635210d7006eb98ff1c6271aacbf4b9d5a7dfce8a02b6e392745c954d0dd48 WHIRLPOOL a9cdb5e2c9767e481b7e704cb1492ea0e95cbc9cadf59886dbc07bba13864718e19f2d278412662d503d71f554dfa302d56de4129d5c2f09f88a1d85b421477f
diff --git a/app-emulation/docker-machine/docker-machine-0.5.4.ebuild b/app-emulation/docker-machine/docker-machine-0.5.4.ebuild
new file mode 100644
index 000000000000..22922f647220
--- /dev/null
+++ b/app-emulation/docker-machine/docker-machine-0.5.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGO_PN=github.com/docker/machine/...
+
+if [[ ${PV} = *9999* ]]; then
+ inherit golang-vcs
+else
+ KEYWORDS="~amd64"
+ EGIT_COMMIT="v${PV}"
+ SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Machine management for a container-centric world"
+HOMEPAGE="https://docs.docker.com/machine/ "
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RESTRICT="test"
+DEPEND=">=dev-lang/go-1.5:="
+RDEPEND=""
+S=${WORKDIR}/${P}/src/${EGO_PN%/*}
+
+src_prepare() {
+ # don't pre-strip binaries
+ sed -e 's|\(GO_LDFLAGS := $(GO_LDFLAGS) -w\) -s|\1|' -i mk/main.mk ||die
+}
+
+src_compile() {
+ GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake build || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
+}
diff --git a/app-emulation/docker-swarm/Manifest b/app-emulation/docker-swarm/Manifest
index 8103b975b935..11b40d44caa3 100644
--- a/app-emulation/docker-swarm/Manifest
+++ b/app-emulation/docker-swarm/Manifest
@@ -1 +1,2 @@
DIST docker-swarm-0.4.0.tar.gz 853254 SHA256 c3ee1a34ce86da4d31f652c871dfa120fc78d5cc835e391034d740e83b48f7a3 SHA512 ffaa5560d67cafcc97b091d87b7792d6a0bfed2fb08837854a8313175742d535ee671fe45c4b96eeb69bf613a31e2e37cf92524f93ad20fbfbd54647b956c9c1 WHIRLPOOL 3acb07bfbcf33d70dffbfff4c5028767f36d51bd3500143d50e109d062cfd0107dfdc9f45724d08f874d81e15429089ed18a664fd591c26d7f2ff14ea933f93a
+DIST docker-swarm-1.0.1.tar.gz 1187966 SHA256 33c6566af395affbf9861d1491613c48a70e6c61c532910cef2210be7b1323f7 SHA512 ed5e6a37cd0f5a816367cab451d21ac20183f8ce767a30dc3086f849da8e0d2662c9f9b7e56d826e7e8cf5d4ec3d9f1ee8c159cca294af7ec45c2c1a21eaaf80 WHIRLPOOL e17705a3bef077e5fed552131aa7cd4891934a537dc93bbb8dfe81bf2e82c281d7f74a5150febdde26f492cf5ad4eec8417aac9a7edc6e48812f4af3ed1b624e
diff --git a/app-emulation/docker-swarm/docker-swarm-1.0.1.ebuild b/app-emulation/docker-swarm/docker-swarm-1.0.1.ebuild
new file mode 100644
index 000000000000..bb35aaeb8a82
--- /dev/null
+++ b/app-emulation/docker-swarm/docker-swarm-1.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGO_PN=github.com/docker/${PN##*-}/...
+
+if [[ ${PV} = *9999* ]]; then
+ inherit golang-vcs
+else
+ KEYWORDS="~amd64"
+ EGIT_COMMIT="v${PV}"
+ SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="A Docker-native clustering system"
+HOMEPAGE="https://docs.docker.com/${PN##*-}/"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RESTRICT="test"
+DEPEND=""
+RDEPEND=""
+S=${WORKDIR}/${P}/src/${EGO_PN%/*}
+
+src_compile() {
+ GOPATH="${WORKDIR}/${P}:${S}/Godeps/_workspace:$(get_golibdir_gopath)" \
+ go build -v -work -x ${EGO_BUILD_FLAGS} -o ${PN} || die
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
+}
diff --git a/app-emulation/libvirt-glib/Manifest b/app-emulation/libvirt-glib/Manifest
index 42e9da51bbe7..155d4003103a 100644
--- a/app-emulation/libvirt-glib/Manifest
+++ b/app-emulation/libvirt-glib/Manifest
@@ -1 +1,2 @@
DIST libvirt-glib-0.2.2.tar.gz 853052 SHA256 d7be16025231c91ccae43838b7cdb1d55d181856a2a50b0f7b1c5078ad202d9d SHA512 77adcf74dd057b8c5e3c21e1fbe0a99eedbe0005d0247c0173bce69e4e6209dbffe18c7a2f0de9a4c279f138ab5bcc360c14cc2335d0b2b55f22b5819c3e5b70 WHIRLPOOL 628d76cf20fe0b707a56688ad4f17c2c95b12b89fe89f4628e42cee2e8c5855aeac0e06ad45fe71fb63ae935b1ff7a17ee69f294b8358653f7cbcd03aea59876
+DIST libvirt-glib-0.2.3.tar.gz 876258 SHA256 c3b11aa34584b3416148b36bb005505e461830c73c9fd2f40143cca3309250dd SHA512 007e642724658e7f2d4ad10094e70a93186196467140662d5e71644ae8efac25a7f60dcf51b55b60d056d3079ecf0798428e077cb6110292ce5f2a474db9e369 WHIRLPOOL 594ab70f4647e053d9540e857aeba7853491200d825eed713a1025afe5eabbe2f3c698d30b00e0da1735f2fc8465212eae2a965fb93a68099df5d11ce494a0d2
diff --git a/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild b/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild
new file mode 100644
index 000000000000..a5ccb744bdff
--- /dev/null
+++ b/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1 vala
+
+DESCRIPTION="GLib and GObject mappings for libvirt"
+HOMEPAGE="http://libvirt.org/git/?p=libvirt-glib.git"
+SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection python +vala"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ vala? ( introspection )
+"
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1093633
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/libxml2:2
+ >=app-emulation/libvirt-1.2.6:=
+ >=dev-libs/glib-2.38.0:2
+ introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.35.0
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-test-coverage \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable vala) \
+ $(use_with python)
+}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index fad874c2b429..a7622e1e11bf 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,2 +1,4 @@
DIST libvirt-1.2.21-20151222.tar.xz 1684 SHA256 6c97f288470ec58bcbe98507563c6a191892c6f8813a7b9688c09b823934cbe5 SHA512 4fd43f0e12434b78ac3e671ad8eb0e402d384cff6278f6d0db322a068c2c8807c7c7f7e5774aa9d19e2a85e49f6d9888908b32fca5fc04980134edaccba0afe2 WHIRLPOOL 2bfbc3cbf1ca44a2bb06ddf2e8eabeb116165560b9c73d649d7b8cc9baba851f5e9246414bfc2c4740f27d0d0d42b6176eaec43b05e8c1e54de2804150c2cde1
DIST libvirt-1.2.21.tar.gz 29848954 SHA256 8d406582f5fe88d739d1d83e0ba7ac7f91f5a8da4be82162ab85631744d8925b SHA512 5c15d0ba5d75c13f735c6a60dfdbad007426f77e113f95894d520f7fc358fa4361d5cce7bb9a548a436f323b845f13b8940abbad568b8b146418430068bb970e WHIRLPOOL d53bbb07c85b3aa2d9b0f38ff2edd3cd0a2a5300627f3e2f0a82bc057303617cab9d6f1d8a9a771bd968b0496d38d3a39a0154f88bdca44dda359a65fdc2c650
+DIST libvirt-1.3.0-20151222.tar.xz 1684 SHA256 3628c3398862eae2966ccf0e55822e4cb8f47e6e8c1b0d17b6fdb9f69dc5490b SHA512 71c8dabc9cb8ead2858bf2d77d3831db59ac34076c99a4ae607c7bb4678b0af28a9f31fdca047ee174237f0e91fbb8db3a843e605256514e1d0ad527fc412275 WHIRLPOOL 47ebd21dd7d17812b8e97ebb70453574550cac18b0cf88cd38c152565d1e01f725a6da90878c41c7836a59318c1294859870e5bb523981954618fdde6704360e
+DIST libvirt-1.3.0.tar.gz 30114683 SHA256 ebcf5645fa565e3fe2fe94a86e841db9b768cf0e0a7e6cf395c6327f9a23bd64 SHA512 e252390a05b76e9cd9ed02caadd0ee0d674505f60940bb6ced955e17f69c7dd55fe5b38204ae5c25b6e5703415a0f6a12fc545d138d0e8b016457a85dc8fa2b8 WHIRLPOOL 852c592b27be86d3fb2ec75ca5debf9a1e0ac5de6d1ab06c55c2d70e83de125d10c2fc967b7578fba9137ed7a30b7a7e195f4e5f8d35708deeeddc97424d5e40
diff --git a/app-emulation/libvirt/files/libvirt-1.2.22-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch
index 32965130cd72..47010c4f7478 100644
--- a/app-emulation/libvirt/files/libvirt-1.2.22-do_not_use_sysconf.patch
+++ b/app-emulation/libvirt/files/libvirt-1.3.0-do_not_use_sysconf.patch
@@ -14,7 +14,7 @@ index be1b5a9..5ce0e1e 100644
rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
-index 9e67e43..68a32f8 100644
+index 608221c..63708f4 100644
--- a/daemon/libvirtd.service.in
+++ b/daemon/libvirtd.service.in
@@ -12,8 +12,7 @@ Documentation=http://libvirt.org
@@ -57,6 +57,20 @@ index 57089b0..ace0c83 100644
ExecReload=/bin/kill -USR1 $MAINPID
# Loosing the locks is a really bad thing that will
# cause the machine to be fenced (rebooted), so make
+diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
+index a264d3a..b467884 100644
+--- a/src/logging/virtlogd.service.in
++++ b/src/logging/virtlogd.service.in
+@@ -5,8 +5,7 @@ Documentation=man:virtlogd(8)
+ Documentation=http://libvirt.org
+
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/virtlogd
+-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
++ExecStart=@sbindir@/virtlogd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the logs is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9180564..e72d5f4 100644
--- a/tools/Makefile.am
diff --git a/app-emulation/libvirt/files/virtlogd.init-r1 b/app-emulation/libvirt/files/virtlogd.init-r1
new file mode 100644
index 000000000000..fac51d99b475
--- /dev/null
+++ b/app-emulation/libvirt/files/virtlogd.init-r1
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="libvirt virtual machine logging manager"
+command="/usr/sbin/virtlogd"
+command_args="-d"
+pidfile="/var/run/virtlogd.pid"
+
+extra_started_commands="reload"
+description_reload="re-exec the daemon, while maintaining open connections"
+
+
+depend() {
+ after ntp-client ntpd nfs nfsmount corosync
+}
+
+reload() {
+ ebegin "re-exec() virtlogd"
+
+ start-stop-daemon --signal SIGUSR1 \
+ --exec "${command}" --pidfile "${pidfile}"
+}
diff --git a/app-emulation/libvirt/libvirt-1.2.21-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild
index 36ce77afccf8..80333eeb4bd4 100644
--- a/app-emulation/libvirt/libvirt-1.2.21-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils user autotools-utils linux-info systemd readme.gentoo
-BACKPORTS="20151222"
+BACKPORTS="20151222" # CVE-2015-5313
if [[ ${PV} = *9999* ]]; then
inherit git-r3
@@ -295,8 +295,7 @@ src_configure() {
--disable-static
--disable-werror
- --docdir=/usr/share/doc/${PF}
- --htmldir=/usr/share/doc/${PF}/html
+ --with-html-subdir=${PF}/html
--localstatedir=/var
)
diff --git a/app-emulation/libvirt/libvirt-1.3.0.ebuild b/app-emulation/libvirt/libvirt-1.3.0.ebuild
new file mode 100644
index 000000000000..0f03ffa5a7dd
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.3.0.ebuild
@@ -0,0 +1,384 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user autotools-utils linux-info systemd readme.gentoo
+
+BACKPORTS="20151222" # CVE-2015-5313
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+ SRC_URI=""
+ KEYWORDS=""
+ SLOT="0"
+else
+ # Versions with 4 numbers are stable updates:
+ if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+ SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
+ else
+ SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
+ fi
+ SRC_URI+=" ${BACKPORTS:+
+ https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
+ https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
+ KEYWORDS="~amd64 ~x86"
+ SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
+ lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
+ selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
+ xen"
+
+REQUIRED_USE="
+ firewalld? ( virt-network )
+ libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+ lxc? ( caps libvirtd )
+ openvz? ( libvirtd )
+ qemu? ( libvirtd )
+ uml? ( libvirtd )
+ vepa? ( macvtap )
+ virt-network? ( libvirtd )
+ virtualbox? ( libvirtd )
+ xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+ app-misc/scrub
+ dev-libs/libgcrypt:0
+ dev-libs/libnl:3
+ >=dev-libs/libxml2-2.7.6
+ >=net-analyzer/netcat6-1.0-r2
+ >=net-libs/gnutls-1.0.25
+ net-libs/libssh2
+ >=net-misc/curl-7.18.0
+ sys-apps/dmidecode
+ >=sys-apps/util-linux-2.17
+ sys-devel/gettext
+ sys-libs/ncurses:0=
+ sys-libs/readline:=
+ apparmor? ( sys-libs/libapparmor )
+ audit? ( sys-process/audit )
+ avahi? ( >=net-dns/avahi-0.6[dbus] )
+ caps? ( sys-libs/libcap-ng )
+ firewalld? ( net-firewall/firewalld )
+ fuse? ( >=sys-fs/fuse-2.8.6 )
+ glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+ iscsi? ( sys-block/open-iscsi )
+ lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+ lxc? ( !systemd? ( sys-power/pm-utils ) )
+ nfs? ( net-fs/nfs-utils )
+ numa? (
+ >sys-process/numactl-2.0.2
+ sys-process/numad
+ )
+ openvz? ( sys-kernel/openvz-sources:* )
+ parted? (
+ >=sys-block/parted-1.8[device-mapper]
+ sys-fs/lvm2
+ )
+ pcap? ( >=net-libs/libpcap-1.0.0 )
+ policykit? ( >=sys-auth/polkit-0.9 )
+ qemu? (
+ >=app-emulation/qemu-0.13.0
+ dev-libs/yajl
+ !systemd? ( sys-power/pm-utils )
+ )
+ rbd? ( sys-cluster/ceph )
+ sasl? ( dev-libs/cyrus-sasl )
+ selinux? ( >=sys-libs/libselinux-2.0.85 )
+ systemd? ( sys-apps/systemd )
+ virt-network? (
+ net-dns/dnsmasq[script]
+ net-firewall/ebtables
+ >=net-firewall/iptables-1.4.10[ipv6]
+ net-misc/radvd
+ sys-apps/iproute2[-minimal]
+ )
+ virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+ wireshark-plugins? ( net-analyzer/wireshark:= )
+ xen? (
+ app-emulation/xen
+ app-emulation/xen-tools:=
+ )
+ udev? (
+ virtual/udev
+ >=x11-libs/libpciaccess-0.10.9
+ )"
+
+DEPEND="${RDEPEND}
+ app-text/xhtml1
+ dev-lang/perl
+ dev-libs/libxslt
+ dev-perl/XML-XPath
+ virtual/pkgconfig"
+
+pkg_setup() {
+ enewgroup qemu 77
+ enewuser qemu 77 -1 -1 qemu kvm
+
+ # Some people used the masked ebuild which was not adding the qemu
+ # user to the kvm group originally. This results in VMs failing to
+ # start for some users. bug #430808
+ egetent group kvm | grep -q qemu
+ if [[ $? -ne 0 ]]; then
+ gpasswd -a qemu kvm
+ fi
+
+ # Check kernel configuration:
+ CONFIG_CHECK=""
+ use fuse && CONFIG_CHECK+="
+ ~FUSE_FS"
+
+ use lvm && CONFIG_CHECK+="
+ ~BLK_DEV_DM
+ ~DM_MULTIPATH
+ ~DM_SNAPSHOT"
+
+ use lxc && CONFIG_CHECK+="
+ ~BLK_CGROUP
+ ~CGROUP_CPUACCT
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~CGROUP_NET_PRIO
+ ~CGROUP_PERF
+ ~CGROUPS
+ ~CGROUP_SCHED
+ ~CPUSETS
+ ~DEVPTS_MULTIPLE_INSTANCES
+ ~IPC_NS
+ ~MACVLAN
+ ~NAMESPACES
+ ~NET_CLS_CGROUP
+ ~NET_NS
+ ~PID_NS
+ ~POSIX_MQUEUE
+ ~SECURITYFS
+ ~USER_NS
+ ~UTS_NS
+ ~VETH
+ ~!GRKERNSEC_CHROOT_MOUNT
+ ~!GRKERNSEC_CHROOT_DOUBLE
+ ~!GRKERNSEC_CHROOT_PIVOT
+ ~!GRKERNSEC_CHROOT_CHMOD
+ ~!GRKERNSEC_CHROOT_CAPS"
+ # Handle specific kernel versions for different features
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+ kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+ use macvtap && CONFIG_CHECK+="
+ ~MACVTAP"
+
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_MARK_T
+ ~BRIDGE_NF_EBTABLES
+ ~NETFILTER_ADVANCED
+ ~NETFILTER_XT_CONNMARK
+ ~NETFILTER_XT_MARK
+ ~NETFILTER_XT_TARGET_CHECKSUM"
+ # Bandwidth Limiting Support
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_T_NAT
+ ~NET_ACT_POLICE
+ ~NET_CLS_FW
+ ~NET_CLS_U32
+ ~NET_SCH_HTB
+ ~NET_SCH_INGRESS
+ ~NET_SCH_SFQ"
+
+ ERROR_USER_NS="Optional depending on LXC configuration."
+
+ if [[ -n ${CONFIG_CHECK} ]]; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ touch "${S}/.mailmap"
+
+ if [[ ${PV} = *9999* ]]; then
+ # git checkouts require bootstrapping to create the configure script.
+ # Additionally the submodules must be cloned to the right locations
+ # bug #377279
+ ./bootstrap || die "bootstrap failed"
+ (
+ git submodule status | sed 's/^[ +-]//;s/ .*//'
+ git hash-object bootstrap.conf
+ ) >.git-module-status
+ fi
+
+ epatch \
+ "${FILESDIR}"/${P}-do_not_use_sysconf.patch \
+ "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
+ "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
+
+ [[ -n ${BACKPORTS} ]] &&
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
+ EPATCH_SOURCE="${WORKDIR}/patches" epatch
+
+ epatch_user
+
+ # Tweak the init script:
+ cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die
+ sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+ -e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \
+ -e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \
+ -e "s/USE_FLAG_RBD/$(usex rbd ceph '')/" \
+ -i "${S}/libvirtd.init" || die "sed failed"
+
+ AUTOTOOLS_AUTORECONF=true
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with apparmor)
+ $(use_with apparmor apparmor-profiles)
+ $(use_with audit)
+ $(use_with avahi)
+ $(use_with caps capng)
+ $(use_with firewalld)
+ $(use_with fuse)
+ $(use_with glusterfs)
+ $(use_with glusterfs storage-gluster)
+ $(use_with iscsi storage-iscsi)
+ $(use_with libvirtd)
+ $(use_with lvm storage-lvm)
+ $(use_with lvm storage-mpath)
+ $(use_with lxc)
+ $(use_with macvtap)
+ $(use_enable nls)
+ $(use_with numa numactl)
+ $(use_with numa numad)
+ $(use_with openvz)
+ $(use_with parted storage-disk)
+ $(use_with pcap libpcap)
+ $(use_with phyp)
+ $(use_with policykit polkit)
+ $(use_with qemu)
+ $(use_with qemu yajl)
+ $(use_with rbd storage-rbd)
+ $(use_with sasl)
+ $(use_with selinux)
+ $(use_with systemd systemd-daemon)
+ $(usex systemd --with-init-script=systemd '')
+ $(use_with udev)
+ $(use_with uml)
+ $(use_with vepa virtualport)
+ $(use_with virt-network network)
+ $(use_with wireshark-plugins wireshark-dissector)
+ $(use_with xen)
+ $(use_with xen xen-inotify)
+ $(usex xen --with-libxl '')
+
+ --without-hal
+ --without-netcf
+ --without-sanlock
+ --without-xenapi
+ --with-esx
+ --with-qemu-group=$(usex caps qemu root)
+ --with-qemu-user=$(usex caps qemu root)
+ --with-remote
+ --with-storage-fs
+ --with-vmware
+
+ --disable-static
+ --disable-werror
+
+ --with-html-subdir=${PF}/html
+ --localstatedir=/var
+ )
+
+ if use virtualbox && has_version app-emulation/virtualbox-ose; then
+ myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+ else
+ myeconfargs+=( $(use_with virtualbox vbox) )
+ fi
+
+ autotools-utils_src_configure
+
+ if [[ ${PV} = *9999* ]]; then
+ # Restore gnulib's config.sub and config.guess
+ # bug #377279
+ (cd .gnulib && git reset --hard > /dev/null)
+ fi
+
+ # Workaround: Sometimes this subdirectory is missing and leads to a
+ # build failure.
+ mkdir -p "${BUILD_DIR}"/docs/internals
+}
+
+src_test() {
+ # Explicitly allow parallel build of tests
+ export VIR_TEST_DEBUG=1
+ HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+ autotools-utils_src_compile install \
+ DESTDIR="${D}" \
+ SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
+
+ find "${D}" -name '*.la' -delete || die
+
+ # Remove bogus, empty directories. They are either not used, or
+ # libvirtd is able to create them on demand
+ rm -rf "${D}"/etc/sysconfig
+ rm -rf "${D}"/var/cache
+ rm -rf "${D}"/var/run
+ rm -rf "${D}"/var/log
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ use systemd && systemd_install_serviced \
+ "${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+ newinitd "${S}/libvirtd.init" libvirtd || die
+ newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ # we only ever want to generate this once
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+ fi
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+ fi
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then
+ FORCE_PRINT_ELOG=true
+ fi
+
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 92f4454f980c..f07387ffca7e 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -218,7 +218,7 @@ src_prepare() {
fi
epatch \
- "${FILESDIR}"/${PN}-1.2.22-do_not_use_sysconf.patch \
+ "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch \
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
"${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
@@ -295,8 +295,7 @@ src_configure() {
--disable-static
--disable-werror
- --docdir=/usr/share/doc/${PF}
- --htmldir=/usr/share/doc/${PF}/html
+ --with-html-subdir=${PF}/html
--localstatedir=/var
)
@@ -346,6 +345,7 @@ src_install() {
newinitd "${S}/libvirtd.init" libvirtd || die
newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die
newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
diff --git a/app-emulation/spice-protocol/spice-protocol-0.12.10.ebuild b/app-emulation/spice-protocol/spice-protocol-0.12.10.ebuild
index 2380c21a86c8..8d0478273d5c 100644
--- a/app-emulation/spice-protocol/spice-protocol-0.12.10.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-0.12.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
IUSE=""
DEPEND=""
diff --git a/app-emulation/vice/vice-2.4.22.ebuild b/app-emulation/vice/vice-2.4.22.ebuild
index a0138be1b1c4..a5d8a2818f76 100644
--- a/app-emulation/vice/vice-2.4.22.ebuild
+++ b/app-emulation/vice/vice-2.4.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"
# upstream says gtk3 and sdl2 shouldn't be exposed yet.
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index a4e485f6bcdc..452a7d430905 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,4 +1,4 @@
DIST virt-manager-1.1.0.tar.gz 2509440 SHA256 ab0906cb15a132f1893f89ac4ca211c6c2c9c2d1860fbc285edbf9451c0f7941 SHA512 8c3aa56e13f1ec4a67e353b15b4f61bdc067300dbc459790b04e5f5258bf526694ec712a9f74d7af48ddd271081d48ae98d576f4bc5ed139e046620a9aa64e2d WHIRLPOOL aaffdf75b313c88a10648503bf552357139aff2a1624da1b17cac3975fec21ad6c3ccce00999ef8f4f1f4731aabf5ae2c07e70e453785caefe932c3b0deab456
DIST virt-manager-1.2.1.tar.gz 2524812 SHA256 74bba80e72e5e1b4d84f1d5b7211b874e9c4ae00a0a44149d1721acab38ce6be SHA512 b99144f498bc2f28c98bb2395e0a9c2fe244a3da476892698ff0f1fd4a6d36a8ddf53e13561593c5e94932ce8176a27092c818ed218634fc5201666ad6792791 WHIRLPOOL d2402087453ec720add0a815433e9feda1bd36e253178dfe1cf27f52e0ad41a13e1e1d6a9977b63485ed8acc257d93c903625b775c6ab130ea7235e52be0e8fc
DIST virt-manager-1.3.0.tar.gz 2564090 SHA256 a6ebec0dd695b195778c5d710c7b6f1cd28d3ccb8b128fa006eebb35b156a315 SHA512 8cba9ad45aa3b070e29ec72cc45c5eb88231dfb0ef2a24cdc913acdf30158d29cc0b18e23f168fb5eafa4d890b5cd286a04669210b1411701adc912e29274101 WHIRLPOOL 379c54e1541b2186b1c218849758a917a8913e92603f8c492e707c206ef1fb7084bb7f21c474d6829e613b5ba524684562c1b3d696823478909f2a9d5a0f780f
-DIST virt-manager-1.3.1.tar.gz 2562273 SHA256 6644015bd0f5186e0d7231b09c516577678397ebdb66d53fe65a92797a4c0d53 SHA512 6fae31adb99e510c1625bd860bfd20e7b04d86029c6e7c94b923f3ed6ec52171b9fbfc6614e6ffb68ba0c776906a063206a0c259521c3ed70eaebd5069f7c3c1 WHIRLPOOL 037d2e1770412343faf0c8534d1a7054c88363014c00daf46f685b0ad367a2045a91ef81f604a5212b71054ac58a4bb26f1ada2f30cb5d0b695c9a33e5f3b73f
+DIST virt-manager-1.3.2.tar.gz 2564573 SHA256 270c1f631fd029fee5291e83f50d69e261db666aa952c184643bc6cece77fdb3 SHA512 a60efa8ecd0a3fad50f2ab3b7f27347e3fc7ac1928e7bfc13860f6fed6d929399fbd072d1dfe2424de38a3926fcf03d0092a43b958601bc6af6f87f2cad0aaab WHIRLPOOL b1e59c17d5891aa19a2965a93d601e7f677141b1730ad3a717b97e9d799328bc94f276c12c53f7ea61f1d67458ca7d7a37d5dedf49a1a95a446b1651a6e575a3
diff --git a/app-emulation/virt-manager/virt-manager-1.3.1.ebuild b/app-emulation/virt-manager/virt-manager-1.3.2.ebuild
index 9a6fb846d3e3..dced9d8224e3 100644
--- a/app-emulation/virt-manager/virt-manager-1.3.1.ebuild
+++ b/app-emulation/virt-manager/virt-manager-1.3.2.ebuild
@@ -45,7 +45,7 @@ RDEPEND="!app-emulation/virtinst
>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
net-misc/spice-gtk[usbredir,gtk3,introspection,python,sasl?,${PYTHON_USEDEP}]
net-misc/x11-ssh-askpass
- x11-libs/vte:2.90[introspection]
+ || ( x11-libs/vte:2.91[introspection] x11-libs/vte:2.90[introspection] )
gnome-keyring? ( dev-python/gnome-keyring-python )
policykit? ( sys-auth/polkit[introspection] )
x11-themes/gnome-icon-theme
diff --git a/app-emulation/xen/xen-4.5.2-r2.ebuild b/app-emulation/xen/xen-4.5.2-r2.ebuild
index 07af8f9be985..d703dcf280c1 100644
--- a/app-emulation/xen/xen-4.5.2-r2.ebuild
+++ b/app-emulation/xen/xen-4.5.2-r2.ebuild
@@ -177,9 +177,14 @@ src_install() {
}
pkg_postinst() {
+ local msg="INSTALL_MASK=/boot/xen-syms"
elog "Official Xen Guide and the unoffical wiki page:"
elog " https://wiki.gentoo.org/wiki/Xen"
elog " http://en.gentoo-wiki.com/wiki/Xen/"
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+ elog "You can optionally block the installation of /boot/xen-syms by an entry"
+ elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+ elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
}
diff --git a/app-emulation/xen/xen-4.5.2-r3.ebuild b/app-emulation/xen/xen-4.5.2-r3.ebuild
index 2bd75da2cb0c..434306c66456 100644
--- a/app-emulation/xen/xen-4.5.2-r3.ebuild
+++ b/app-emulation/xen/xen-4.5.2-r3.ebuild
@@ -185,4 +185,8 @@ pkg_postinst() {
elog " http://en.gentoo-wiki.com/wiki/Xen/"
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+ elog "You can optionally block the installation of /boot/xen-syms by an entry"
+ elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+ elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
}
diff --git a/app-emulation/xen/xen-4.6.0-r3.ebuild b/app-emulation/xen/xen-4.6.0-r3.ebuild
index 4ca1a84356e7..7ff1d1daea5f 100644
--- a/app-emulation/xen/xen-4.6.0-r3.ebuild
+++ b/app-emulation/xen/xen-4.6.0-r3.ebuild
@@ -182,4 +182,8 @@ pkg_postinst() {
elog " http://en.gentoo-wiki.com/wiki/Xen/"
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+ elog "You can optionally block the installation of /boot/xen-syms by an entry"
+ elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+ elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
}
diff --git a/app-emulation/xen/xen-4.6.0-r4.ebuild b/app-emulation/xen/xen-4.6.0-r4.ebuild
index c1c7fa0dbbc7..277e71a12752 100644
--- a/app-emulation/xen/xen-4.6.0-r4.ebuild
+++ b/app-emulation/xen/xen-4.6.0-r4.ebuild
@@ -183,4 +183,8 @@ pkg_postinst() {
elog " http://en.gentoo-wiki.com/wiki/Xen/"
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+ elog "You can optionally block the installation of /boot/xen-syms by an entry"
+ elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+ elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
}
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
new file mode 100644
index 000000000000..b83a73bed1ab
--- /dev/null
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-admin/eselect-1.2.3
+ >=media-libs/fontconfig-2.4"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${S}"/fontconfig.eselect-${PV} fontconfig.eselect
+}
diff --git a/app-eselect/eselect-opencl/Manifest b/app-eselect/eselect-opencl/Manifest
index c4ba2e13a7da..0c3a3b675fc2 100644
--- a/app-eselect/eselect-opencl/Manifest
+++ b/app-eselect/eselect-opencl/Manifest
@@ -5,6 +5,5 @@ DIST cl_gl.h.1.1.xz 1856 SHA256 eeddf3403c13776b3d13a25c9e47a01eee750c0120f74d40
DIST cl_gl_ext.h.1.1.xz 1356 SHA256 594e463e3a24e62870c5c1914b05e796aeda8892bf6830ee8db3f722993fdf02 SHA512 23fbc933e0beb2748152fa058d8ed413351fcfce167b9788c8a3529323b89e57eb1bf84d998fc262081410985f476bbf56fdd0bffe73f08135f5c90b7d09bb8d WHIRLPOOL 94301285dd567d8c7c9145d49801ea5c7e0ae4f5c01a9f93bcea667df925ea9d55a5ec978c3c05337306bdd0d53b829a9c03cbe8131982b2eddae23fc2eb1e5c
DIST cl_platform.h.1.1.xz 5584 SHA256 2f70eb47285fd46f75d48476e90ee3b7e9ba62166bc573bbb35cb0f9d7a2ea53 SHA512 8265cd3b3630d367fe494a60911564e57169d03948827a0e2ca0669678b4a5b595b22ae2786a7c42c0b96fd6fbfb7d326c63759cfd1b7888b8cd35588b5f7544 WHIRLPOOL aa5e12ec2eb49323f9812ae51d5b45db2919488bd36fd58bb40eb6538020e8de732aa60a4fc1b8bf913cdfbdf35c0ebe63fd8cd0b8f415d34cbdce4d54207ff7
DIST eselect-opencl-1.1.0-r1.tar.xz 3276 SHA256 86a2f5f152e543046899989b3a12a065dfc357a2276ce06d69d19bdbf175fdea SHA512 b2be1e2035fda4e119f03e9ef84fbf1f09fc0bd5475d3fe30d2330dac76180930451d78dbb9e158c34dee9ce524076434254757b594e84dea96341e52ef13c14 WHIRLPOOL 4df96b5f97b6071c27c613addd0b579deb800012ba2640814dcb107ec6ab9f3fac6384c4c3313bd245d62eb2a376e378e0820ef891bed6b41b778721b325f667
-DIST eselect-opencl-1.1.0.tar.xz 3272 SHA256 0b49d847d4475119f969fc7bbcdc4ceb1905e37e102b10d0bdad4f8e6010bbbe SHA512 ffa026fe7569dbd9833fd246a494048965c183d877216e3e436cbde11ed26c1f5ba9139b15d25801dc066d957d13f1b6332de7d104951c511f6554ebe5bd6ddb WHIRLPOOL bf0bd8810b133e1d78ed222814a0366a2689dfe3c8f7b308efab4248e7cd4def9a158e0fa12a15f21e5e74ec38d0fc56a875770f2f01a17823c1c750f73305d3
DIST opencl-headers-1.2.tar.gz 122068 SHA256 c35c1aada9984b24784d6b6a5752e22b9c70646043344e0f45830c9dc5ae28c4 SHA512 0780c96d47a7ad41f6b31d46d41be77651d27d5decd1a4248c452d8bf763b6fc3b76597352bd259778c5846c62c17f077ff8db5504da39844c8e6e07c7d9a264 WHIRLPOOL 4f5c1058d23f91d806dba861fefd5cf3685a12a78217136adc0ac2f630995c82fa6d537e3cd67b6b2e2d01b6de12c30dc7e039b9aaa057661deb7f10a466f48d
DIST opencl.h.1.1.xz 944 SHA256 c076e410eaffd9fbb056528f31a59fe1908481f0fd38981c13970727a0c4d096 SHA512 62b5ae61f2d9a44e9f8b6a7e3421cacfe5291bc9b5430845d469ea5a6404d71d3ab49d78c6da2588eab2bcd5f9b0d86c53f3aa74bd7c43c960ad86f0eab9595c WHIRLPOOL bd3d946b6c361187d9d7c4337287c24161fc0f291cfc810c0bcf05d9fe120192a853fe7b69500783b7ec1994e9b265d84eb82b8fc681df060c16aa3d038c8374
diff --git a/app-eselect/eselect-opencl/eselect-opencl-1.1.0.ebuild b/app-eselect/eselect-opencl/eselect-opencl-1.1.0.ebuild
deleted file mode 100644
index 02397fce5809..000000000000
--- a/app-eselect/eselect-opencl/eselect-opencl-1.1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-CL_ABI=1.1
-
-inherit multilib
-
-DESCRIPTION="Utility to change the OpenCL implementation being used"
-HOMEPAGE="https://www.gentoo.org/"
-
-# Source:
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/opencl.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_platform.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_ext.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl_ext.h
-# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.hpp
-
-MIRROR="https://dev.gentoo.org/~xarthisius/distfiles/"
-SRC_URI="${MIRROR}/opencl.h.${CL_ABI}.xz
- ${MIRROR}/cl_platform.h.${CL_ABI}.xz
- ${MIRROR}/cl.h.${CL_ABI}.xz
- ${MIRROR}/cl_ext.h.${CL_ABI}.xz
- ${MIRROR}/cl_gl.h.${CL_ABI}.xz
- ${MIRROR}/cl_gl_ext.h.${CL_ABI}.xz
- ${MIRROR}/cl.hpp.${CL_ABI}.xz
- ${MIRROR}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=">=app-admin/eselect-1.2.4"
-
-pkg_postinst() {
- local impl="$(eselect opencl show)"
- if [[ -n "${impl}" && "${impl}" != '(none)' ]] ; then
- eselect opencl set "${impl}"
- fi
-}
-
-src_install() {
- insinto /usr/share/eselect/modules
- doins opencl.eselect
- #doman opencl.eselect.5
-
- local headers=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl.hpp )
- insinto /usr/$(get_libdir)/OpenCL/global/include/CL
- cd "${WORKDIR}"
- for f in ${headers[@]}; do
- newins ${f}.${CL_ABI} ${f}
- done
-}
diff --git a/app-i18n/ibus/ibus-1.5.5.ebuild b/app-i18n/ibus/ibus-1.5.5.ebuild
index 3473d00f725d..3fed965844fb 100644
--- a/app-i18n/ibus/ibus-1.5.5.ebuild
+++ b/app-i18n/ibus/ibus-1.5.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://ibus.googlecode.com/files/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
REQUIRED_USE="|| ( gtk gtk3 X )
deprecated? ( python )
diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
index d092a029dcae..3222ccb423e0 100644
--- a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
+++ b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE=""
RDEPEND="
diff --git a/app-misc/birthday/birthday-1.6.2-r1.ebuild b/app-misc/birthday/birthday-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..dcfe624184f8
--- /dev/null
+++ b/app-misc/birthday/birthday-1.6.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Displays a list of events happening in the near future"
+HOMEPAGE="http://sourceforge.net/projects/birthday/"
+SRC_URI="mirror://sourceforge/birthday/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+ # Don't strip, install in correct share dir and respect CFLAGS
+ sed \
+ -e "s:install -s:install:g" -e "s:#SHARE:SHARE:g" -e "s:-O2:${CFLAGS}:g" \
+ -i Makefile || die
+ sed \
+ -e 's:grep -v:grep --binary-files=text -v:g' \
+ -i runtest.sh || die
+
+ default
+}
+
+src_compile() {
+ emake CC=$(tc-getCC)
+}
diff --git a/app-misc/birthday/birthday-1.6.2.ebuild b/app-misc/birthday/birthday-1.6.2.ebuild
index 600b93523b1b..c8f79f8f04da 100644
--- a/app-misc/birthday/birthday-1.6.2.ebuild
+++ b/app-misc/birthday/birthday-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,8 +18,12 @@ src_unpack() {
cd "${S}"
# Don't strip, install in correct share dir and respect CFLAGS
- sed -i -e "s:install -s:install:g" -e "s:#SHARE:SHARE:g" -e "s:-O2:${CFLAGS}:g" \
- Makefile || die
+ sed \
+ -e "s:install -s:install:g" -e "s:#SHARE:SHARE:g" -e "s:-O2:${CFLAGS}:g" \
+ -i Makefile || die
+ sed \
+ -e 's:grep -v:grep --binary-files=text -v:g' \
+ -i runtest.sh || die
}
src_compile() {
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index 239e445ee2ff..c959c33bf467 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_
LICENSE="openssl"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE=""
RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
diff --git a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69-r1.ebuild b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69-r1.ebuild
index d5178faa93bc..8a1ffe2fc84e 100644
--- a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69-r1.ebuild
+++ b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69-r1.ebuild
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes"
inherit autotools eutils gnome2
-DESCRIPTION="A program created to allow you to control aspects of your mobile phone from your GNOME desktop"
+DESCRIPTION="Allows you to control aspects of your mobile phone from your GNOME desktop"
HOMEPAGE="https://wiki.gnome.org/PhoneManager"
LICENSE="GPL-2"
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index eeec2a5be5e1..a6bd3058d5b5 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,2 +1,2 @@
-DIST gnumeric-1.12.23.tar.xz 18515672 SHA256 00474cbf1e70f62062974d0beb5f65ebc45d1047bc8fd0a1133e3d9725e19551 SHA512 58f7667196cef453a24689640d21f7de20b052502fcd8f18c9abbe3ca6210d183e0bd53080ba0d6686f145400f404e75f4ed691c90801c5e2cb9f0168420cca0 WHIRLPOOL 7717082ce618adc32f20146aa86b355cbc235e8643fb7729d96c35230035cdebdf8b3aca6ba04fc53e47ce8124efe899129763384bd2172a27087482abedb30a
DIST gnumeric-1.12.24.tar.xz 18526768 SHA256 c59d5271b27366008bccb4d53ad8333da36d837003a018892f2da325c1449551 SHA512 71bed41a1b50ed57e9ab4993df8d963cb14a9f6f3fbf87d81c30f71359a23c4092daab00079936e587a118041a303c1c563bcd3f38f2aaea78a9ae5593dcdd4b WHIRLPOOL 648930de4d37d25db471fe9b639b91a64a1d1ebf1a50291ef2c79a23d4082b7249e6197467e86ce752e96699b38a7c3d86730cead7d0438c7e6605521b61e7b8
+DIST gnumeric-1.12.25.tar.xz 18536284 SHA256 9709a8fccfc371a07b1590d037a43e525531d5a46f31c5c5fe223c6054cecdb6 SHA512 260d08391b336437df7f9160ca7ceaf123f2ae84afaea81e7be3b52a3999d40b03b5292ed14a7682d4376c90ef3d69ae12a4767cf1a8fb75761e66ee1e801684 WHIRLPOOL 1f245120c2dac7cd10283597e3364d7937e646f07438f20f52af4f536ca26a1594371851316163f20dd75c0bc1047058a055edecf451b710fde459b241bcc6ef
diff --git a/app-office/gnumeric/gnumeric-1.12.23.ebuild b/app-office/gnumeric/gnumeric-1.12.25.ebuild
index 6536b60f1486..a78dd0792a06 100644
--- a/app-office/gnumeric/gnumeric-1.12.23.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.25.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnumeric.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="+introspection libgda perl python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -45,7 +45,6 @@ RDEPEND="
libgda? ( gnome-extra/libgda:5[gtk] )
"
DEPEND="${RDEPEND}
- app-text/scrollkeeper
>=dev-util/intltool-0.35.0
virtual/pkgconfig
"
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 70d6e39525c3..c2c868ad6b57 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,4 +1,4 @@
-DIST wps-office_9.1.0.4961~a18p1_amd64.deb 67419632 SHA256 a37c28648d571571351582e0863d252fc7378da87683c335ee93937a09924a6f SHA512 c828f9cc3383a33db533ada811dd8ca2d80599b8c49d9f1a4fd6080386245aae7a5bc71b2e628cacb2bf9c07b2619417afebf990c6332abb4e23ade2ef0f471f WHIRLPOOL c46cf46a6bd8249c5f6643fbc61c03a374e264a3577e66c32e459b95ae7fe4ef663488657a2c4ba4ef79a32dddbe0ae63515f7efcd898dada698528d74778386
-DIST wps-office_9.1.0.4961~a18p1_i386.deb 74647622 SHA256 e5e6f2813d3e778c68c3bc810ebe95ee862700c7ebf823f10a70dffbea1cd81c SHA512 7d90812e4a5a23f7d55f30c24831f8c17825048da14de6689cd8df9c4ce0cfb62982a05da78cbdc314e174b0e965c04852b104dd4d44bd1b76af45fdeba604d8 WHIRLPOOL 83fe9921bb71e2541790bff44728cd3ae5d557819ee25f103f5b3cb4c4e8d4801d2f402029371b8a58d6bdb5459efe8f5f64777b763070ab79d9690915c2b87d
+DIST wps-office_10.1.0.5444~a20_amd64.deb 81954904 SHA256 19380705962fb6f161dbf2ba40c6a5b5df34dc55b983ac6b1bd1776baeef2069 SHA512 585bcf5f51c7fec073fdc284501e4f31199f5982badaf879b325b6e49b5e0d4c3eb0d719ce6b5ee180aed8b479531e8f060d036902a4efbe6c632bb0146e6eb3 WHIRLPOOL 246fb53eb3122966be033c0bcc20035b86fbd0b8f1a327fa21bbd27ffef14738c61f23d00431e5b7ab93fc95d759e6bc269c128de66ad45488d363f2e3d63d30
+DIST wps-office_10.1.0.5444~a20_i386.deb 81553560 SHA256 130ac0926ae2c8bc4dc3b3092998556b5d949044d7630cc4d41b5339e6e487f5 SHA512 02474a9948b1e2907a84522cb7d84a4acbda5bfdd5aa97068b60acf92646ef89858ee1eb5e834be7caa2eeb8c8e3eb33b5fd691d15711e5daf205611dfac0363 WHIRLPOOL 8d06d473ae042497173b68bedc3d776c1f3b133428035410c14d24ea12e0a340ab47a1362f60eb6b1113ab48a2bfb9aac55031a878f6097f644477b751130b73
DIST wps-office_9.1.0.4975~a19p1_amd64.deb 64716800 SHA256 79a49c9db0c4482c894e3c334e38bd299302e1c4bb4cd387f6a615f9e054a25d SHA512 f92415eb8d652afa6601dbea8f87949ed05d970e610c5aedebda21f2b0386a80bcea164f86e7c680946302d2f953067fc88889891a346353e4f15b547ecb8a3a WHIRLPOOL b8603756e4d3b09691974966d62f80dbe1ec668ae2eb5d99bbe2ad39a6c944de89292ede651143d894fad2631f7686036cd4a281ed5265a09f1af6361d75ea77
DIST wps-office_9.1.0.4975~a19p1_i386.deb 66646188 SHA256 5b843cfc44d062a6b9c8e3b57ca55ffff5bc76dba7d03bc489275ebda4388122 SHA512 79e7ef4b3a7e906aa1811f5caa9bc056994e64c3abbf4ed9b1866d3d935235a092a55623ee4efe2de9a42b8ffe4737deba9cbc24ca187229a82adc05f30ab238 WHIRLPOOL 44f9e4f170decc923f47996683a070d32c10fee78b586c7fc160d5d7173c4197abe5384f78cad5b35349199dd2a81a4de7793299f16d708f0703182bad6e1264
diff --git a/app-office/wps-office/wps-office-9.1.0.4961_alpha18_p1.ebuild b/app-office/wps-office/wps-office-10.1.0.5444_alpha20.ebuild
index 1b7097632016..cd7c16fa8240 100644
--- a/app-office/wps-office/wps-office-9.1.0.4961_alpha18_p1.ebuild
+++ b/app-office/wps-office/wps-office-10.1.0.5444_alpha20.ebuild
@@ -43,9 +43,9 @@ LICENSE="WPS-EULA"
IUSE="+sharedfonts"
UNBUNDLED_LIBS="
- dev-qt/qtwebkit:4
- media-libs/tiff:3
"
+# media-libs/tiff:3
+# dev-qt/qtwebkit:4
# dev-qt/qtcore:4
# dev-qt/qtdbus:4
# media-libs/phonon
@@ -98,9 +98,9 @@ src_prepare() {
# rm -f libQtCore.so* || die
# rm -f libQtDBus.so* || die
# rm -f libQtNetwork.so || die
- rm -f libQtWebKit.so* || die
+# rm -f libQtWebKit.so* || die
# rm -f libphonon.so*
- rm -f libtiff.so.4* || die
+# rm -f libtiff.so.4* || die
}
src_install() {
diff --git a/app-portage/ufed/ufed-0.92.ebuild b/app-portage/ufed/ufed-0.92.ebuild
index 6ff43a369d49..d91e686e94a8 100644
--- a/app-portage/ufed/ufed-0.92.ebuild
+++ b/app-portage/ufed/ufed-0.92.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
COMMON_DEPEND="sys-libs/ncurses:0="
diff --git a/app-shells/bash/bash-4.3_p42.ebuild b/app-shells/bash/bash-4.3_p42.ebuild
index 9c19bc40abe5..8f140fcde197 100644
--- a/app-shells/bash/bash-4.3_p42.ebuild
+++ b/app-shells/bash/bash-4.3_p42.ebuild
@@ -38,7 +38,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
DEPEND=">=sys-libs/ncurses-5.2-r2
diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml
index 0bf837b891e0..2cfa7063165c 100644
--- a/app-text/aspell/metadata.xml
+++ b/app-text/aspell/metadata.xml
@@ -3,8 +3,8 @@
<pkgmetadata>
<herd>proxy-maintainers</herd>
<maintainer>
- <name>Elizabeth Myers</name>
<email>elizabeth@interlinked.me</email>
+ <name>Elizabeth Myers</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
</pkgmetadata>
diff --git a/app-text/bibletime/bibletime-2.10.1.ebuild b/app-text/bibletime/bibletime-2.10.1-r1.ebuild
index 61108f0340ba..7caac5080b1e 100644
--- a/app-text/bibletime/bibletime-2.10.1.ebuild
+++ b/app-text/bibletime/bibletime-2.10.1-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="debug qt5"
# RESTRICT="test"
RDEPEND="
- >=app-text/sword-1.6.0
+ >=app-text/sword-1.7.0
>=dev-cpp/clucene-2.3.3.4
qt5? (
dev-qt/qtcore:5
@@ -55,6 +55,7 @@ src_prepare() {
sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
-i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
epatch "${FILESDIR}/${PN}-2.10.1-qt5-printsupport.patch"
+ epatch "${FILESDIR}/${PN}-2.10.1-qt55.patch"
}
src_configure() {
@@ -62,7 +63,7 @@ src_configure() {
-DUSE_QT_WEBKIT=ON
)
if use !qt5; then
- mycmakeargs+=(-DBT_FORCE_USE_QT4=)
+ mycmakeargs+=(-DBT_FORCE_USE_QT4=ON)
fi
cmake-utils_src_configure
diff --git a/app-text/bibletime/files/bibletime-2.10.1-qt55.patch b/app-text/bibletime/files/bibletime-2.10.1-qt55.patch
new file mode 100644
index 000000000000..715792035039
--- /dev/null
+++ b/app-text/bibletime/files/bibletime-2.10.1-qt55.patch
@@ -0,0 +1,32 @@
+From: Gary Holmlund <gary.holmlund@gmail.com>
+Date: Fri, 3 Jul 2015 21:32:26 -0700
+Subject: [PATCH] backend: Fix Qt 5.5 compile error with Q_ASSERT.
+
+---
+ src/backend/drivers/cswordmoduleinfo.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/backend/drivers/cswordmoduleinfo.cpp b/src/backend/drivers/cswordmoduleinfo.cpp
+index f86f9ac..ae7444f 100644
+--- a/src/backend/drivers/cswordmoduleinfo.cpp
++++ b/src/backend/drivers/cswordmoduleinfo.cpp
+@@ -54,7 +54,7 @@ const unsigned long BT_MAX_LUCENE_FIELD_LENGTH = 1024 * 1024;
+ CSwordModuleInfo::CSwordModuleInfo(sword::SWModule * module,
+ CSwordBackend & backend,
+ ModuleType type)
+- : m_module((Q_ASSERT(module), module)),
++ : m_module(module),
+ m_backend(backend),
+ m_type(type),
+ m_cancelIndexing(false),
+@@ -63,6 +63,7 @@ CSwordModuleInfo::CSwordModuleInfo(sword::SWModule * module,
+ {
+ initCachedCategory();
+ initCachedLanguage();
++ Q_ASSERT(module);
+
+ m_hidden = btConfig().value<QStringList>("state/hiddenModules",
+ QStringList()).contains(m_cachedName);
+--
+2.4.10
+
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 476590e3a092..14a3eb749a7c 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,2 +1,3 @@
DIST docbook-xsl-1.78.0.tar.bz2 5011106 SHA256 e43220bfe35cad7eb289291264da472819c4b781173a9a58f72d6e404a1f5923 SHA512 9611e354a8c8e86fa203a0b58356a6229e82f98197a94f9a668c10e10ef3ebb87f468fa03a04292068d1cca5ad31043d78e19981933ee3820910d70ca9e044e2 WHIRLPOOL a2ffba19a2da8c6fc1be9fbdc8ef5b5fc5f13ed8524ffc07bda56b7f986268f45b5c4df2261f6a04c7e12b97aadc2e2a6718268ffe3102aa58589f2db6e6f90c
DIST docbook-xsl-1.79.0.tar.bz2 21973361 SHA256 de7ba9cfdc75cb7df4f3e57f080d3a30d97ef2ba6841cbce8bdbd9f6eb43d606 SHA512 5761b9fafe7895a76afacbbf20607fff493fd5a9e3ab4d2f67780c887c24ef12c8313065ea384964a57b6e47d92c7a5167ed16bdf3c4e93576b0af5cb99463ab WHIRLPOOL 45eea4d335d4371d089284f66681702bb0c9b2602f95c7eafe98a22d1ebf9fa621b58a5390ec5735ecece88a104d6e04a7d90e1bd330d71af8d102325ce07853
+DIST docbook-xsl-1.79.1.tar.bz2 21967928 SHA256 725f452e12b296956e8bfb876ccece71eeecdd14b94f667f3ed9091761a4a968 SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7 WHIRLPOOL 3bd03072aba15cda9e7a18cb6c1edfc91cdb706811fd07d5aa69df1ffd5a48394848079cf63c67360104f0c0ec89920268b49d358c62bf5f61d6030938be0a0f
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild
index 9760c95da460..499645137593 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ruby"
RDEPEND=">=app-text/build-docbook-catalog-1.1
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1.ebuild
new file mode 100644
index 000000000000..aeba63242dee
--- /dev/null
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
+MY_PN="${PN%-stylesheets}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XSL Stylesheets for Docbook"
+HOMEPAGE="http://wiki.docbook.org/DocBookXslStylesheets"
+SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ruby"
+
+RDEPEND=">=app-text/build-docbook-catalog-1.1
+ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:2.1 dev-lang/ruby:2.2 ) )"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+# Makefile is broken since 1.76.0
+RESTRICT=test
+
+# The makefile runs tests, not builds.
+src_compile() { :; }
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ # The changelog is now zipped, and copied as the RELEASE-NOTES, so we
+ # don't need to install it
+ dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
+
+ insinto ${DOCBOOKDIR}
+ doins VERSION VERSION.xsl
+
+ local i
+ for i in $(find . -maxdepth 1 -mindepth 1 -type d -exec basename {} \;); do
+ [[ "$i" == "epub" ]] && ! use ruby && continue
+
+ cd "${S}"/${i}
+ for doc in ChangeLog README; do
+ if [ -e "$doc" ]; then
+ mv ${doc} ${doc}.${i}
+ dodoc ${doc}.${i}
+ rm ${doc}.${i}
+ fi
+ done
+
+ doins -r "${S}"/${i}
+ done
+
+ if use ruby; then
+ local cmd="dbtoepub${MY_PN#docbook-xsl}"
+
+ # we can't use a symlink or it'll look for the library in the
+ # wrong path.
+ dodir /usr/bin
+ cat - > "${D}"/usr/bin/${cmd} <<EOF
+#!/usr/bin/env ruby
+
+load "${DOCBOOKDIR}/epub/bin/dbtoepub"
+EOF
+ fperms 0755 /usr/bin/${cmd}
+ fi
+}
+
+pkg_postinst() {
+ build-docbook-catalog
+}
+
+pkg_postrm() {
+ build-docbook-catalog
+}
diff --git a/app-text/dvipng/dvipng-1.15.ebuild b/app-text/dvipng/dvipng-1.15.ebuild
index f55955e141f4..4a86ac46af58 100644
--- a/app-text/dvipng/dvipng-1.15.ebuild
+++ b/app-text/dvipng/dvipng-1.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-3+ Texinfo-manual"
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 ~x86-solaris"
+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 ~x86-solaris"
IUSE="truetype test"
RDEPEND="
diff --git a/app-text/fbreader/fbreader-0.99.4-r1.ebuild b/app-text/fbreader/fbreader-0.99.4-r1.ebuild
deleted file mode 100644
index 5b86080e93a3..000000000000
--- a/app-text/fbreader/fbreader-0.99.4-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib
-
-DESCRIPTION="E-Book Reader. Supports many e-book formats"
-HOMEPAGE="http://www.fbreader.org/"
-SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="debug"
-
-RDEPEND="
- app-arch/bzip2
- dev-libs/expat
- dev-libs/liblinebreak
- dev-libs/fribidi
- dev-db/sqlite
- net-misc/curl
- sys-libs/zlib
- dev-qt/qtcore:4
- dev-qt/qtgui:4
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Still use linebreak instead of new unibreak
- sed -e "s:-lunibreak:-llinebreak:" \
- -i makefiles/config.mk zlibrary/text/Makefile || die "fixing libunibreak failed"
-
- # Let portage decide about the compiler
- sed -e "/^CC = /d" \
- -i makefiles/arch/desktop.mk || die "removing CC line failed"
-
- # let portage strip the binary
- sed -e '/@strip/d' \
- -i fbreader/desktop/Makefile || die
-
- # Respect *FLAGS
- sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
- -i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
- sed -e "/^ CFLAGS +=/ d" \
- -i makefiles/config.mk || die "CFLAGS sed failed"
- sed -e "/^ LDFLAGS += -s$/ d" \
- -i makefiles/config.mk || die "sed failed"
- sed -e "/^LDFLAGS =$/ d" \
- -i makefiles/arch/desktop.mk || die "sed failed"
-
- echo "TARGET_ARCH = desktop" > makefiles/target.mk
- echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
-
- echo "UI_TYPE = qt4" >> makefiles/target.mk
- sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \
- -i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
-
- if use debug; then
- echo "TARGET_STATUS = debug" >> makefiles/target.mk
- else
- echo "TARGET_STATUS = release" >> makefiles/target.mk
- fi
-
- # bug #452636
- epatch "${FILESDIR}"/${P}.patch
-}
-
-src_install() {
- default
- dosym /usr/bin/FBReader /usr/bin/fbreader
-}
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
index 41047bb40dcf..66c1556ff284 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
inherit gnome2 multibuild python-r1
DESCRIPTION="A collection of documentation utilities for the Gnome project"
-HOMEPAGE="https://live.gnome.org/GnomeDocUtils"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index 780768af9783..1dbe40d1e331 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,2 +1,3 @@
DIST gtkspell-2.0.16.tar.gz 351277 SHA256 8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d WHIRLPOOL 58dc258297412b99185f8d284fb4d2ab71ab834aa29e17a9dfb743e93271ae14d517fea2dc886112898f666104300df62b04082c307b3870de4a5d908bf2ae57
DIST gtkspell3-3.0.4.tar.gz 420762 SHA256 fabf8e670c99c1a91996e0e33fa78b7c023f77efb3e11355cf5aa9bcdc43e4a7 SHA512 907b9321b4608ca13c55c1c3a07a648b2d5eb30f0e4a92dca1c27051af254d4ded2444fef1b941f03a96e29e389d868ee15daad4bd7016239cd0dc54bb0f4abb WHIRLPOOL fd07dfd1fc2b4d449083c6847bf2c69d8f11fce2da6a5198a505e75ce6b14b9bd0c66638b5a15c0f0ff8675914355e6f9bbafbbc2096e786f81870c6ab42c1da
+DIST gtkspell3-3.0.7.tar.gz 447648 SHA256 13f2e6d3e2554cc24253ef592074b28c117db33b7a4465c98c69a3e0a4fa3cc2 SHA512 121c32050a3f3fe6868d76ce7783cb4619a9cbca083b45b78e1279e4c86143fe414e60971fed4c505b066449743664b372a06589af9c3e8dd1bafae355f83e47 WHIRLPOOL db0c04e6a6c01bf6929ef92c7f53f0852afab5216854d9dfd028749caa016b9cce94d8c41b0cca6d2e4a5e6005141bb080b1167e4dfeefa4acd0cd8196a8e112
diff --git a/app-text/gtkspell/gtkspell-3.0.7.ebuild b/app-text/gtkspell/gtkspell-3.0.7.ebuild
new file mode 100644
index 000000000000..c4cb2b2b396a
--- /dev/null
+++ b/app-text/gtkspell/gtkspell-3.0.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 vala
+
+DESCRIPTION="Spell checking widget for GTK"
+HOMEPAGE="http://gtkspell.sourceforge.net/"
+MY_P="${PN}3-${PV}"
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="3/0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="+introspection vala"
+
+RDEPEND="
+ >=app-text/enchant-1.1.6
+ app-text/iso-codes
+ dev-libs/glib:2
+ x11-libs/gtk+:3[introspection?]
+ >=x11-libs/pango-1.8.0[introspection?]
+ introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.17
+ >=dev-util/intltool-0.35.0
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml
index 8d000ed3d2b4..599d7cff92d2 100644
--- a/app-text/hunspell/metadata.xml
+++ b/app-text/hunspell/metadata.xml
@@ -3,8 +3,8 @@
<pkgmetadata>
<herd>proxy-maintainers</herd>
<maintainer>
- <name>Elizabeth Myers</name>
<email>elizabeth@interlinked.me</email>
+ <name>Elizabeth Myers</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
<upstream>
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index e15b1c2f5912..1506aa845801 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -4,3 +4,4 @@ DIST JabRef-2.11.jar 20374561 SHA256 2e8b6f01e4b783049817ad0cc83fc05de57574cd219
DIST JabRef-2.11b2.jar 15817749 SHA256 f811eb98bdef938c9aaeee5e9807c6ea28a8b4d7270df93cb6ac2cf405dc6f8c SHA512 045f33632f5aa6ef6c61cb8e16dae69f2d91f2b4b85bfce5e51bd9492ad80d41c92b093d8f6b0d67972f18fa787d626b8c6fd419c7cd4cd3249d3e40d7025bf4 WHIRLPOOL 01e9c89b644a110ec2fc1e222ff996f69a0210520cb5c2dc0f7b4c8bb16d91bb4d37358e8e76bd2cfe7630cd664ad925b62c0a46e041da2949c4655b8326250d
DIST JabRef-2.11b3.jar 16426897 SHA256 251192bc24448886bb62dbc5d01e0c68ee345c45d83fd586db16e5562894fa78 SHA512 93f691928948346f2e3891d5a52be14159b6e0e953897d12a839026ae125bae9c97082bf8f2e160bf20fd42d7e81fa5385114c5e7800e17be07666aa4ec0f7ed WHIRLPOOL ecf0088eb1b30391851a2c30f502b34accd9d4b1e6133f2f06e6e6689160a1dcd74a7f719c3d1e7d8e489f0bcb1f5187a07403d998a0a3256bacf4cbcaa0a2fc
DIST JabRef-2.11b4.jar 20366631 SHA256 4f715c5e8849167b234cec2edbf6c8e32f3eaab5b69ff672210746bdb0c9204d SHA512 28d57d75cbd197e9a2fd9307cfd1cac9f8b2a0855c440db2a06292770a068cf7eb67db1af31f7240f70ddd382b33c30cb10c1d4be7e53cfd302efc1671b6a2a3 WHIRLPOOL 6b90bd7668330fa1c41bf2622a3d48acaf98d1b3ae0e5174ec3e85ca12a12f56b6ec42887cda655bdb2863e69899a707eb2be7663dc27f53030315bd3c68da20
+DIST JabRef-3.1.jar 20307649 SHA256 81adaa1b672535e7b64814b6ad8f6a00e8bcf0a82b0849ba4523e36cd440425d SHA512 aab648f19feecf64a9afe3e69092736c0c2c177ee3a6c0dc3a9a9a8cea6d5a0d24201abed7048e4b569b0f1bb4736c1ad75df056243293e7b82795f50eb16476 WHIRLPOOL 437744b7236249e342ccaba9b08164727017b4136246c04a73c824c0df91e9b9f6d0814294f110ab935fb60bcd60d70f921774dfced0375ea19afafe60451c22
diff --git a/app-text/jabref-bin/jabref-bin-3.1.ebuild b/app-text/jabref-bin/jabref-bin-3.1.ebuild
new file mode 100644
index 000000000000..862601ec7b4e
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils java-pkg-2
+
+MY_PV_1="${PV/_beta/b}"
+MY_PV="${MY_PV_1/_rc/}"
+MY_URI_PV_1="${PV/rc/}"
+MY_URI_PV="${MY_URI_PV_1//_/%20}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://jabref.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ cp -v "${DISTDIR}/${A}" . || die
+ jar xf ${A} images/icons/JabRef-icon-48.png || die
+}
+
+src_install() {
+ java-pkg_newjar "JabRef-${MY_PV}.jar"
+ java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+ newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
+ make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+}
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 5ebcfb3ad645..f9fab18ff18f 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,2 +1 @@
DIST linuxdoc-tools-0.9.71.tar.gz 613357 SHA256 1710b03d0e7151892c417363dd26c15d7f45d36411b6a341b0a4d3753519f476 SHA512 8383e5f08d58ca6395db1832c02e1af7b348c276187e8271564b229d811f5141128976924f110d6575fa94bb45d547a2f4c90acee523e78c849659cad592b7ae WHIRLPOOL d40660d2b3373e853adb3055d8053507c786e278906eedf1d9b9afb74a032bc464587fbd6e9320b7fa8aab3de334c12a899a2e8bf9f5addf0c13988bbdc0ced1
-DIST linuxdoc-tools_0.9.69.orig.tar.gz 604379 SHA256 7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101 SHA512 5e0ca7614acd5a4c67d4beadd12e9665540d664dc4796c361a25d26ccdc53ef9e0b58cd051d028659e07530e351b0773895f8e6d06e5d2c6ffaad0a1f0c4d41e WHIRLPOOL 0ee3492252f6607169a6404701e04030047f4a4d9237d213606a67c8f6b9ec019315a355e78318a2c57ac8cb2eb08b1ab4d6b81a7f05b77b257127b70cd8ae1d
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-compiler.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-compiler.patch
deleted file mode 100644
index d66bb0fce101..000000000000
--- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-compiler.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Strip hardcoded CC, CFLAGS, LDFLAGS as linuxdoc-tools build system ignores
-systemd-wide values of these variables.
-
-diff --git a/Makefile.in b/Makefile.in
-index 359f14e..4af3ee3 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -42,14 +42,6 @@ tex_ddir = $(DESTDIR)$(texdir)
-
- progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2rtf sgml2txt sgmlcheck
-
--PROFILE =
--INCLUDE =
--OPTIMIZE = -O
--DEBUG =
--WARN =
--CFLAGS = $(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
--LDFLAGS = $(DEBUG) $(PROFILE)
--
- all:
- ifeq ($(BUILD_SGMLSASP), true)
- @echo "Compiling the SGML translator tools (in sgmls-1.1/)..."
-diff --git a/rtf-fix/Makefile b/rtf-fix/Makefile
-index 7b02427..c0628bf 100644
---- a/rtf-fix/Makefile
-+++ b/rtf-fix/Makefile
-@@ -1,6 +1,4 @@
--CC=gcc
- LEX=flex
--CFLAGS=-O
-
- all: rtf2rtf
-
-diff --git a/sgmls-1.1/Makefile b/sgmls-1.1/Makefile
-index 7a1cffa..6dc53ad 100644
---- a/sgmls-1.1/Makefile
-+++ b/sgmls-1.1/Makefile
-@@ -15,14 +15,7 @@ MANDIR=$(PREFIX)/man/man$(MANEXT)
- # Permissions mode to use for man pages.
- MANMODE=444
-
--CC=gcc
--PROFILE=
- INCLUDE=
--OPTIMIZE=-O
--DEBUG=
--WARN=
--CFLAGS=$(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
--LDFLAGS=$(DEBUG) $(PROFILE)
- # Additional libraries needed.
- # Ultrix needs -li
- LIBS=
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-disable-doc-build.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-disable-doc-build.patch
deleted file mode 100644
index 075eae6526a7..000000000000
--- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-disable-doc-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 359f14e..1649245 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -161,23 +161,6 @@ endif
- mkdir -m 755 -p $(tex_ddir)
- $(INSTALL_DATA) tex/* $(tex_ddir)
-
--# -- Build and install documentation
-- @echo "Installing documentation in $(doc_ddir) ..."
-- (cd doc; \
-- PATH=${PATH}:$(bin_ddir) \
-- PREFIX=$(DESTDIR)$(prefix) \
-- AUXBINDIR=$(auxbin_ddir) \
-- PKGPERL5LIB=$(perl5lib_ddir) \
-- PKGDATADIR=$(pkgdata_ddir) \
-- bash Makedoc.sh)
--
-- mkdir -m 755 -p $(doc_ddir)
-- # cp -r doc/* $(doc_ddir)
-- ( cd doc && tar --exclude='CVS' -cpf - . ) | ( cd $(doc_ddir) && tar -xpf - )
-- rm -f $(doc_ddir)/Makedoc.sh
-- find $(doc_ddir) -type d -print | xargs chmod 755
-- find $(doc_ddir) -type f -print | xargs chmod 644
--
- # what dirs do the targets clean and distclean need?
- DDIRS=
- MDIRS=
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild
deleted file mode 100644
index ad31ecac4a5b..000000000000
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils perl-module sgml-catalog toolchain-funcs
-
-DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
-HOMEPAGE="https://tracker.debian.org/pkg/linuxdoc-tools"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="MIT SGMLUG"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
-IUSE="doc"
-
-DEPEND="
- || ( app-text/openjade app-text/opensp )
- app-text/sgml-common
- dev-lang/perl:=
- || ( sys-apps/gawk sys-apps/mawk )
- sys-apps/groff
- sys-devel/flex
- doc? (
- dev-texlive/texlive-fontsrecommended
- virtual/latex-base
- )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-compiler.patch" )
-
-DOCS=( ChangeLog README )
-
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" \
- "/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
-
-src_prepare() {
- # Fix malloc include.
- sed -e \
- 's/#include <malloc.h>/#include <stdlib.h>/' \
- -i rtf-fix/rtf2rtf.l || die
-
- # Fix SGML catalog path.
- sed -e \
- 's%/iso-entities-8879.1986/iso-entities.cat%/sgml-iso-entities-8879.1986/catalog%' \
- -i perl5lib/LinuxDocTools.pm || die
-
- # Fix doc install path.
- sed -e \
- "s%/share/doc/linuxdoc-tools%/share/doc/${PF}%" \
- -i Makefile.in || die
-
- # Upstream developers unconditionally build docs during the install phase.
- # The only sane solution in this case is to patch things out from Makefile.
- # See Gentoo bug #558610 for more info.
- use doc || epatch "${FILESDIR}/${P}-disable-doc-build.patch"
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- perl_set_version
- tc-export CC
- local myeconfargs=(
- --with-texdir="/usr/share/texmf/tex/latex/misc"
- --with-perllibdir="${VENDOR_ARCH}"
- --with-installed-iso-entities
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-}
-
-src_install() {
- # Prevent access violations from bitmap font files generation.
- export VARTEXFONTS="${T}/fonts"
-
- # Help linuxdoc-tools find sgml-iso-entities catalog again.
- export SGML_CATALOG_FILES="/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
-
- autotools-utils_src_install
-}
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
index 528386280a67..42d7ee29e763 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://gitlab.com/agmartin/${PN}/repository/archive.tar.gz?ref=upstrea
LICENSE="MIT SGMLUG"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
IUSE="doc"
RDEPEND="
diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
index ea30d74020de..76f401efbbfa 100644
--- a/app-text/pdf2djvu/Manifest
+++ b/app-text/pdf2djvu/Manifest
@@ -1,2 +1,3 @@
DIST pdf2djvu-0.8.2.tar.xz 234412 SHA256 40b0812e954f374704bd8dbb5952786f6744623a2ec6df1c56de0b8057be93d6 SHA512 72a3ee719b6311824c1f71269787b31cdd600bc8671f0486419f4d023cb10f9d338df18ce33c982ed43f893d441a723bffd502a17287be43a00dc695ca959042 WHIRLPOOL 72863dfc7f4a7d1665de77a3fa12242c83746f4c3a237b45e92fd3111581f55e16a5c020590d12185db13b7035a987ab2efaa8fee9b47adb60f0502703af6a7c
DIST pdf2djvu-0.9.1.tar.xz 238840 SHA256 9f9919e97fe244f4c49fa4074120cfc03397379b39f32a911793088039c63df5 SHA512 9ccc5a5523f9b9f17f67912a63f0314eac93a633282bb8bee95bcd9b0f50ef2d05ddbb3456daee7b8d5795081c27002ffc355e6effcfbee4ce9a52b7f92bdf50 WHIRLPOOL ae3e531a5de524e03cd353af54bb4171a62fc01b4162ec31b2401eea53732acb13fed80f3b5eb7ed797080b1b2aab5908d6666a95068b0583b3f8ce92130897e
+DIST pdf2djvu-0.9.3.tar.xz 239492 SHA256 d05eb7a10e22d18b77113831ac1c6e380c4569e021c39554d5bb54effe4c7077 SHA512 388b76642c354480674b6eee4961792c4ef483313ffd25a6248d1d6302985ac5adfb558ae9241062893a419463c9626d8dac9d08297d66b68a98cebbcc4dc193 WHIRLPOOL 76f5d53c11c921968eaf9f91b4fcf7ff25bd6405b6f92638af4fd38c5931941f6c48f4ba586d0ef3a6f5f8bdcfff68b1681c6429e32c818ffe379bd3a6891bfc
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.3.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.3.ebuild
new file mode 100644
index 000000000000..653e9bbc712e
--- /dev/null
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="A tool to create DjVu files from PDF files"
+HOMEPAGE="http://jwilk.net/software/pdf2djvu"
+SRC_URI="https://bitbucket.org/jwilk/${PN}/downloads/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+graphicsmagick nls openmp test"
+
+RDEPEND="
+ >=app-text/djvu-3.5.21:=
+ >=app-text/poppler-0.16.7:=
+ dev-libs/libxml2:=
+ dev-libs/libxslt:=
+ graphicsmagick? ( media-gfx/graphicsmagick:= )
+"
+DEPEND="${RDEPEND}
+ dev-cpp/pstreams
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+REQUIRED_USE="test? ( graphicsmagick ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+ use test && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local openmp=--disable-openmp
+ use openmp && tc-has-openmp && openmp=--enable-openmp
+
+ econf \
+ ${openmp} \
+ $(use_enable nls) \
+ $(use_with graphicsmagick)
+}
+
+src_install() {
+ default
+ dodoc doc/{changelog,{cjk,credits,djvudigital}.txt}
+}
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 609085aed236..359cc96792d7 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,2 +1,4 @@
DIST qpdf-5.1.1.tar.gz 7662701 SHA256 95d355d8fa5e1c677e04d884161de94f5438bf3bdc1638498796b042bad4a726 SHA512 236132290694730d7de08635560435d34ae44f4edbc1b887e494f2ee183271331827226e7e29e539d25d5a2ca1dd5815a387c46edc0b6fd898436bbb674d9993 WHIRLPOOL 66eee10dc5163f1e53afcbd02b71bab73598c28ebb9b005c26af4e58396fd693af7ed76a17fd0c29819b0fa08a71ea0158c76bfa0b0d452a78bb357277644459
DIST qpdf-5.1.2.tar.gz 7664268 SHA256 e9dd8d5d0a322078ffd573f057f03d24a734cc5b7dd925b089ebcb0f6e867bfd SHA512 be2fe3f1127532edc1b3d9af2d25df64c2c04c402cfef8d1ca5ed77129c2f17ef3435abb6c630b260ee4be8458984c0fbf0abfb6cda82ef4fa74dc23ca7a8864 WHIRLPOOL 5ec875f0ea73aa044c671f4ea9e5b69c74c188463ad58006a55ed395fed4e0184baad760486596586866b9f701ae5e211ac08ade1eff54028e20c6c1462ee629
+DIST qpdf-5.1.3.tar.gz 7681578 SHA256 d5164bdad3afc381568dbe8e1509a4a6a911d4d077f1fc20b9866ef8fad901d3 SHA512 676cc6db27dcbcdece21cb427c6aae14646389f4000ff111feee8fdbbb03fe715035e5236a08db4137f275a09ed0dda5c80afbdc5093fe7f56b69a0e335ab73a WHIRLPOOL 96cf06c0da63f9f3f5bccd422875c23e473443a4552de3c23ab9971104876fb5463cb6b7db86faee3aac04bddd9b59391093a7d5840cad801093162561ba459d
+DIST qpdf-6.0.0.tar.gz 8344860 SHA256 a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233 SHA512 303e3cc77ddb87b9494e26c35e0b45b42f73692054c56a00f2e4f1922633c6ebb45c8684992cd9bf32f03366fcc4cd7e7ec6fb9432d2dbba6e0b24395909b5bf WHIRLPOOL f9fae783c16a93826f825a8efe1a116cbde00fb19b8b56dbfcad7878557c106c8f7a58945af3002f2a72aa032247008013edce8943a45cca8c186b68bf2b5cd3
diff --git a/app-text/qpdf/qpdf-5.1.3.ebuild b/app-text/qpdf/qpdf-5.1.3.ebuild
new file mode 100644
index 000000000000..ebfd5d539ef0
--- /dev/null
+++ b/app-text/qpdf/qpdf-5.1.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0/13" # subslot = libqpdf soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples static-libs test"
+
+RDEPEND="dev-libs/libpcre
+ sys-libs/zlib
+ >=dev-lang/perl-5.8"
+DEPEND="${RDEPEND}
+ test? (
+ sys-apps/diffutils
+ media-libs/tiff
+ app-text/ghostscript-gpl
+ )"
+
+DOCS=( ChangeLog README TODO )
+
+src_prepare() {
+ # manually install docs
+ sed -i "/docdir/d" make/libtool.mk || die
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable test test-compare-images)
+}
+
+src_install() {
+ default
+
+ if use doc ; then
+ dodoc doc/qpdf-manual.pdf
+ dohtml doc/*
+ fi
+
+ if use examples ; then
+ dobin examples/build/.libs/*
+ fi
+
+ prune_libtool_files
+}
diff --git a/app-text/qpdf/qpdf-6.0.0.ebuild b/app-text/qpdf/qpdf-6.0.0.ebuild
new file mode 100644
index 000000000000..b31f1b04b5af
--- /dev/null
+++ b/app-text/qpdf/qpdf-6.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0/17" # subslot = libqpdf soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples static-libs test"
+
+RDEPEND="dev-libs/libpcre
+ sys-libs/zlib
+ >=dev-lang/perl-5.8"
+DEPEND="${RDEPEND}
+ test? (
+ sys-apps/diffutils
+ media-libs/tiff
+ app-text/ghostscript-gpl
+ )"
+
+DOCS=( ChangeLog README TODO )
+
+src_prepare() {
+ # manually install docs
+ sed -i "/docdir/d" make/libtool.mk || die
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable test test-compare-images)
+}
+
+src_install() {
+ default
+
+ if use doc ; then
+ dodoc doc/qpdf-manual.pdf
+ dohtml doc/*
+ fi
+
+ if use examples ; then
+ dobin examples/build/.libs/*
+ fi
+
+ prune_libtool_files
+}
diff --git a/app-text/referencer/referencer-1.2.1.ebuild b/app-text/referencer/referencer-1.2.1.ebuild
index f39393be512c..a747180ac5bf 100644
--- a/app-text/referencer/referencer-1.2.1.ebuild
+++ b/app-text/referencer/referencer-1.2.1.ebuild
@@ -3,10 +3,9 @@
# $Id$
EAPI="5"
-
PYTHON_DEPEND="2:2.7"
-inherit fdo-mime eutils python
+inherit fdo-mime eutils flag-o-matic python
DESCRIPTION="Gnome application to organise documents or references, and to generate BibTeX bibliography files"
HOMEPAGE="https://launchpad.net/referencer"
@@ -41,6 +40,7 @@ src_prepare () {
}
src_configure() {
+ append-cxxflags -std=c++11
econf --disable-update-mime-database --enable-python
}
diff --git a/app-text/stardict/stardict-3.0.6-r2.ebuild b/app-text/stardict/stardict-3.0.6-r2.ebuild
index 26b96b185265..f86956151f3d 100644
--- a/app-text/stardict/stardict-3.0.6-r2.ebuild
+++ b/app-text/stardict/stardict-3.0.6-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://sourceforge/${PN}-4/${P}.tar.bz2
LICENSE="CPL-1.0 GPL-3 LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86"
IUSE="espeak qqwry pronounce spell tools"
RESTRICT="test"
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index b8141c67aa45..5d59b6859dc5 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,3 +1,4 @@
DIST sword-1.6.2.tar.gz 1965427 SHA256 af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9 SHA512 3a62364ce528540a338a163d5fe48ce4a0263c8af6d5a955ab6b5182f122a65130683d6cc6a8eb9fe3a41661d3bd3fe5bf830aa8329c2b8a6d47f010461b32b4 WHIRLPOOL 50fc2cc6a18a269c7f1eca16ed2f659b84ed0a53d520b4e7935bf0af10c96e9c0b2f26c7e3088edf8311564620fb778fc1f63c0b78c449ad165fee9843fb753d
DIST sword-1.7.2.tar.gz 2127944 SHA256 ac7aace0ecb7a405d4b4b211ee1ae5b2250bb5c57c9197179747c9e830787871 SHA512 1ee9565f36d113c9b21883a78004e895ab2f74d9c9f1909058c204e38647a96938de2e544a68858d2c4b048b67ba868049c1c09f0067bc9819a5a85f75285ebe WHIRLPOOL 894e4d96b2ff61ac19de853ff6b17aa2279fb7b5b571c1030ba18daefbea8997bd61d386ff3a1dff49d997c69d6acf2a83094ad6ec5c593acca3dc7fb1d488a0
DIST sword-1.7.3.tar.gz 2149459 SHA256 5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea SHA512 4805215954211584ed6b00869a31e1d317d9fa460db2d2e8c5c396f0154979949ec8b770ac8c6ff20106d8beea75d2a824c7e6b6ce5138fc3e558ab4b5614f2a WHIRLPOOL a0ccc912f72835cc30045c21da9aff6209cac8d356f6c71031761e7e884916a4707712d0d22df01281f5ea5e29759d01951d5e9908c85332fc569c1a9543abe6
+DIST sword-1.7.4.tar.gz 2157882 SHA256 995da8cf5a207c1f09809bf4b9db0bd7d267da5fcdb9d6666c9b313edd9d213d SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75 WHIRLPOOL a998552c18b5913d88f091d7dfec307e409401a01eb6011b62c7b4d3ea81355f816f013d7a3165ada2fa54454fdea980574091d8006d05f161cf55438f1df14b
diff --git a/app-text/sword/sword-1.7.4.ebuild b/app-text/sword/sword-1.7.4.ebuild
new file mode 100644
index 000000000000..1567283b4ed6
--- /dev/null
+++ b/app-text/sword/sword-1.7.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="Library for Bible reading software"
+HOMEPAGE="http://www.crosswire.org/sword/"
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
+IUSE="curl debug doc icu static-libs"
+
+RDEPEND="sys-libs/zlib
+ curl? ( net-misc/curl )
+ icu? ( dev-libs/icu:= )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+DOCS="AUTHORS CODINGSTYLE ChangeLog README"
+
+RESTRICT="test" #Restricting for now, see bug 313207
+
+src_prepare() {
+ sed -i \
+ -e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
+ -e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
+ configure || die
+
+ sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
+ sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
+
+ cat <<-EOF > "${T}"/${PN}.conf
+ [Install]
+ DataPath=${EPREFIX}/usr/share/${PN}/
+ EOF
+}
+
+src_configure() {
+ # TODO: Why is this here and can we remove it?
+ strip-flags
+
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable debug) \
+ --with-zlib \
+ $(use_with icu) \
+ --with-conf \
+ $(use_with curl)
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -exec rm -f {} +
+
+ if use doc; then
+ rm -rf examples/.cvsignore
+ rm -rf examples/cmdline/.cvsignore
+ rm -rf examples/cmdline/.deps
+ cp -R samples examples "${ED}"/usr/share/doc/${PF}/
+ fi
+
+ insinto /etc
+ doins "${T}"/${PN}.conf
+}
+
+pkg_postinst() {
+ elog "Check out http://www.crosswire.org/sword/modules/"
+ elog "to download modules that you would like to use with SWORD."
+ elog "Follow module installation instructions found on"
+ elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
index b425c2d90054..da15ded97d64 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
@@ -22,6 +22,7 @@ LICENSE="public-domain"
SLOT="2"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="doc examples static-libs"
+RESTRICT="test" # No tests but test target blows up!
DEPEND="doc? ( app-doc/doxygen )"
RDEPEND="!!dev-java/antlr:0[cxx]"
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 290ed2ad0135..72f81b1625b4 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -2,3 +2,4 @@ DIST eigen-2.0.17.tar.bz2 367890 SHA256 7255e856ed367ce6e6e2d4153b0e4e753c8b8d36
DIST eigen-3.1.3.tar.bz2 1052724 SHA256 1a443145f321dd47a5ca11f176e7319056198a6124a7577723d92e3c3cd59ece SHA512 7b6b816416570c9592ed9ca09e61970346f02bed492df7073fed3e657ded0c2bb736fb024554f92064ee783cbf1180952ccb87ed724899fa353f34c6a49210a4 WHIRLPOOL 53c667def19d882bff0e6a7b8476028a211ca2b4617d579b8555738c726ed1d4f3d4aed0e87b39c00a941484505f2a54fb82dba19444cc04f7f438fa1fc22c45
DIST eigen-3.2.5.tar.bz2 1151510 SHA256 5f6e6cb88188e34185f43cb819d7dab9b48ef493774ff834e568f4805d3dc2f9 SHA512 5a90a312c3503bb91293aa9ed69258f36c6a3a06a64ff851c8b57a4df01bd467e22e5ba95221bce97a8cf2d3fb9f0ad1c1c40116a3c9c9b1f80d7fc7b0a96c7a WHIRLPOOL 21333e30f77b4712d21eb4bed6159c0e0bfb769ed65d01d4cf5cfeb1a9105f2a3c2ccbc41d251fc09399ee8ad8a50d2eb9d1ea5d38d98ca1df12f8972b24a630
DIST eigen-3.2.6.tar.bz2 1152805 SHA256 8a3352f9a5361fe90e451a7305fb1896fc7f771dc16cc0edd8e6b157f52c343e SHA512 a1abcef36d774ab29418961143174e460e11c05f40d493844e4d4e8024e0b60c453cb007e96ed05d786eec3214d72f15ead0ac49ed84762d3037db90f11c935a WHIRLPOOL e15f917ad6b8aeda2e11c6af186073921d78c3b96c922f1068989b64a2ec7c3d58df280ce809be877b6e93a691c0d511afa601cb806bf4d9f29e9133c62e280c
+DIST eigen-3.2.7.tar.bz2 1155162 SHA256 e58e1a11b23cf2754e32b3c5990f318a8461a3613c7acbf6035870daa45c2f3e SHA512 6e9beb4fdd69d96a1bb305ea9463547c19cac0072ce908c19bf952d2b7a254c0d674d19a7797a3ba5e8617e1c1bca74dfb7c01971301cb152e467f13eaaed6cc WHIRLPOOL ff42ff72757736dceab759e6d12a6430e5d41b8119890eaf0f1158af1f6f5f25267e830e8cd5c7dbc71f5e1c27b0a9880420c1a3acd9369387489183b199d9ce
diff --git a/dev-cpp/eigen/eigen-2.0.17.ebuild b/dev-cpp/eigen/eigen-2.0.17.ebuild
index 4736dda61a77..6591d833ff0d 100644
--- a/dev-cpp/eigen/eigen-2.0.17.ebuild
+++ b/dev-cpp/eigen/eigen-2.0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@ EAPI=4
inherit cmake-utils
-DESCRIPTION="C++ template library for linear algebra: vectors, matrices, and related algorithms"
+DESCRIPTION="C++ template library for linear algebra"
HOMEPAGE="http://eigen.tuxfamily.org/"
SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
diff --git a/dev-cpp/eigen/eigen-3.1.3.ebuild b/dev-cpp/eigen/eigen-3.1.3.ebuild
index a716edca70d6..842fb400898a 100644
--- a/dev-cpp/eigen/eigen-3.1.3.ebuild
+++ b/dev-cpp/eigen/eigen-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@ EAPI=4
inherit cmake-utils
-DESCRIPTION="C++ template library for linear algebra: vectors, matrices, and related algorithms"
+DESCRIPTION="C++ template library for linear algebra"
HOMEPAGE="http://eigen.tuxfamily.org/"
SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
diff --git a/dev-cpp/eigen/eigen-3.2.5.ebuild b/dev-cpp/eigen/eigen-3.2.5.ebuild
index f561a76b31df..373ac6081c11 100644
--- a/dev-cpp/eigen/eigen-3.2.5.ebuild
+++ b/dev-cpp/eigen/eigen-3.2.5.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit cmake-utils
-DESCRIPTION="C++ template library for linear algebra: vectors, matrices, and related algorithms"
+DESCRIPTION="C++ template library for linear algebra"
HOMEPAGE="http://eigen.tuxfamily.org/"
SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
diff --git a/dev-cpp/eigen/eigen-3.2.6.ebuild b/dev-cpp/eigen/eigen-3.2.6.ebuild
index 4c51aedddccc..8ee6857967de 100644
--- a/dev-cpp/eigen/eigen-3.2.6.ebuild
+++ b/dev-cpp/eigen/eigen-3.2.6.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit cmake-utils
-DESCRIPTION="C++ template library for linear algebra: vectors, matrices, and related algorithms"
+DESCRIPTION="C++ template library for linear algebra"
HOMEPAGE="http://eigen.tuxfamily.org/"
SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
diff --git a/dev-cpp/eigen/eigen-3.2.7.ebuild b/dev-cpp/eigen/eigen-3.2.7.ebuild
new file mode 100644
index 000000000000..be503c9b36e3
--- /dev/null
+++ b/dev-cpp/eigen/eigen-3.2.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="C++ template library for linear algebra"
+HOMEPAGE="http://eigen.tuxfamily.org/"
+SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2 GPL-3"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc"
+
+DEPEND="doc? ( app-doc/doxygen[dot,latex] )"
+RDEPEND="!dev-cpp/eigen:0"
+
+src_unpack() {
+ default
+ mv ${PN}* ${P} || die
+}
+
+src_prepare() {
+ sed -i CMakeLists.txt \
+ -e "/add_subdirectory(demos/d" \
+ -e "/add_subdirectory(blas/d" \
+ -e "/add_subdirectory(lapack/d" \
+ || die "sed disable unused bundles failed"
+
+ sed -i -e "/Unknown build type/d" CMakeLists.txt || die
+
+ sed \
+ -e '/Cflags/s|:.*|: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}|g' \
+ -i eigen3.pc.in || die
+
+ cmake-utils_src_prepare
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && cmake-utils_src_compile doc
+}
+
+src_test() {
+ local mycmakeargs=(
+ -DEIGEN_BUILD_TESTS=ON
+ -DEIGEN_TEST_NO_FORTRAN=ON
+ -DEIGEN_TEST_NO_OPENGL=ON
+ )
+ cmake-utils_src_configure
+ cmake-utils_src_compile buildtests
+ cmake-utils_src_test
+}
+
+src_install() {
+ cmake-utils_src_install
+ use doc && dodoc -r "${BUILD_DIR}"/doc/html
+
+ # Debian installs it and some projects started using it.
+ insinto /usr/share/cmake/Modules/
+ doins "${S}/cmake/FindEigen3.cmake"
+}
diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml
index cae726980c93..c5aa60e0b27d 100644
--- a/dev-cpp/eigen/metadata.xml
+++ b/dev-cpp/eigen/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sci</herd>
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index d61d2e782716..512b2426a60c 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -1,3 +1,4 @@
DIST LMDB_0.9.15.tar.gz 130113 SHA256 a72b13db91e7c445e47194178915556b4ebcd6f9f64d48f60b1f830b0cfbd75a SHA512 c6c73661aea42679c83738afbecf9542a04ceed229f72c008b4ef406e7d9284defc652c5b070897155917c5bb2c96a4c35bde3e6423ab0f1802fb711ef1cf16a WHIRLPOOL c00fbb166467a2e7157b4ffbf10525ea8fd2987d172083b07ba52990ab7c39005be3436fe948a29f2c722bf8e4cf76009be55ff5148b0d139126c9a4703c0b28
DIST LMDB_0.9.16.tar.gz 130343 SHA256 49d7b40949f2ced9bc8b23ea6a89e75471a1c9126537a8b268c318a00b84322b SHA512 ef879df615b5ca1a5c28194ff2cad49559d336c470b3ae904428d219452a0d721cae7d64defe44119d19f7c731fe4e0e293ff09118eb057fe322feb3a5aebcc9 WHIRLPOOL 9bf349df3909874b7554175eb66f904132a39b9fc343e019793d68f8227a45a706f725adb87dd2a951acb22c4acd375ce56acc293762157b8a878d6a3f241f1a
+DIST LMDB_0.9.17.tar.gz 135816 SHA256 80a08218e40f76a0485ec18c42de6f1e020b1ed0268f7cb34c69746e8d98c72c SHA512 2f6108364973e01f6379613c02b9fa11933d6c91eadc5ae0cad55818bc0205041d0663a5dd936d89ec651eb1de0257390d48d549d1bc24ef29d7ee57c9fcb941 WHIRLPOOL 9ed1ed2857cc1282e30fa5a6ecab710bbb00f88f973a90228004194f7f52fe21053e27692e9ec9d0dedd33c6e204bd9f66702fd63e60c8a8a23f655acfbda474
DIST lmdb-0.9.14.tar.gz 128170 SHA256 3b14dfe2134521cfebd98168b925f7327b9bd07c715640b79f3526e54f0ccb1f SHA512 d5bde616fb22631fe1689e2c77babfbf5098833cf313bce59a5daab1e450d2998a65f087929879e73e0a897b934ff40b8e340c79ec7b2b1c1fe7e1eea7da6267 WHIRLPOOL 0ebda52fd50d9d73bc079e6a613b2e2cdaa1032665d91e499dea9dcf1698095bfe84b03a931118baae8048c616e9bae7153972446502d368e7dc9ee33105e777
diff --git a/dev-db/lmdb/lmdb-0.9.14.ebuild b/dev-db/lmdb/lmdb-0.9.14.ebuild
index 63868c2578b1..5493891693df 100644
--- a/dev-db/lmdb/lmdb-0.9.14.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.14.ebuild
@@ -37,15 +37,15 @@ src_configure() {
}
src_compile() {
- emake LDLIBS+=" -pthread"
+ emake LDLIBS+=" -pthread" || die
}
src_install() {
- mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1}
+ mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1} || die
default
mv "${D}"/usr/$(get_libdir)/liblmdb.so{,.0} || die
dosym liblmdb.so.0 /usr/$(get_libdir)/liblmdb.so
- use static-libs || rm -f "${D}"/usr/$(get_libdir)/liblmdb.a
+ use static-libs || rm "${D}"/usr/$(get_libdir)/liblmdb.a || die
}
diff --git a/dev-db/lmdb/lmdb-0.9.15.ebuild b/dev-db/lmdb/lmdb-0.9.15.ebuild
index aebd820f7912..212d1840c0fe 100644
--- a/dev-db/lmdb/lmdb-0.9.15.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.15.ebuild
@@ -36,15 +36,15 @@ src_configure() {
}
src_compile() {
- emake LDLIBS+=" -pthread"
+ emake LDLIBS+=" -pthread" || die
}
src_install() {
- mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1}
+ mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1} || die
default
mv "${D}"/usr/$(get_libdir)/liblmdb.so{,.0} || die
dosym liblmdb.so.0 /usr/$(get_libdir)/liblmdb.so
- use static-libs || rm -f "${D}"/usr/$(get_libdir)/liblmdb.a
+ use static-libs || rm "${D}"/usr/$(get_libdir)/liblmdb.a || die
}
diff --git a/dev-db/lmdb/lmdb-0.9.16.ebuild b/dev-db/lmdb/lmdb-0.9.16.ebuild
index aebd820f7912..212d1840c0fe 100644
--- a/dev-db/lmdb/lmdb-0.9.16.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.16.ebuild
@@ -36,15 +36,15 @@ src_configure() {
}
src_compile() {
- emake LDLIBS+=" -pthread"
+ emake LDLIBS+=" -pthread" || die
}
src_install() {
- mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1}
+ mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1} || die
default
mv "${D}"/usr/$(get_libdir)/liblmdb.so{,.0} || die
dosym liblmdb.so.0 /usr/$(get_libdir)/liblmdb.so
- use static-libs || rm -f "${D}"/usr/$(get_libdir)/liblmdb.a
+ use static-libs || rm "${D}"/usr/$(get_libdir)/liblmdb.a || die
}
diff --git a/dev-db/lmdb/lmdb-0.9.17.ebuild b/dev-db/lmdb/lmdb-0.9.17.ebuild
new file mode 100644
index 000000000000..13bcb4a8443f
--- /dev/null
+++ b/dev-db/lmdb/lmdb-0.9.17.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
+HOMEPAGE="http://symas.com/mdb/"
+SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=""
+# =net-nds/openldap-2.4.40 installs lmdb files.
+RDEPEND="!=net-nds/openldap-2.4.40"
+
+S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
+
+src_prepare() {
+ sed -i -e "s/^CC.*/CC = $(tc-getCC)/" \
+ -e "s/^CFLAGS.*/CFLAGS = ${CFLAGS}/" \
+ -e "s/^AR.*/AR = $(tc-getAR)/" \
+ -e "/mkdir/s:lib:$(get_libdir):" \
+ -e "/for f/s:lib:$(get_libdir):" \
+ -e "s:prefix)/man:mandir):" \
+ -e "s:shared:shared -Wl,-soname,liblmdb.so.0:" \
+ "${S}/Makefile" || die
+}
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ emake LDLIBS+=" -pthread" || die
+}
+
+src_install() {
+ emake DESTDIR="${ED}" prefix="${EROOT}usr" mandir="${EROOT}usr/share/man" install || die
+
+ mv "${ED}"usr/$(get_libdir)/liblmdb.so{,.0} || die
+ dosym liblmdb.so.0 "${EROOT}"usr/$(get_libdir)/liblmdb.so
+
+ use static-libs || rm "${ED}"usr/$(get_libdir)/liblmdb.a || die
+}
diff --git a/dev-db/mariadb/mariadb-10.0.22.ebuild b/dev-db/mariadb/mariadb-10.0.22.ebuild
index 74479b231423..77d9050b1f9d 100644
--- a/dev-db/mariadb/mariadb-10.0.22.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.22.ebuild
@@ -11,7 +11,7 @@ inherit toolchain-funcs mysql-multilib
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index d1d69ed0c87f..ebaaf21c0c8e 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -7,3 +7,4 @@ DIST mongodb-src-r3.0.5.tar.gz 26332788 SHA256 05b16a7991aa65b1d396a3dc622107fba
DIST mongodb-src-r3.0.6.tar.gz 26241944 SHA256 609f6bd416ed11898b49406332b8ff301de239ba72df0bdbf1603233229c822d SHA512 1990e9011ae586e30aef28be58f9fc6d8b7f45b787dbde9785c82eff6fb0a70ea45152e450c032a898e6464bbb9b1683082f2a072ba874f7532e167330658175 WHIRLPOOL 4090cfb5912f81e6329d3c3680009037f22cd406611f78dc0ddd6fc9a63ee5261c7751fe83c60add2d5917f57b2a3c2796c48abb6f633157a8811d0571793a35
DIST mongodb-src-r3.0.7.tar.gz 26261343 SHA256 2d25bae7c3bfb3c0e168fcad526dc212da72faaeae6d1573db631cacb172a7e7 SHA512 183691c5dc137ea4b86d53d24d2935fd66ed8de60fbf5eca0a0a39c159be1f29043cd655cde1a213a98a76b2b3e6369dbccf790b02a1cc4b622c067ad3c0c91b WHIRLPOOL 986d962e76122142ca810eb7fe13ef66c88c7e354f066292836fc1207fa64c8bbb7fc49d1392db503c8a594d2593e2a19d831d7367462fcfa43eea38768e6323
DIST mongodb-src-r3.0.8.tar.gz 26245612 SHA256 3574f2f577e212ff1876485e1502c91f70f996fbbcc5a4657fe440ac76bd97a5 SHA512 3b8578ed2a6196cda0867d219214e1dc9fe95ecaa8320cdee3766c9a8a78e9cf66013769a3fbbf03ccf9a35d97e02a1eaa5fe8fc7429a0d76dd78486db7520ac WHIRLPOOL ded0b84b940c66b8a7ef6b363f179a4b2c1ddc23a3077b9cadb01f76c2a90956f0a720e713d4806db6132ac96b1026b82c2bf966ec3869af095e12590ea04d0e
+DIST mongodb-src-r3.2.0.tar.gz 26440220 SHA256 c6dd1d1670b86cbf02a531ddf7a7cda8f138d8733acce33766f174bd1e5ab2ee SHA512 4b321b582f5ec2613b869b003a02494c8a9e3b772b1f13898417b1e831c204468309a0e1785acd3b85c8a663cae91e55e44f53f8b74bd3a516b1e1471f606882 WHIRLPOOL c10639597303c122376d7387a4d5c9bdf6c44d9971f476fab72c85e78206ed256270d1a5e01e53aef4979127fdd03b3e5fbefa50ebf7639fa172723d6eee9737
diff --git a/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch
new file mode 100644
index 000000000000..1eb79d13980c
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch
@@ -0,0 +1,30 @@
+--- a/SConstruct 2015-12-02 20:01:34.000000000 +0100
++++ b/SConstruct 2015-12-27 17:06:45.563739544 +0100
+@@ -1371,7 +1371,6 @@
+ env.Append( CCFLAGS=["-fno-omit-frame-pointer",
+ "-fPIC",
+ "-fno-strict-aliasing",
+- "-ggdb",
+ "-pthread",
+ "-Wall",
+ "-Wsign-compare",
+@@ -1382,8 +1381,9 @@
+ if not has_option("disable-warnings-as-errors"):
+ env.Append( CCFLAGS=["-Werror"] )
+
+- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
+ env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+
+ # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
+ # startup.
+@@ -1398,7 +1398,7 @@
+ env.Append( SHLINKFLAGS=["-Wl,-z,now"] )
+ env.Append( LINKFLAGS=["-rdynamic"] )
+
+- env.Append( LIBS=[] )
++ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
+
+ #make scons colorgcc friendly
+ for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/mongodb-3.2.0.ebuild b/dev-db/mongodb/mongodb-3.2.0.ebuild
new file mode 100644
index 000000000000..c8836f74039a
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.2.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+SCONS_MIN_VERSION="2.3.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.2
+ >=dev-cpp/yaml-cpp-0.5.1
+ >=dev-libs/boost-1.57[threads(+)]
+ >=dev-libs/libpcre-8.37[cxx]
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.8
+ mms-agent? ( app-admin/mms-agent )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:= )
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/gcc-4.8.2:*
+ sys-libs/ncurses
+ sys-libs/readline
+ debug? ( dev-util/valgrind )
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ test? (
+ dev-python/pymongo
+ dev-python/pyyaml
+ )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+ if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
+ ewarn "To upgrade an existing MongoDB deployment to 3.2, you must be"
+ ewarn "running a 3.0-series release. Please update to the latest 3.0"
+ ewarn "release before continuing if wish to keep your data."
+ fi
+}
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+ # Maintainer notes
+ #
+ # --use-system-tcmalloc is strongly NOT recommended:
+ # https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
+
+ scons_opts+=" --disable-warnings-as-errors"
+ scons_opts+=" --use-system-boost"
+ scons_opts+=" --use-system-pcre"
+ scons_opts+=" --use-system-snappy"
+ scons_opts+=" --use-system-stemmer"
+ scons_opts+=" --use-system-yaml"
+ scons_opts+=" --use-system-zlib"
+
+ if use debug; then
+ scons_opts+=" --dbg=on"
+ fi
+
+ if use prefix; then
+ scons_opts+=" --cpppath=${EPREFIX}/usr/include"
+ scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
+ fi
+
+ if use kerberos; then
+ scons_opts+=" --use-sasl-client"
+ fi
+
+ if use ssl; then
+ scons_opts+=" --ssl"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.2.0-fix-scons.patch"
+}
+
+src_compile() {
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+ escons ${scons_opts} core tools
+}
+
+src_install() {
+ escons ${scons_opts} --nostrip install --prefix="${ED}"/usr
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners mongodb:mongodb "${x}"
+ done
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+ newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
+ newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+ # wrt bug #461466
+ if [[ "$(get_libdir)" == "lib64" ]]; then
+ rmdir "${ED}"/usr/lib/ &>/dev/null
+ fi
+}
+
+src_test() {
+ # this one test fails
+ rm jstests/core/repl_write_threads_start_param.js
+
+ ./buildscripts/resmoke.py --dbpathPrefix=test --suites core || die "Tests failed"
+}
+
+pkg_postinst() {
+ if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
+ ewarn "!! IMPORTANT !!"
+ ewarn " "
+ ewarn "${PN} configuration files have changed !"
+ ewarn " "
+ ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
+ ewarn " http://docs.mongodb.org/manual/reference/configuration-options/"
+ ewarn " "
+ ewarn "Make sure you also follow the upgrading process :"
+ ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/"
+ ewarn " "
+ ewarn "MongoDB 3.0 introduces the WiredTiger storage engine."
+ ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it."
+ ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf"
+ ewarn " http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger"
+ fi
+
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.org/manual/release-notes/3.2/"
+ ewarn " https://docs.mongodb.org/master/release-notes/3.2-upgrade/"
+ ewarn
+ ewarn " Starting in 3.2, MongoDB uses the WiredTiger as the default storage engine."
+}
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index d4a3914a095a..b64620e4d0d1 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,3 +1,3 @@
DIST phpMyAdmin-4.4.14.1-all-languages.zip 10057503 SHA256 223fc8f7fd135ca5d6389724b77bd6926acc41f81e050a64712d5f9a0a88c6b1 SHA512 17302b90cc74f37d0e0c881cfa6821f2806040cc23b70c67dfb8d3ba237a387ce3665aa477b5d5aff0117d19200b73f64ce13490c28488ba21e68bbbebbe8731 WHIRLPOOL 36c84f38ecfc6ce669ad5cc151f46a81b1327c74a997fe948ff5abd45891e02ad9d714a49ae582cd34628074130da181593257a57be181ed43b0da65687d1c9e
-DIST phpMyAdmin-4.4.15.1-all-languages.zip 10087489 SHA256 b6dc530b8848441669bd9887a24df311dd3b2ac1f28142eb4d1c9a07ed827185 SHA512 d3dfd08a881332942f126c4674c2396b899395d8cac04b31185e703fea0a9d34de9a1a941d5bf91823bc45df4bb41f27e78b97d9cc383b47f4e853a0c9ff5287 WHIRLPOOL 8442442309e963d8e057ddb32393a8ed2f4292d7e746ccca02d1c2b5d0b07271485fe76158cf2a26a2b3c2bd0bd2fec7218216a11d89f140fe23412572a2eb2a
-DIST phpMyAdmin-4.5.1-all-languages.zip 10363029 SHA256 4806b6e41a14a6686c62e54e5d23fb8e90561e9edb162c7f38b1aef66d71285c SHA512 a6140e083cec393f3570edef6a41cc2b134990c08926aa8b48ef460c3b95c829047553b3cb65ac841458a31077700e98db2d5d6218df7e45edf2b486d12d236c WHIRLPOOL 327d3d5cf4661516f3449f9b1d9780caaa25e9ebac20f348ac20da6c0814498b2425806d8110ca9451915f7d0c62c23ab8ed922f573bb6955a0f85d55bf0dcbf
+DIST phpMyAdmin-4.4.15.2-all-languages.tar.xz 5596188 SHA256 27c528ea446f1704e80592c77473a6307b52332008e17eaf14d28ebe5e636a70 SHA512 3beccd52c124698e79854d81ab789accbf41e0abf45b7ba9574bc1dc835e9ee435720807824945f50f18f08c14bc97d260fd313f86b4c376fcf8732aa969e57c WHIRLPOOL 965d460ae8a9879159564cb85964a0b54cd20dc88b23ccd515cde5b3f95ac8618088ea45247cf75d69208824475381154e5c4726cf5255d6e527234e5814aaa0
+DIST phpMyAdmin-4.5.3.1-all-languages.tar.xz 5757736 SHA256 75be3589b5e4800afb21581761478ddc5b888d6a09d5235a0ba997401d04fc00 SHA512 4a53fbc1facdc1b9ff627d2dc29e948793a1998ebe54f67db666abfda65e1eb43b309d548113bb0a140989bc394e51f19b267f3ea639dbcb0ef40126ab77fe48 WHIRLPOOL 4f4b5a659c241ec1ff7e3179cc6e65a9afe4a5d072ea02ec355e980635041f742edcc7133cd641eb419ede15d24c9821170283f052e603c2e13539e41a086e52
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.5.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.15.2.ebuild
index d923c97c8086..c17345b308d5 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.5.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.15.2.ebuild
@@ -12,10 +12,10 @@ MY_P="${MY_PN}-${MY_PV}-all-languages"
DESCRIPTION="Web-based administration for MySQL database in PHP"
HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.zip"
+SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.15.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.5.3.1.ebuild
index d923c97c8086..c17345b308d5 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.15.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.5.3.1.ebuild
@@ -12,10 +12,10 @@ MY_P="${MY_PN}-${MY_PV}-all-languages"
DESCRIPTION="Web-based administration for MySQL database in PHP"
HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.zip"
+SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-db/sqlite/sqlite-3.9.2.ebuild b/dev-db/sqlite/sqlite-3.9.2.ebuild
index 848e016768cd..2b4786616031 100644
--- a/dev-db/sqlite/sqlite-3.9.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.9.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-games/crystalspace/crystalspace-2.0-r1.ebuild b/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
index 7d0c1083bfc3..e90bc2ee8f93 100644
--- a/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
+++ b/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/crystal/${MY_P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="3ds alsa bullet cal3d cegui cg doc java jpeg mng ode png speex truetype vorbis wxwidgets"
COMMON_DEP="virtual/opengl
diff --git a/dev-java/commons-email/commons-email-1.4.ebuild b/dev-java/commons-email/commons-email-1.4.ebuild
index c4837bb206fd..8821e566f647 100644
--- a/dev-java/commons-email/commons-email-1.4.ebuild
+++ b/dev-java/commons-email/commons-email-1.4.ebuild
@@ -12,21 +12,24 @@ HOMEPAGE="http://commons.apache.org/email/"
SRC_URI="mirror://apache/commons/email/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
# Requires a slew of packages we don't ship yet.
RESTRICT="test"
CDEPEND="dev-java/oracle-javamail:0"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
test? (
dev-java/ant-junit:0
)
- ${CDEPEND}"
-IUSE=""
+ >=virtual/jdk-1.6"
S="${WORKDIR}/${P}-src"
@@ -44,7 +47,7 @@ src_test() {
}
src_install() {
- java-pkg_newjar target/${P}.jar ${PN}.jar
+ java-pkg_newjar "target/${P}.jar" "${PN}.jar"
dodoc {NOTICE,README,RELEASE-NOTES}.txt || die
use doc && java-pkg_dojavadoc target/site/apidocs
use source && java-pkg_dosrc src/main/java
diff --git a/dev-java/glassfish-deployment-api/Manifest b/dev-java/glassfish-deployment-api/Manifest
index 632ae3722ad2..d248da9f3296 100644
--- a/dev-java/glassfish-deployment-api/Manifest
+++ b/dev-java/glassfish-deployment-api/Manifest
@@ -1,2 +1 @@
DIST glassfish-deployment-api-3.1.1.jar 86511 SHA256 e45d07481c68a53b615ad064bdd4612ab08beba443b58147b4122799ca4c2bbf SHA512 9325d44da2258c84b879360fe92314b49c0b3ca7be2dd3b9016bf884e79ed66f9bf3fcec2b99a7b8baf3847e5d15376d10e3013bd4dd0f0cfaaf7859fa83a6ba WHIRLPOOL df7f1dfbcc7d9ecb86bc97f619bce4bffeb1c060d082b5caed8d22b5dd8bc3561c98be375a3e8e97a7f89b78a4ed90af6d49b8e902d508ab81898fe976a0fc40
-DIST glassfish-v2ur2-b04-src.zip 39817113 SHA256 b554e618ed8edddd8f77de15a800b7d374edbfe1814196125c1e9ee7634ba388 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8 WHIRLPOOL c3796120a85b2e370cb9fced56c166a554cd40ee2278c819ee6fa4eadce325373f1d2369cad77746f6e5b871c075d16adfdc9dbfb1bd20194e0f19e6ef0f0719
diff --git a/dev-java/glassfish-deployment-api/files/glassfish-deployment-api-1.2-build.xml.patch b/dev-java/glassfish-deployment-api/files/glassfish-deployment-api-1.2-build.xml.patch
deleted file mode 100644
index 155b6af84b95..000000000000
--- a/dev-java/glassfish-deployment-api/files/glassfish-deployment-api-1.2-build.xml.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nru deployment-api.vanilla/build.xml deployment-api/build.xml
---- deployment-api.vanilla/build.xml 2009-05-09 15:54:02.000000000 +0100
-+++ deployment-api/build.xml 2009-05-09 15:54:44.000000000 +0100
-@@ -70,12 +70,7 @@
- description="Compile javax/enterprise/deploy sources">
-
- <javac srcdir="${src.dir}"
-- destdir="${component.classes.dir}"
-- debug="${javac.debug}"
-- optimize="${javac.optimize}"
-- source="${javac.source}"
-- deprecation="${javac.deprecation}"
-- failonerror="true">
-+ destdir="${component.classes.dir}">
- <include name="javax/enterprise/deploy/**"/>
- </javac>
- </target>
-@@ -89,7 +84,7 @@
- includes="**/LocalStrings.properties"/>
- </copy>
-
-- <jar jarfile="${javaee.jar}" update="yes">
-+ <jar jarfile="deployment-api.jar" update="yes">
- <fileset dir="${component.classes.dir}">
- <include name="javax/enterprise/deploy/**/*.class"/>
- <include name="javax/enterprise/deploy/**/*.properties"/>
diff --git a/dev-java/glassfish-deployment-api/glassfish-deployment-api-1.2.ebuild b/dev-java/glassfish-deployment-api/glassfish-deployment-api-1.2.ebuild
deleted file mode 100644
index 137390c02802..000000000000
--- a/dev-java/glassfish-deployment-api/glassfish-deployment-api-1.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV=${PV/./_}
-
-DESCRIPTION="J2EE Application Deployment Specification"
-HOMEPAGE="https://glassfish.dev.java.net/"
-LICENSE="|| ( CDDL GPL-2 )"
-SLOT="1.2"
-
-KEYWORDS="amd64 ppc x86"
-
-GLASSFISH_MAJOR="v2ur2"
-GLASSFISH_MINOR="b04"
-SRC_URI="http://download.java.net/javaee5/${GLASSFISH_MAJOR}/promoted/source/glassfish-${GLASSFISH_MAJOR}-${GLASSFISH_MINOR}-src.zip"
-
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/glassfish/deployment-api/"
-EANT_BUILD_TARGET="all"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-build.xml.patch"
-}
-
-src_install() {
- java-pkg_newjar "deployment-api.jar"
- use source && java-pkg_dosrc src/java/javax
-}
diff --git a/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild b/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
index 827d491fe77c..1c8205d57693 100644
--- a/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
+++ b/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/glassfish/javax.enterprise.deploy/${
LICENSE="|| ( CDDL GPL-2 )"
SLOT="1.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
DEPEND="
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index e5f18af5f3bc..8080c9544807 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -4,12 +4,6 @@ DIST icedtea-bin-core-6.1.13.8-x86.tar.xz 49676360 SHA256 495171e826414051670fad
DIST icedtea-bin-core-6.1.13.9-amd64.tar.xz 49472280 SHA256 3faf62158a33cf1021f63f137a5b35c1c04bc4366d40d7288a6745911bf15034 SHA512 237266a1843b5d1ed0b4553fa36e88d7dce7f6a9bf6e13277d38bc83bb85cfac9b031ed5b362e73e5bc24464893cfdb37bfe67fcf3d4e218a87f101ab56afae7 WHIRLPOOL dd067ee66e2ce7ebbf08d4187d4699198d9759d6571c7d3bf127b7c8ff3a8eb1bea48bf45ed5d480df8de7320ab4f9a00ed6608935f2b3b794a99141568aa57a
DIST icedtea-bin-core-6.1.13.9-ppc.tar.xz 39644200 SHA256 c91ca06361bb533b24a9850339e6a55c9f73e3d758483ed9251aa91638507d72 SHA512 c23bb2fcab5090344d7a8510375ca6c0a5c64b639e23e1f3d281ce0f671934c8cf9d02b3ac0550453da123601095b2850dcf4172d1fed8541ff2bddf2806cf6c WHIRLPOOL b9009309aa050f3084cc89c4c497fccb8dc188b0ebfce269a845032ad8d372e7a6003deb402b849897d823ec5620e9cb2a61168de9fb4b2739dc9fd2ec4c5bd4
DIST icedtea-bin-core-6.1.13.9-x86.tar.xz 50947228 SHA256 fbef618f82fc640553bf69383ddf6a4ffb4da5191426d040f0186538fdb3ab2f SHA512 04a066493a0e742da0508fa7e010e7663e73a48e0663939884d22a2f7fa4d440d3680f6a38d7909b2b2f569bbd35facabe838a275cdd589556570601484d443c WHIRLPOOL 9e144546554bf0de5c7cc280fe20a3cd97554d0745b071d0c3f5f97a394556c71246423a39d10de207d0058889ddc010fd367813f4d10fe888d49924b4d7bac7
-DIST icedtea-bin-core-7.2.5.6-r1-ppc.tar.xz 42627680 SHA256 c0af7c735b01f0ddb8096c27b6ebbc458cded8ad5a50a129867bab74872cffb3 SHA512 0eb6ff3d44da0fe05cdf2af0e630db74c46fc201c0cb7f0d833442f153b701ece58c60cd5a273d48f233374743090b841810f0caf9640bf5e9977019deb8504b WHIRLPOOL 8c29d11dbe6576d8d485bd67ea13b891848762069823b10216469de0c9e87420d1e7b57e6dc9c640cafe0545ecdbb68fc226ed0a77b1bbee0cdc73c3a3b0932f
-DIST icedtea-bin-core-7.2.6.2-amd64.tar.xz 52999196 SHA256 6a91616948e46312f9a8ee5b3b3f685d9052485e1f2b120f4a45b472a50c9228 SHA512 bf424b0923cb3ad3181d3b618b439b68f767f6757905b4cfa2b0cc8cc71618f33c596102129c861ecc98f18a1ef73eb84a4277d7d6ac245513779c15750722d9 WHIRLPOOL 3fbad963bcb576c4d0d58ce089e87f2c5d2bf6f7d01e29d8406bf29dd938a247418694341203dc3d66cddf0e9361959276e694e0691203275dbc7cc108720c73
-DIST icedtea-bin-core-7.2.6.2-arm.tar.xz 43981456 SHA256 4e3db1a1bf9e50b4c688adc639c6de97653840ac2407c78ab1122005fa13e2bc SHA512 33f3e2c2781376817b07bd89ebff3abbf2c8a820fe7d44b2f79eba43fa3ca0d73496d910ae3f92fa560cacbc737215399f6baf3659d1e8abe7c0dfaf5e7ef9ac WHIRLPOOL 3deebdbd62e4e23925d9b94bbe77e7d475b9d7cc9f8d896e1593d64590a623f295a76322b23972a5df7ee3fb8bb4747f1f4b0f6722336749eb4c19407a130128
-DIST icedtea-bin-core-7.2.6.2-ppc.tar.xz 42889628 SHA256 606f3075153f6d158e9e3388a6270170109dd98f212c61ffb89d220d8d6329c8 SHA512 8a0887f27c9d07f78e3d0321478576c3761c23686e009e9e17aec03adff0e1dfb10433d5280e09862127d313108863414f0a4bfd319fa89fa886092c7f92d310 WHIRLPOOL 653cb61da00a3f3494fea12f5eee0491b80b1c9bbac1e93248ebdcbb8152501290ada111cf4430ef53f138095a05dc3f8951f3f20fdab01667655e0c08767309
-DIST icedtea-bin-core-7.2.6.2-ppc64.tar.xz 42985052 SHA256 6da399d79c53444ab776da4cf63d4c326239b75436d48c258adda9a20b23b23c SHA512 a89f07c6028f8cce6ef2f8909acb7a4e5d37221ce685d7023029119e576b08fbae22ae321ac74bc595312b6b68107966335825e4aa0e973cba2223f8318078b3 WHIRLPOOL 673dcbb7b8dd137f5ea833dbd65713adf2bbbbf3667eb20d28ec6808f7a1e98dac32c74a28c70818e5f1c58abb0a3e513d02f1d2a1d2ffd652c180c9b64ed9c5
-DIST icedtea-bin-core-7.2.6.2-x86.tar.xz 54652528 SHA256 dada0681098ed67f6ad665cb2a005d26a3ab365e2aca85d0dd9e924e6943065c SHA512 2a0e4b934e7aa734d8d0cc0d8851182bbf17a7cb29d66ce3490ce157a8b282b974501c9106160c9dccffb7565b994136cb39952efe0c530855b14491255f55a9 WHIRLPOOL 3ee3f13b51a3c587612026ae686a46bddb457ba2fec4ffc8fd7fa94af697c039761436fcba634ccb6ceda6705844346617cc48f0532af41f78a8978ad54aa3b4
DIST icedtea-bin-core-7.2.6.3-amd64.tar.xz 52999776 SHA256 565383f7cecedf740e9ca0f0c98921cef04f5ccb754d9a4591f98b75a6b6d616 SHA512 9299a9f62fb1a05688523ff4a48ab28a2fd1d16bb8a9984dfc203d919e7e49e733792b9f5aa9852867e8542a422327c235a03fb850b20d38877d0048ccfb6420 WHIRLPOOL 657cf42fdff2a40f8acaa9fe1ea0c7a29d28799943f92418636ec76dd82ed658dfb628596d01c4d432220bfdc0f0f4c4dc247181a5e17cdb198d2edf09b61bb1
DIST icedtea-bin-core-7.2.6.3-arm.tar.xz 43980964 SHA256 bfc50f27b063461e2382da6f480bdc24a498feb3eba3c368912239ef176a384c SHA512 2d3aa682c20a6abd200263e15f0a7cb7f2ee3bdd52db6eff5d1d3676f286c3ed356ed9ca71041ad9514ca4684ab84f52c7df2a94bb112c99e34477a225f57a20 WHIRLPOOL 1c2139fe5b2da957ac64fdf9214cd2c62b55591f7c535b6ff287d0da20b7f9e6e19f5d93d816cb4346ec3746491a30b5b080184132669bd0a90d7f0ac3fa0da3
DIST icedtea-bin-core-7.2.6.3-ppc.tar.xz 42890632 SHA256 5524cc47fdb1e8c4c5b6f5926b71835b74e6a0ba1e9f7deb3ddef8a2896f27f2 SHA512 808771fa6379ee564f45737d019493d552508b8b5555a6ac512606a99fc0f0943210abef628494a50144d799d821091060244e63c0c410d530937156c6540d0c WHIRLPOOL a205c711c2a96dd985c48f2dfcb57041887e6243b465bca2f7665d153c6f9da1bae4668bbb102e20f73b81fa3edcf95dd51c9287f0df04fb48c6c98d3c9fed2e
@@ -17,8 +11,6 @@ DIST icedtea-bin-core-7.2.6.3-ppc64.tar.xz 42984708 SHA256 8d0723accf8cb02585045
DIST icedtea-bin-core-7.2.6.3-x86.tar.xz 54651304 SHA256 3fc4faf7a9370cb0155df3c650eb36096c9430e38b3904e535027d823234043c SHA512 3ad55d66839c4cde86b44826ef8ba0ef1565cf9af9386cc327ef2b5476ddd954c519f925885e156ac87d4c606b0fd00ebaf8c8987c8b4fd81e789713a2ba3ef7 WHIRLPOOL 43df9b60ec270eb4a750299beeae316026d27b8ddf1e2246c5ce711f7d1f6f297b710b7cbf481d887fffa44a1a59f36997af7c52722a06d6c4e4ea1cf5b33208
DIST icedtea-bin-doc-6.1.13.8.tar.xz 9844756 SHA256 71cffd016040d28366f8e50c983ca55a3af1d7b08a56c501838b78fc0d1837c1 SHA512 36a0691ad720869c2855345bd20dcccd60e7adfa90c511d829131997e9e995ab929a2f24955955b638b21672912a39774deacf72ee3390ae41e3d44e58eea5eb WHIRLPOOL 11892894ddae46a6f999e8e835a5d428fcb86643c20f44639d8b692090468ddecfdd7db4cebef0c422983950cfaf6d337b540effef64c6fb1f7d58ffd2e069e7
DIST icedtea-bin-doc-6.1.13.9.tar.xz 9853020 SHA256 94ff85ba64be5c8cfcf261cb6293e48cc3239c1c9da69e98fbc744a82620bd16 SHA512 501d483dccfc349c6dd8a55f9d509d2859774054be9b9ca8020a75e3975d740d78d40184aa86f16b5ea948e16b74944ce4d890396d8ccb5209f7a9514a8b649a WHIRLPOOL 751afbb1e0e2384419424d9ae093893c2e377c004c69d0e06979385823f743ee33321b3c3076e0c8e0b16625a159293d81f959455ca6ee779dfdfa5fc5361907
-DIST icedtea-bin-doc-7.2.5.6.tar.xz 10420552 SHA256 97cafad29d26e1fba75fd848a3d35de0e84e83f36a9e345852f1d684a81e148b SHA512 53261dbbafad7af9b97cdc9b55430ebbbc7e4975acff7b73013f893eba5583c303abf32d77ab8fb641bac35ac5549c313bc1f4c94c27faed88ab23bc5c22aec4 WHIRLPOOL 6213996e1435acac287b2993814ae1f49c13ce58f9315731d2e327c3f9765b6119202e83735c504919b9487e04de23ee28ac2695f8a67a49652a4c01f19aa0c0
-DIST icedtea-bin-doc-7.2.6.2.tar.xz 10624484 SHA256 ed677d27cebe61433f12b0b586b29671121210e495374ed575d28b0a79f77c09 SHA512 e1475cee4db80eb071defe7af05483a1a6799bfd7511791cc3db01cc86decc956fe09f50cc19bd1850b917c02aa3c9a4b0d6c368031034d30a7e3c867d0eace8 WHIRLPOOL 2b80fc301c5e36d895b0934c55c3f17968e0cfac8a509a5b54dce77617b96fc53fa8baea6c6136983d7fbb7f0b43e465c2931b999a7991e530732949eeb0de25
DIST icedtea-bin-doc-7.2.6.3.tar.xz 10604044 SHA256 7e43108f95991600d58f85ce44480d5702cfc6951d0cc096e1321852997acc5b SHA512 35688e7a19620ef7d4890ee9058b6f49f76b5ba67b5f1038cc9a53b7c50224eaec599baf6fc9e9bc4cc5b49e13c0dd05d5d14043b4d291caf237e9cd5a7e31fa WHIRLPOOL 9a6d3e3ad62f1cd5a4435dc1e1cf3943cb752898c3ba61b149be38603cb8746ad88b68e3e3812a449d65ccb4b9d8da211c07bc503044efe5849a35188944ad2b
DIST icedtea-bin-examples-6.1.13.8-amd64.tar.xz 1904080 SHA256 29c2933d4fc4c7e240c7406d403a2667a42c5a3faee82413d2255d7dccea6873 SHA512 84771c52b816f4d3f065871df83bdd05408b69941c807de0bdc7ea423cff436878aa58dd5d61cb1bfae35cb37e56e2b5d29be6f6073a744e6af2125d66578713 WHIRLPOOL a08c748dd757c5927abd65088b0961d2dfb716030cc07e64589e5394a434123cb018630766e0223c6578ceb7f67ee0a68f5b2a548b1c9f701a5cc13732b84ecc
DIST icedtea-bin-examples-6.1.13.8-ppc.tar.xz 1889932 SHA256 62bc68f31b1118d890c2add87a4d14663b0595aeb5fdfd8d904a59a19c4ed7f4 SHA512 22d38c9efa794165e1ecdb8cabb1ecaf8b9c27027cf28562721789c33c1a714e3d226b95a8c5420ff48a769c869ef09c575e76e8995f089037263ddfd72d21c5 WHIRLPOOL 031a8ffb8609028d089d047f1324352db90ef72be951bcedc158f671f2930c4ae5087e65e53ec59e4457a9e09b40ad6848b980b63e3494e0d1dd70721e6e640e
@@ -26,12 +18,6 @@ DIST icedtea-bin-examples-6.1.13.8-x86.tar.xz 1902616 SHA256 cd74d0b8056f7373f37
DIST icedtea-bin-examples-6.1.13.9-amd64.tar.xz 1904980 SHA256 aa10b253ba35e14d83852c80999c04bfee7c6ffee7b1baa9df502e253a6a87a1 SHA512 f9be25093aed5b762a268a5fc2cd943fa010bab469e1fd0cc9c39c927a9a154041e637036bfa804cc826f1c674b661ee6d4a5dd7d29820df1de4390db403a229 WHIRLPOOL 121122c84abe3ddbddf5faf6e163ce9a34331cdddfc8cd0ca746d8ba94a79af31c1dadba711aa4bb709edd91605d81785de4fe4ff1e3edd526d4aff592b18816
DIST icedtea-bin-examples-6.1.13.9-ppc.tar.xz 1891664 SHA256 e5a28cb2cbd1f8720f194567039595062bace09ac7b8384c426db065775f8b34 SHA512 3deca264999bbe4a88359f8150267aff6510313fc4e14c19260c16fd98dbc8aff3aa08c5a4451c6390e933f7c9a3c34594f9c9d776634a21ef3df5845bb39029 WHIRLPOOL 9f1cea1241d4c0ddeed19dac84ed42309446a05eb1b58be9414a1c55928dbd9dc7d5567231ec6bceb46365e65d3b736ceb20eb37155504248038fe048a4cdcb2
DIST icedtea-bin-examples-6.1.13.9-x86.tar.xz 1904548 SHA256 1aaaaa4ba6c37b5f03ecea8a978c9bdac371e5891dd02459cd7f4174286b182a SHA512 fcdae8dc62376f60a19a3de1fbba867fcbcaa069b5d669120e53d1792119a147566ce59e3e3205ca1db0afea3e6809f339a4a443ff0d21cb1a7c4aa8eb5060df WHIRLPOOL 5625b1af755e79c1e4360ac3fcbf786664525c9508f6fe902788f95a1be9b94d429a61ef0e475fa9d0e2c4ea386fe251a299305961e7936f932c8e2c0abcaa3e
-DIST icedtea-bin-examples-7.2.5.6-ppc.tar.xz 1785152 SHA256 5e798c0172e20653df303d2ae334a416bf4c29afff76f425e94d9ef36e81992d SHA512 e3ba6ca13a1f0f76e0a9fc12979b571560bcf74f2c8ae3e23bfd693452f14d7a153ed4fe32058cb9ec8e2071c43cc57094e12a3345f9d36c7d3b8d1744259f05 WHIRLPOOL 05b7463c5d7b36aba805718dbf3c3d37bf30ca2ef61de3672784f20635283c1005443f265821ce52848a35ac656681a125ce31479736435f74db997c82ecae2e
-DIST icedtea-bin-examples-7.2.6.2-amd64.tar.xz 1796688 SHA256 d1fa34dc87ef7947fd98fa222d6ed5fe30833dcdebb523edd2271913a2f21ee6 SHA512 0a6bdd498e1203d2fd6168b91dc3b2081ce0c102107523dbab78ca0e2b605c1f88c246f554f077245d76945726dc4151a898e5b2e42f6a5df4d04098b26f42bf WHIRLPOOL 42049d21a6e5b72cc091e63d60bdb84a774fb80d0f828d4d85e48efb219c51ad3c5239bbf466d2f80f56ddb9e57832f739eb783d2ff8ed4f23277f55b3f9adff
-DIST icedtea-bin-examples-7.2.6.2-arm.tar.xz 1779804 SHA256 3fb597b80d4ef1253d36b032126622b91cbe030b492e68c372ebf1304f0d86ac SHA512 af210e3ab3b234c767fad0b0442276b8ac7d5e0c3bd98aa7e9c729a9239247911b6788a1e4415561ef889b63a242fffd7cb97452a611e84fb30a6413287ec26f WHIRLPOOL 95d4fbb9cbb74e279291d8a823158a66111211dee8d5a21e2665a89406f3f89dd69e40c57c48cb91e12ace620abc34a2b65977c4c3a96f66604c103e66f69284
-DIST icedtea-bin-examples-7.2.6.2-ppc.tar.xz 1786908 SHA256 2506a0fa0f38008a5edffcab637a2c9091bd895fdcc8b25713c536e4c15957a4 SHA512 ad1bbf7ad71036c4f48efb0861776e3dd733249a19cb7ac5d154f55e3b3ee15f1a8642a45ffeaf7fb39f82416dc7ea2b8239c464a0c8284aa53502bcc2400f1c WHIRLPOOL a321523cf23211f565d47e16d0d3d539053a047bb7bf875e7a702288e01b807651024a8cee8b2b8a61929687ab9d0cba7ed62c857e28a900a066f0d8b1a2da87
-DIST icedtea-bin-examples-7.2.6.2-ppc64.tar.xz 1790088 SHA256 75c6c237c1ad792079f86dd5a3899022ccce78c65e67e635e6e14bbfb637db0e SHA512 ed50dd9a81687e01fde484255b0466ea003351f01468d93a95d33824f8fe909abcea2ef9a15ff212a4e376b1f9dc019295776bfd7ce84f982ef0db828c73cc25 WHIRLPOOL 5ced2c1c746241e54b6cc4b62d846ebc12b66cafdc4708f0593a5c73cae6400ead1f3ebe4d40e0e6ebf1a3ea1823293751a2b52101cbcba2fcd6e94551579698
-DIST icedtea-bin-examples-7.2.6.2-x86.tar.xz 1796540 SHA256 58a876ab7452199456a4fa35f550a9aa8775df8a70e687073f7106eb69702c9e SHA512 c759f97f0ba22e0ebc1d70b3cb9a339b6e1186c707cef4a6d8f3dd512792e2a729fb89d1110aafc25d4438853c066ad4f1f3ac7ee12bf3d12d8ffb961a7af8c0 WHIRLPOOL 5aebeeb861616d8da0e14409223d886ffa99bcad34c0419e5e21ad52cf9f088d26952a8f3be4d9b0a0dbe720b31afc55308c499140a7456d4dca5bd2090611f6
DIST icedtea-bin-examples-7.2.6.3-amd64.tar.xz 1796572 SHA256 bdbe018716fa955df5dfea56c1321698033debed7a29fe03650b0cdc5c7e6da3 SHA512 d6e1b5a93dde61bb0d7ebd7a06e7a326e94423ad362e0b9956d5eeb37197f716d5db7bbd6fbc32a1906089953a83a77ebc2ee99cedcfd9e7944e48ec3865e0fe WHIRLPOOL 0e728e3cdc1e33d264bfb3b5f54bbe4bd3ec64a19b0bc3047dc65c99cc45009fef9d8eab94761100ce84919379e5890e96c54965e840c5f10eb102a4df03767a
DIST icedtea-bin-examples-7.2.6.3-arm.tar.xz 1779684 SHA256 78e068da88739404332cb50588229d236709f0adfe00596405c80c8a10f03d3a SHA512 a854095d3ee23db768ce9d1dff8bcd1598523a65af82ee6654b9ba464436d9f5d88208fe6879c1ea5140f30fca4f31e8dd5212b781722608c535d951c9670feb WHIRLPOOL 8dc1a49eb6a8bff49690d64384e9ffbd51725882aeca064419a69ff9ec82f624c6a16023b1930f16806189b0a89a70f3339ca653d3abc5335850205129b13d01
DIST icedtea-bin-examples-7.2.6.3-ppc.tar.xz 1786900 SHA256 769e085fb3c64b41083c4a3335c3f6cdff41bb3502526784937a77551dc5492c SHA512 5db45bc9b3d5e59260d5fd319333e91467520291f131432f649cb064a9d892e4f4962bd0aef37ff3401eb051964d9d6311f8d20c9d1ae77a25e1020930544dde WHIRLPOOL c46e3bf017498cf51968799d10c67f1e72883e2c59941695a2cfe1f6135011ff8dcd27cf5d6b5e562d425572c4300bb8d28ab1b95101e42fa21888cab54247d5
@@ -39,6 +25,4 @@ DIST icedtea-bin-examples-7.2.6.3-ppc64.tar.xz 1790340 SHA256 33b1f32e1b88469d1a
DIST icedtea-bin-examples-7.2.6.3-x86.tar.xz 1796668 SHA256 3f7d09d5f7b3dd45e9555c7653adf450b74c24eed8e91d4c6829cd084eaf1894 SHA512 d1bc7800bded733e69573694d8cb18cf352a633c36f336ff40fe8e4cde42f390dcac54a08945926eb0c17591574bf8eb7861977cbfaeb9b8eff7c2e7cef036d3 WHIRLPOOL a324137216a623749f8a1de904dd5cddb481b92c7286c365fb1f7d95682044674a2267d23e660cb804e071eecec3c6baea63ce75c0b97c0caed0afae1b2a7761
DIST icedtea-bin-src-6.1.13.8.tar.xz 39773388 SHA256 c01deb2ef8ed9cf58284538e9f52651ff70b8349ec001f13314d69137f99ff4b SHA512 dba0cc027f3ed7589c7cb0ba7d9f1a401ef47a20a5ff502ad7e9b27d0f552a77f28ebbd9032d191ba3ac441955545b632d6fb242f67bc590a5f1a8d855b89ad8 WHIRLPOOL 6b835a7a6123a3843bd74506e52befafbc4792e792798660829d75ede09f6c283933d30d51ba01c87a16095b9faa1795bfec6539cb55709032e22d6395566d19
DIST icedtea-bin-src-6.1.13.9.tar.xz 39778948 SHA256 11ed522199d3919f7013f4d3d4fb2324d4505ca60fdbcb015faf635c4dfcfc70 SHA512 4c02e7368ed21882afe68cbba3475a16a30276110282d28984586f1c1e0c3d14278e70e495fc74676ba57df3849b8f60ea24da49c6f41070319c46962f1a221a WHIRLPOOL b6daed3717d434688e8946976d96857ce904d510cb45fc30b464e86d1c123ccb2a81ee07bea432ad6fb5148d1b0a73bebe7f51a0bc2f5b1308701a4fce436d79
-DIST icedtea-bin-src-7.2.5.6.tar.xz 39999236 SHA256 dba9a16d6ed8ba6bcd1090e469d176c979395a4828ea8875cde271d8bfff4a43 SHA512 9f7c7377d90058fecdbe08259b8b1b0678ba3df1ebfd13b7664088fe3bae0823631b0b548a0b65981c79318b7a63d566c79a6c3b3b77df434d5b4e0b9b8095f6 WHIRLPOOL 214c9fd79be0ef3f650a64c15e02e889475ee27c9c2b975ade20689bd8d2799617b2ba0eae55cb1596b77e987f5b14cd4ccaa583ff5ef4dd83e4dcbedff869af
-DIST icedtea-bin-src-7.2.6.2.tar.xz 40010036 SHA256 d4cc4954ccaf2f4ee77eb44e7d16c568eff835a5e6ead4971c611774caaf2c02 SHA512 f2dace8e37dcfd23b6f5e6806fc21a62686e9addd545fd141e47d4c24e574a65c8ea5b9b4b6462e8633ebf61bac2a3ee0a1dcd94367a7b8723bbb5fc7a125bab WHIRLPOOL 6087cf6fc2463c2e7069379c75d01258247fa1613575a736f5653b4f969d3fa03291f4acd1a9c26863014af8838af96107a4e49766e0e09372d51f85b46d7c63
DIST icedtea-bin-src-7.2.6.3.tar.xz 40039304 SHA256 eb8a7e7dd567934a274f496640d984792731ca1192f2fd415a4d6597a282b8b8 SHA512 f02778176bdf524a954689576272ea4af8d77e6dacdab05edb8bc0ff2db43ae2d63635b07ae88f8f9d88797c4b9f28c4d24341c8e10a0f7841bae1b6775b97e4 WHIRLPOOL b9603cbaeb9528288b18225323f97635efd7a434d4a9fb45ceb1abfa2d93c1cc1fc212187448a8ed3cb074d657736537b5e175ca82749c8cb04cf085f16a162b
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.5.6-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.5.6-r1.ebuild
deleted file mode 100644
index 80e436690a79..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.5.6-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-vm-2 multilib prefix toolchain-funcs versionator
-
-dist="https://dev.gentoo.org/~chewi/distfiles"
-TARBALL_VERSION="${PV}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
- source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
-
-for arch in ppc; do
- SRC_URI+="
- ${arch}? (
- ${dist}/${PN}-core-${TARBALL_VERSION}$([[ ${arch} = ppc ]] && echo -r1)-${arch}.tar.xz
- examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
- )"
-done
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="-* ppc"
-
-IUSE="+alsa +awt cjk +cups doc examples +gtk nsplugin pulseaudio selinux source webstart"
-REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND=">=dev-libs/glib-2.40:2
- >=gnome-base/gsettings-desktop-schemas-3.12.2
- media-fonts/dejavu
- >=media-libs/fontconfig-2.11:1.0
- >=media-libs/freetype-2.5.3:2
- >=media-libs/lcms-2.6:2
- >=sys-devel/gcc-4.8.4
- >=sys-libs/glibc-2.20
- >=sys-libs/zlib-1.2.3-r1
- virtual/jpeg:62
- alsa? ( >=media-libs/alsa-lib-1.0 )
- awt? (
- >=media-libs/giflib-4.1.6-r1
- media-libs/libpng:0/16
- >=x11-libs/libX11-1.6
- >=x11-libs/libXext-1.3
- >=x11-libs/libXi-1.7
- >=x11-libs/libXrender-0.9.4
- >=x11-libs/libXtst-1.2
- )
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- cups? ( >=net-print/cups-2.0 )
- gtk? (
- >=dev-libs/atk-2.12
- >=x11-libs/cairo-1.12
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.24:2
- >=x11-libs/pango-1.36
- )
- selinux? ( sec-policy/selinux-java )"
-
-DEPEND="!arm? ( dev-util/patchelf )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
- nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
-
-pkg_pretend() {
- if [[ "$(tc-is-softfloat)" != "no" ]]; then
- die "These binaries require a hardfloat system."
- fi
-}
-
-src_prepare() {
- if ! use alsa; then
- rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- if ! use awt; then
- rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- if ! use gtk; then
- rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
- fi
-
- if [[ -n "${EPREFIX}" ]]; then
- # The binaries are built on a non-prefixed system so the
- # fontconfig needs to have prefixes inserted.
- sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
- eprefixify jre/lib/fontconfig.Gentoo.properties
- fi
-
- # Fix the RPATHs, except on arm.
- # https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
- # https://github.com/NixOS/patchelf/issues/8
- if use arm; then
- ewarn "The RPATHs on these binaries are normally modified to avoid"
- ewarn "conflicts with an icedtea installation built from source. This"
- ewarn "is currently not possible on ARM so please refrain from"
- ewarn "installing dev-java/icedtea on the same system."
- else
- local old="/usr/$(get_libdir)/icedtea${SLOT}"
- local new="${EPREFIX}/opt/${P}"
- local elf rpath
-
- for elf in $(find -type f -executable ! -name "*.cgi" || die); do
- rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
-
- if [[ -n "${rpath}" ]]; then
- patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
- fi
- done
- fi
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}${dest#/}"
- dodir "${dest}"
-
- # doins doesn't preserve executable bits.
- cp -pRP bin include jre lib man "${ddest}" || die
-
- dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
- use doc && dodoc -r doc/html
-
- if use examples; then
- cp -pRP demo sample "${ddest}" || die
- fi
-
- if use source; then
- cp src.zip "${ddest}" || die
- fi
-
- if use webstart || use nsplugin; then
- dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
- dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
- fi
- if use webstart; then
- dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
- dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
- fi
-
- # Both icedtea itself and the icedtea ebuild set PAX markings but we
- # disable them for the icedtea-bin build because the line below will
- # respect end-user settings when icedtea-bin is actually installed.
- java-vm_set-pax-markings "${ddest}"
-
- set_java_env
- java-vm_revdep-mask "${dest}"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- if use nsplugin; then
- if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
- elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
- elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
- elog "The switch should complete properly during the subsequent installation of icedtea-web"
- elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
- fi
- fi
-
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.2.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.2.ebuild
deleted file mode 100644
index b3b8027ba082..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-vm-2 multilib prefix toolchain-funcs versionator
-
-dist="https://dev.gentoo.org/~chewi/distfiles"
-TARBALL_VERSION="${PV}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
- source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
-
-for arch in amd64 arm ppc ppc64 x86; do
- SRC_URI+="
- ${arch}? (
- ${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
- examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
- )"
-done
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="-* amd64 ~arm ~ppc ~ppc64 x86"
-
-IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND=">=dev-libs/glib-2.42:2
- >=dev-libs/nss-3.16.1-r1
- >=dev-libs/nspr-4.10
- >=gnome-base/gsettings-desktop-schemas-3.12.2
- media-fonts/dejavu
- >=media-libs/fontconfig-2.11:1.0
- >=media-libs/freetype-2.5.5:2
- >=media-libs/lcms-2.6:2
- >=sys-devel/gcc-4.9.3
- >=sys-libs/glibc-2.21
- >=sys-libs/zlib-1.2.8-r1
- virtual/jpeg:62
- alsa? ( >=media-libs/alsa-lib-1.0 )
- !headless-awt? (
- >=media-libs/giflib-4.1.6-r1
- media-libs/libpng:0/16
- >=x11-libs/libX11-1.6
- >=x11-libs/libXext-1.3
- >=x11-libs/libXi-1.7
- >=x11-libs/libXrender-0.9.8
- >=x11-libs/libXtst-1.2
- )
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- cups? ( >=net-print/cups-2.0 )
- gtk? (
- >=dev-libs/atk-2.16.0
- >=x11-libs/cairo-1.14.2
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.24:2
- >=x11-libs/pango-1.36
- )
- selinux? ( sec-policy/selinux-java )"
-
-DEPEND="!arm? ( dev-util/patchelf )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
- nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
-
-pkg_pretend() {
- if [[ "$(tc-is-softfloat)" != "no" ]]; then
- die "These binaries require a hardfloat system."
- fi
-}
-
-src_prepare() {
- if ! use alsa; then
- rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- if use headless-awt; then
- rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- if ! use gtk; then
- rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
- fi
-
- # NSS is already required because of SunEC. The nss flag in the
- # icedtea package just comments or uncomments this line.
- sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" jre/lib/security/java.security || die
-
- if [[ -n "${EPREFIX}" ]]; then
- # The binaries are built on a non-prefixed system so the
- # fontconfig needs to have prefixes inserted.
- sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
- eprefixify jre/lib/fontconfig.Gentoo.properties
- fi
-
- # Fix the RPATHs, except on arm.
- # https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
- # https://github.com/NixOS/patchelf/issues/8
- if use arm; then
- ewarn "The RPATHs on these binaries are normally modified to avoid"
- ewarn "conflicts with an icedtea installation built from source. This"
- ewarn "is currently not possible on ARM so please refrain from"
- ewarn "installing dev-java/icedtea on the same system."
- else
- local old="/usr/$(get_libdir)/icedtea${SLOT}"
- local new="${EPREFIX}/opt/${P}"
- local elf rpath
-
- for elf in $(find -type f -executable ! -name "*.cgi" || die); do
- rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
-
- if [[ -n "${rpath}" ]]; then
- patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
- fi
- done
- fi
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}${dest#/}"
- dodir "${dest}"
-
- # doins doesn't preserve executable bits.
- cp -pRP bin include jre lib man "${ddest}" || die
-
- dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
- use doc && dodoc -r doc/html
-
- if use examples; then
- cp -pRP demo sample "${ddest}" || die
- fi
-
- if use source; then
- cp src.zip "${ddest}" || die
- fi
-
- if use webstart || use nsplugin; then
- dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
- dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
- fi
- if use webstart; then
- dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
- dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
- fi
-
- # Both icedtea itself and the icedtea ebuild set PAX markings but we
- # disable them for the icedtea-bin build because the line below will
- # respect end-user settings when icedtea-bin is actually installed.
- java-vm_set-pax-markings "${ddest}"
-
- set_java_env
- java-vm_revdep-mask "${dest}"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- if use nsplugin; then
- if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
- elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
- elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
- elog "The switch should complete properly during the subsequent installation of icedtea-web"
- elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
- fi
- fi
-
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild
index b3b8027ba082..c166af6fada8 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild
@@ -24,7 +24,7 @@ done
LICENSE="GPL-2-with-linking-exception"
SLOT="7"
-KEYWORDS="-* amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="-* amd64 ~arm ppc ~ppc64 x86"
IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source webstart"
REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
diff --git a/dev-java/jacl/jacl-1.4.1-r1.ebuild b/dev-java/jacl/jacl-1.4.1-r1.ebuild
index 864b58471c07..6c4f9fa1a53d 100644
--- a/dev-java/jacl/jacl-1.4.1-r1.ebuild
+++ b/dev-java/jacl/jacl-1.4.1-r1.ebuild
@@ -40,7 +40,7 @@ src_configure() {
}
src_compile() {
- rm -rf src/{Test.java,empty,tests} || die
+ rm -rf src/{Test.java,empty,tests,janino} || die
java-pkg-simple_src_compile
mv src/jacl/tcl src/ || die
java-pkg_addres "${PN}.jar" src/ -name "*.tcl"
diff --git a/dev-java/jama/Manifest b/dev-java/jama/Manifest
index 6c62bcb5d5b8..45126b7dff1b 100644
--- a/dev-java/jama/Manifest
+++ b/dev-java/jama/Manifest
@@ -1 +1 @@
-DIST Jama-1.0.3.tar.gz 82188 SHA256 a8f4c8f3a4a5d5f8908304638d03aa181b7c71debb2e3c08bb9dc14fcc350a75 SHA512 9bedf8f35ea1d400194b5a3b49914ebd04b5a31247959886f1967d062ceffae30993d34cd2f15d3942285a45c6930e2d4518f4ed0cc013ce853cc26aca021b0d WHIRLPOOL aa9f303b906bead6f4620d1d307a372ccbc305bd0947948b3b26b160b4f5b6ab67901289d9525ff2705e8d9ab21d3a6c30f3715c9ae57394a373e1bbdfd9c436
+DIST jama-1.0.3.tar.gz 82188 SHA256 a8f4c8f3a4a5d5f8908304638d03aa181b7c71debb2e3c08bb9dc14fcc350a75 SHA512 9bedf8f35ea1d400194b5a3b49914ebd04b5a31247959886f1967d062ceffae30993d34cd2f15d3942285a45c6930e2d4518f4ed0cc013ce853cc26aca021b0d WHIRLPOOL aa9f303b906bead6f4620d1d307a372ccbc305bd0947948b3b26b160b4f5b6ab67901289d9525ff2705e8d9ab21d3a6c30f3715c9ae57394a373e1bbdfd9c436
diff --git a/dev-java/jama/jama-1.0.3-r1.ebuild b/dev-java/jama/jama-1.0.3-r1.ebuild
index 46145fc46964..ba985c995bf3 100644
--- a/dev-java/jama/jama-1.0.3-r1.ebuild
+++ b/dev-java/jama/jama-1.0.3-r1.ebuild
@@ -13,13 +13,17 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="A Java Matrix Package"
HOMEPAGE="http://math.nist.gov/javanumerics/jama/"
-SRC_URI="http://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86 ~ppc ~ppc64"
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
S="${WORKDIR}"
+
+java_prepare() {
+ java-pkg_clean
+}
diff --git a/dev-java/javacc/javacc-5.0-r2.ebuild b/dev-java/javacc/javacc-5.0-r2.ebuild
new file mode 100644
index 000000000000..fed55da5875e
--- /dev/null
+++ b/dev-java/javacc/javacc-5.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.java.net/"
+SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+CDEPEND="dev-java/junit:0"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0-javadoc.patch
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="junit"
+
+java_prepare() {
+ epatch "${PATCHES[@]}"
+ rm -v lib/junit*/*.jar || die
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_dojar "bin/lib/${PN}.jar"
+
+ dodoc README
+
+ if use doc; then
+ java-pkg_dohtml -r www/*
+ java-pkg_dojavadoc doc/api
+ fi
+ use examples && java-pkg_doexamples examples
+ use source && java-pkg_dosrc src/*
+
+ echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc
+ doenvd "${T}"/22javacc
+
+ echo "export VERSION=${PV}" > "${T}"/pre
+
+ local launcher
+ for launcher in javacc jjdoc jjtree
+ do
+ java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
+ done
+}
diff --git a/dev-java/jcmdline/Manifest b/dev-java/jcmdline/Manifest
index c8d91e9a71b1..0c7e4d557fc5 100644
--- a/dev-java/jcmdline/Manifest
+++ b/dev-java/jcmdline/Manifest
@@ -1 +1,2 @@
DIST jcmdline-1.0.2.zip 397472 SHA256 a042f7061c79629cdf298ee4f7b334c3ece9c1a4d87acf7c2f051ae0372bf43b SHA512 b261856eed9426257fd6391d45760f96f0085a40167632bfb2f85d35071e58d766553819bc0f8022b92fa193d47464928d09d2b0772a08ba484dd954b6206fd7 WHIRLPOOL a62bf4ab0c3e5236655d246a193135f23b52f692d1e1865d194dcaa03e1a0db6249f32142c212e34661d62fd2c4ae4714e18687b97f2bd2ab08141ff1c76ef3b
+DIST jcmdline-2.0.0.zip 395547 SHA256 663cbb6af09f4b0eee9d06a65de804de87062a96517c6382e2d93399c89ec421 SHA512 cbd5fcfa01b733ed1904bf56fa509dbf6d6764091902b31d2a620ba1e302d1ebac8c54d20ebc9031d7724aa1578cc6ca5befb6f38625780fd021e1b002674cb9 WHIRLPOOL 7eec3308f52fcbe536e788301790bcf5493261405523de70ba89dcb456e6a77d6431543789d17f152ee8a7f1c4f6fdd67b160ec08c524b1f472791e68db491b1
diff --git a/dev-java/jcmdline/jcmdline-2.0.0.ebuild b/dev-java/jcmdline/jcmdline-2.0.0.ebuild
new file mode 100644
index 000000000000..d019da535ac9
--- /dev/null
+++ b/dev-java/jcmdline/jcmdline-2.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Library for parsing/handling of command line parameters"
+HOMEPAGE="http://jcmdline.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jcmdline/${P}.zip"
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=virtual/jre-1.6"
+
+DEPEND="
+ >=virtual/jdk-1.6
+ app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+
+java_prepare() {
+ java-pkg_clean
+ rm -rf testsrc || die
+}
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 67a26867f79a..ad40d81921a1 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,4 +1 @@
-DIST mysql-connector-java-5.1.14.tar.gz 3272153 SHA256 ca6f873a4da59cfe1f464ccee29672dc3bc56ef79cc6a1e9aefba2449c7a32d0 SHA512 42568335dce2e1dbce3e885dfbaafcba8456bf0bcdd9bcc3ec23f3c36af65d05b62968b56c0cda89f803e4d52f15effec8ae7ef40d16993ac542ae981991b6c6 WHIRLPOOL a9f4bb2ed433eb078208f0780ca4a1d76d4b0e83c0c8f46e73fb80a1a00789266904dc4121dab7d227c3fe5752032cbee14e3cd0502cfac9a6ad2e10071dc4d3
-DIST mysql-connector-java-5.1.18.tar.gz 3834947 SHA256 e67216a40fba486dbba9d93fca8e2d5bd6e434edb08f4b47b07e08f27555f414 SHA512 ec6ac3892c9df1abe26a93b5b60f0ca6350dc4e35f3ba9862754d30c1e4a2a5ecb51eda3b2d8cb32a1b1503a472de0ccedc579144de30cbc12a40264f4e8b90d WHIRLPOOL 3efcf5227ab8ce5d802f44458764d35a0705c89ff946902402c5e3e64a31bddd244f382622d9cecab18092df13e4da251894fc12a391f4cb53eddca29706e116
-DIST mysql-connector-java-5.1.23.tar.gz 3683852 SHA256 133e74bd7cd0cd5f20dd8d2a365f5fc0274693517b323a6faa960ff46e2c68dc SHA512 adeb464b52b4df717a81ceb0677901ce52e11d04b13f47c1f5312e1f4c45ab1be1a149acbbe147f73875330a0d5ed50265a1e5430657571d9223b39b34de6061 WHIRLPOOL 501b1558a4c6e1d07cc68e3d4764c4aba057436a46b075e30e852bca37db12570b8243744e58e81caaf02ac6ffed85d35cfa3b56823483ad6743037928dbdaad
DIST mysql-connector-java-5.1.26.tar.gz 3724076 SHA256 fade4caa398c41f537d9b7bcaf83aabaa1eab1ef23c81de49979b5b04ba395bd SHA512 93b882f5262dc991aa885ed9ae7fead02b9d28431022c86c6724272b508e78eee3df7310e9964e60f68953ed56f4fcdf9159a90f463eb39aea65af2453371879 WHIRLPOOL 9ecf39094c1a07f5658a24574f7852aadf51c024495572bedf38ee74f83f6380159e60ce8b6a415480d8e9ec923174a0f6ba2209cdcb96167bcf8ed4e1e3a9b9
diff --git a/dev-java/jdbc-mysql/files/5.1.11-java6.patch b/dev-java/jdbc-mysql/files/5.1.11-java6.patch
deleted file mode 100644
index 1e3c21d16612..000000000000
--- a/dev-java/jdbc-mysql/files/5.1.11-java6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- build.xml.orig 2010-01-20 19:45:30.000000000 +0100
-+++ build.xml 2010-02-13 00:34:30.000000000 +0100
-@@ -124,7 +124,7 @@
- </if>
- </target>
-
-- <target name="init" depends="-compiler-check, -init-copy, -init-no-crypto">
-+ <target name="init" depends="-init-copy, -init-no-crypto">
- <!-- If we're building under cruise control, update ourself -->
-
- <if>
-@@ -746,7 +746,8 @@
- <javac sourcepath="" srcdir="${buildDir}/${fullProdName}"
- destdir="${compiler.output}"
- deprecation="off"
-- debug="${debug.enable}">
-+ debug="${debug.enable}"
-+ bootclasspath="${gentoo.bootclasspath}">
- <include name="**/*.java" />
- <exclude name="testsuite/**" />
- <exclude name="com/mysql/jdbc/integration/**" />
-@@ -763,11 +764,7 @@
- <javac destdir="${compiler.output}"
- deprecation="off"
- debug="${debug.enable}"
-- fork="yes"
-- executable="${com.mysql.jdbc.java6.javac}"
-- compiler="modern"
-- sourcepath="" srcdir="${buildDir}/${fullProdName}"
-- bootclasspath="${com.mysql.jdbc.java6.rtjar}">
-+ sourcepath="" srcdir="${buildDir}/${fullProdName}">
- <include name="**/JDBC4*.java" />
- <include name="com/mysql/jdbc/exceptions/jdbc4/*" />
-
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild
deleted file mode 100644
index 5e4cb515fdb0..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-WANT_ANT_TASKS="ant-contrib"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="mysql-connector-java"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="http://www.mysql.com/products/connector/j/"
-SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
-
-LICENSE="GPL-2-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="c3p0 log4j"
-
-COMMON_DEP="
- log4j? ( dev-java/log4j )
- c3p0? ( dev-java/c3p0 )
- dev-java/commons-logging"
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEP}"
-
-DEPEND="virtual/jdk:1.6
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch"
- # http://bugs.mysql.com/bug.php?id=28286
- epatch "${FILESDIR}/5.0.5-dist-target-depends.patch"
- # use java6 for everything except jdbc3 - #283848
- epatch "${FILESDIR}/5.1.14-java6.patch"
-
- rm -v *.jar || die
-
- # use test && mkdir src/lib-nodist # needed, or ant will fail
-
- cd src/lib
- rm -v *.jar || die
- java-pkg_jar-from commons-logging
- use log4j && java-pkg_jar-from log4j
- use c3p0 && java-pkg_jar-from c3p0
-}
-
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="dist"
-
-src_compile() {
- # cannot use rewrite-bootclasspath because of the jdbc4 part
- local bcp="$(java-pkg_get-bootclasspath 1.5)"
- java-pkg-2_src_compile -Dgentoo.bootclasspath="${bcp}"
-}
-
-# Tests need a mysql DB to exist
-RESTRICT="test"
-src_test() {
- cd src/lib
- java-pkg_jar-from junit
- cd "${S}"
- ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true
-}
-
-src_install() {
- # Skip bytecode check because we want two versions there
- JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar
- dodoc README CHANGES || die
- dohtml docs/*.html || die
- use source && java-pkg_dosrc src/com src/org
-}
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild
deleted file mode 100644
index d3aee2653532..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-WANT_ANT_TASKS="ant-contrib"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="mysql-connector-java"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="http://www.mysql.com/products/connector/j/"
-SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
-
-LICENSE="GPL-2-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-IUSE="c3p0 log4j"
-
-COMMON_DEP="
- dev-java/slf4j-api:0
- log4j? ( dev-java/log4j )
- c3p0? ( dev-java/c3p0 )"
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEP}"
-
-DEPEND="virtual/jdk:1.6
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch"
- # http://bugs.mysql.com/bug.php?id=28286
- epatch "${FILESDIR}/5.0.5-dist-target-depends.patch"
- # use java6 for everything except jdbc3 - #283848
- epatch "${FILESDIR}/5.1.14-java6.patch"
-
- rm -v *.jar || die
-
- # use test && mkdir src/lib-nodist # needed, or ant will fail
-
- cd src/lib
- rm -v *.jar || die
- java-pkg_jar-from slf4j-api
- use log4j && java-pkg_jar-from log4j
- use c3p0 && java-pkg_jar-from c3p0
-}
-
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="dist"
-
-src_compile() {
- # cannot use rewrite-bootclasspath because of the jdbc4 part
- local bcp="$(java-pkg_get-bootclasspath 1.5)"
- java-pkg-2_src_compile -Dgentoo.bootclasspath="${bcp}"
-}
-
-# Tests need a mysql DB to exist
-RESTRICT="test"
-src_test() {
- cd src/lib
- java-pkg_jar-from junit
- cd "${S}"
- ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true
-}
-
-src_install() {
- # Skip bytecode check because we want two versions there
- JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar
- dodoc README CHANGES || die
- dohtml docs/*.html || die
- use source && java-pkg_dosrc src/com src/org
-}
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild
deleted file mode 100644
index f3b85571a355..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-WANT_ANT_TASKS="ant-contrib"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="mysql-connector-java"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="http://www.mysql.com/products/connector/j/"
-SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
-
-LICENSE="GPL-2-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="c3p0 log4j"
-
-COMMON_DEP="
- dev-java/slf4j-api:0
- log4j? ( dev-java/log4j )
- c3p0? ( dev-java/c3p0 )"
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.6
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch"
-
- # http://bugs.mysql.com/bug.php?id=28286
- epatch "${FILESDIR}/5.0.5-dist-target-depends.patch"
-
- # Use java6 for everything except jdbc3 - #283848
- epatch "${FILESDIR}/5.1.14-java6.patch"
-
- find . -name '*.jar' -print -delete || die
-
- # use test && mkdir src/lib-nodist # needed, or ant will fail
-
- cd src/lib
- java-pkg_jar-from slf4j-api
- use log4j && java-pkg_jar-from log4j
- use c3p0 && java-pkg_jar-from c3p0
-}
-
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="dist"
-
-src_compile() {
- # Cannot use rewrite-bootclasspath because of the jdbc4 part.
- java-pkg-2_src_compile \
- -Dgentoo.bootclasspath="$(java-pkg_get-bootclasspath 1.5)"
-}
-
-# Tests need a mysql DB to exist.
-RESTRICT="test"
-
-src_test() {
- cd src/lib
- java-pkg_jar-from junit
-
- cd "${S}"
- ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true
-}
-
-src_install() {
- # Skip bytecode check because we want two versions there
- JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar
-
- dodoc README CHANGES
- dohtml docs/*.html
-
- use source && java-pkg_dosrc src/com src/org
-}
diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
index 672aac8dd6a6..0699aea79e21 100644
--- a/dev-java/jline/jline-2.12.1-r1.ebuild
+++ b/dev-java/jline/jline-2.12.1-r1.ebuild
@@ -14,23 +14,32 @@ SRC_URI="https://github.com/jline/${PN}/archive/${P}.tar.gz"
LICENSE="BSD"
SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
-CDEPEND="dev-java/jansi:0
+CDEPEND="
+ dev-java/jansi:0
dev-java/jansi-native:0"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
- test? ( dev-java/junit:4 )"
+DEPEND="
+ test? (
+ dev-java/junit:4
+ )
+ ${CDEPEND}
+ >=virtual/jdk-1.6"
-RDEPEND="${CDEPEND}
+RDEPEND="
+ ${CDEPEND}
>=virtual/jre-1.6"
S="${WORKDIR}/${PN}2-${P}"
JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="jansi,jansi-native"
+
+JAVA_GENTOO_CLASSPATH="
+ jansi
+ jansi-native
+"
java_prepare() {
# Easier to use java-pkg-simple.
diff --git a/dev-java/jline/jline-2.12.1.ebuild b/dev-java/jline/jline-2.12.1.ebuild
deleted file mode 100644
index a8372f325443..000000000000
--- a/dev-java/jline/jline-2.12.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java library for handling console input"
-HOMEPAGE="https://github.com/jline/jline2"
-SRC_URI="https://github.com/jline/jline2/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="dev-java/jansi:1.11
- dev-java/jansi-native:0"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.5
- test? ( dev-java/junit:4 )"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.5"
-
-S="${WORKDIR}/${PN}2-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="jansi-1.11,jansi-native"
-
-java_prepare() {
- # Easier to use java-pkg-simple.
- rm -v pom.xml || die
-
- # Don't forget the resources!
- mkdir -p target/classes || die
- cp -r src/main/resources/* target/classes || die
-}
-
-src_install() {
- java-pkg-simple_src_install
-
- dodoc {CHANGELOG,README}.md
-}
-
-src_test() {
- cd src/test/java || die
-
- local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
- local TESTS=$(find * -name "*Test.java")
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -cp "${CP}" -d . $(find * -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jsr322/Manifest b/dev-java/jsr322/Manifest
new file mode 100644
index 000000000000..f70e2ac5e463
--- /dev/null
+++ b/dev-java/jsr322/Manifest
@@ -0,0 +1 @@
+DIST jsr322-1.5.jar 86462 SHA256 f059b4df36671095a759f09e29730fb2b34fc5fb370cb87c5510a3042d7695d5 SHA512 e96d54f8ac8279e53754a3950590382f7857abf26a0a97f7ad70dc72e0da66c11c537627a329bee943756ffbb4d96e47b0501663b51c3775fb1dd5e8bfe3a9ae WHIRLPOOL 3bf9264ca67cc987b2b61d58f66cee3c58622ff400d853a6942a73bb87f36156f0061bb4959585a5376f56522bd6ab600e4b8abf25e1e1aa9558a95da7dfd5c6
diff --git a/dev-java/jsr322/jsr322-1.5.ebuild b/dev-java/jsr322/jsr322-1.5.ebuild
new file mode 100644
index 000000000000..5d32efa93bc4
--- /dev/null
+++ b/dev-java/jsr322/jsr322-1.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source doc"
+
+MY_PN="connector-api"
+MY_P="${MY_PN}-${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java EE Connector Architecture"
+HOMEPAGE="http://jcp.org/en/jsr/detail?id=322"
+SRC_URI="https://repo1.maven.org/maven2/javax/resource/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jsr322/metadata.xml b/dev-java/jsr322/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/jsr322/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild
index 052754ca3e54..fdadfd936126 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Native APR library for Tomcat"
SLOT="0"
SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
LICENSE="Apache-2.0"
IUSE="test"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.65.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.65.ebuild
index 7beea28259ba..d80f2ebdbff2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.65.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.65.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.28.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.28.ebuild
index 7e086a049fec..e980d1e5e5cc 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.28.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.28.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.1"
-KEYWORDS="amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/vldocking/vldocking-3.0.5.ebuild b/dev-java/vldocking/vldocking-3.0.5.ebuild
index 46f99c8fbfbb..7f155a058bd2 100644
--- a/dev-java/vldocking/vldocking-3.0.5.ebuild
+++ b/dev-java/vldocking/vldocking-3.0.5.ebuild
@@ -13,20 +13,21 @@ SRC_URI="https://github.com/cmadsen/${PN}/archive/${P}.zip"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
-CDEPEND="dev-java/slf4j-log4j12:0
- dev-java/slf4j-api:0
-"
+CDEPEND="
+ dev-java/slf4j-log4j12:0
+ dev-java/slf4j-api:0"
-RDEPEND=">=virtual/jre-1.6
+RDEPEND="
${CDEPEND}
-"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
+ >=virtual/jre-1.6"
+
+DEPEND="
${CDEPEND}
-"
+ app-arch/unzip
+ >=virtual/jdk-1.6"
JAVA_GENTOO_CLASSPATH="
slf4j-log4j12
diff --git a/dev-lang/mono/files/fix-for-GitExtensions-issue-2710-another-resolution.patch b/dev-lang/mono/files/fix-for-GitExtensions-issue-2710-another-resolution.patch
new file mode 100644
index 000000000000..b306b697c09d
--- /dev/null
+++ b/dev-lang/mono/files/fix-for-GitExtensions-issue-2710-another-resolution.patch
@@ -0,0 +1,48 @@
+diff --git a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
+index 4b69010..1bb6195 100644
+--- a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
++++ b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
+@@ -578,6 +578,34 @@ namespace System.Configuration
+ private ExeConfigurationFileMap exeMapPrev = null;
+ private SettingsPropertyValueCollection values = null;
+
++ /// <remarks>
++ /// Hack to remove the XmlDeclaration that the XmlSerializer adds.
++ /// <br />
++ /// see <a href="https://github.com/mono/mono/pull/2273">Issue 2273</a> for details
++ /// </remarks>
++ private string StripXmlHeader(string serializedValue)
++ {
++ if (serializedValue == null)
++ {
++ return string.Empty;
++ }
++
++ XmlDocument doc = new XmlDocument();
++ XmlElement valueXml = doc.CreateElement("value");
++ valueXml.InnerXml = serializedValue;
++
++ foreach (XmlNode child in valueXml.ChildNodes) {
++ if (child.NodeType == XmlNodeType.XmlDeclaration) {
++ valueXml.RemoveChild(child);
++ break;
++ }
++ }
++
++ // InnerXml will give you well-formed XML that you could save as a separate document, and
++ // InnerText will immediately give you a pure-text representation of this inner XML.
++ return valueXml.InnerXml;
++ }
++
+ private void SaveProperties (ExeConfigurationFileMap exeMap, SettingsPropertyValueCollection collection, ConfigurationUserLevel level, SettingsContext context, bool checkUserLevel)
+ {
+ Configuration config = ConfigurationManager.OpenMappedExeConfiguration (exeMap, level);
+@@ -623,7 +651,7 @@ namespace System.Configuration
+ element.Value.ValueXml = new XmlDocument ().CreateElement ("value");
+ switch (value.Property.SerializeAs) {
+ case SettingsSerializeAs.Xml:
+- element.Value.ValueXml.InnerXml = (value.SerializedValue as string) ?? string.Empty;
++ element.Value.ValueXml.InnerXml = StripXmlHeader(value.SerializedValue as string);
+ break;
+ case SettingsSerializeAs.String:
+ element.Value.ValueXml.InnerText = value.SerializedValue as string;
diff --git a/dev-lang/mono/mono-4.2.2.10-r1.ebuild b/dev-lang/mono/mono-4.2.2.10-r1.ebuild
new file mode 100644
index 000000000000..677210ad41ce
--- /dev/null
+++ b/dev-lang/mono/mono-4.2.2.10-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils versionator
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.mono-project.com/Main_Page"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE="nls minimal pax_kernel xen doc"
+
+COMMONDEPEND="
+ !minimal? ( >=dev-dotnet/libgdiplus-2.10 )
+ ia64? ( sys-libs/libunwind )
+ nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMONDEPEND}
+ || ( www-client/links www-client/lynx )
+"
+DEPEND="${COMMONDEPEND}
+ sys-devel/bc
+ virtual/yacc
+ pax_kernel? ( sys-apps/elfix )
+ !dev-lang/mono-basic
+"
+
+MAKEOPTS="${MAKEOPTS} -j1" #nowarn
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+pkg_pretend() {
+ # If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling.
+ # See http://bugs.gentoo.org/261869 for more info."
+ CONFIG_CHECK="SYSVIPC"
+ use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ mono-env_pkg_setup
+}
+
+src_prepare() {
+ # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
+ # get killed in the build proces when MPROTECT is enable. #286280
+ # RANDMMAP kill the build proces to #347365
+ # use paxmark.sh to get PT/XT logic #532244
+ if use pax_kernel ; then
+ ewarn "We are disabling MPROTECT on the mono binary."
+
+ # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
+ sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
+ fi
+
+ # mono build system can fail otherwise
+ strip-flags
+
+ # Fix VB targets
+ # http://osdir.com/ml/general/2015-05/msg20808.html
+ epatch "${FILESDIR}/add_missing_vb_portable_targets.patch"
+
+ # Fix build when sgen disabled
+ # https://bugzilla.xamarin.com/show_bug.cgi?id=32015
+ epatch "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch"
+
+ # Fix atomic_add_i4 support for 32-bit ppc
+ # https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf
+ epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch"
+
+ epatch "${FILESDIR}/systemweb3.patch"
+ epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710-another-resolution.patch"
+ epatch "${FILESDIR}/fix-for-bug36724.patch"
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-silent-rules
+ $(use_with xen xen_opt)
+ --without-ikvm-native
+ --disable-dtrace
+ $(use_with doc mcs-docs)
+ $(use_enable nls)
+ )
+
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+}
+
+src_test() {
+ cd mcs/tests || die
+ emake check
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
+ # mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
+ # for reference.
+ rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+ rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index ce071e264eb8..551100ca269a 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,17 +1,13 @@
-DIST ruby-2.0.0-p645.tar.xz 8295192 SHA256 875be4f57bdbb2d2be0d64bfd8fc5022f004d55261ead8fd0cdc2e9e415e9f7b SHA512 440f8ea50f51c53f90e42a8dfd7cd41f806b290d5c12c09f84d9159ab9c95e19b036cd8a5dc788844da501b9fcd1fa8ad8352ef7417998debc1b43a61a4ea4dc WHIRLPOOL 6201a39976f793dd3702ba580aafb881ba6e9f5cbc9d544bdddf508ca86dc14fc2970451a386ba495d16f2f68724197ef089ba02e7d1a9423870a0fa5c39cbc8
DIST ruby-2.0.0-p647.tar.xz 8301008 SHA256 9f793880df1209ea4e5c10ee9d8ef79caa0e73ee769f745f1c191505255e2847 SHA512 38fd2ad631588a0e8adf9a7ae01cb5274eca4fd794c5ed7030e5fae9e53cd8920eaac9d388c73b844a154c7eb56fa6fed8e2ee5df5617efd624b6a568ea4953b WHIRLPOOL c8ec19ed900e6578f1f6e08d1e2a5c015cfa6e81379fb0437a1167ffb8bc56561d02b4b5b35a674039f7adcd2c43b222b89e139cb0ea702e8bfec886872c8e6a
DIST ruby-2.0.0-p648.tar.xz 8303584 SHA256 22fe97739110ba9171b13fc4dcd1a92e767f16769de3593ee41ef1283d218402 SHA512 95df515d37f04193eaceaded4a4f568f83041683349cd44767803f77361a66533226d83eac6586ac894ae61d79bd36ce047f951aed43f9a8356dbb3244280774 WHIRLPOOL ef78b838d061b1707219453a70c8b4a503d46e9f95797007555943a837de21f22c0c93039c75172d7df4fe9b5eca38472ee7177f98785cb5993c7e80140a1d27
-DIST ruby-2.1.6.tar.xz 9381724 SHA256 137b27bffefd795fd97c288fff539d135f42320f8a1afddde99a34e1fbe7314e SHA512 0cf91fe7ae53a3f9c034fa5996eeed91889b942b8e595e84be4e244adc30d79aa3f540cc6f657982715069dfb14af20786557689d9a8fe4bbfc66280e84dd6cf WHIRLPOOL 1881ba54cf751e558f3a321041ed987c4433f64e786078de35227126afc801fabdcff74cf7d882fd07a70988c8a28c95269fd0ed4ccaebb3627931320c697e60
DIST ruby-2.1.7.tar.xz 9371208 SHA256 225c067d9820fe52fcffbfb91d5b5243708a0b666b9929bea466e9379eb40ad7 SHA512 a4f2a3a684517678442b4ad3bda50433634317c910e8c13c844dffe470532bae5fd8d72b3f83c9a36865f303fe0464703e30854b3e55a558a758252b5e594406 WHIRLPOOL 54fae59b754aebbf1736720e042574ed4a0b4f7c1518742f8215bb396bb7416ee7b50df7d27167337e10eef518f1d488a48d064bfcbfac0065aa8313296fe263
DIST ruby-2.1.8.tar.xz 9382672 SHA256 94eeae3b3e3ac93cfd205e1aaef4c5325227b7656cbb2fc1ee217618145dd19d SHA512 c712ee69cb1d41ad8420177b9564e451ab795e4903f1edc20c14aa189b8e38c54c5119d913204d13a5f8fa424f2ec43bfad04c77b313ea4533e23a9b1d161392 WHIRLPOOL 542e61ec35a5dacf0ee49daeaf70c2cc3efb605685013eea48208709a4eea6eb83413ff32839dab1d316a60d6d5ebc75811f8085c39b08205c36d815460e7549
DIST ruby-2.2.2.tar.xz 10463044 SHA256 f033b5d08ab57083e48c1d81bcd7399967578c370b664da90e12a32891424462 SHA512 bd72d0a4c017e2527659f64ef2781bbe8bd540a2302eaa60234a12282fd53c359e04205c56385402c67e81bb9dab3b88de53de82e12bb13e3386c26301043b64 WHIRLPOOL ee9c3a664ac1d67bd9ff4ed8fcc7d4c8e9b6e2f5774c938f876223b22022b498932afc41990890a03b560c65ffe29a039761d18bbeeab46fe13cbfff515bc115
DIST ruby-2.2.3.tar.xz 10453204 SHA256 c6ec90e9ed018e6d9a578fc93755d8565839908d5796809e1aecd1798c7ea8a7 SHA512 e3ce3333e8d59f4f3bfc84cf9bbbc6f74272470e12913d299fd1d41fc166dee21921eed1789591f50c3f3b6e5fd38fd1b99855c16aff28bdc4ae8fcc680c71bd WHIRLPOOL 3fae4fc3112f24004f0f043d29b2e624e559fa3d53e6b0479af03df910d210aaeb8274c294dfe1ef0602f63790b4cdc31147d5fd92707e38ea29f01fd07e8839
DIST ruby-2.2.4.tar.xz 10464500 SHA256 d28bff4641e382681c58072ddc244d025ac47ff71dd9426a92fcfc3830d1773c SHA512 755257eea0cb79f28f1d2dc6e2a5ee4b1954280f51153e5fe90605a875b1d52077660b87e4e04d11552591a1f60a1241e4c70056f073a217b3bad896f64780da WHIRLPOOL 9d3d549dce991d2d594df624bf2f55f4ff9269c35193b190e3fd774b8883facb568f010a3b79927e083cc5bad277281e4c8a9fc3979f609fca50f86775563484
-DIST ruby-patches-2.0.0_p645.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512 423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
+DIST ruby-2.3.0.tar.xz 11294412 SHA256 70125af0cfd7048e813a5eecab3676249582bfb65cfd57b868c3595f966e4097 SHA512 d893c5e6db5a0533e0da48d899c619964388852ef90e7d1b92a4363d5f189cd2dba32a009581f62b9f42a8e6027975fc3c18b64faf356f5e3ac43a8d69ec5327 WHIRLPOOL 1d39136dad87580339f87057649d136e1b76cb58118b275d6847b791be8f6882820de892d9fb7144991a7acf30c355311fd289d1a7931fd018b3b95398945c07
DIST ruby-patches-2.0.0_p647-r1.tar.bz2 3341 SHA256 7d82403fed6216baed59ac1fbba888e2b9a4a9cb742ffd01531753bae07ab6b8 SHA512 40d07275a391df3e0a7a0c2705913c8120a548e223032dc39993f8f873c8d0639646cf728dc95f1400352a13766623ac6d69a1b1ff03183df6fabf32946dd7a6 WHIRLPOOL ed7ea6b1c1fd3570ea85b885f7455d8273cff2a9db2540c9e89faca867bd5eed2b4de52c7d21a96bb33ae0beedce113c68bb6c8cee4688650ff5169bd9c265fd
-DIST ruby-patches-2.0.0_p647.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512 423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
DIST ruby-patches-2.0.0_p648.tar.bz2 3341 SHA256 7d82403fed6216baed59ac1fbba888e2b9a4a9cb742ffd01531753bae07ab6b8 SHA512 40d07275a391df3e0a7a0c2705913c8120a548e223032dc39993f8f873c8d0639646cf728dc95f1400352a13766623ac6d69a1b1ff03183df6fabf32946dd7a6 WHIRLPOOL ed7ea6b1c1fd3570ea85b885f7455d8273cff2a9db2540c9e89faca867bd5eed2b4de52c7d21a96bb33ae0beedce113c68bb6c8cee4688650ff5169bd9c265fd
-DIST ruby-patches-2.1.6-r1.tar.bz2 2348 SHA256 2c158373217a719f2961c1f2cf2f3494eb43c413dc41ba7f9c1d88c60baca7f7 SHA512 01367d463a3aa72261742ae468d96ca1fb06a2d6b2a7a0cc416e449a7ae602d4478fb2394390636725424f252fa95c5db7d2c8116dc0b1e4477d8d641961980f WHIRLPOOL b39e8b9bdd8d05958b3b4c5884bfdd65c99b9aee2470a48ca748cbf336948bf0bb9f834ce3fec5e9365abaf385de760012f67dec6db257d7cbeff04ce0c5c7fb
DIST ruby-patches-2.1.7-r1.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
DIST ruby-patches-2.1.7.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
DIST ruby-patches-2.1.8.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
@@ -20,3 +16,4 @@ DIST ruby-patches-2.2.3-r1.tar.bz2 3143 SHA256 45ce438c31c62313f193546a883afe19c
DIST ruby-patches-2.2.3-r2.tar.bz2 3143 SHA256 45ce438c31c62313f193546a883afe19ccb6dda3276d1378eb5dfd33bd7b8bbe SHA512 e5799b8008276d98f3cd1bd57b1b76a39d052a7c920d84ef245961c2db55e96e7b7081b71aa04843844786cdeee759eb415b46d8e44611d5ff8f658ad12be7bb WHIRLPOOL d9d6dd5562574c2597cbb81b9dbb15c345cad9096e24cc82515fd021882a4e7fa375f37e660b1ce2075ef66bc7582bae4d0c3e819713549dbe7c5c3d4c658ded
DIST ruby-patches-2.2.3.tar.bz2 2263 SHA256 a08bfaf193adf8e92e7937c9e8db3ec4a880e80dd9c99a5621a00a9233d4d2cd SHA512 dafbb40254d9703a7ed66314f6d9d0dd4c88485a5cef28ff1e3c7020c28cfaac1561ecfb72a465811b59213dbaf9aece6b52240ae895e47f5be63d7f88bc5543 WHIRLPOOL 54b91871b991d38cd4c573884389aaa4ee81afc14fd918e968f0b82df95264930d71199741be820c816998ca9134c496a028e13d00b93cae3c870981f28c2160
DIST ruby-patches-2.2.4.tar.bz2 3143 SHA256 45ce438c31c62313f193546a883afe19ccb6dda3276d1378eb5dfd33bd7b8bbe SHA512 e5799b8008276d98f3cd1bd57b1b76a39d052a7c920d84ef245961c2db55e96e7b7081b71aa04843844786cdeee759eb415b46d8e44611d5ff8f658ad12be7bb WHIRLPOOL d9d6dd5562574c2597cbb81b9dbb15c345cad9096e24cc82515fd021882a4e7fa375f37e660b1ce2075ef66bc7582bae4d0c3e819713549dbe7c5c3d4c658ded
+DIST ruby-patches-2.3.0.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64
diff --git a/dev-lang/ruby/ruby-2.0.0_p645.ebuild b/dev-lang/ruby/ruby-2.0.0_p645.ebuild
deleted file mode 100644
index 3f9c88574722..000000000000
--- a/dev-lang/ruby/ruby-2.0.0_p645.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-RUBYPL=$(get_version_component_range 4)
-
-MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.0.0
-
-if [[ -n ${PATCHSET} ]]; then
- if [[ ${PVR} == ${PV} ]]; then
- PATCHSET="${PV}-r0.${PATCHSET}"
- else
- PATCHSET="${PVR}.${PATCHSET}"
- fi
-else
- PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.0/${MY_P}.tar.xz
- https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline cpu_flags_x86_sse2"
-
-RDEPEND="
- berkdb? ( sys-libs/db:= )
- gdbm? ( sys-libs/gdbm )
- ssl? ( dev-libs/openssl:0 )
- socks5? ( >=net-proxy/dante-1.1.13 )
- ncurses? ( sys-libs/ncurses:0= )
- readline? ( sys-libs/readline:0 )
- dev-libs/libyaml
- virtual/libffi
- sys-libs/zlib
- >=app-eselect/eselect-ruby-20100402
- !<dev-ruby/rdoc-3.9.4
- !<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-PDEPEND="
- virtual/rubygems[ruby_targets_ruby20]
- >=dev-ruby/json-1.7.7[ruby_targets_ruby20]
- >=dev-ruby/rake-0.9.6[ruby_targets_ruby20]
- rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] )
- xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
- if use cpu_flags_x86_sse2 ; then
- excluded_patches="012_no_forced_sse2.patch"
- fi
-
- EPATCH_EXCLUDE="${excluded_patches}" EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches"
-
- # We can no longer unbundle all of rake because rubygems now depends
- # on this. We leave the actual rake code around to bootstrap
- # rubygems, but remove the bits that would cause a file collision.
- einfo "Unbundling gems..."
- cd "$S"
- rm -r \
- {bin,lib}/rake lib/rake.rb man/rake.1 \
- bin/gem || die "removal failed"
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=
-
- # The Tk module can no longer be built because the module code is no
- # longer compatible with newer stable versions.
- # https://bugs.gentoo.org/show_bug.cgi?id=500894
- local modules="tk"
-
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
- # SuperH needs this
- use sh && append-flags -mieee
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- # ipv6 hack, bug 168939. Needs --enable-ipv6.
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
- # Determine which modules *not* to build depending in the USE flags.
- if ! use readline ; then
- modules="${modules},readline"
- fi
- if ! use berkdb ; then
- modules="${modules},dbm"
- fi
- if ! use gdbm ; then
- modules="${modules},gdbm"
- fi
- if ! use ssl ; then
- modules="${modules},openssl"
- fi
- if ! use ncurses ; then
- modules="${modules},curses"
- fi
-
- INSTALL="${EPREFIX}/usr/bin/install -c" econf \
- --program-suffix=${MY_SUFFIX} \
- --with-soname=ruby${MY_SUFFIX} \
- --docdir=${EPREFIX}/usr/share/doc/${P} \
- --enable-shared \
- --enable-pthread \
- --disable-rpath \
- --with-out-ext="${modules}" \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- --enable-ipv6 \
- $(use_enable debug) \
- ${myconf} \
- --enable-option-checking=no \
- || die "econf failed"
-}
-
-src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
- emake -j1 V=1 test || die "make test failed"
-
- elog "Ruby's make test has been run. Ruby also ships with a make check"
- elog "that cannot be run until after ruby has been installed."
- elog
- if use rubytests; then
- elog "You have enabled rubytests, so they will be installed to"
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
- elog "than root, and you must place them into a writeable directory."
- elog "Then call: "
- elog
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
- else
- elog "Enable the rubytests USE flag to install the make check tests"
- fi
-}
-
-src_install() {
- # Remove the remaining bundled gems. We do this late in the process
- # since they are used during the build to e.g. create the
- # documentation.
- rm -rf ext/json || die
-
- # Ruby is involved in the install process, we don't want interference here.
- unset RUBYOPT
-
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
- LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
- for d in $(find "${S}/ext" -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- emake V=1 DESTDIR="${D}" install || die "make install failed"
-
- # Remove installed rubygems copy
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r sample
- fi
-
- dodoc ChangeLog NEWS doc/NEWS* README* || die
-
- if use rubytests; then
- pushd test
- insinto /usr/share/${PN}-${SLOT}/test
- doins -r .
- popd
- fi
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
-
- elog
- elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(19|20|...)"
- elog
-}
-
-pkg_postrm() {
- eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild b/dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild
index 446304b5c4c4..3f9c88574722 100644
--- a/dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://ruby/2.0/${MY_P}.tar.xz
https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline cpu_flags_x86_sse2"
RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.1.6-r1.ebuild b/dev-lang/ruby/ruby-2.1.6-r1.ebuild
deleted file mode 100644
index 1a360ae0edfa..000000000000
--- a/dev-lang/ruby/ruby-2.1.6-r1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-RUBYPL=$(get_version_component_range 4)
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-#MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.1.0
-
-if [[ -n ${PATCHSET} ]]; then
- if [[ ${PVR} == ${PV} ]]; then
- PATCHSET="${PV}-r0.${PATCHSET}"
- else
- PATCHSET="${PVR}.${PATCHSET}"
- fi
-else
- PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.1/${MY_P}.tar.xz
- https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline"
-
-RDEPEND="
- berkdb? ( sys-libs/db:= )
- gdbm? ( sys-libs/gdbm )
- ssl? ( dev-libs/openssl:0 )
- socks5? ( >=net-proxy/dante-1.1.13 )
- ncurses? ( sys-libs/ncurses:0= )
- readline? ( sys-libs/readline:0 )
- dev-libs/libyaml
- virtual/libffi
- sys-libs/zlib
- >=app-eselect/eselect-ruby-20131227
- !<dev-ruby/rdoc-3.9.4
- !<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-PDEPEND="
- virtual/rubygems[ruby_targets_ruby21]
- >=dev-ruby/json-1.8.1[ruby_targets_ruby21]
- >=dev-ruby/rake-0.9.6[ruby_targets_ruby21]
- rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby21] )
- xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches"
-
- # We can no longer unbundle all of rake because rubygems now depends
- # on this. We leave the actual rake code around to bootstrap
- # rubygems, but remove the bits that would cause a file collision.
- einfo "Unbundling gems..."
- cd "$S"
- rm -r \
- {bin,lib}/rake lib/rake.rb man/rake.1 \
- bin/gem || die "removal failed"
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=
-
- # The Tk module can no longer be built because the module code is no
- # longer compatible with newer stable versions.
- # https://bugs.gentoo.org/show_bug.cgi?id=500894
- local modules="tk"
-
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
- # SuperH needs this
- use sh && append-flags -mieee
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- # ipv6 hack, bug 168939. Needs --enable-ipv6.
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
- # Determine which modules *not* to build depending in the USE flags.
- if ! use readline ; then
- modules="${modules},readline"
- fi
- if ! use berkdb ; then
- modules="${modules},dbm"
- fi
- if ! use gdbm ; then
- modules="${modules},gdbm"
- fi
- if ! use ssl ; then
- modules="${modules},openssl"
- fi
- if ! use ncurses ; then
- modules="${modules},curses"
- fi
-
- INSTALL="${EPREFIX}/usr/bin/install -c" econf \
- --program-suffix=${MY_SUFFIX} \
- --with-soname=ruby${MY_SUFFIX} \
- --docdir=${EPREFIX}/usr/share/doc/${P} \
- --enable-shared \
- --enable-pthread \
- --disable-rpath \
- --with-out-ext="${modules}" \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- --enable-ipv6 \
- $(use_enable debug) \
- ${myconf} \
- --enable-option-checking=no \
- || die "econf failed"
-}
-
-src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
- emake -j1 V=1 test || die "make test failed"
-
- elog "Ruby's make test has been run. Ruby also ships with a make check"
- elog "that cannot be run until after ruby has been installed."
- elog
- if use rubytests; then
- elog "You have enabled rubytests, so they will be installed to"
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
- elog "than root, and you must place them into a writeable directory."
- elog "Then call: "
- elog
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
- else
- elog "Enable the rubytests USE flag to install the make check tests"
- fi
-}
-
-src_install() {
- # Remove the remaining bundled gems. We do this late in the process
- # since they are used during the build to e.g. create the
- # documentation.
- rm -rf ext/json || die
-
- # Ruby is involved in the install process, we don't want interference here.
- unset RUBYOPT
-
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
- LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
- for d in $(find "${S}/ext" -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- emake V=1 DESTDIR="${D}" install || die "make install failed"
-
- # Remove installed rubygems copy
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r sample
- fi
-
- dodoc ChangeLog NEWS doc/NEWS* README* || die
-
- if use rubytests; then
- pushd test
- insinto /usr/share/${PN}-${SLOT}/test
- doins -r .
- popd
- fi
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
-
- elog
- elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(19|20|...)"
- elog
-}
-
-pkg_postrm() {
- eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.1.7.ebuild b/dev-lang/ruby/ruby-2.1.7.ebuild
index f9715f71b943..1a360ae0edfa 100644
--- a/dev-lang/ruby/ruby-2.1.7.ebuild
+++ b/dev-lang/ruby/ruby-2.1.7.ebuild
@@ -34,7 +34,7 @@ SRC_URI="mirror://ruby/2.1/${MY_P}.tar.xz
https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline"
RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.0.0_p647.ebuild b/dev-lang/ruby/ruby-2.3.0.ebuild
index db41ee153b22..8de3d23842b5 100644
--- a/dev-lang/ruby/ruby-2.0.0_p647.ebuild
+++ b/dev-lang/ruby/ruby-2.3.0.ebuild
@@ -8,14 +8,12 @@ EAPI=5
inherit autotools eutils flag-o-matic multilib versionator
-RUBYPL=$(get_version_component_range 4)
-
-MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
+MY_P="${PN}-$(get_version_component_range 1-3)"
S=${WORKDIR}/${MY_P}
SLOT=$(get_version_component_range 1-2)
MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.0.0
+RUBYVERSION=2.3.0
if [[ -n ${PATCHSET} ]]; then
if [[ ${PVR} == ${PV} ]]; then
@@ -29,51 +27,59 @@ fi
DESCRIPTION="An object-oriented scripting language"
HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.0/${MY_P}.tar.xz
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
LICENSE="|| ( Ruby-BSD BSD-2 )"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline cpu_flags_x86_sse2"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl xemacs ncurses +readline"
RDEPEND="
berkdb? ( sys-libs/db:= )
gdbm? ( sys-libs/gdbm )
- ssl? ( dev-libs/openssl:0 )
+ jemalloc? ( dev-libs/jemalloc )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
socks5? ( >=net-proxy/dante-1.1.13 )
ncurses? ( sys-libs/ncurses:0= )
readline? ( sys-libs/readline:0 )
dev-libs/libyaml
virtual/libffi
sys-libs/zlib
- >=app-eselect/eselect-ruby-20100402
+ >=app-eselect/eselect-ruby-20141227
!<dev-ruby/rdoc-3.9.4
!<dev-ruby/rubygems-1.8.10-r1"
DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+ >=dev-ruby/did_you_mean-1.0.0[ruby_targets_ruby23]
+ >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23]
+ >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23]
+ >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23]
+ >=dev-ruby/rake-10.4.2[ruby_targets_ruby23]
+ >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23]
+"
+
PDEPEND="
- virtual/rubygems[ruby_targets_ruby20]
- >=dev-ruby/json-1.7.7[ruby_targets_ruby20]
- >=dev-ruby/rake-0.9.6[ruby_targets_ruby20]
- rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] )
+ ${BUNDLED_GEMS}
+ virtual/rubygems[ruby_targets_ruby23]
+ >=dev-ruby/json-1.8.3[ruby_targets_ruby23]
+ rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] )
xemacs? ( app-xemacs/ruby-modes )"
src_prepare() {
- if use cpu_flags_x86_sse2 ; then
- excluded_patches="012_no_forced_sse2.patch"
- fi
-
- EPATCH_EXCLUDE="${excluded_patches}" EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
epatch "${WORKDIR}/patches"
- # We can no longer unbundle all of rake because rubygems now depends
- # on this. We leave the actual rake code around to bootstrap
- # rubygems, but remove the bits that would cause a file collision.
einfo "Unbundling gems..."
cd "$S"
- rm -r \
- {bin,lib}/rake lib/rake.rb man/rake.1 \
- bin/gem || die "removal failed"
+ # Remove bundled gems that we will install via PDEPEND, bug
+ # 539700. Use explicit version numbers to ensure rm fails when they
+ # change so we can update dependencies accordingly.
+ rm -f gems/{did_you_mean-1.0.0,minitest-5.8.3,net-telnet-0.1.1,power_assert-0.2.6,rake-10.4.2,test-unit-3.1.5}.gem || die
# Fix a hardcoded lib path in configure script
sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
@@ -131,7 +137,10 @@ src_configure() {
modules="${modules},curses"
fi
- INSTALL="${EPREFIX}/usr/bin/install -c" econf \
+ # Provide an empty LIBPATHENV because we disable rpath but we do not
+ # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+ # #564272
+ INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
--program-suffix=${MY_SUFFIX} \
--with-soname=ruby${MY_SUFFIX} \
--docdir=${EPREFIX}/usr/share/doc/${P} \
@@ -139,6 +148,7 @@ src_configure() {
--enable-pthread \
--disable-rpath \
--with-out-ext="${modules}" \
+ $(use_enable jemalloc jemalloc) \
$(use_enable socks5 socks) \
$(use_enable doc install-doc) \
--enable-ipv6 \
@@ -190,10 +200,11 @@ src_install() {
emake V=1 DESTDIR="${D}" install || die "make install failed"
- # Remove installed rubygems copy
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+ # Remove installed rubygems and rdoc copy
+ rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+ rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+ rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+ rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
if use doc; then
make DESTDIR="${D}" install-doc || die "make install-doc failed"
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index d6b567383449..7828585e9e28 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -2,3 +2,4 @@ DIST appstream-glib-0.3.4.tar.xz 1814472 SHA256 97b948ad992cb985e5bed533446fb5d2
DIST appstream-glib-0.4.0.tar.xz 1837552 SHA256 f4dee0e86549009f248d38eb643061e82ff0d542f06e1f4af6b36af2f97c2e13 SHA512 54769b47f11f8792ee85ab0922d8a256800c00558ca9e2fcaab30845e3fbd9f4a08d311608f0b600f8ad070d79d5227cd9ac4b644ef6d94e1772e4695c4f1afe WHIRLPOOL da036564be55acc4c0b3d5320f165ac98d6f4754ed74dda8b06d31c7bfd91b10ff3f4ff0d85b141bfa804391befcadecd714a9b110d422cf9286c899714ad58d
DIST appstream-glib-0.5.0.tar.xz 1818388 SHA256 35d63ca31664918905c3de634766766d98dadcd99d7271fb319f6279b846bf36 SHA512 1c1a1f41d6911c73a25a83396fb183d99ee139378766235b8885ee68c2b738137d55c108e7ea3ec2853e5ac5f17936b87df554bea45a1c19db3caea5bcee5d0d WHIRLPOOL 2a26ce1685ed3c78242c0ef29b4e5dea95ba070e531503f00f378f36974a8e1aa858b66640fe48ccc7c1ace9619671ff3c6d71aaf78e81a6ef5b55ab2be64090
DIST appstream-glib-0.5.3.tar.xz 1853508 SHA256 842688933d182c4789843f0d7b288622a9fd3f75fbe645849cacc6195bdfceab SHA512 18ff35dcaed26072c0c3f84dc7310f1838e0626f733d2bf7cb8aeb7e36a963fa07a9b2c917e7cb423a5fab1b329977ff9ec8836be9c3a988724a624d4d77f4a8 WHIRLPOOL d8c10c5e669cb2d52c55217fe97e08f6b29119a57254d63df9187ea82fb98b174345b8a4e314b548e8f40cf2066a3d42ae189a3e89199e14d60f5f8a6f0f2c54
+DIST appstream-glib-0.5.5.tar.xz 1855288 SHA256 c539b261678b152554cd0548f973c371188403dfdb88e6ca979cc378ff50bbff SHA512 529cfcca989c501ab5666c98ce85fa085afe08df72de8217802d8baa6b606c5f6e1038adb57b29351a40ec2de71cf99c1dbf4b18289286d1b7ebb5a7f15be5de WHIRLPOOL b29fc6825cb4906e8951d81301e97bb41f2c79cdb6e78475a5a1b8daa8d15bfab531903f802c2036f2065d18245f609819f72018711d0d71a0b59348752893b7
diff --git a/dev-libs/appstream-glib/appstream-glib-0.5.5.ebuild b/dev-libs/appstream-glib/appstream-glib-0.5.5.ebuild
new file mode 100644
index 000000000000..d207a6c8183c
--- /dev/null
+++ b/dev-libs/appstream-glib/appstream-glib-0.5.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit bash-completion-r1 gnome2
+
+DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
+HOMEPAGE="http://people.freedesktop.org/~hughsient/appstream-glib/"
+SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/8" # soname version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection nls"
+
+# FIXME: yaml is optional with --enable-dep11 but not
+# properly handled in autofoo bug#????
+RDEPEND="
+ app-arch/gcab
+ app-arch/libarchive
+ dev-db/sqlite:3
+ >=dev-libs/glib-2.45.8:2
+ dev-libs/libyaml
+ >=media-libs/fontconfig-2.11
+ >=media-libs/freetype-2.4:2
+ >=net-libs/libsoup-2.51.92:2.4
+ sys-apps/util-linux
+ >=x11-libs/gdk-pixbuf-2.31.5:2
+ x11-libs/gtk+:3
+ x11-libs/pango
+ introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.3
+ dev-libs/libxslt
+ >=dev-util/gtk-doc-am-1.9
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+"
+# ${PN} superseeds appdata-tools, require dummy package until all ebuilds
+# are migrated to appstream-glib
+RDEPEND="${RDEPEND}
+ !<dev-util/appdata-tools-0.1.8-r1
+"
+PDEPEND=">=dev-util/appdata-tools-0.1.8-r1"
+
+src_configure() {
+ gnome2_src_configure \
+ --enable-builder \
+ --enable-firmware \
+ --disable-ostree \
+ --disable-rpm \
+ --disable-static \
+ --enable-dep11 \
+ --enable-man \
+ $(use_enable nls) \
+ $(use_enable introspection) \
+ --with-bashcompletiondir="$(get_bashcompdir)"
+}
diff --git a/dev-libs/cloog/cloog-0.18.1.ebuild b/dev-libs/cloog/cloog-0.18.1.ebuild
index 0076b1dc0de1..d3276d184bfa 100644
--- a/dev-libs/cloog/cloog-0.18.1.ebuild
+++ b/dev-libs/cloog/cloog-0.18.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/4"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/cloog/cloog-0.18.4.ebuild b/dev-libs/cloog/cloog-0.18.4.ebuild
index 2ed3bba10cde..58d9d225450a 100644
--- a/dev-libs/cloog/cloog-0.18.4.ebuild
+++ b/dev-libs/cloog/cloog-0.18.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://repo.or.cz/cloog.git"
inherit autotools git-2
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
fi
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index a6e04d01b4ec..1e9d7e76d259 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,6 +1,4 @@
DIST efl-1.12.2-lauch_via_logind_or_root_privilege.patch.xz 6276 SHA256 9af4e2cc5df96d25fb70f7d21381444ce988dd8f71f1a544bdc357115040897c SHA512 2011619b6382358e291ee185426716836c136e85d7fd337b73f909acd7b2ba82d65bba3e5328eac0909a55af04aa47f5e0778f6f22fb47a914c146b68ba17733 WHIRLPOOL c4085c8f3d59566c09e8a7428df6a0a2cb634f5f15f2fbf75bd98d85e6136a8469ef1ec1a692e485e1d7afc9c3c35cfe0ac428d2843eabbbcb8e516910a97ba9
DIST efl-1.12.2.tar.bz2 46808743 SHA256 aa1a6b95de3d92dda819e1245254e3d9c0d68f77d27d89afb1ae3f2244c0bf0c SHA512 8d137a4cd7a11f102b949bfc7047b3be870df6d7ede72765b005914729bf291f59d1f70b69ab7fbbd3328975068aa5ded2f10e556a7d4f7c31aedfcd0d7340e9 WHIRLPOOL 531f81000dafbd88dacd24588a3832a7c2afccf466d070d78d86641b8c0e3e64854c4f9d8dfe46ab0fb84fd6890ac6eb3e8e63d02ef58bedf88c265412f3ddf7
-DIST efl-1.13.1.tar.xz 40332672 SHA256 7e06e11678063fd74522f8fc56eb3d0235e9d7f889639e2ecff4bb663a2568d6 SHA512 29324acdeffa287f4ef9c72938cfc18ab4f8ae40a0b2ddbdeccb323361bfe10da43b65a419561e04a7c2c148b1a9bc820a71ad735fbf2988940e982b73e2b2f5 WHIRLPOOL 10639471666c7aae6283f4ff442b10fea7e5159f36207a676030a9a6961e86faee72026b1bdd4c512f0831db7a945dbf53e2e3da67defb4527d3adc72ee52756
-DIST efl-1.15.0.tar.xz 43130156 SHA256 5d9580e9ba961fc64222d54a73849c730477c209dde89cc123dde14f22d532bc SHA512 59f28ddee01b4b5f1d7117a9e4c051e7074fbd5712dae7d9f99f0a4d09d41963cc411eeec664f3e1c57e84ad6ebde9c58ddcc9931eef0468817a90fe96a1dfdd WHIRLPOOL 113a0da4c0f2a7b22bcfd12b2f83a85a999979ec97a423cd53310e9ef9d15d8f1d0db5dd035bc931116d4a79b435144366c1930ffe3f11d48fd439ca37124e36
-DIST efl-1.15.1.tar.xz 43177472 SHA256 56efb5a88328f8ed04552d6e10d7b9ff2d3c7ed9da669ae06d457b9a801554d8 SHA512 72fdb7107ec818f2c97ff88521ca505a1f4b7705a3eede7ab1c22a6d98aa1b4245dac431d95f682c49767a0621a81843c0bd1eb44a98f9fe71380a1c5a253bd7 WHIRLPOOL 19eff46b6e96ff6b80e6d27f516632e7c83b449d39a28a8d595a9871401de9230799bf0bbc926d688c626d20db83f1bab8dad4ef5f07e4086737c3f75a9082a4
DIST efl-1.15.2.tar.xz 43176564 SHA256 dd738f19f454621a7fa1fdb4c008457c170989f5f0c535edfed7b6773ae6c2a4 SHA512 bee8d7473bac73545ca02180f42614b7ae6ee0628fe8879b35bbf6809353535df8b1fa01f19ddc81d2ee1ecb5e36512b63c3be4b6b982f4efe8e410aa8ad5c56 WHIRLPOOL 380debdded1989412579cbe17d057512acb8381527c6c50606e6e936ea8bd0f1f1077861ca9afbb5661f404eb658c0dc288d991b204fbca72506d7b89f511df2
+DIST efl-1.16.1.tar.xz 43216556 SHA256 ef01be81598f03aa0e873951cf8280d963fad2b543cdbd3d749916e91825da84 SHA512 85ea5ec7a0d79ce4d9b4308cc262922b0c7b21bef8e415ea774e5e1c7916519a02f9c9526dc2d47c985c055796a81df173a78ea1cb13d2440b87b865473ee38c WHIRLPOOL 03e0398fcc09ebfcbaf5567224f028da273e225d7281553e5ff1997d52b1a3ef2c74423bc58ac2eeb12ac10d20068a6062d870cbc4fdc3b746866af72f5db0db
diff --git a/dev-libs/efl/efl-1.12.2.ebuild b/dev-libs/efl/efl-1.12.2.ebuild
index 52f65730e2e3..234fae0b0413 100644
--- a/dev-libs/efl/efl-1.12.2.ebuild
+++ b/dev-libs/efl/efl-1.12.2.ebuild
@@ -45,9 +45,9 @@ RDEPEND="
fontconfig? ( media-libs/fontconfig )
fribidi? ( dev-libs/fribidi )
gif? ( media-libs/giflib )
- glib? ( dev-libs/glib )
+ glib? ( dev-libs/glib:2= )
gnutls? ( net-libs/gnutls )
- !gnutls? ( ssl? ( dev-libs/openssl ) )
+ !gnutls? ( ssl? ( dev-libs/openssl:0= ) )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -56,7 +56,7 @@ RDEPEND="
ibus? ( app-i18n/ibus )
jpeg2k? ( media-libs/openjpeg:0 )
!oldlua? ( >=dev-lang/luajit-2.0.0 )
- oldlua? ( dev-lang/lua )
+ oldlua? ( dev-lang/lua:* )
physics? ( >=sci-physics/bullet-2.80 )
pixman? ( x11-libs/pixman )
png? ( media-libs/libpng:0= )
@@ -68,7 +68,7 @@ RDEPEND="
)
sound? ( media-libs/libsndfile )
systemd? ( sys-apps/systemd )
- tiff? ( media-libs/tiff )
+ tiff? ( media-libs/tiff:0= )
tslib? ( x11-libs/tslib )
wayland? (
>=dev-libs/wayland-1.3.0
@@ -108,7 +108,7 @@ RDEPEND="
sys-apps/dbus
>=sys-apps/util-linux-2.20.0
sys-libs/zlib
- virtual/jpeg
+ virtual/jpeg:0=
!dev-libs/ecore
!dev-libs/edbus
diff --git a/dev-libs/efl/efl-1.13.1.ebuild b/dev-libs/efl/efl-1.13.1.ebuild
deleted file mode 100644
index 1c35b3b3d169..000000000000
--- a/dev-libs/efl/efl-1.13.1.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
- EGIT_SUB_PROJECT="core"
- EGIT_URI_APPEND="${PN}"
-elif [[ *"${PV}" == *"_pre"* ]] ; then
- MY_P=${P%%_*}
- SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
- EKEY_STATE="snap"
-else
- SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
- EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 valgrind wayland webp X xim xine xpm"
-
-REQUIRED_USE="
- pulseaudio? ( sound )
- opengl? ( || ( X sdl wayland ) )
- gles? ( || ( X wayland ) )
- gles? ( !sdl )
- gles? ( egl )
- sdl? ( opengl )
- wayland? ( egl !opengl gles )
- xim? ( X )
-"
-
-RDEPEND="
- drm? (
- >=dev-libs/libinput-0.8
- media-libs/mesa[gbm]
- >=x11-libs/libdrm-2.4
- >=x11-libs/libxkbcommon-0.3.0
- )
- fontconfig? ( media-libs/fontconfig )
- fribidi? ( dev-libs/fribidi )
- gif? ( media-libs/giflib )
- glib? ( dev-libs/glib:2 )
- gnutls? ( net-libs/gnutls )
- !gnutls? ( ssl? ( dev-libs/openssl:0 ) )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- harfbuzz? ( media-libs/harfbuzz )
- ibus? ( app-i18n/ibus )
- jpeg2k? ( media-libs/openjpeg:0 )
- !oldlua? ( >=dev-lang/luajit-2.0.0 )
- oldlua? ( dev-lang/lua )
- physics? ( >=sci-physics/bullet-2.80 )
- pixman? ( x11-libs/pixman )
- png? ( media-libs/libpng:0= )
- pulseaudio? ( media-sound/pulseaudio )
- scim? ( app-i18n/scim )
- sdl? (
- media-libs/libsdl2
- virtual/opengl
- )
- sound? ( media-libs/libsndfile )
- systemd? ( sys-apps/systemd )
- tiff? ( media-libs/tiff:0 )
- tslib? ( x11-libs/tslib )
- valgrind? ( dev-util/valgrind )
- wayland? (
- >=dev-libs/wayland-1.3.0
- >=x11-libs/libxkbcommon-0.3.1
- media-libs/mesa[gles2,wayland]
- )
- webp? ( media-libs/libwebp )
- X? (
- x11-libs/libXcursor
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXp
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libXScrnSaver
-
- opengl? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
-
- gles? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
- )
- xine? ( >=media-libs/xine-lib-1.1.1 )
- xpm? ( x11-libs/libXpm )
-
- sys-apps/dbus
- >=sys-apps/util-linux-2.20.0
- sys-libs/zlib
- virtual/jpeg
-
- !dev-libs/ecore
- !dev-libs/edbus
- !dev-libs/eet
- !dev-libs/eeze
- !dev-libs/efreet
- !dev-libs/eina
- !dev-libs/eio
- !dev-libs/embryo
- !dev-libs/eobj
- !dev-libs/ephysics
- !media-libs/edje
- !media-libs/emotion
- !media-libs/ethumb
- !media-libs/evas
-"
-#external lz4 support currently broken because of unstable ABI/API
-# app-arch/lz4
-
-#soft blockers added above for binpkg users
-#hard blocks are needed for building
-CORE_EFL_CONFLICTS="
- !!dev-libs/ecore
- !!dev-libs/edbus
- !!dev-libs/eet
- !!dev-libs/eeze
- !!dev-libs/efreet
- !!dev-libs/eina
- !!dev-libs/eio
- !!dev-libs/embryo
- !!dev-libs/eobj
- !!dev-libs/ephysics
- !!media-libs/edje
- !!media-libs/emotion
- !!media-libs/ethumb
- !!media-libs/evas
-"
-
-DEPEND="
- ${CORE_EFL_CONFLICTS}
-
- ${RDEPEND}
- doc? ( app-doc/doxygen )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- if use ssl && use gnutls ; then
- einfo "You enabled both USEssl and USE=gnutls, but only one can be used;"
- einfo "gnutls has been selected for you."
- fi
- if use opengl && use gles ; then
- einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
- einfo "opengl has been selected for you."
- fi
-
- E_ECONF=(
- --with-profile=$(usex debug debug release)
- --with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
- --with-x11=$(usex X xlib none)
- $(use_with X x)
- --with-opengl=$(usex opengl full $(usex gles es none))
- --with-glib=$(usex glib)
- --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba
-
- $(use_enable bmp image-loader-bmp)
- $(use_enable bmp image-loader-wbmp)
- $(use_enable drm)
- $(use_enable doc)
- $(use_enable eet image-loader-eet)
- $(use_enable egl)
- $(use_enable fbcon fb)
- $(use_enable fontconfig)
- $(use_enable fribidi)
- $(use_enable gif image-loader-gif)
- $(use_enable gstreamer gstreamer1)
- $(use_enable harfbuzz)
- $(use_enable ico image-loader-ico)
- $(use_enable ibus)
- $(use_enable jpeg2k image-loader-jp2k)
- $(use_enable neon)
- $(use_enable nls)
- $(use_enable oldlua lua-old)
- $(use_enable physics)
- $(use_enable pixman)
- $(use_enable pixman pixman-font)
- $(use_enable pixman pixman-rect)
- $(use_enable pixman pixman-line)
- $(use_enable pixman pixman-poly)
- $(use_enable pixman pixman-image)
- $(use_enable pixman pixman-image-scale-sample)
- $(use_enable png image-loader-png)
- $(use_enable ppm image-loader-pmaps)
- $(use_enable psd image-loader-psd)
- $(use_enable pulseaudio)
- $(use_enable scim)
- $(use_enable sdl)
- $(use_enable sound audio)
- $(use_enable systemd)
- $(use_enable tga image-loader-tga)
- $(use_enable tiff image-loader-tiff)
- $(use_enable tslib)
- $(use_enable v4l2)
- $(use_enable valgrind)
- $(use_enable wayland)
- $(use_enable webp image-loader-webp)
- $(use_enable xim)
- $(use_enable xine)
- $(use_enable xpm image-loader-xpm)
- --enable-cserve
- --enable-gui
- --enable-image-loader-generic
- --enable-image-loader-jpeg
-
- --disable-tizen
- --disable-gesture
- --disable-gstreamer
- --enable-xinput2
- --disable-xinput22
- --disable-multisense
- --enable-libmount
-
- # external lz4 support currently broken because of unstable ABI/API
- #--enable-liblz4
- )
-
- enlightenment_src_configure
-}
-
-src_compile() {
- ewarn "If the following compile phase fails with a message including"
- ewarn "lib/edje/.libs/libedje.so: undefined reference to 'eet_mmap'"
- ewarn "then most likely the @preserved-rebuild feature of portage"
- ewarn "preserved the 1.7 libraries, which cause the build failure."
- ewarn "As a workaround, either remove those libs manually or"
- ewarn "uninstall all packages still using those old libs with"
- ewarn "emerge -aC @preserved-rebuild"
-
- enlightenment_src_compile
-}
-
-src_install() {
- MAKEOPTS+=" -j1"
-
- enlightenment_src_install
-}
diff --git a/dev-libs/efl/efl-1.15.0.ebuild b/dev-libs/efl/efl-1.15.0.ebuild
deleted file mode 100644
index 2a7cf4ead6da..000000000000
--- a/dev-libs/efl/efl-1.15.0.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
- EGIT_SUB_PROJECT="core"
- EGIT_URI_APPEND="${PN}"
-elif [[ *"${PV}" == *"_pre"* ]] ; then
- MY_P=${P%%_*}
- SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
- EKEY_STATE="snap"
-else
- SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
- EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 valgrind wayland webp X xim xine xpm"
-
-REQUIRED_USE="
- pulseaudio? ( sound )
- opengl? ( || ( X sdl wayland ) )
- gles? ( || ( X wayland ) )
- gles? ( !sdl )
- gles? ( egl )
- sdl? ( opengl )
- wayland? ( egl !opengl gles )
- xim? ( X )
-"
-
-RDEPEND="
- drm? (
- >=dev-libs/libinput-0.8
- media-libs/mesa[gbm]
- >=x11-libs/libdrm-2.4
- >=x11-libs/libxkbcommon-0.3.0
- )
- fontconfig? ( media-libs/fontconfig )
- fribidi? ( dev-libs/fribidi )
- gif? ( media-libs/giflib )
- glib? ( dev-libs/glib:2 )
- gnutls? ( net-libs/gnutls )
- !gnutls? ( ssl? ( dev-libs/openssl:0 ) )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- harfbuzz? ( media-libs/harfbuzz )
- ibus? ( app-i18n/ibus )
- jpeg2k? ( media-libs/openjpeg:0 )
- !oldlua? ( >=dev-lang/luajit-2.0.0 )
- oldlua? ( dev-lang/lua )
- physics? ( >=sci-physics/bullet-2.80 )
- pixman? ( x11-libs/pixman )
- png? ( media-libs/libpng:0= )
- pulseaudio? ( media-sound/pulseaudio )
- scim? ( app-i18n/scim )
- sdl? (
- media-libs/libsdl2
- virtual/opengl
- )
- sound? ( media-libs/libsndfile )
- systemd? ( sys-apps/systemd )
- tiff? ( media-libs/tiff:0 )
- tslib? ( x11-libs/tslib )
- valgrind? ( dev-util/valgrind )
- wayland? (
- >=dev-libs/wayland-1.8.0
- >=x11-libs/libxkbcommon-0.3.1
- media-libs/mesa[gles2,wayland]
- )
- webp? ( media-libs/libwebp )
- X? (
- x11-libs/libXcursor
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXp
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libXScrnSaver
-
- opengl? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
-
- gles? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
- )
- xine? ( >=media-libs/xine-lib-1.1.1 )
- xpm? ( x11-libs/libXpm )
-
- sys-apps/dbus
- >=sys-apps/util-linux-2.20.0
- sys-libs/zlib
- virtual/jpeg
-
- !dev-libs/ecore
- !dev-libs/edbus
- !dev-libs/eet
- !dev-libs/eeze
- !dev-libs/efreet
- !dev-libs/eina
- !dev-libs/eio
- !dev-libs/embryo
- !dev-libs/eobj
- !dev-libs/ephysics
- !media-libs/edje
- !media-libs/emotion
- !media-libs/ethumb
- !media-libs/evas
-"
-#external lz4 support currently broken because of unstable ABI/API
-# app-arch/lz4
-
-#soft blockers added above for binpkg users
-#hard blocks are needed for building
-CORE_EFL_CONFLICTS="
- !!dev-libs/ecore
- !!dev-libs/edbus
- !!dev-libs/eet
- !!dev-libs/eeze
- !!dev-libs/efreet
- !!dev-libs/eina
- !!dev-libs/eio
- !!dev-libs/embryo
- !!dev-libs/eobj
- !!dev-libs/ephysics
- !!media-libs/edje
- !!media-libs/emotion
- !!media-libs/ethumb
- !!media-libs/evas
-"
-
-DEPEND="
- ${CORE_EFL_CONFLICTS}
-
- ${RDEPEND}
- doc? ( app-doc/doxygen )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # This is a hack of the upstream fix. Drop with next release. #551882
- sed -i \
- -e 's:SDL/:SDL2/:g' \
- configure \
- src/modules/evas/engines/gl_common/evas_gl_common.h \
- src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h || die
-
- enlightenment_src_prepare
-}
-
-src_configure() {
- if use ssl && use gnutls ; then
- einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
- einfo "gnutls has been selected for you."
- fi
- if use opengl && use gles ; then
- einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
- einfo "opengl has been selected for you."
- fi
-
- E_ECONF=(
- --with-profile=$(usex debug debug release)
- --with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
- --with-x11=$(usex X xlib none)
- $(use_with X x)
- --with-opengl=$(usex opengl full $(usex gles es none))
- --with-glib=$(usex glib)
- --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba
-
- $(use_enable bmp image-loader-bmp)
- $(use_enable bmp image-loader-wbmp)
- $(use_enable drm)
- $(use_enable doc)
- $(use_enable eet image-loader-eet)
- $(use_enable egl)
- $(use_enable fbcon fb)
- $(use_enable fontconfig)
- $(use_enable fribidi)
- $(use_enable gif image-loader-gif)
- $(use_enable gstreamer gstreamer1)
- $(use_enable harfbuzz)
- $(use_enable ico image-loader-ico)
- $(use_enable ibus)
- $(use_enable jpeg2k image-loader-jp2k)
- $(use_enable neon)
- $(use_enable nls)
- $(use_enable oldlua lua-old)
- $(use_enable physics)
- $(use_enable pixman)
- $(use_enable pixman pixman-font)
- $(use_enable pixman pixman-rect)
- $(use_enable pixman pixman-line)
- $(use_enable pixman pixman-poly)
- $(use_enable pixman pixman-image)
- $(use_enable pixman pixman-image-scale-sample)
- $(use_enable png image-loader-png)
- $(use_enable ppm image-loader-pmaps)
- $(use_enable psd image-loader-psd)
- $(use_enable pulseaudio)
- $(use_enable scim)
- $(use_enable sdl)
- $(use_enable sound audio)
- $(use_enable systemd)
- $(use_enable tga image-loader-tga)
- $(use_enable tiff image-loader-tiff)
- $(use_enable tslib)
- $(use_enable v4l2)
- $(use_enable valgrind)
- $(use_enable wayland)
- $(use_enable webp image-loader-webp)
- $(use_enable xim)
- $(use_enable xine)
- $(use_enable xpm image-loader-xpm)
- --enable-cserve
- --enable-image-loader-generic
- --enable-image-loader-jpeg
-
- --disable-tizen
- --disable-gesture
- --disable-gstreamer
- --enable-xinput2
- --disable-xinput22
- --disable-multisense
- --enable-libmount
-
- # external lz4 support currently broken because of unstable ABI/API
- #--enable-liblz4
- )
-
- enlightenment_src_configure
-}
-
-src_install() {
- MAKEOPTS+=" -j1"
-
- enlightenment_src_install
-}
diff --git a/dev-libs/efl/efl-1.15.1.ebuild b/dev-libs/efl/efl-1.15.1.ebuild
deleted file mode 100644
index 2a7cf4ead6da..000000000000
--- a/dev-libs/efl/efl-1.15.1.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
- EGIT_SUB_PROJECT="core"
- EGIT_URI_APPEND="${PN}"
-elif [[ *"${PV}" == *"_pre"* ]] ; then
- MY_P=${P%%_*}
- SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
- EKEY_STATE="snap"
-else
- SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
- EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 valgrind wayland webp X xim xine xpm"
-
-REQUIRED_USE="
- pulseaudio? ( sound )
- opengl? ( || ( X sdl wayland ) )
- gles? ( || ( X wayland ) )
- gles? ( !sdl )
- gles? ( egl )
- sdl? ( opengl )
- wayland? ( egl !opengl gles )
- xim? ( X )
-"
-
-RDEPEND="
- drm? (
- >=dev-libs/libinput-0.8
- media-libs/mesa[gbm]
- >=x11-libs/libdrm-2.4
- >=x11-libs/libxkbcommon-0.3.0
- )
- fontconfig? ( media-libs/fontconfig )
- fribidi? ( dev-libs/fribidi )
- gif? ( media-libs/giflib )
- glib? ( dev-libs/glib:2 )
- gnutls? ( net-libs/gnutls )
- !gnutls? ( ssl? ( dev-libs/openssl:0 ) )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- harfbuzz? ( media-libs/harfbuzz )
- ibus? ( app-i18n/ibus )
- jpeg2k? ( media-libs/openjpeg:0 )
- !oldlua? ( >=dev-lang/luajit-2.0.0 )
- oldlua? ( dev-lang/lua )
- physics? ( >=sci-physics/bullet-2.80 )
- pixman? ( x11-libs/pixman )
- png? ( media-libs/libpng:0= )
- pulseaudio? ( media-sound/pulseaudio )
- scim? ( app-i18n/scim )
- sdl? (
- media-libs/libsdl2
- virtual/opengl
- )
- sound? ( media-libs/libsndfile )
- systemd? ( sys-apps/systemd )
- tiff? ( media-libs/tiff:0 )
- tslib? ( x11-libs/tslib )
- valgrind? ( dev-util/valgrind )
- wayland? (
- >=dev-libs/wayland-1.8.0
- >=x11-libs/libxkbcommon-0.3.1
- media-libs/mesa[gles2,wayland]
- )
- webp? ( media-libs/libwebp )
- X? (
- x11-libs/libXcursor
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXp
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libXScrnSaver
-
- opengl? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
-
- gles? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
- )
- xine? ( >=media-libs/xine-lib-1.1.1 )
- xpm? ( x11-libs/libXpm )
-
- sys-apps/dbus
- >=sys-apps/util-linux-2.20.0
- sys-libs/zlib
- virtual/jpeg
-
- !dev-libs/ecore
- !dev-libs/edbus
- !dev-libs/eet
- !dev-libs/eeze
- !dev-libs/efreet
- !dev-libs/eina
- !dev-libs/eio
- !dev-libs/embryo
- !dev-libs/eobj
- !dev-libs/ephysics
- !media-libs/edje
- !media-libs/emotion
- !media-libs/ethumb
- !media-libs/evas
-"
-#external lz4 support currently broken because of unstable ABI/API
-# app-arch/lz4
-
-#soft blockers added above for binpkg users
-#hard blocks are needed for building
-CORE_EFL_CONFLICTS="
- !!dev-libs/ecore
- !!dev-libs/edbus
- !!dev-libs/eet
- !!dev-libs/eeze
- !!dev-libs/efreet
- !!dev-libs/eina
- !!dev-libs/eio
- !!dev-libs/embryo
- !!dev-libs/eobj
- !!dev-libs/ephysics
- !!media-libs/edje
- !!media-libs/emotion
- !!media-libs/ethumb
- !!media-libs/evas
-"
-
-DEPEND="
- ${CORE_EFL_CONFLICTS}
-
- ${RDEPEND}
- doc? ( app-doc/doxygen )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # This is a hack of the upstream fix. Drop with next release. #551882
- sed -i \
- -e 's:SDL/:SDL2/:g' \
- configure \
- src/modules/evas/engines/gl_common/evas_gl_common.h \
- src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h || die
-
- enlightenment_src_prepare
-}
-
-src_configure() {
- if use ssl && use gnutls ; then
- einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
- einfo "gnutls has been selected for you."
- fi
- if use opengl && use gles ; then
- einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
- einfo "opengl has been selected for you."
- fi
-
- E_ECONF=(
- --with-profile=$(usex debug debug release)
- --with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
- --with-x11=$(usex X xlib none)
- $(use_with X x)
- --with-opengl=$(usex opengl full $(usex gles es none))
- --with-glib=$(usex glib)
- --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba
-
- $(use_enable bmp image-loader-bmp)
- $(use_enable bmp image-loader-wbmp)
- $(use_enable drm)
- $(use_enable doc)
- $(use_enable eet image-loader-eet)
- $(use_enable egl)
- $(use_enable fbcon fb)
- $(use_enable fontconfig)
- $(use_enable fribidi)
- $(use_enable gif image-loader-gif)
- $(use_enable gstreamer gstreamer1)
- $(use_enable harfbuzz)
- $(use_enable ico image-loader-ico)
- $(use_enable ibus)
- $(use_enable jpeg2k image-loader-jp2k)
- $(use_enable neon)
- $(use_enable nls)
- $(use_enable oldlua lua-old)
- $(use_enable physics)
- $(use_enable pixman)
- $(use_enable pixman pixman-font)
- $(use_enable pixman pixman-rect)
- $(use_enable pixman pixman-line)
- $(use_enable pixman pixman-poly)
- $(use_enable pixman pixman-image)
- $(use_enable pixman pixman-image-scale-sample)
- $(use_enable png image-loader-png)
- $(use_enable ppm image-loader-pmaps)
- $(use_enable psd image-loader-psd)
- $(use_enable pulseaudio)
- $(use_enable scim)
- $(use_enable sdl)
- $(use_enable sound audio)
- $(use_enable systemd)
- $(use_enable tga image-loader-tga)
- $(use_enable tiff image-loader-tiff)
- $(use_enable tslib)
- $(use_enable v4l2)
- $(use_enable valgrind)
- $(use_enable wayland)
- $(use_enable webp image-loader-webp)
- $(use_enable xim)
- $(use_enable xine)
- $(use_enable xpm image-loader-xpm)
- --enable-cserve
- --enable-image-loader-generic
- --enable-image-loader-jpeg
-
- --disable-tizen
- --disable-gesture
- --disable-gstreamer
- --enable-xinput2
- --disable-xinput22
- --disable-multisense
- --enable-libmount
-
- # external lz4 support currently broken because of unstable ABI/API
- #--enable-liblz4
- )
-
- enlightenment_src_configure
-}
-
-src_install() {
- MAKEOPTS+=" -j1"
-
- enlightenment_src_install
-}
diff --git a/dev-libs/efl/efl-1.15.2.ebuild b/dev-libs/efl/efl-1.15.2.ebuild
index 806219a27a0d..08d9bb719a89 100644
--- a/dev-libs/efl/efl-1.15.2.ebuild
+++ b/dev-libs/efl/efl-1.15.2.ebuild
@@ -15,7 +15,7 @@ elif [[ *"${PV}" == *"_pre"* ]] ; then
EKEY_STATE="snap"
else
SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
- EKEY_STATE="snap"
+ EKEY_STATE="release"
fi
inherit enlightenment pax-utils
@@ -50,7 +50,7 @@ RDEPEND="
gnutls? ( net-libs/gnutls )
!gnutls? (
ssl? (
- !libressl? ( dev-libs/openssl:0 )
+ !libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
)
)
@@ -62,7 +62,7 @@ RDEPEND="
ibus? ( app-i18n/ibus )
jpeg2k? ( media-libs/openjpeg:0 )
!oldlua? ( >=dev-lang/luajit-2.0.0 )
- oldlua? ( dev-lang/lua )
+ oldlua? ( dev-lang/lua:* )
physics? ( >=sci-physics/bullet-2.80 )
pixman? ( x11-libs/pixman )
png? ( media-libs/libpng:0= )
@@ -74,7 +74,7 @@ RDEPEND="
)
sound? ( media-libs/libsndfile )
systemd? ( sys-apps/systemd )
- tiff? ( media-libs/tiff:0 )
+ tiff? ( media-libs/tiff:0= )
tslib? ( x11-libs/tslib )
valgrind? ( dev-util/valgrind )
wayland? (
@@ -115,7 +115,7 @@ RDEPEND="
sys-apps/dbus
>=sys-apps/util-linux-2.20.0
sys-libs/zlib
- virtual/jpeg
+ virtual/jpeg:0=
!dev-libs/ecore
!dev-libs/edbus
diff --git a/dev-libs/efl/efl-1.15.1-r1.ebuild b/dev-libs/efl/efl-1.16.1.ebuild
index d4c401b94bca..10fab6deb1a2 100644
--- a/dev-libs/efl/efl-1.15.1-r1.ebuild
+++ b/dev-libs/efl/efl-1.16.1.ebuild
@@ -18,7 +18,7 @@ else
EKEY_STATE="snap"
fi
-inherit enlightenment
+inherit enlightenment pax-utils
DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
@@ -50,7 +50,7 @@ RDEPEND="
gnutls? ( net-libs/gnutls )
!gnutls? (
ssl? (
- !libressl? ( dev-libs/openssl:0 )
+ !libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
)
)
@@ -62,7 +62,7 @@ RDEPEND="
ibus? ( app-i18n/ibus )
jpeg2k? ( media-libs/openjpeg:0 )
!oldlua? ( >=dev-lang/luajit-2.0.0 )
- oldlua? ( dev-lang/lua )
+ oldlua? ( dev-lang/lua:* )
physics? ( >=sci-physics/bullet-2.80 )
pixman? ( x11-libs/pixman )
png? ( media-libs/libpng:0= )
@@ -74,7 +74,7 @@ RDEPEND="
)
sound? ( media-libs/libsndfile )
systemd? ( sys-apps/systemd )
- tiff? ( media-libs/tiff:0 )
+ tiff? ( media-libs/tiff:0= )
tslib? ( x11-libs/tslib )
valgrind? ( dev-util/valgrind )
wayland? (
@@ -115,7 +115,7 @@ RDEPEND="
sys-apps/dbus
>=sys-apps/util-linux-2.20.0
sys-libs/zlib
- virtual/jpeg
+ virtual/jpeg:0=
!dev-libs/ecore
!dev-libs/edbus
@@ -164,14 +164,14 @@ DEPEND="
S=${WORKDIR}/${MY_P}
src_prepare() {
- # This is a hack of the upstream fix. Drop with next release. #551882
- sed -i \
- -e 's:SDL/:SDL2/:g' \
- configure \
- src/modules/evas/engines/gl_common/evas_gl_common.h \
- src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h || die
-
enlightenment_src_prepare
+
+ # Remove stupid sleep command.
+ # Also back out gnu make hack that causes regen of Makefiles.
+ sed -i \
+ -e '/sleep 10/d' \
+ -e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
+ configure || die
}
src_configure() {
@@ -256,6 +256,18 @@ src_configure() {
enlightenment_src_configure
}
+src_compile() {
+ if host-is-pax && ! use oldlua ; then
+ # We need to build the lua code first so we can pax-mark it. #547076
+ local target='_e_built_sources_target_gogogo_'
+ printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
+ emake -C src "${target}"
+ emake -C src bin/elua/elua
+ pax-mark m src/bin/elua/.libs/elua
+ fi
+ enlightenment_src_compile
+}
+
src_install() {
MAKEOPTS+=" -j1"
diff --git a/dev-libs/efl/efl-9999.ebuild b/dev-libs/efl/efl-9999.ebuild
index fcf0d81744ec..3972324ef27e 100644
--- a/dev-libs/efl/efl-9999.ebuild
+++ b/dev-libs/efl/efl-9999.ebuild
@@ -18,7 +18,7 @@ else
EKEY_STATE="snap"
fi
-inherit enlightenment
+inherit enlightenment pax-utils
DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
@@ -50,7 +50,7 @@ RDEPEND="
gnutls? ( net-libs/gnutls )
!gnutls? (
ssl? (
- !libressl? ( dev-libs/openssl:0 )
+ !libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
)
)
@@ -62,7 +62,7 @@ RDEPEND="
ibus? ( app-i18n/ibus )
jpeg2k? ( media-libs/openjpeg:0 )
!oldlua? ( >=dev-lang/luajit-2.0.0 )
- oldlua? ( dev-lang/lua )
+ oldlua? ( dev-lang/lua:* )
physics? ( >=sci-physics/bullet-2.80 )
pixman? ( x11-libs/pixman )
png? ( media-libs/libpng:0= )
@@ -74,7 +74,7 @@ RDEPEND="
)
sound? ( media-libs/libsndfile )
systemd? ( sys-apps/systemd )
- tiff? ( media-libs/tiff:0 )
+ tiff? ( media-libs/tiff:0= )
tslib? ( x11-libs/tslib )
valgrind? ( dev-util/valgrind )
wayland? (
@@ -115,7 +115,7 @@ RDEPEND="
sys-apps/dbus
>=sys-apps/util-linux-2.20.0
sys-libs/zlib
- virtual/jpeg
+ virtual/jpeg:0=
!dev-libs/ecore
!dev-libs/edbus
@@ -163,6 +163,19 @@ DEPEND="
S=${WORKDIR}/${MY_P}
+src_prepare() {
+ enlightenment_src_prepare
+
+ # Remove stupid sleep command.
+ # Also back out gnu make hack that causes regen of Makefiles.
+ # Delete var setting that causes the build to abort.
+ sed -i \
+ -e '/sleep 10/d' \
+ -e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
+ -e '/BARF_OK=/s:=.*:=:' \
+ configure || die
+}
+
src_configure() {
if use ssl && use gnutls ; then
einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
@@ -180,7 +193,7 @@ src_configure() {
$(use_with X x)
--with-opengl=$(usex opengl full $(usex gles es none))
--with-glib=$(usex glib)
- --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba
+ --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
$(use_enable bmp image-loader-bmp)
$(use_enable bmp image-loader-wbmp)
@@ -245,6 +258,18 @@ src_configure() {
enlightenment_src_configure
}
+src_compile() {
+ if host-is-pax && ! use oldlua ; then
+ # We need to build the lua code first so we can pax-mark it. #547076
+ local target='_e_built_sources_target_gogogo_'
+ printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
+ emake -C src "${target}"
+ emake -C src bin/elua/elua
+ pax-mark m src/bin/elua/.libs/elua
+ fi
+ enlightenment_src_compile
+}
+
src_install() {
MAKEOPTS+=" -j1"
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 43ec42a551ee..d5d51f050352 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>enlightenment</herd>
-<use>
- <flag name="bmp">Enable WBMP image loader.</flag>
- <flag name="drm">Enable DRM engine.</flag>
- <flag name="eet">Enable Eet image loader.</flag>
- <flag name="egl">Enable EGL rendering.</flag>
- <flag name="fribidi">Enable bidirectional text support.</flag>
- <flag name="gles">Enable the OpenGL ES GL implementation.</flag>
- <flag name="glib">Enable <pkg>dev-libs/glib</pkg> support.</flag>
- <flag name="harfbuzz">Enable complex text shaping and layout support.</flag>
- <flag name="ibus">Enable Intelligent Input Bus.</flag>
- <flag name="ico">Enable Ico image loader.</flag>
- <flag name="oldlua">USE <pkg>dev-lang/lua</pkg> instead of <pkg>dev-lang/luajit</pkg></flag>
- <flag name="physics">Enable Bullet physics effects and support.</flag>
- <flag name="pixman">Enable PixMan for software rendering.</flag>
- <flag name="ppm">Enable PMAPS image loader.</flag>
- <flag name="psd">Enable PSD image loader.</flag>
- <flag name="scim">Enable Smart Common Input Method.</flag>
- <flag name="tga">Enable Tga image loader.</flag>
- <flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events.</flag>
- <flag name="v4l2">Enable Video4Linux2 support.</flag>
- <flag name='valgrind'>Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
- <flag name="webp">Enable WebP image loader.</flag>
- <flag name="xim">Enable X Input Method.</flag>
-</use>
+ <herd>enlightenment</herd>
+ <use>
+ <flag name="bmp">Enable WBMP image loader.</flag>
+ <flag name="drm">Enable DRM engine.</flag>
+ <flag name="eet">Enable Eet image loader.</flag>
+ <flag name="egl">Enable EGL rendering.</flag>
+ <flag name="fribidi">Enable bidirectional text support.</flag>
+ <flag name="gles">Enable the OpenGL ES GL implementation.</flag>
+ <flag name="glib">Enable <pkg>dev-libs/glib</pkg> support.</flag>
+ <flag name="harfbuzz">Enable complex text shaping and layout support.</flag>
+ <flag name="ibus">Enable Intelligent Input Bus.</flag>
+ <flag name="ico">Enable Ico image loader.</flag>
+ <flag name="oldlua">USE <pkg>dev-lang/lua</pkg> instead of <pkg>dev-lang/luajit</pkg></flag>
+ <flag name="physics">Enable Bullet physics effects and support.</flag>
+ <flag name="pixman">Enable PixMan for software rendering.</flag>
+ <flag name="ppm">Enable PMAPS image loader.</flag>
+ <flag name="psd">Enable PSD image loader.</flag>
+ <flag name="scim">Enable Smart Common Input Method.</flag>
+ <flag name="tga">Enable Tga image loader.</flag>
+ <flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events.</flag>
+ <flag name="v4l2">Enable Video4Linux2 support.</flag>
+ <flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
+ <flag name="webp">Enable WebP image loader.</flag>
+ <flag name="xim">Enable X Input Method.</flag>
+ </use>
</pkgmetadata>
diff --git a/dev-libs/glib/glib-1.2.10-r6.ebuild b/dev-libs/glib/glib-1.2.10-r6.ebuild
index 7233d4f7c3ef..d82e55da2385 100644
--- a/dev-libs/glib/glib-1.2.10-r6.ebuild
+++ b/dev-libs/glib/glib-1.2.10-r6.ebuild
@@ -57,6 +57,7 @@ multilib_src_configure() {
# this package doesn't contain any significant binaries, build the
# whole thing with -fPIC (23 Apr 2004 agriffis)
append-flags -fPIC
+ append-cflags -std=gnu89
ECONF_SOURCE="${S}" \
gnome2_src_configure \
diff --git a/dev-libs/gom/Manifest b/dev-libs/gom/Manifest
index 8671591f7110..823a38ad1bb3 100644
--- a/dev-libs/gom/Manifest
+++ b/dev-libs/gom/Manifest
@@ -1,2 +1,3 @@
DIST gom-0.3.0.tar.xz 382924 SHA256 352a8bee8dc47e7bd5d08af35b0d67e1f3c54bca23a058a00004cb56ede6f4fd SHA512 ab26dbbb4cbeaa637ca835eff96caf647428505129652d0229808951b3ba5ec2225e2d37054a6b61ccad59954fda7d95bb04d61f75c1ec1ebbc1abea7025b627 WHIRLPOOL 98b7fc358635e17c1c878f2439f667cecd9304a8b5d10023d2e084d01e2950201404156add20da5e05f2a1e09bd42811a31f0765fa9e196e58d4c09496ba7664
DIST gom-0.3.1.tar.xz 385836 SHA256 7951eb46ee784cbdbee6e3f2da084ffbf776c11ca1c904404b05feafe37e38f5 SHA512 7596b7be0de6f10ef1fbe8a278d917c07ecc714e9af24f2b61a7d871c6a1b1cf19ea92d5b4fbf7802c9c097dc2ae7a65ac47b8ca8f6689b49a3e4930cff6d54c WHIRLPOOL 9fa3a42411e3892a3648f31614462d43b5a4f52a166e5edd80e97741427a9444c39d2200a4ce1ac3e1e87d3b3e974b9dad6f11ee252ba3d10fa1d63b00a09bde
+DIST gom-0.3.2.tar.xz 410300 SHA256 bce8f0f94af6ff7847b853580ba6baebbab8ae531cedb0c78a5c473f39c758fd SHA512 a7bfb263e5ff6f89768d8fcbdcc949d4ec9b82ecbb80952becd357a3d5781a60e52a327e865e39e46d542b2a2c5e5c861e5302d7ae3c3a2258d3c3f698263675 WHIRLPOOL b676f4117c66fbe47b4216b3f5e4259e0569bcf355ca2f474498c29218d42093ac66e3afb0eb1cd946837e813f4e7c3ff981e99a726458150c00c89653d06559
diff --git a/dev-libs/gom/gom-0.3.2.ebuild b/dev-libs/gom/gom-0.3.2.ebuild
new file mode 100644
index 000000000000..5c7c94b4284e
--- /dev/null
+++ b/dev-libs/gom/gom-0.3.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="GObject to SQLite object mapper library"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gom"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection python"
+REQUIRED_IUSE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
+
+RDEPEND="
+ >=dev-db/sqlite-3.7:3
+ >=dev-libs/glib-2.36:2
+ introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygobject-3.16:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.14
+ >=dev-util/intltool-0.40.0
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-libs/gdk-pixbuf:2
+"
+# TODO: make gdk-pixbuf properly optional with USE=test
+
+pkg_setup() {
+ use python && python_setup
+}
+
+src_prepare() {
+ gnome2_src_prepare
+
+ use python && python_copy_sources
+}
+
+src_configure() {
+ # glibtest is a relic from AM_PATH_GLIB macro
+ local myconf=(
+ --disable-static
+ --disable-glibtest
+ )
+
+ gnome2_src_configure \
+ ${myconf[@]} \
+ --disable-python \
+ $(use_enable introspection) \
+
+ if use python ; then
+ python_foreach_impl run_in_build_dir \
+ gnome2_src_configure \
+ ${myconf[@]} \
+ --enable-python
+ fi
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use python ; then
+ docinto examples
+ dodoc examples/*.py
+
+ python_foreach_impl run_in_build_dir \
+ emake DESTDIR="${D}" install-overridesPYTHON
+ fi
+}
diff --git a/dev-libs/guiloader-c++/guiloader-c++-2.21.0-r1.ebuild b/dev-libs/guiloader-c++/guiloader-c++-2.21.0-r1.ebuild
index 73c2e44f84dd..2bf4a545367d 100644
--- a/dev-libs/guiloader-c++/guiloader-c++-2.21.0-r1.ebuild
+++ b/dev-libs/guiloader-c++/guiloader-c++-2.21.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://nothing-personal.googlecode.com/files/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="nls"
LANGS="ru"
diff --git a/dev-libs/guiloader-c++/guiloader-c++-2.21.0.ebuild b/dev-libs/guiloader-c++/guiloader-c++-2.21.0.ebuild
deleted file mode 100644
index 7a33e373ef19..000000000000
--- a/dev-libs/guiloader-c++/guiloader-c++-2.21.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-DESCRIPTION="C++ binding to GuiLoader library"
-HOMEPAGE="http://www.crowdesigner.org"
-SRC_URI="https://nothing-personal.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-LANGS="ru"
-
-RDEPEND=">=dev-libs/guiloader-2.21
- >=dev-cpp/gtkmm-2.22:2.4
- >=dev-cpp/glibmm-2.24:2"
-DEPEND="${RDEPEND}
- dev-libs/boost
- virtual/pkgconfig
- nls? ( >=sys-devel/gettext-0.18 )"
-
-for x in ${LANGS}; do
- IUSE="${IUSE} linguas_${x}"
-done
-
-src_configure() {
- econf $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc doc/{authors.txt,news.en.txt,readme.en.txt} || die
-}
diff --git a/dev-libs/isl/isl-0.12.2.ebuild b/dev-libs/isl/isl-0.12.2.ebuild
index cab71a2a1a73..85432505f124 100644
--- a/dev-libs/isl/isl-0.12.2.ebuild
+++ b/dev-libs/isl/isl-0.12.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0/10"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.15.ebuild b/dev-libs/isl/isl-0.15.ebuild
index da9172bd5e42..cc2f08c7c3a2 100644
--- a/dev-libs/isl/isl-0.15.ebuild
+++ b/dev-libs/isl/isl-0.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libbsd/libbsd-0.8.0.ebuild b/dev-libs/libbsd/libbsd-0.8.0.ebuild
index ce72644d5283..87bee88d10db 100644
--- a/dev-libs/libbsd/libbsd-0.8.0.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"
LICENSE="BSD BSD-2 BSD-4 ISC"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="static-libs"
DOCS="ChangeLog README TODO"
diff --git a/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild
index 72b4836cb1dd..ece7eba20b48 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
LICENSE="LGPL-2.1 LGPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug gtk gtk3 +introspection"
RDEPEND="
diff --git a/dev-libs/libgudev/libgudev-230.ebuild b/dev-libs/libgudev/libgudev-230.ebuild
index 7c9531940149..973af224f993 100644
--- a/dev-libs/libgudev/libgudev-230.ebuild
+++ b/dev-libs/libgudev/libgudev-230.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
LICENSE="LGPL-2.1"
SLOT="0/0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
IUSE="introspection static-libs"
DEPEND=">=dev-libs/glib-2.22.0:2=[static-libs?]
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 169e77d9946e..54098398adbd 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1 +1,2 @@
DIST libgusb-0.2.7.tar.xz 275492 SHA256 0be9578f7875cecb6c163ad47eb39bc6bf497e501b08986c0d384748a054c3ee SHA512 9210ddc95458c452fa32c8e11849c6f44e24680485aafe93887a52266c8253e495e5f0584f25e3e67051bb00247d6b658cd2ff3f6a4da167a113974d8fefd5ac WHIRLPOOL 7ce8652167f3bf553d33d2b2504e1b1a8fdbdd0844b9fa8f2b54ad5d91b0db505cdedb3d1b6827212bde36bea39c28160f51f0253c921db4f33dae1e9368c07d
+DIST libgusb-0.2.8.tar.xz 289744 SHA256 a9c269ef21145b228e59fdcb533ef9c4ae214a6f4748d17ecd2e022f79389eed SHA512 83dce9704276f5edbe893b417a569bd62f2d14d8de1730d6e7e48c72170593c471c8354b813668d0736e31ecf48d2efe76a81c5dc485c1fa6ba62c5f8ceff3b4 WHIRLPOOL 878d07f37f79ef59506e76fa995b58b9e00fe75ae9424b86ea47bd5fb6c14868bc95e85e0744ff4d3c6a2f4aecdbf86f6c584c40c8febddd1c754cbc8386f261
diff --git a/dev-libs/libgusb/libgusb-0.2.8.ebuild b/dev-libs/libgusb/libgusb-0.2.8.ebuild
new file mode 100644
index 000000000000..2e5cef78f761
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.2.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 multilib-minimal vala
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://github.com/hughsie/libgusb"
+SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+introspection static-libs vala"
+REQUIRED_USE="vala? ( introspection )"
+
+# Yes, we really need API from dev-libs/libusb-1.0.19, not virtual/libusb
+RDEPEND="
+ >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+ virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+"
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ dev-util/gtk-doc-am
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+ vala? ( $(vala_depend) )
+"
+
+# Tests try to access usb devices in /dev
+RESTRICT="test"
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_enable vala)
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/api/html docs/api/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild
index 9eab10f1985e..13d93ffd0802 100644
--- a/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
LICENSE="LGPL-2.1 LGPL-3"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="gtk +introspection"
RESTRICT="test" # consequence of the -no-mono.patch
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 216da5971aa2..df0196e279a6 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,6 +1,5 @@
DIST libinput-0.9.0.tar.xz 510512 SHA256 309043976f41f5451c2a4b1c25bc2993b18aecb22524d797f21eb6b6c968ff0d SHA512 a6f718215428eda45ac00c25d0b62ada84bf924822cb66e0a9b28f4cfc36e7d1678f2dfb47afae16ce4c277d589adcf97aefe8e2e5a154873b649fe4a84527a1 WHIRLPOOL 23da6dbcd7b17000cea641e0931db8a9b2ad34b0655e4e31b0419ff4799adc59d2646b10316e073ad49695ebd652c150abf05c39d15c735ecb1d97f6f8c1d8de
DIST libinput-1.0.1.tar.xz 800244 SHA256 482fb35119b457ba65a8bebaa47e4f6b4dbd77e59c320014a22296847b7ff99e SHA512 17efc6ddd58aadcd30aecb4d1b8b6ad32f6f61c592f29b0a99aac7d49e5cb814038874d9e8996cd6726f15c58bf4239169564c650a3250a87a9ec6fd3110c5bb WHIRLPOOL 0bba6b4a58ca0020ebcbffe5675d75832b4ed67a350ca141d990f9db522a2eee942543f475d76c1f2b816b849074f4a50e30bcb3adc99bd4abdea1a43800a2d5
DIST libinput-1.1.0.tar.xz 802348 SHA256 673186ea2a0d2b695afaa9758834f9217b175774d9ae222e1b43ff63c663f582 SHA512 7f014eabed120c00fcd2d8748aed44a8ca31fd30bdda8b289ca63f7d1bebb9c49f1d508707fb0c4a5c7c4a37b58548efdff0e9b7761475f18e1cf787a80520e6 WHIRLPOOL 028518c20cfc6daa442dd92d04183a6575b95b1f4792a646ce42c09a7bc75e5bb469ca88b8cad89919c0814e00aa65178cc49c9dca6e9aad4ce997a94f9ba645
-DIST libinput-1.1.1.tar.xz 791276 SHA256 2de2b433ddc73ba1bfd4d309fd873d0ced6937cf1a7a94e4afbf18ddd8f8dd17 SHA512 3806e67a4530be71463b693076a64f210475d3487abc2848f5ee13b92b281c6e4950bdb754c6b9c090c51c5b8dd4e698b882ae325bdea78bb05e6b7399eb75f0 WHIRLPOOL 031af4cb17d51d2f888cdb3192ccb25e4b3eb22422aeda3e999fd215b3d5bba89782b1f4a5e0b95706bf6da2ffaf3cbc0b5078a1fa95433afd414b79826542de
-DIST libinput-1.1.2.tar.xz 818680 SHA256 a323a32718a8f0f5e85e1ed3a81f0dde45eb52b215a15c7887bec40961d97a84 SHA512 7babc1be1ad08915fb9cf361c99d9c91eea74cfd67cc5b7608f53dbcec8ed986cd9844e6a555a88c52687e7660a20ed3ff9342aba206125d7d4ba40019bb2127 WHIRLPOOL 472ad01b4dae48882e0edbe5bac727084f3e9c8d7fd5138d99b751e08f73cc5f390d091039f60ddd2e2187aaab72020fc15e392fbde16338cc67415512274b6d
DIST libinput-1.1.3.tar.xz 815840 SHA256 b95af39391e2b91957af0addce691a4070b28aff69cd2348823bf6ce8169995e SHA512 ee51b6d005bacca57c4cad5a8b70097990299bf934cb460016176630009cea872e5413e053b09b456d35e085268a9a96ceb667ef0f4cd3b874e89cda2bb1c344 WHIRLPOOL 2934b26ef372f337873eefc5fd0c3464e8d380fc263a6cd0fda759fa5d1efe974dd3a83e076aec0ee2e85259784452c7294b163f8ca657af9c2c803c69540867
+DIST libinput-1.1.4.tar.xz 819536 SHA256 302cb76209b9c57a5a318e178f9bc446eede8ea79386103b5291cbfaa5fab5b6 SHA512 54c1ca1cbb747d62950f5f5bf6a906cdb6b0e79305ba9d7e8408828691eb523be517bb88e739c6ab5465ec95b69c81f096fe8ad4b6bbbd010d431e72d79d0763 WHIRLPOOL 82b9831bce546d4d1329fbf51f64bfea8a1d23bee11cf1664212ba7949e18bff6ae471e2e248f8ec16dc93d8514024a5576fb2a298edea433899c2a69189d6b8
diff --git a/dev-libs/libinput/libinput-1.1.0.ebuild b/dev-libs/libinput/libinput-1.1.0.ebuild
index e00c77f95881..4fb734e6c9de 100644
--- a/dev-libs/libinput/libinput-1.1.0.ebuild
+++ b/dev-libs/libinput/libinput-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/10"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="test"
# Tests require write access to udev rules directory which is a no-no for live system.
# Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libinput/libinput-1.1.2.ebuild b/dev-libs/libinput/libinput-1.1.2.ebuild
deleted file mode 100644
index 26877357fe85..000000000000
--- a/dev-libs/libinput/libinput-1.1.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/libevdev-0.4
- >=sys-libs/mtdev-1.1
- virtual/libudev
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-# test? (
-# >=dev-libs/check-0.9.10
-# dev-util/valgrind
-# sys-libs/libunwind )
-
-src_configure() {
- # Doc handling in kinda strange but everything
- # is available in the tarball already.
- sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die
-}
-
-src_configure() {
- # gui can be built but will not be installed
- # building documentation silently fails with graphviz syntax errors
- econf \
- --disable-documentation \
- --disable-event-gui \
- $(use_enable test tests) \
- --with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc -r doc/html
- prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-1.1.1.ebuild b/dev-libs/libinput/libinput-1.1.4.ebuild
index 26877357fe85..26877357fe85 100644
--- a/dev-libs/libinput/libinput-1.1.1.ebuild
+++ b/dev-libs/libinput/libinput-1.1.4.ebuild
diff --git a/dev-libs/liblinear/liblinear-210-r1.ebuild b/dev-libs/liblinear/liblinear-210-r1.ebuild
index 97dfda445313..d319f76f088c 100644
--- a/dev-libs/liblinear/liblinear-210-r1.ebuild
+++ b/dev-libs/liblinear/liblinear-210-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="blas"
RDEPEND="
diff --git a/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild b/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
index 7bfd3d80cfa8..1d703f8186b6 100644
--- a/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
+++ b/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/2"
-KEYWORDS="~amd64 ~arm hppa ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm hppa x86 ~amd64-linux"
IUSE="debug doc static-libs test"
RDEPEND="
diff --git a/dev-libs/libnl/libnl-3.2.27.ebuild b/dev-libs/libnl/libnl-3.2.27.ebuild
index 59703c8a61cc..23870a1c3e25 100644
--- a/dev-libs/libnl/libnl-3.2.27.ebuild
+++ b/dev-libs/libnl/libnl-3.2.27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
"
LICENSE="LGPL-2.1 utils? ( GPL-2 )"
SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="static-libs python utils"
RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/dev-libs/libofx/libofx-0.9.10.ebuild b/dev-libs/libofx/libofx-0.9.10.ebuild
index 065016dabc37..eeb977532deb 100644
--- a/dev-libs/libofx/libofx-0.9.10.ebuild
+++ b/dev-libs/libofx/libofx-0.9.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
IUSE="static-libs test"
RDEPEND="
diff --git a/dev-libs/libpcre/libpcre-8.38.ebuild b/dev-libs/libpcre/libpcre-8.38.ebuild
index 73e9acc1b2ab..57497da6a06c 100644
--- a/dev-libs/libpcre/libpcre-8.38.ebuild
+++ b/dev-libs/libpcre/libpcre-8.38.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="BSD"
SLOT="3"
-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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
diff --git a/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild
index 421a205b90fa..97975971727b 100644
--- a/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="debug examples icu ipv6 lzma python readline static-libs test"
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/nspr/nspr-4.10.10.ebuild b/dev-libs/nspr/nspr-4.10.10.ebuild
index 84884ec5b268..0780b358c8b6 100644
--- a/dev-libs/nspr/nspr-4.10.10.ebuild
+++ b/dev-libs/nspr/nspr-4.10.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://archive.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug"
RDEPEND="
diff --git a/dev-libs/nss/files/nss-3.21-hppa-byte_order.patch b/dev-libs/nss/files/nss-3.21-hppa-byte_order.patch
new file mode 100644
index 000000000000..703df99c7645
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.21-hppa-byte_order.patch
@@ -0,0 +1,16 @@
+--- a/nss/lib/dbm/include/mcom_db.h
++++ b/nss/lib/dbm/include/mcom_db.h
+@@ -110,11 +110,13 @@
+ #endif /* !BYTE_ORDER */
+ #endif /* __sun */
+
++#ifndef BYTE_ORDER
+ #if defined(__hpux) || defined(__hppa)
+ #define BYTE_ORDER BIG_ENDIAN
+ #define BIG_ENDIAN 4321
+ #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax, all NT risc */
+ #endif
++#endif /* !BYTE_ORDER */
+
+ #if defined(AIXV3) || defined(AIX)
+ /* BYTE_ORDER, LITTLE_ENDIAN, BIG_ENDIAN are all defined here */
diff --git a/dev-libs/nss/nss-3.20.1.ebuild b/dev-libs/nss/nss-3.20.1.ebuild
index 746cc56c7b83..45ae6e19aa22 100644
--- a/dev-libs/nss/nss-3.20.1.ebuild
+++ b/dev-libs/nss/nss-3.20.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://archive.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cacert +nss-pem utils"
CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/nss/nss-3.21-r1.ebuild b/dev-libs/nss/nss-3.21-r1.ebuild
index 06f3df4cf297..fe74af8afeba 100644
--- a/dev-libs/nss/nss-3.21-r1.ebuild
+++ b/dev-libs/nss/nss-3.21-r1.ebuild
@@ -52,6 +52,8 @@ src_prepare() {
# Custom changes for gentoo
epatch "${FILESDIR}/${PN}-3.21-gentoo-fixups.patch"
epatch "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+ epatch "${FILESDIR}/${PN}-3.21-hppa-byte_order.patch"
+
if use cacert ; then
epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
epatch "${FILESDIR}/${PN}-3.21-cacert-class3.patch" #521462
diff --git a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild b/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
index 5e1ae78f1603..8f17833959a1 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
LICENSE="openssl"
SLOT="0.9.8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
RESTRICT="!bindist? ( bindist )"
diff --git a/dev-libs/openssl/openssl-1.0.2e.ebuild b/dev-libs/openssl/openssl-1.0.2e.ebuild
index 5ce910c542e0..444743d6c8e0 100644
--- a/dev-libs/openssl/openssl-1.0.2e.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2e.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
LICENSE="openssl"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )"
diff --git a/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.200-r1.ebuild b/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.200-r1.ebuild
deleted file mode 100644
index 572b32880bb5..000000000000
--- a/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.200-r1.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=5
-
-MODULE_AUTHOR=TYEMQ
-MODULE_VERSION=1.1902
-inherit perl-module
-
-DESCRIPTION="Compute intelligent differences between two files / lists"
-
-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"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild b/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild
index f696d2af8f5d..ac807e149555 100644
--- a/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild
+++ b/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Compute intelligent differences between two files / lists"
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"
+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"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Algorithm-Diff/Manifest b/dev-perl/Algorithm-Diff/Manifest
index e412786856d5..ff8c8f868d2c 100644
--- a/dev-perl/Algorithm-Diff/Manifest
+++ b/dev-perl/Algorithm-Diff/Manifest
@@ -1,2 +1 @@
-DIST Algorithm-Diff-1.1902.tar.gz 33529 SHA256 c8b40dbf406770c6bcbd1a26a3f2343fa1563675085b63932d06f37e60098375 SHA512 00860f458d1dc09dab2d0c829c02401e5100e63a301c349981d39e910bf12b63fbc88cf99dcd0d3790187119623d5dc790dcebbc785a65e091730bb20ec175cb WHIRLPOOL 518e90bac35a8b25d7a500a993fd7f194e03605d28c8d8cc822109a3e786b3817bb962230b8774fa68858e92718ed2762d4b2a9343d039a923dfa9dc471f9d02
DIST Algorithm-Diff-1.1903.tar.gz 34174 SHA256 30e84ac4b31d40b66293f7b1221331c5a50561a39d580d85004d9c1fff991751 SHA512 61632be4c19a03ccacaa218ab7cb8bdbc53a4a6030b8173a59c7611056375536788392c1da00ab88f3df9884fc8a67825efc83b70e2e564664d5187021d6b106 WHIRLPOOL 71f36036e1f89ae305d5ed91bfb1f0116a0cf30a50ab9f3e36802186bc8efa79ae3cba98d1b1333e0f2650bcc588b60e9091c7bf8204e19827b664e9cca164b2
diff --git a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.640.0-r1.ebuild b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.640.0-r1.ebuild
deleted file mode 100644
index 2bfd3c5dbea8..000000000000
--- a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.640.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-MODULE_AUTHOR=MDOOTSON
-MODULE_VERSION=0.64
-inherit wxwidgets perl-module
-
-DESCRIPTION="Building, finding and using wxWidgets binaries"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
-IUSE="test"
-
-RDEPEND="
- >=x11-libs/wxGTK-2.8.11.0:2.8[X,tiff]
- >=dev-perl/Module-Pluggable-3.1-r1
-"
-DEPEND="${RDEPEND}
- >=virtual/perl-ExtUtils-CBuilder-0.24
- dev-perl/Module-Build
- test? (
- dev-perl/Test-Pod
- dev-perl/Test-Pod-Coverage
- )
-"
-
-SRC_TEST="do"
-
-src_configure() {
- myconf=( --wxWidgets-build=0 )
- perl-module_src_configure
-}
diff --git a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.670.0.ebuild b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.670.0.ebuild
index 9555da82a6e0..4785777b737f 100644
--- a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.670.0.ebuild
+++ b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.670.0.ebuild
@@ -12,7 +12,7 @@ inherit wxwidgets perl-module
DESCRIPTION="Building, finding and using wxWidgets binaries"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
IUSE="gstreamer test"
RDEPEND="
diff --git a/dev-perl/Alien-wxWidgets/Manifest b/dev-perl/Alien-wxWidgets/Manifest
index 6b4ab83d73dd..93c008dad534 100644
--- a/dev-perl/Alien-wxWidgets/Manifest
+++ b/dev-perl/Alien-wxWidgets/Manifest
@@ -1,2 +1 @@
-DIST Alien-wxWidgets-0.64.tar.gz 701204 SHA256 bdaec7b54d9bbcf6e7e5ef52f7e23ad4295c54819d6f29e6ca3bf07f6fdb35bb SHA512 4b687527936dc88fcf35e103bb6effea2dffaf2e313d2ff4a6000a20d240fcb0bde165dbf92f2cc8e2ddf1780f58e585001c261413cfc2ca53c0c617acbeb359 WHIRLPOOL d0ac4a28c26376d5d91b7f97ea9458f4c98829151348557ea3b03eacc7ff9b54490df49a7b39a4bc3aa1ae710eae9ce1d84885c41845e705c49c94ddd8097a91
DIST Alien-wxWidgets-0.67.tar.gz 671487 SHA256 d906dffefec41748676e16ff28a93ca36d60a8158a82e9d8bac6383a0142b51c SHA512 633547a4417a42e96621a9409a83e736ba94c8692b7791a1887cf8497aaade9bc827a1279db169f737e834c5070c6f0d485c005133708bbf76a279acf1684092 WHIRLPOOL 4768b069c44218a7e27b7d24a50a25c86380f354e5ad83d3f052126ed576a7a61727972717726b70f4add6e6128c2569291844f88db4f30358182cc81e7fce59
diff --git a/dev-perl/Benchmark-Timer/Benchmark-Timer-0.710.600.ebuild b/dev-perl/AnyEvent-CacheDNS/AnyEvent-CacheDNS-0.80.0.ebuild
index bdc5ea8d67f4..e97462d66d54 100644
--- a/dev-perl/Benchmark-Timer/Benchmark-Timer-0.710.600.ebuild
+++ b/dev-perl/AnyEvent-CacheDNS/AnyEvent-CacheDNS-0.80.0.ebuild
@@ -2,27 +2,23 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-MODULE_AUTHOR=DCOPPIT
-MODULE_VERSION=0.7106
+DIST_AUTHOR=POTYL
+DIST_VERSION=0.08
inherit perl-module
-DESCRIPTION="Perl code benchmarking tool"
+DESCRIPTION="Simple DNS resolver with caching"
-LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="
- dev-perl/Statistics-TTest
- virtual/perl-Time-HiRes
+ dev-perl/AnyEvent
"
-
DEPEND="${RDEPEND}
- >=virtual/perl-ExtUtils-MakeMaker-6.360.0
+ virtual/perl-File-Spec
+ >=dev-perl/Module-Build-0.400.0
test? ( virtual/perl-Test-Simple )
"
-
-SRC_TEST=do
diff --git a/dev-perl/AnyEvent-CacheDNS/Manifest b/dev-perl/AnyEvent-CacheDNS/Manifest
new file mode 100644
index 000000000000..74c508120c98
--- /dev/null
+++ b/dev-perl/AnyEvent-CacheDNS/Manifest
@@ -0,0 +1 @@
+DIST AnyEvent-CacheDNS-0.08.tar.gz 5295 SHA256 41c1faf183b61806b55889ceea1237750c1f61b9ce2735fdf33dc05536712dae SHA512 26c0cbe3c45b48a4760d3a6e601ae8eb098b1840e892cc21a351e04a7c0582ff0f05e368d6f6d25f1fe97f992af2c3742d555e2d68cc0002a7bb984deb34e9f4 WHIRLPOOL a82c9a1598bed225ee5d9f9a2b6fe7e738d693c2ab030781d6ccb6df409aa3a5b9b8f53acbd81a9b6ba7214f57b7a4078a27eacf6abbcdbfb84a231bcea7254b
diff --git a/dev-perl/AnyEvent-CacheDNS/metadata.xml b/dev-perl/AnyEvent-CacheDNS/metadata.xml
new file mode 100644
index 000000000000..708bcbd30056
--- /dev/null
+++ b/dev-perl/AnyEvent-CacheDNS/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>perl</herd>
+</pkgmetadata>
diff --git a/dev-perl/AnyEvent-I3/AnyEvent-I3-0.160.0.ebuild b/dev-perl/AnyEvent-I3/AnyEvent-I3-0.160.0.ebuild
index a74a10227a74..1efff715aca6 100644
--- a/dev-perl/AnyEvent-I3/AnyEvent-I3-0.160.0.ebuild
+++ b/dev-perl/AnyEvent-I3/AnyEvent-I3-0.160.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Communicate with the i3 window manager"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
COMMON_DEPEND="
diff --git a/dev-perl/AnyEvent/AnyEvent-7.110.0.ebuild b/dev-perl/AnyEvent/AnyEvent-7.110.0.ebuild
new file mode 100644
index 000000000000..e214f9a14701
--- /dev/null
+++ b/dev-perl/AnyEvent/AnyEvent-7.110.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=7.11
+inherit perl-module
+
+DESCRIPTION="Provides a uniform interface to various event loops"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.520.0
+ dev-perl/Canary-Stability
+"
diff --git a/dev-perl/AnyEvent/AnyEvent-7.80.0.ebuild b/dev-perl/AnyEvent/AnyEvent-7.80.0.ebuild
index e6a077dbf5d9..cf688d7cd4f9 100644
--- a/dev-perl/AnyEvent/AnyEvent-7.80.0.ebuild
+++ b/dev-perl/AnyEvent/AnyEvent-7.80.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Provides a uniform interface to various event loops"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/AnyEvent/Manifest b/dev-perl/AnyEvent/Manifest
index 325778fa979d..0b07ed287d1f 100644
--- a/dev-perl/AnyEvent/Manifest
+++ b/dev-perl/AnyEvent/Manifest
@@ -1,2 +1,3 @@
DIST AnyEvent-7.04.tar.gz 286523 SHA256 6a9d94fa61c7f5dc515c834eb224dbc6ce4123da8fd5bfa0cf3815f3f3e908b2 SHA512 2da60d08d81e52dfc43235d737905cc86840dde7555f9752ec9f990317fb8710cff52bc518e18a9d141956520599f04e5bc94ed407ab9846bd642f6597ec90ce WHIRLPOOL cfaab8bd8a0274a273d5f456c7dedf5c86bca37ff1be30256d80cb8e881094e37724b8f26625af721c268f34cf6476c557eb75e0033ee1054f49059f54e04858
DIST AnyEvent-7.07.tar.gz 292938 SHA256 4c4cc8e877bc8812e17aad29ae8d6364066bf2a0d1e4de9de14fb01e02a43106 SHA512 db02fd12aa64f7d253509f701dde5af67b58e43f7df052f8b1e23fc6f45327bec7668ed0ead8407ce72578d2d8544bab4a688f739bcc2fb5aaac3a431aeaeb6c WHIRLPOOL 569fd392192a2718603500cae0ce0bf8a4a31b37e9343259e449f68ac2c14c15711ca82196b2c9069a96697a9d7b2c3195735dfa4c4a3a4835dfec38eec8f172
+DIST AnyEvent-7.11.tar.gz 296544 SHA256 8bf1b59860d04daeec4f6f56e3b86b581dfabacbc3ba0442e493e267b4b9f522 SHA512 2b1949a73c3ad0ae06c3da8d06d7074089910bc9f44b32be5177b603999ddb13b5801cc81db11cefb7e490f7386b8403ca511ccbdc92f898cb3650c5d1d82b8b WHIRLPOOL 4a99099004a88ac1cc3f0261a43ce4eacc75a1b47e056e8c2b75173260ce98a147c601de3cccf171225c9fbfa4e821490f1b697122cd9c7382a988ee3398f077
diff --git a/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.230.0.ebuild b/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.230.0.ebuild
index 36535e5dce9f..2ee1d8d37200 100644
--- a/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.230.0.ebuild
+++ b/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.230.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl Authentication and Authorization via cookies"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Apache-Reload/Apache-Reload-0.130.0.ebuild b/dev-perl/Apache-Reload/Apache-Reload-0.130.0.ebuild
index f43ad7eb9bba..3dc2b06c377b 100644
--- a/dev-perl/Apache-Reload/Apache-Reload-0.130.0.ebuild
+++ b/dev-perl/Apache-Reload/Apache-Reload-0.130.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl module for Apache::Reload"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND="www-apache/mod_perl"
diff --git a/dev-perl/Apache-Session/Apache-Session-1.930.0.ebuild b/dev-perl/Apache-Session/Apache-Session-1.930.0.ebuild
index bf2901ce2be7..4a1b36c34e19 100644
--- a/dev-perl/Apache-Session/Apache-Session-1.930.0.ebuild
+++ b/dev-perl/Apache-Session/Apache-Session-1.930.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A persistence framework for session data"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.960.0-r1.ebuild b/dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.960.0-r1.ebuild
deleted file mode 100644
index 86b292d4897f..000000000000
--- a/dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.960.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=PHRED
-MODULE_VERSION=0.96
-inherit perl-module
-
-DESCRIPTION="Graceful exit for large children"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-# mod_perl < 2.0.5 bundles Apache-SizeLimit
-RDEPEND="dev-perl/Linux-Pid
- !<www-apache/mod_perl-2.0.5
- >=www-apache/mod_perl-2.0.5"
-DEPEND="${RDEPEND}
- test? ( >=dev-perl/Apache-Test-1.360.0 )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Apache-SizeLimit/Manifest b/dev-perl/Apache-SizeLimit/Manifest
index bd5fa71eb8a5..f3c214b61924 100644
--- a/dev-perl/Apache-SizeLimit/Manifest
+++ b/dev-perl/Apache-SizeLimit/Manifest
@@ -1,2 +1 @@
-DIST Apache-SizeLimit-0.96.tar.gz 24216 SHA256 f09b60266aaf67b41907aa9d24af71c1d868462a5be2bd0ef24c05ca2e0602ff SHA512 71d9045be4a8f319f420c399121e3e67ecfaf24bba4216160c8dd61b10c0050a50ee4ee5305788045ad2da37a44c9485bc9dde906bdd34e1235c0f00457dcd24 WHIRLPOOL 531cc741d30343862b8675192b0c14981efb425e2793222fec038043e500262a382d4ef87f658118c3164b299c9ac9e97d3cb8e33923ed68fa114d793eebec45
DIST Apache-SizeLimit-0.97.tar.gz 24544 SHA256 484fdfbd82833918c30347ffc4fcfe61b139b5a3a05d9919effb786ce264d636 SHA512 d3c4e97e3f9c7e3bb9a8868dd89ee14443f8596c900b85ea4b6d766b9d71001e3e920871adf58829c8d17d03dea6fd48901d2082b83c7382cf0bf30b8238472a WHIRLPOOL 7963dc776f0eae37ad8e1133b9a513b29506125a1f270e18387233df6e804ff43553f8a0278245056d694739a2488cf70ceb84948d95451702cbb8d2eae277b4
diff --git a/dev-perl/Apache-Test/Apache-Test-1.390.0.ebuild b/dev-perl/Apache-Test/Apache-Test-1.390.0.ebuild
index 80ddc6fd96c3..03de187088d0 100644
--- a/dev-perl/Apache-Test/Apache-Test-1.390.0.ebuild
+++ b/dev-perl/Apache-Test/Apache-Test-1.390.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Test.pm wrapper with helpers for testing Apache"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/App-Nopaste/App-Nopaste-0.910.0.ebuild b/dev-perl/App-Nopaste/App-Nopaste-0.910.0.ebuild
deleted file mode 100644
index c65740635d37..000000000000
--- a/dev-perl/App-Nopaste/App-Nopaste-0.910.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SARTAK
-MODULE_VERSION=0.91
-inherit perl-module
-
-DESCRIPTION="Easy access to any pastebin"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+pastebin clipboard github"
-
-DEPEND="
- dev-perl/Class-Load
- dev-perl/Getopt-Long-Descriptive
- dev-perl/JSON
- dev-perl/WWW-Mechanize
- dev-perl/Module-Pluggable
- dev-perl/URI
- pastebin? (
- dev-perl/WWW-Pastebin-PastebinCom-Create
- )
- clipboard? (
- dev-perl/Clipboard
- )
- github? (
- dev-vcs/git[perl]
- )
-"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/App-Nopaste/App-Nopaste-0.920.0.ebuild b/dev-perl/App-Nopaste/App-Nopaste-0.920.0.ebuild
deleted file mode 100644
index abefc2a03d00..000000000000
--- a/dev-perl/App-Nopaste/App-Nopaste-0.920.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SARTAK
-MODULE_VERSION=0.92
-inherit perl-module
-
-DESCRIPTION="Easy access to any pastebin"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+pastebin clipboard github"
-
-DEPEND="
- dev-perl/Class-Load
- dev-perl/Getopt-Long-Descriptive
- dev-perl/JSON
- dev-perl/WWW-Mechanize
- dev-perl/Module-Pluggable
- dev-perl/URI
- pastebin? (
- dev-perl/WWW-Pastebin-PastebinCom-Create
- )
- clipboard? (
- dev-perl/Clipboard
- )
- github? (
- dev-vcs/git[perl]
- )
-"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/App-Nopaste/Manifest b/dev-perl/App-Nopaste/Manifest
index d7c3561d6291..18da59776cf3 100644
--- a/dev-perl/App-Nopaste/Manifest
+++ b/dev-perl/App-Nopaste/Manifest
@@ -1,3 +1 @@
-DIST App-Nopaste-0.91.tar.gz 43018 SHA256 7556801d9b00508fcd6e07d362a1dd648cd4d08921c3f16ac8b13340e1f781d5 SHA512 b1ca6510fdc182866f6dd50381e62d4d400078dac665a56da038c86d5302c6538ff616c7a39ee738f7f02d26cff9c461bb99ff3b0121310c1ec51e29ae658025 WHIRLPOOL 12bfb40490a7632a31b41546d412d4390b5ef04d8f12d015154dc6634c6c8077698784f1c0c6e163f2c08552feadcee14b626598078c14b0f463a51783ba5d4c
-DIST App-Nopaste-0.92.tar.gz 42911 SHA256 8a7d8b19662c96679a7844685d9833cd16a75c47683d8a68908b56a2cc2da211 SHA512 fb1be8d5e94bbd4d3a0c6b21be5b9bb39d12e7c081c7c2184be440033f3e9e1d1fa8a053e1478b8d8b333ec893ccc5f0359c6d93bbc3d3dc21fe03865123484c WHIRLPOOL effed52632f2e46c0c05a8b6dc0dfbebc571cb9a3431f0fd9c5593674cfdce69c20eccc05b722b8b577d02846447e0f3a312f6c5dedc43ed607bcb9302533566
DIST App-Nopaste-1.004.tar.gz 45403 SHA256 62eac2cd9bef0a3bd41c16da94236619ecab1f5cf950807dcd64783c9a7d2a16 SHA512 d3fd4116ed4a3e73ac53ac60e122b7d79b877d056ab5a0715d6c478f0c6dd0d7c1fe19def769e67ddf6328fe95ee4ee7a412938e6ac5fb6440c05f0328bd75b5 WHIRLPOOL ba2be134c1d0ee37cd4d03bf1516e2b3c0872cb58010075cc5f6b9d440bbaeca86ac5d041a700b37b3932cb03cb377ced9ef223038d3c0c0a5fa09707c48fe61
diff --git a/dev-perl/App-perlbrew/App-perlbrew-0.740.0.ebuild b/dev-perl/App-perlbrew/App-perlbrew-0.740.0.ebuild
new file mode 100644
index 000000000000..f9a105e7fc59
--- /dev/null
+++ b/dev-perl/App-perlbrew/App-perlbrew-0.740.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=GUGOD
+DIST_VERSION=0.74
+inherit perl-module
+
+DESCRIPTION='Manage perl installations in your $HOME'
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-perl/CPAN-Perl-Releases-1.940.0
+ >=dev-perl/Capture-Tiny-0.250.0
+ >=dev-perl/Devel-PatchPerl-1.280.0
+ >=virtual/perl-Pod-Parser-1.620.0
+ >=dev-perl/local-lib-2.0.14
+"
+DEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.590.0
+ >=virtual/perl-File-Temp-0.230.400
+ >=dev-perl/IO-All-0.510.0
+ >=dev-perl/Path-Class-0.330.0
+ test? (
+ >=dev-perl/Test-Exception-0.320.0
+ >=virtual/perl-Test-Simple-1.1.2
+ >=dev-perl/Test-NoWarnings-1.40.0
+ >=dev-perl/Test-Output-1.30.0
+ >=dev-perl/Test-Spec-0.470.0
+ )
+"
diff --git a/dev-perl/App-perlbrew/Manifest b/dev-perl/App-perlbrew/Manifest
index 8b666c635d4f..0279699fb846 100644
--- a/dev-perl/App-perlbrew/Manifest
+++ b/dev-perl/App-perlbrew/Manifest
@@ -1 +1,2 @@
DIST App-perlbrew-0.73.tar.gz 82802 SHA256 acbc9e7b9913ef453bcac3e6caa6620d4bd67e129e63f060a82f96542554a77a SHA512 ceb78a62b179d4a6ad9e8788e849869cf9b45e526501d73cba004f96827d01ba03969307a1179840e6629e9f90385f7bae81b3662e0be81d00bcd462da59d28a WHIRLPOOL 27655d050da48012e71598e0a03b87be542e8eebcf0a610a15e45eaab5c55d82e25755f59c7be9d51ea45028752dfce31e8bfbe8bb93059b08ed07d03cd4b6c3
+DIST App-perlbrew-0.74.tar.gz 84360 SHA256 7134a9f858e3a3292ed879df04f6c880495300d727fa2b79dee7c81036d2d1c7 SHA512 eb586649e199059b42d3a6b85b37e2efb2f6769989e05e37fc44c4a46976daf2bfe7d0f96312ce8401937e99d5cd4c51c2b17bc74b6b4fe11a915ddb4bfd405a WHIRLPOOL 40e48a7de64e7672cb6f53920c8c1b3fcee85b56b3549a12452298ace1178faf0cadc010dffa98996f968b523575fcd086c12f8b5170315d62ad21b522d3398a
diff --git a/dev-perl/AppConfig/AppConfig-1.660.0-r1.ebuild b/dev-perl/AppConfig/AppConfig-1.660.0-r1.ebuild
deleted file mode 100644
index 1501f88b80f8..000000000000
--- a/dev-perl/AppConfig/AppConfig-1.660.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ABW
-MODULE_VERSION=1.66
-inherit perl-module eutils
-
-DESCRIPTION="Perl5 module for reading configuration files and parsing command line arguments"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-perl/File-HomeDir-0.57"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/blockdiffs.patch" )
-SRC_TEST="do"
diff --git a/dev-perl/AppConfig/AppConfig-1.710.0.ebuild b/dev-perl/AppConfig/AppConfig-1.710.0.ebuild
index 15f06b65e6f5..fc77b74cae87 100644
--- a/dev-perl/AppConfig/AppConfig-1.710.0.ebuild
+++ b/dev-perl/AppConfig/AppConfig-1.710.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl5 module for reading configuration files and parsing command line arguments"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/AppConfig/Manifest b/dev-perl/AppConfig/Manifest
index a023ca5ea994..b7e49e74b6e8 100644
--- a/dev-perl/AppConfig/Manifest
+++ b/dev-perl/AppConfig/Manifest
@@ -1,2 +1 @@
-DIST AppConfig-1.66.tar.gz 63521 SHA256 8b402de20569e6499e55bd36bd2264d964a41218f75fde6ac29902d16fd23bdc SHA512 dbb82ab785f1ff203e362e226e17586e7eab00d47be5581dd1085dddd2294dc36f110c322e95dfbaa9e24d1196273d6767079055b138a76ae1e65b40bd861f80 WHIRLPOOL d9db64435800da5757cf01aa210c0de4e01917b49e912d27a77e781abb3954d77347124be5ef85bf17791992a66a6d7d3672b96f810a2d4e178cc8b15e6370d8
DIST AppConfig-1.71.tar.gz 56739 SHA256 1177027025ecb09ee64d9f9f255615c04db5e14f7536c344af632032eb887b0f SHA512 cbd58601ce0ea6c237e86b8b013cf75e552914263f56b1ab26b8079bff75b28ca2bb35585bfaa187b611afa969767c25494d3ec2a6b3ff5d1aecd2f9ffa8df72 WHIRLPOOL c3622adb84506e782eea2a0b3208ab9894c56c6a9293a10edeea958453b47861e937bf7cb530c6469057c762709932dc439ca6a5d196da25cb0b95802190d56a
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.370.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.370.0.ebuild
deleted file mode 100644
index 5ffc5f316d08..000000000000
--- a/dev-perl/Archive-Zip/Archive-Zip-1.370.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=PHRED
-MODULE_VERSION=1.37
-inherit perl-module
-
-DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/perl-Compress-Raw-Zlib-2.017
- >=virtual/perl-File-Spec-0.80"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.500.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.500.0.ebuild
deleted file mode 100644
index 89972c5d9ca5..000000000000
--- a/dev-perl/Archive-Zip/Archive-Zip-1.500.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=PHRED
-MODULE_VERSION=1.50
-inherit perl-module
-
-DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
- >=virtual/perl-Compress-Raw-Zlib-2.17.0
- >=virtual/perl-File-Spec-0.800.0
- virtual/perl-File-Temp
- virtual/perl-IO
-"
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
- test? ( >=virtual/perl-Test-Simple-0.880.0 )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.530.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.530.0.ebuild
index d46994886a6d..ac5801f58470 100644
--- a/dev-perl/Archive-Zip/Archive-Zip-1.530.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.530.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.490.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.560.0.ebuild
index 325c89fc0fca..e11123dbdb4c 100644
--- a/dev-perl/Archive-Zip/Archive-Zip-1.490.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.560.0.ebuild
@@ -2,27 +2,29 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-MODULE_AUTHOR=PHRED
-MODULE_VERSION=1.49
+DIST_AUTHOR=PHRED
+DIST_VERSION=1.56
inherit perl-module
DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="test"
RDEPEND="
>=virtual/perl-Compress-Raw-Zlib-2.17.0
+ virtual/perl-File-Path
>=virtual/perl-File-Spec-0.800.0
virtual/perl-File-Temp
virtual/perl-IO
"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
- test? ( >=virtual/perl-Test-Simple-0.880.0 )
+ test? (
+ dev-perl/Test-MockModule
+ >=virtual/perl-Test-Simple-0.880.0
+ )
"
-
-SRC_TEST=do
diff --git a/dev-perl/Archive-Zip/Manifest b/dev-perl/Archive-Zip/Manifest
index db97d21f6351..6bc7d7faeb32 100644
--- a/dev-perl/Archive-Zip/Manifest
+++ b/dev-perl/Archive-Zip/Manifest
@@ -1,4 +1,2 @@
-DIST Archive-Zip-1.37.tar.gz 184345 SHA256 ba789436dc82db02a7f3d2e9d120d0221edc83d8c7ec72519648ae64bbc4ce05 SHA512 416dc16286edef085a9fd11b3f98c3abf6345a70552cf4f0d4e0da364b39d400cb259a09f1b33b82ff4aa6494a88e85e59afd80a94ae8446c329eb8a3af63ef1 WHIRLPOOL 07103e2d5a2f23e911b9bc9b3e784e21645864f2e6b08042c577deeaf5b27799c3df0fc8c2a89dfc805840ac0349e88053b173e8db51aefacb2dc7e225d5a8d1
-DIST Archive-Zip-1.49.tar.gz 192903 SHA256 991622ea495daf395abcd69c3b9b8ac92a10435c8d9562d50e30ef395dcc9451 SHA512 78e34f4a122ff5ad516d9efa983de8ba7995b87107148658e5d4100d3d428c361c4ab2674fce1bc87cc4068bdd3277ea810a878175a5c3b4eed691c79a260664 WHIRLPOOL 77d57b0bf8c5b9820dd13302797a278b2db5ad3f5cd8df981115a7eff3ed794ca5b93d3df3403013ae4a124b26911891e6b365bca6e44950375a0086feba4254
-DIST Archive-Zip-1.50.tar.gz 188086 SHA256 514020ac15a3442867267f294f155065b4c0b1a09e6106837359d28d1e3e0eeb SHA512 3b79da1edb1e0c9bc72206a33d7ec1e44eec008b28de17236f7f40808deccf8c394c6fc66eb0efe9b60490a58b4e72f6c428a157147b812e1b148db867a2582d WHIRLPOOL cb252199d4c2ffbca5e8e4b4cef968e655bdf63b997a56a55ef22e9c11d4f5c0cc08a99d0facca75a4890a04fe8e389bf3644f894ddec38fe54e3d77856288cc
DIST Archive-Zip-1.53.tar.gz 189493 SHA256 c66f3cdfd1965d47d84af1e37b997e17d3f8c5f2cceffc1e90d04d64001424b9 SHA512 ddf2f518e31c41b31c1ee66c1b4c09c8e964f1f458c6403b9a0f2ff6f41e54284a8995db7c0d1a8b08143f464b02a38fc0162bde9c0ad13f38e8b44a575482b3 WHIRLPOOL 69970596329334bcba3059bc5661880de5ae2938f32303e84c5f9f440b473ba3b37c8886d10358b48055abf8baefce100ef0d40c9b43121a7bc00bf5e81d21e5
+DIST Archive-Zip-1.56.tar.gz 190124 SHA256 109f3ccaee5bc963144f700e96206c248dd83f855dffc9b796a76518c36400f8 SHA512 f636cfbc9cff43a153e20621ab1f155a8eb9395ae59a7d97ce1dfd6f82335f0b9600d09e37e7f3e16c1d8054bbf000a7ffcb44629337ce6a94ca0e191924e801 WHIRLPOOL 431f1cb58a47657df05b60b7b97ac46cfb568c137d2f0da33dd7a710f35411c92e6c7c23d9ace3bc7dc5349274786ae82d03943def0167ba18654315b2b87afc
diff --git a/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild b/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild
index 3a86d6fdbe5e..cb1066cba4d6 100644
--- a/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild
+++ b/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Modules for reading & writing Microsoft WAV files"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.150.0.ebuild b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.150.0.ebuild
index 7b5b37bed869..1012e441f290 100644
--- a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.150.0.ebuild
+++ b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.150.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Execute code after a scope finished compilation"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~ppc-aix ~x64-macos"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.130.0.ebuild b/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.130.0.ebuild
deleted file mode 100644
index 6fe32a7aa80c..000000000000
--- a/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.130.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=0.13
-inherit perl-module
-
-DESCRIPTION="Interface to perls parser variables"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-perl/B-Hooks-OP-Check"
-DEPEND="${RDEPEND}
- >=dev-perl/ExtUtils-Depends-0.302
- test? ( dev-perl/Test-Exception
- dev-perl/B-Hooks-EndOfScope )"
-SRC_TEST=do
diff --git a/dev-perl/B-Hooks-Parser/Manifest b/dev-perl/B-Hooks-Parser/Manifest
index e3996034de92..14f809b9813f 100644
--- a/dev-perl/B-Hooks-Parser/Manifest
+++ b/dev-perl/B-Hooks-Parser/Manifest
@@ -1,2 +1 @@
-DIST B-Hooks-Parser-0.13.tar.gz 83951 SHA256 f6c838e59f52e21ccc0b2c9d85d6f7ba33119098ad3a261698b01690c2619646 SHA512 f1729830350d25f5decc4b08be23591920683d86d910bec99b478e58905dee6cc384af305b665a8a90dc48b9b819df6cbc975cf606b495448d25d00e3357a149 WHIRLPOOL d6505cbb95834b0a6084af24ba4f1ba96704016cf0180a79e479036d98567c29fbc42f60b91e5c72068e5403dc581d56c5b0493e173965ee571f9ce442094725
DIST B-Hooks-Parser-0.16.tar.gz 84593 SHA256 24e65268da41976fe3055091554848f6ef6eedd0c5c1a708b0fca5fe10cabab6 SHA512 5079b7233b5d69c4347cace3131e736c973d6c63daf063b39338d2b91dd44880fbfb255b9e9aac291ec0614e747115d14c2b7e13425336b97352ee1a41a10a2a WHIRLPOOL 9c53d5621b1648ef3636282cf51cc23b619fc4ece408a29e4980789fbf053642d89c98ae319c17a8217789727a6239e99d5be2fd05f04fa5861cecccd7d7bd83
diff --git a/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild
index 59b994772595..8aa4eb23c133 100644
--- a/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild
+++ b/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Lists of reserved barewords and symbol names"
# GPL-2 - no later clause
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/B-Keywords/B-Keywords-1.150.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.150.0.ebuild
new file mode 100644
index 000000000000..c1ebba20aec3
--- /dev/null
+++ b/dev-perl/B-Keywords/B-Keywords-1.150.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=1.15
+inherit perl-module
+
+DESCRIPTION="Lists of reserved barewords and symbol names"
+
+# GPL-2 - no later clause
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/B-Keywords/Manifest b/dev-perl/B-Keywords/Manifest
index bef36b0fdeff..965fc20ba547 100644
--- a/dev-perl/B-Keywords/Manifest
+++ b/dev-perl/B-Keywords/Manifest
@@ -1,2 +1,3 @@
DIST B-Keywords-1.13.tar.gz 9739 SHA256 073eb916f69bd337261de6cb6cab8ccdb06f67415d8c7291453ebdfdfe0be405 SHA512 6176dbe7ff25a7d355a03d887b6ec52e49c6bce634c3aa8dd5a7126201ac11e9f8ee6c78f7cacc353a5a83dea688646d25d675570fdba80d160abb45248eb08b WHIRLPOOL ffb6275127dcd468df89221c6b7c18cb41ef69d1c28615505d6f633e0f1c38e7cc42d7ad772f0e0cdcbf9de4efff3363b62ccdd280852202395ffde43066cb62
DIST B-Keywords-1.14.tar.gz 9981 SHA256 9c1662abbd573b408fdd13513e5cad7ef8fba28479d75e8dd33484633ac48ad2 SHA512 62e10e0f22fdce9855d7f4e1e96c8a2063a220d663ddc5ba0cb1a2e1b398b4f3a9d765dbc122797a66475535b5b6addf8eb655c8b27428355bc00e598930a5c4 WHIRLPOOL e8ca6175615955f144456187f88f02b12e858f4a756337b5b2e824c8b486b14b9f86c19b8b57eab31433531cb3ffca9681f369b55d5fe8374e01cc1ad3a14d58
+DIST B-Keywords-1.15.tar.gz 10140 SHA256 65d2ef8e3cf4a37fbf2da07e6caa1da15e33a155e349e5b9a5c978d02abd0dda SHA512 41d06de68d010095efd643153db10fb6c3cf33e320d576f76b9b60b2a96d1f0ad9da41741b4e57a3c78c8516197b81a5a6110cc6a49ee4ddf1b33085d7bcd913 WHIRLPOOL b3fa473bb2937995e031e15e6be769dfdcb2d2e13cb87910772cbc749e6995d2b3ea025d078809ee31e5968e816f496c9ca903fab138f6f2c5b84668fc0e6e80
diff --git a/dev-perl/B-OPCheck/B-OPCheck-0.290.0-r1.ebuild b/dev-perl/B-OPCheck/B-OPCheck-0.290.0-r1.ebuild
deleted file mode 100644
index 58425dacdf15..000000000000
--- a/dev-perl/B-OPCheck/B-OPCheck-0.290.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=FLORA
-MODULE_VERSION=0.29
-inherit perl-module
-
-DESCRIPTION="PL_check hacks using Perl callbacks"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/B-Utils-0.250.0
- dev-perl/Scope-Guard"
-DEPEND="${RDEPEND}
- >=dev-perl/ExtUtils-Depends-0.302"
-
-PATCHES=( "${FILESDIR}"/0.29-Perl_check_t.patch )
-SRC_TEST=do
diff --git a/dev-perl/B-OPCheck/Manifest b/dev-perl/B-OPCheck/Manifest
index be414c59c1e1..aa8d09ec4395 100644
--- a/dev-perl/B-OPCheck/Manifest
+++ b/dev-perl/B-OPCheck/Manifest
@@ -1,2 +1 @@
-DIST B-OPCheck-0.29.tar.gz 61578 SHA256 8a1d07ed51d5c867dbecd9e81d50a43470eb2aff2d144cd2b16ef2c33e9e20eb SHA512 4b9afb0e3acbf654a4393ec55814747f382cc0385d9b9d0d9f34a42ec0ce76009b169352238e7aa37bee7b699bce3e967e320f81bfc293b73c62ddf573cf630c WHIRLPOOL fb2ec13301b7b646158b61f4f63b225b66cb5e109b3c1d07995fd4bee618deebda2707c078c3e2a3d70da5f7e7e8c49dff223c5559bc84990486d2a4d5e391bf
DIST B-OPCheck-0.30.tar.gz 74668 SHA256 3a01bb406543cd204453322647fa48fcad2ecd9d5cc689154dfad71a441ad1bd SHA512 09aac95626c2594a1833682b6e1d5fc3f631570ceb0f1773c9d3c3c8a2aff57a903d5d24a51aa117cb8027d9c201153f790546300272c2a0748320f4f49274fc WHIRLPOOL 8aa8b69c367765a5df8d92d59f8a1bae3ab382933d7836adc9080f2dc060097028dec7a1439d0b97e283d825b012cd907c3cb679bce6645ea2a06d3e3e71ae96
diff --git a/dev-perl/B-Utils/B-Utils-0.260.0.ebuild b/dev-perl/B-Utils/B-Utils-0.260.0.ebuild
deleted file mode 100644
index a0a4ce077752..000000000000
--- a/dev-perl/B-Utils/B-Utils-0.260.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=0.26
-inherit perl-module
-
-DESCRIPTION="Helper functions for op tree manipulation"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
- virtual/perl-Exporter
- virtual/perl-Scalar-List-Utils
- dev-perl/Task-Weaken
-"
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-CBuilder
- >=dev-perl/ExtUtils-Depends-0.301.0
- test? (
- virtual/perl-Test-Simple
- )
-"
-
-SRC_TEST=do
diff --git a/dev-perl/B-Utils/Manifest b/dev-perl/B-Utils/Manifest
index 51d8443c6c22..0fffe7f078c6 100644
--- a/dev-perl/B-Utils/Manifest
+++ b/dev-perl/B-Utils/Manifest
@@ -1,2 +1 @@
-DIST B-Utils-0.26.tar.gz 73325 SHA256 15f9143bb86893813f5acdbe01deb84bafd45e725b536e15984fefc9f64c97e0 SHA512 14fb9f3b1ba95181c5e57368350fec60e5933e813278d522fec122f0888fe4bd84ca75a798722cefee07e3f7cb2ffec1cd0535d956bc7f0ef26504f9a65200d9 WHIRLPOOL a217fa2491fb2de6a485f527f8cc012ff5d666b4ec402ca87e66ea651db812059b0f682d37afea82b69ae67b9ad43fb629122eecfa462b903b5fbc1499f6086b
DIST B-Utils-0.27.tar.gz 74612 SHA256 f97f53f6a3050109aa414feeb184cad101812d41760e952b5d84993f6685ffea SHA512 a896476f59a424fa9062c5dfe6431493c020e51746fa7f7b4c7fcdb109d1c0fa252292b891263d676884f064db95f16958a5d2ed5981dc5997436dced6579e74 WHIRLPOOL 86ebdf04f8e659f21a2e546412313e8287e41ba9b93beb2e2658d20736b92bd72c82804c16464a6f3f5e987404ca8560fcd2521b3a926c9386f3cdc8f410aee6
diff --git a/dev-perl/Benchmark-Timer/Manifest b/dev-perl/Benchmark-Timer/Manifest
index fb61fbcd3d92..3b4117dbceaf 100644
--- a/dev-perl/Benchmark-Timer/Manifest
+++ b/dev-perl/Benchmark-Timer/Manifest
@@ -1,2 +1 @@
-DIST Benchmark-Timer-0.7106.tar.gz 45648 SHA256 f4a2d6103197418b488ff85ca2272dc6a7f4b5f642921d7cebab48311d871cea SHA512 89fbf2695886a08efdbedd5cf85fe65dcf61ef422a747fe947950404cc0a7e7bdb7362b69253ee787166803eb56842966362d29ecb6e7001c32cebbaf28e5ee8 WHIRLPOOL c49ecf13566f2ebade1c8521d43db44dc9e69d19f78c1a1cb9be0f4ca05a6c40a20433200c80dd2ede41f7c5766b5a03ac2cdc3ba99c7ec5103285e1108b127d
DIST Benchmark-Timer-0.7107.tar.gz 45734 SHA256 64f70fabc896236520bfbf43c2683fdcb0f2c637d77333aed0fd926b92226b60 SHA512 6faa50a90173a075a4bb398212e2db77348f59a47ff483db9e1885dc7dce9636557684574a21f228c53f0c29a468e663706843840b2e59abbaaed1222f400e05 WHIRLPOOL 8f09e9687a42f82b4bccd47aca76ab10d8d406c27be4fb5224e188a55c24235067702e4e19a97677982771b46aa101abf5fe64779148f97c4afca34cb8f0552f
diff --git a/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild b/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild
index e4f69251fdb8..520fe2a32da2 100644
--- a/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild
+++ b/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
# Install DB_File if you want older support. BerkleyDB no longer
# supports less than 2.0.
-RDEPEND=">=sys-libs/db-2.0"
+RDEPEND=">=sys-libs/db-2.0:*"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? ( dev-perl/Test-Pod )"
diff --git a/dev-perl/Bio-Graphics/Bio-Graphics-2.370.0-r1.ebuild b/dev-perl/Bio-Graphics/Bio-Graphics-2.370.0-r1.ebuild
deleted file mode 100644
index 7f9a4a3c9999..000000000000
--- a/dev-perl/Bio-Graphics/Bio-Graphics-2.370.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=LDS
-MODULE_VERSION=2.37
-inherit perl-module
-
-DESCRIPTION="Generate images from Bio::Seq objects for visualization purposes"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/GD
- dev-perl/Statistics-Descriptive"
-DEPEND="${RDEPEND}
- dev-perl/Module-Build"
-
-SRC_TEST=no
diff --git a/dev-perl/Bio-Graphics/Manifest b/dev-perl/Bio-Graphics/Manifest
index d2bd441d724d..babc791fbd0a 100644
--- a/dev-perl/Bio-Graphics/Manifest
+++ b/dev-perl/Bio-Graphics/Manifest
@@ -1,2 +1 @@
-DIST Bio-Graphics-2.37.tar.gz 1081671 SHA256 d85716b3e773cc899b9cb5733203fa0fbb4ce7b1ac3ae36fef1bbb9000968c0f SHA512 f8858f018ece0cf174d6803f0fe1110099ba5b2b6f0a1452db361949320aeccb7738f588fe2ac5c642d2b9b5e449a0c7822c0da1ceda91e5f1ffbac07ce3fcbe WHIRLPOOL 4dda3d65472c5863820a88082daf5da05624067f4c518cf53918574c88c89e0610df94f33d1db004542290a1bedaa78ef4159c6810e6de9c4401bdecfafd7ca8
DIST Bio-Graphics-2.39.tar.gz 1139511 SHA256 5602e56c469fba8be024d72bff7ec1502392d82ac0fde4d1399e02488d6bfd85 SHA512 4119c56a125df67a613833c06d7db94be7f19c39fcf908eb52c403e70652c04d91a3b7de768e2465423bff69dd900cb45f1044ed673eb6228a8ad7516a35471f WHIRLPOOL 30877d7f6c264b833ebcf69dfebc037fdaff66200a80cd7b9bf964b2f435d6d23db7a8f1228c010675955b7528f95fb1d9a018c48fa8a5456e4813d10d7ce76f
diff --git a/dev-perl/Bio-SamTools/Bio-SamTools-1.390.0-r1.ebuild b/dev-perl/Bio-SamTools/Bio-SamTools-1.420.0.ebuild
index 1ad7fbe64dcb..68d73836cb3d 100644
--- a/dev-perl/Bio-SamTools/Bio-SamTools-1.390.0-r1.ebuild
+++ b/dev-perl/Bio-SamTools/Bio-SamTools-1.420.0.ebuild
@@ -2,11 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-
-MODULE_AUTHOR=LDS
-MODULE_VERSION=1.39
+EAPI=6
+DIST_AUTHOR=LDS
+DIST_VERSION=1.42
inherit perl-module toolchain-funcs
DESCRIPTION="Read SAM/BAM database files"
@@ -14,20 +13,22 @@ DESCRIPTION="Read SAM/BAM database files"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
+LICENSE="|| ( Apache-2.0 Artistic-2 GPL-1+ )"
RDEPEND="
- sci-biology/bioperl
+ >=sci-biology/bioperl-1.6.9
>=sci-biology/samtools-1
"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-CBuilder
- dev-perl/Module-Build
+ >=dev-perl/Module-Build-0.420.0
"
-SRC_TEST=do
+DIST_TEST=skip
+# cannot load its own library, fundamentally b0rken
PATCHES=(
- "${FILESDIR}"/${P}-samtools-1.patch
+ "${FILESDIR}"/${PN}-1.390.0-samtools-1.patch
)
src_prepare() {
diff --git a/dev-perl/Bio-SamTools/Manifest b/dev-perl/Bio-SamTools/Manifest
index bf52deb79454..9143d805af78 100644
--- a/dev-perl/Bio-SamTools/Manifest
+++ b/dev-perl/Bio-SamTools/Manifest
@@ -1,2 +1,2 @@
-DIST Bio-SamTools-1.39.tar.gz 331515 SHA256 a2baaa0f569c2b49e988978a121fb210fcb35200dcb2f183aa58bb03d711ef4f SHA512 aff502af24239cd64dec3a5a9cb6ab7280661f277cef066f79c87f608112d5870f46ffcc81f3bc2382f48d5247c7ab5de35e4afaa7ca4e286b0323978368d668 WHIRLPOOL db069d76fe386354b8cec60527de6612fc501428e9775e02574955cead3eba55db169697aaacc22c3b4df6475c6ecb72486b94c9b577da1deb42dc5c3791b04f
DIST Bio-SamTools-1.41.tar.gz 338745 SHA256 b5d7ca16c96cc9fbee5daceb3268f36011740fe4de92074c17a729bac57c3077 SHA512 6f822cd219ecf86e95bc3a6bde1aebbe5eb8284b21b07ca919618c1422c37e6d182285d1a5e77848c6d5cea0dc74a51705f6bc1a27d44aeeaaa69f1cea58f147 WHIRLPOOL b651ea5059ea46ab5e31d237d3e52d7936921470bbd04133be70f935a47b913dc7f3b154c14d1af52f0ba2f5afc6878a27d88e4bbf9d39023cf786bca70f6696
+DIST Bio-SamTools-1.42.tar.gz 337821 SHA256 ef4b736e86442ce61f56ddd94befc302ccc4646cae3c45407e107400c703584c SHA512 6a1f95104ce91a800a314c304915af9d6e1cc477c7d5f42b640d0a27b18cd32c4ad9e261cac5556f4863652570a3c573d34245963fc4b9ade067981b2a329271 WHIRLPOOL 5a216e51173ee5a9a930013718452bcbfbcffe1aa1663f50d567daf17378a50135b1b0b6d750c9aece05de268e730faf6c54963823c037559fb50ed95dda32c7
diff --git a/dev-perl/Bit-Vector/Bit-Vector-7.300.0.ebuild b/dev-perl/Bit-Vector/Bit-Vector-7.300.0.ebuild
deleted file mode 100644
index 428f367411a7..000000000000
--- a/dev-perl/Bit-Vector/Bit-Vector-7.300.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=STBEY
-MODULE_VERSION=7.3
-inherit perl-module
-
-DESCRIPTION="Efficient bit vector, set of integers and big int math library"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-perl/Carp-Clan
- >=virtual/perl-Storable-2.20"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Bit-Vector/Manifest b/dev-perl/Bit-Vector/Manifest
index 61dbbf1f48f9..8baa87970e37 100644
--- a/dev-perl/Bit-Vector/Manifest
+++ b/dev-perl/Bit-Vector/Manifest
@@ -1,3 +1,2 @@
DIST Bit-Vector-7.2.tar.gz 137817 SHA256 6339f9e4376c623b411934cdfb52d7553c6c38457bfa376b953d40ca007807c2 SHA512 0344c2572e4a16259a4bb4b5f668c8f0ab32dc5a4eb0ab9e7da15ae86c1845036851095aa6353dcc9b1f9bf72ec5bd204e349c286ff5896869c36a4b7ff55955 WHIRLPOOL 219338151a816d055930878efe9c127f35ff3976c9e4c8a374bb821daace297fc6fee760d02b16225b5e7ceee45323a9b6ace0ef07a82ffb88d4f91e6d8bbd56
-DIST Bit-Vector-7.3.tar.gz 130395 SHA256 5a76330bfb9b9083371484c960d01ac0ad0e129fe770bfb1e87a85384e088f3d SHA512 e6baa2385d366ee00449abe52c20c49dbd41d2396d7c8f0fd6222262b6c4399d75eb081f46c5d1e524d12dafe0e5e78249f273e7705d04bd03033703fd2e86c8 WHIRLPOOL f583160f314e9d1ef0715711620ae5037e9cd196550c5f7ff2397ea4770a2d85b288d1d948619b2c724cb9bb8004a452493b340fcb1e491d7d67b649811e7503
DIST Bit-Vector-7.4.tar.gz 135965 SHA256 3c6daa671fecfbc35f92a9385b563d65f50dfc6bdc8b4805f9ef46c0d035a926 SHA512 80aa49aea8c31c60c14161198eab9d620d738530c3c209104b8ad8f1144822f80c3effb3303c569fc556b2457328659ae5d1aaf511d714c835618b84c722abc5 WHIRLPOOL 2953d658f769e511522d11322793dd60f71b95e3ce6b4cc1ef0ff154f5889d53c8c4bb2ca66533398b400010da426292fbf69d6b1f2da7b50ce3ce5fa204a998
diff --git a/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20120719.1.0-r1.ebuild b/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20120719.1.0-r1.ebuild
deleted file mode 100644
index 6671ad66cadb..000000000000
--- a/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20120719.1.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=BDFOY
-MODULE_VERSION=20120719.001
-inherit perl-module
-
-DESCRIPTION="Data pack for Business::ISBN"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
- test? (
- >=virtual/perl-Test-Simple-0.950.0
- dev-perl/Test-Pod
- dev-perl/Test-Pod-Coverage
- )
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Business-ISBN-Data/Manifest b/dev-perl/Business-ISBN-Data/Manifest
index 7d733f29d1dc..c92c62e6db65 100644
--- a/dev-perl/Business-ISBN-Data/Manifest
+++ b/dev-perl/Business-ISBN-Data/Manifest
@@ -1,2 +1 @@
-DIST Business-ISBN-Data-20120719.001.tar.gz 14745 SHA256 745f6bf8f7bd912c0a1865aa5f7e49343804de27783f544b2e2c714e14a704a3 SHA512 b688694bf99c65e072cbf5575de477dff607d1f66376f20b147f49896f4a2dd82a9a4b8dc1843c9d363ca93840df6683d989f794dcc7625e4f9b2c78ede2ded0 WHIRLPOOL e57618e9454b6e9ec212bc724961a945e73b7436b5f8758e73ddafcf494db01ae21e612aae2bc9654beec9fa2fb810052732e277b8b369a636581ea3387a92e1
DIST Business-ISBN-Data-20140910.002.tar.gz 16522 SHA256 3e2413d6672f6cbbfad61caa2d6eb315382bb5bc09db5157c8107cbdc98ecbae SHA512 bbfa483490ac3037fba33ae6d038ce2fb9b537d67cd3d2cd1b91edd06306cee38badb6ca6da38983c9b16d98e57b855fef19a5addd21f31ea58eb0d24181c9b1 WHIRLPOOL e29dc6011a23c7874113af1fed680de55908c726f8607c168991ece2318acc50d699e3a60efc00e9b41ba963e317d675e422d8cac62c077ba7e4010d8a3775e6
diff --git a/dev-perl/Business-ISMN/Business-ISMN-1.110.0-r1.ebuild b/dev-perl/Business-ISMN/Business-ISMN-1.110.0-r1.ebuild
deleted file mode 100644
index cad919d5ff34..000000000000
--- a/dev-perl/Business-ISMN/Business-ISMN-1.110.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=BDFOY
-MODULE_VERSION=1.11
-inherit perl-module
-
-DESCRIPTION="International Standard Music Numbers"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
- dev-perl/Tie-Cycle
- virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
- test? (
- dev-perl/Test-Pod
- dev-perl/Test-Pod-Coverage
- )
-"
-
-SRC_TEST=do
-
-src_install() {
- perl-module_src_install
- rm -rf "${ED}"/usr/share/man || die
-}
diff --git a/dev-perl/Business-ISMN/Manifest b/dev-perl/Business-ISMN/Manifest
index 664ab9509150..6abe0cfd4f4b 100644
--- a/dev-perl/Business-ISMN/Manifest
+++ b/dev-perl/Business-ISMN/Manifest
@@ -1,2 +1 @@
-DIST Business-ISMN-1.11.tar.gz 9053 SHA256 76d5240a5672c7a8b1ba9e9ea8238a5c8882139911acbb67b7059b5ee3da342d SHA512 e5bbaf048b06ee133a95443227fe2bf0e49abbb2164330105f7ccd4360503ca97848e4ff6b663064ceb36a34d4e5f7b47209f0153e5fa6e88d8ae8a0c90bd41a WHIRLPOOL f780112fddb09ece0bd784e29cf23fca31ee135f582eabe0bbc3192efdf554bfa610d94c8d222b2eac766c0615b2ca8806e4f1f1707d9f6c6624c9bec4bae1a3
DIST Business-ISMN-1.13.tar.gz 9703 SHA256 89b598dcde116732f8621b18660fec9a6989b1ad5bf96599b98fbcaecad9a132 SHA512 bad9fdfe16a6b62c823019af4162e0cb2f97dbda8cc5cad01ff3a6e80d22e5fa1d260ef410ad1393d03fc750f7976f06932ac948390cdeb995cc458e1d3cd984 WHIRLPOOL fe1bf9401fa4b973388028451d5cd06df8ac3ccc8887b6ef714b4a1f4e9c0e38a2c65ba8a5a500b55b59ffaa37067ad97e5724e47778a3642138cd6085c7cf55
diff --git a/dev-perl/Devel-Symdump/Devel-Symdump-2.150.0.ebuild b/dev-perl/Devel-Symdump/Devel-Symdump-2.150.0.ebuild
new file mode 100644
index 000000000000..f2284ddcb7e2
--- /dev/null
+++ b/dev-perl/Devel-Symdump/Devel-Symdump-2.150.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=ANDK
+DIST_VERSION=2.15
+inherit versionator perl-module
+
+DESCRIPTION="Dump symbol names or the symbol table"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Devel-Symdump/Manifest b/dev-perl/Devel-Symdump/Manifest
index 46e49bab5f68..3ea282a292d7 100644
--- a/dev-perl/Devel-Symdump/Manifest
+++ b/dev-perl/Devel-Symdump/Manifest
@@ -1,2 +1,3 @@
DIST Devel-Symdump-2.12.tar.gz 17541 SHA256 9949c44f7646d380e71744f6d12291de29b0f468fe96e8e1614feb913054073d SHA512 a123e41daf386963c0e199702386b07db75cb675574137c0661183add10d95ef568e48a9c2639373b39e6102ce16c4685ff538711f7d76b3a27c1fee4bd80506 WHIRLPOOL bafd918520c32471102a51fb8e0e16076e1791bb4aeeac7f5fee29845c5f2e294062d232af11a2ed14f4ea14195c5118339e8950fa6abf8369ec910fff876f2e
DIST Devel-Symdump-2.14.tar.gz 17828 SHA256 9b14fb22760e8f1292fdc52932b8dcc6abbd95a29f88d2e4faaf7add5ff71ede SHA512 7323e60ec39a1b4e52c617b001a645521f4361510608b9cfb44e349f5bce7f50565c36467ef25e08bd2ab53fcfdc44b040e77d735064c1a25a863b5f3688d889 WHIRLPOOL c16d1d4892943b375926f743556fb28a464468cce835c202cee3ca9d962963f5c9d2acc36ecf515435c794a9176f2c488ae17ac54a6a91081fb9db80f54a7f0d
+DIST Devel-Symdump-2.15.tar.gz 18112 SHA256 76c2a90d31318204ecf1977f0217ce57b142e6681fe2b99fb8789efc5dd86f41 SHA512 eba7178da3b8c9b8b2f4c61e572e4aef2e181a9b0be7a58f0790534511ccef51b7def381bcf7c37cd4a127de1cf57f1536284b3cb65f8a99920460a172f2e446 WHIRLPOOL d3af70e4e49cb496a25eb1d359ca03a5a62e7dfbbe83116b464ace56af38cbc05405089fe715e27f0f30451b758682ba30e70db9e9df8901feb4723413e843e2
diff --git a/dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild b/dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild
index 2c9546e8194e..a095b87142b0 100644
--- a/dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild
+++ b/dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="An exporter with the features of Sub::Exporter but only core dependencies"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/IO-AIO/IO-AIO-4.310.0.ebuild b/dev-perl/IO-AIO/IO-AIO-4.310.0.ebuild
index 0c4c31148ed2..ebd864d9a8f0 100644
--- a/dev-perl/IO-AIO/IO-AIO-4.310.0.ebuild
+++ b/dev-perl/IO-AIO/IO-AIO-4.310.0.ebuild
@@ -17,4 +17,5 @@ IUSE=""
DEPEND="dev-perl/common-sense"
RDEPEND="${DEPEND}"
+# Tests trigger stack overflow in sandbox code, see bug 553918
SRC_TEST=skip
diff --git a/dev-perl/IO-AIO/IO-AIO-4.320.0.ebuild b/dev-perl/IO-AIO/IO-AIO-4.320.0.ebuild
index e592e6c483b0..2d957af7722b 100644
--- a/dev-perl/IO-AIO/IO-AIO-4.320.0.ebuild
+++ b/dev-perl/IO-AIO/IO-AIO-4.320.0.ebuild
@@ -19,4 +19,5 @@ DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
"
+# Tests trigger stack overflow in sandbox code, see bug 553918
SRC_TEST=skip
diff --git a/dev-perl/IO-Interactive/IO-Interactive-0.0.6.ebuild b/dev-perl/IO-Interactive/IO-Interactive-0.0.6.ebuild
new file mode 100644
index 000000000000..40586ba6ddad
--- /dev/null
+++ b/dev-perl/IO-Interactive/IO-Interactive-0.0.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=BDFOY
+inherit perl-module
+
+DESCRIPTION="Utilities for interactive I/O"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ virtual/perl-version
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/IO-Interactive/Manifest b/dev-perl/IO-Interactive/Manifest
new file mode 100644
index 000000000000..b799dece2207
--- /dev/null
+++ b/dev-perl/IO-Interactive/Manifest
@@ -0,0 +1 @@
+DIST IO-Interactive-0.0.6.tar.gz 6487 SHA256 9cc016cbd94b500027e137cb5070d19487e4431bf822f0cb534c38b6b2c1038c SHA512 beee3f3c9c6ad9c9ca34e313a36312a62520c98914c9c405beacee1c2b3bf05ad2b2fe5a53b43abff8dec1dcbccada4718dd8b7b31a98755d96a6ef0f9863863 WHIRLPOOL 6ff16ee09485007d022c5d1a5a9c28ac72bd4540535f37d5093d9dfdde30bc15aa26f50832e1a2ea11a9014c6d553b7ad0322172bb2205f9492bd590ac6c60c7
diff --git a/dev-perl/IO-Interactive/metadata.xml b/dev-perl/IO-Interactive/metadata.xml
new file mode 100644
index 000000000000..708bcbd30056
--- /dev/null
+++ b/dev-perl/IO-Interactive/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>perl</herd>
+</pkgmetadata>
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild
index b9b0f88b4930..778593a8d883 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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="
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild
index 06e391a81300..31434681a581 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Provide the missing functionality from List::Util"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/MooX-Types-MooseLike/Manifest b/dev-perl/MooX-Types-MooseLike/Manifest
index 2097195440cd..7e82552c070d 100644
--- a/dev-perl/MooX-Types-MooseLike/Manifest
+++ b/dev-perl/MooX-Types-MooseLike/Manifest
@@ -1,2 +1,2 @@
-DIST MooX-Types-MooseLike-0.25.tar.gz 15254 SHA256 33e26df9853ab429a2978d8131304b91b4baadce4b3a908863de44061e4b69c9 SHA512 0d80103fa8f6b2ac76669e3ee37e768fc03cd680db006e06be2ddcc8c1710d3c80909a4d1ee0c5c0a596e84a632e0bbd9176f50212cdf377f363137753e2f418 WHIRLPOOL fc92b5fe7fb8ac83c520b5679aed22d5be36bf21c59441afbafdd6ef2c9497b2aac585f670d88c7178b4522f54a57800dbb860bf7822d8a9a268e185bd5a3417
DIST MooX-Types-MooseLike-0.27.tar.gz 15307 SHA256 ee35e2d85d48bb2785449a4fa42c67513e843c803a0d5074665f54a52b550991 SHA512 bfd221e2dd6b2f292b87b6bb3062fc00fa1f90426961c1c6de0dc266e0745e6ec3a3a9443aec006d8e999912c03f24a0735d01a3a4228803b556e14b608f2153 WHIRLPOOL e45a284cd90ee3833d8abaa85913a214d33859c01d9d5511ee0cfe67833ddc066b587ec03730fe63fc583b732c032ac0ef167705a0cfd1e188c737b3894dad74
+DIST MooX-Types-MooseLike-0.29.tar.gz 18804 SHA256 1d3780aa9bea430afbe65aa8c76e718f1045ce788aadda4116f59d3b7a7ad2b4 SHA512 69ddd0d663d1ea23dfc7e47ec35192f1951f195f70f788bac47cc93e98d9e888394c07fc39f1740b7c1fd04f8724f2b0dfa14183fe33bceb9f77c1f1d1b8752e WHIRLPOOL 016683ed19104d1e62908824902ee1fac29214efcbd487b0cf6071dda222554030acce927016e777edfc056a26acede5ec837db56ca05d7845bcfb53b717e56e
diff --git a/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.250.0.ebuild b/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0.ebuild
index 504b178897f8..bcaf4fd04b86 100644
--- a/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.250.0.ebuild
+++ b/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0.ebuild
@@ -1,29 +1,28 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-MODULE_AUTHOR=MATEU
-MODULE_VERSION=0.25
+DIST_AUTHOR=MATEU
+DIST_VERSION=0.29
inherit perl-module
DESCRIPTION="Some Moosish types and a type builder"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE="test"
RDEPEND="
- >=dev-perl/Module-Runtime-0.12.0
- >=dev-perl/Moo-0.91.10
+ >=dev-perl/strictures-2
+ >=dev-perl/Module-Runtime-0.14.0
+ >=dev-perl/Moo-1.4.2
"
DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
test? (
- dev-perl/Set-Object
>=dev-perl/Test-Fatal-0.3.0
>=virtual/perl-Test-Simple-0.960.0
)
"
-
-SRC_TEST=do
diff --git a/dev-perl/MooseX-Types-DateTime-MoreCoercions/Manifest b/dev-perl/MooseX-Types-DateTime-MoreCoercions/Manifest
index 8deb2ab04a1c..3b1d41f1adcb 100644
--- a/dev-perl/MooseX-Types-DateTime-MoreCoercions/Manifest
+++ b/dev-perl/MooseX-Types-DateTime-MoreCoercions/Manifest
@@ -1,2 +1,2 @@
-DIST MooseX-Types-DateTime-MoreCoercions-0.09.tar.gz 29032 SHA256 47eeeb86ef28ae8e7dda1e32d6466b2c9284efabc2f0b1bf2f13884acd493e3b SHA512 afd09d347094c06be9dbfa672505380a833d2b6b325d355d597b6ebb5ea7e0e78604b667de8000e3e555c4fc91603f10b7e1ab2bd2ccfddc4a5c4bef46c5b190 WHIRLPOOL be640b2a1788f797e077ee258ec06cba56e550c5eb50962df95f80d3036c72b4761a4ccbbd5f414dced260d8a7fd045505b7e30bf3b8aa860a10e1539c180fe0
DIST MooseX-Types-DateTime-MoreCoercions-0.11.tar.gz 29516 SHA256 c746a9284b7db49ce9acb2fbce26629fa816e6636e883d2ed6c62e336cfc52cb SHA512 4a3220e62b92affa0f3eb5121ca53613aefe28b2d4e5a5ef8be7ca24e5be583a4e6ffc69ca751fc7474bc4f51fc7c3479e9fcda4c5e3888dbaacc31de67815c9 WHIRLPOOL 776cc4b89451f017edb5c0ea64db7d3ee4fe9077281e4ba4bc5498385dc9ed2326b008f57090f8b6779b25da3ba010af37ba74ee7e1d89c9ab5988e6566ee810
+DIST MooseX-Types-DateTime-MoreCoercions-0.15.tar.gz 29824 SHA256 21bb3a597719888edb6ceaa132418d5cf92ecb92a50cce37b94259a55e0e3796 SHA512 c0e3e1d1d4969d674d0c5d88b99aa401049b8ca7a61c3ec139a8e7c39d44e8a12ee2a8151029d24b1ef0063af3de6ec235c81c576ef21d6ab0b680f0a94cc020 WHIRLPOOL e98f335df4cd0b25e5f77b11e2430000ce371a2c5329a8cdb5929001bf77d290483b89b45064df538fa22e0667bc275e08623e564c21f024663be65702e33ff5
diff --git a/dev-perl/MooseX-Types-DateTime-MoreCoercions/MooseX-Types-DateTime-MoreCoercions-0.90.0.ebuild b/dev-perl/MooseX-Types-DateTime-MoreCoercions/MooseX-Types-DateTime-MoreCoercions-0.150.0.ebuild
index eebdefece876..e2e1e6691121 100644
--- a/dev-perl/MooseX-Types-DateTime-MoreCoercions/MooseX-Types-DateTime-MoreCoercions-0.90.0.ebuild
+++ b/dev-perl/MooseX-Types-DateTime-MoreCoercions/MooseX-Types-DateTime-MoreCoercions-0.150.0.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-MODULE_AUTHOR=ILMARI
-MODULE_VERSION=0.09
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.15
inherit perl-module
DESCRIPTION="Extensions to MooseX::Types::DateTime"
@@ -18,16 +18,18 @@ RDEPEND="
>=dev-perl/DateTime-0.430.200
>=dev-perl/DateTimeX-Easy-0.85.0
>=dev-perl/Moose-0.410.0
- >=dev-perl/MooseX-Types-0.140.0
- >=dev-perl/MooseX-Types-DateTime-0.70.0
>=dev-perl/MooseX-Types-0.40.0
+ >=dev-perl/MooseX-Types-DateTime-0.70.0
>=dev-perl/Time-Duration-Parse-0.60.0
- >=dev-perl/namespace-clean-0.80.0
+ virtual/perl-if
+ >=dev-perl/namespace-clean-0.190.0
"
DEPEND="${RDEPEND}
+ >=dev-perl/Module-Build-Tiny-0.7.0
test? (
- >=dev-perl/Test-Exception-0.270.0
+ virtual/perl-ExtUtils-MakeMaker
+ virtual/perl-File-Spec
+ dev-perl/Test-Fatal
|| ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-use-ok-0.20.0 )
- )"
-
-SRC_TEST=do
+ )
+"
diff --git a/dev-perl/MooseX-Types-JSON/Manifest b/dev-perl/MooseX-Types-JSON/Manifest
index 06e2a7f56a4f..c53400931b3a 100644
--- a/dev-perl/MooseX-Types-JSON/Manifest
+++ b/dev-perl/MooseX-Types-JSON/Manifest
@@ -1 +1,2 @@
DIST MooseX-Types-JSON-0.02.tar.gz 2363 SHA256 5ffc6710902e4799e269ec0d3e01ebe1b81f8955646de813f85ec2f9af291a32 SHA512 b6c072bae945243ee0efb4a230c31bb20d74d7eccddd3a4c5ae106e21e7eca59f85da5b49950d835d5d396d33cd003063e301728bcac846127ac58b7eb8bd451 WHIRLPOOL f9ab752dc6f7ad00a0df6d68902be0e5d3601ab25f4fa7187a8986e81d4e65c54c08a36ff3619d72db3ff87361500015cacb81e2d0c2eb56c77d02a78770fdc9
+DIST MooseX-Types-JSON-1.00.tar.gz 9742 SHA256 030bdecd7a2f9046ae25824001a27743997efad3ae2378d507551135eb29a30b SHA512 1dfaa8907c04ca765fc03c2049cbf076b2e29f1df34b569d91b3cc3931acde8cc7563cb186d3ea4b278ee40f1c4706f6b03139fb370d6a9d79eb7e6de21aa23f WHIRLPOOL da0208982920ccacd1b98ac882b15d404befabb8994cdd5a011df4693ac058df27bf3637000df1b148f3f1ba60fcc535c1ed7ae63d7e03b439a82e00d3f93c4d
diff --git a/dev-perl/MooseX-Types-JSON/MooseX-Types-JSON-1.0.0.ebuild b/dev-perl/MooseX-Types-JSON/MooseX-Types-JSON-1.0.0.ebuild
new file mode 100644
index 000000000000..72e1a8d93513
--- /dev/null
+++ b/dev-perl/MooseX-Types-JSON/MooseX-Types-JSON-1.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=MILA
+DIST_VERSION=1.00
+inherit perl-module
+
+DESCRIPTION="JSON datatype for Moose"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-perl/JSON-XS-2.00
+ dev-perl/Moose
+ dev-perl/MooseX-Types
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-perl/Mouse/Manifest b/dev-perl/Mouse/Manifest
index 6e15fb9844ea..ebcfaf848fe6 100644
--- a/dev-perl/Mouse/Manifest
+++ b/dev-perl/Mouse/Manifest
@@ -1,4 +1,4 @@
DIST Mouse-0.64-ppport.h.bz2 39634 SHA256 adbd5a9eb45a677b948b9c119815977df82981991dfd66b2eecb44a47ff61c7a SHA512 23316f5e814677ae84968da9733cc19f0b6732e4e8dcc97333e4d56523ed9bf2f41cc2ec8a82d6d66b43161f8ec0d0b9e661a2b01432f8dd9fdf4167c4a697fd WHIRLPOOL c4551c16c3146ce57753d1c005ffbd75d223d526681e4562bcc9520a5d77bbf4ff52412ea29021757bb731d271173ef39683e3a56b4359f2b61fb494560acefb
DIST Mouse-0.97.tar.gz 229149 SHA256 dfb1f3abbc46e7646a685efa4e5804c4cf9772eb807ac6abf8f1d1529b57b97a SHA512 a213d22701f9beef91d97eb6f9223a57a13f8d23d9452cd7802e951d95b42997525362a0e5cc7799fb628cceb1ca88541bb9f649c365e65a18463ad88e24efdf WHIRLPOOL bc2138bd62bad92fc476eff62f0c06cc36130859a4a415b4faf65feb11e089d88c386504ca6c40fd7352562fe2d5d419d328d13eeaed5092f070ba89fe235592
-DIST Mouse-1.05.tar.gz 232827 SHA256 1eb995904be2d1848297fa278430729d3ff87855d3dfd47194913c06913ef792 SHA512 53331be37fbef28e1826a1ca0503caacd155824ef80678f8215432725f26c43b20d3c95bfd14a9a58a5fe7a997e2671f19c0abb120de34bf95b3d245276ea675 WHIRLPOOL cdbad52438a9477490ec09414db3d7b4440a41e41c9fadfd53e8127371f6e09945fd39af1b46615d1bb89055ccbce1ab0fb62c2bb3a2738628cd3d018afe95cd
DIST Mouse-2.4.1.tar.gz 220438 SHA256 3f1000351ae419ecc68e439671e3352d80424568c37b3e6ac7c6bdcbbe8711e1 SHA512 2e76a8c7cc27d7bc128127dd38cb7bc1d3d7eed324f0a8fdea90f21e234c132884e460a6e19c9bf9f26e9f78cb24afea5dbf08495cd980db5bd56d0c8f0200f2 WHIRLPOOL 1ff91b97639879a5eec2dfe4e413dcfdb3b9610d167721bd17b9e9ed1e2e4fa59567578d727d5bb7e0ab9b396b91928c5cbd012f04fda0a01535669e3fe68cea
+DIST Mouse-v2.4.5.tar.gz 221446 SHA256 14223cf0864e307e674e39c0b109398d2fb6289d245f273177810b878cbe8db8 SHA512 555b0543a1bfda2b07c53c2f1d1a62dabfc5261dac5f22cfd227d739e52f85c669ca3570a209eff041528e32bb84ad9cc656fe35b212aea7ff6b287bad5937b9 WHIRLPOOL 1613f023b4d68ba945d9ccc1edbc9b1c94326d97de7e3d20de5724779d3bb7d718245096271b827934b6d6dd1e8bb3a0b564d89f6fd65075d61ea8108d9d8dc7
diff --git a/dev-perl/Mouse/Mouse-1.50.0.ebuild b/dev-perl/Mouse/Mouse-1.50.0.ebuild
deleted file mode 100644
index f6166458d4fe..000000000000
--- a/dev-perl/Mouse/Mouse-1.50.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=GFUJI
-MODULE_VERSION=1.05
-inherit eutils perl-module
-
-DESCRIPTION="Moose minus the antlers"
-#SRC_URI+=" mirror://gentoo/Mouse-0.64-ppport.h.bz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-macos"
-IUSE="test"
-
-RDEPEND="
- virtual/perl-XSLoader
-"
-DEPEND="
- >=virtual/perl-ExtUtils-ParseXS-2.21
- test? (
- ${RDEPEND}
- dev-perl/Sub-Uplevel
- >=virtual/perl-Test-Simple-0.88
- )
-"
-
-#src_prepare() {
-# perl-module_src_prepare
-# epatch "${FILESDIR}"/0.64-ppport.patch
-# mv "${WORKDIR}"/Mouse-0.64-ppport.h "${S}"/ppport.h || die
-#}
-
-SRC_TEST=do
diff --git a/dev-perl/Mouse/Mouse-2.4.5.ebuild b/dev-perl/Mouse/Mouse-2.4.5.ebuild
new file mode 100644
index 000000000000..b7f6141b9265
--- /dev/null
+++ b/dev-perl/Mouse/Mouse-2.4.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=SYOHEX
+DIST_VERSION=v${PV}
+inherit perl-module
+
+DESCRIPTION="Moose minus the antlers"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=virtual/perl-Scalar-List-Utils-1.140.0
+ >=virtual/perl-XSLoader-0.20.0
+"
+DEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-ParseXS-3.220.0
+ >=virtual/perl-Devel-PPPort-3.220.0
+ >=dev-perl/Module-Build-0.400.500
+ dev-perl/Module-Build-XSUtil
+ test? (
+ dev-perl/Test-Exception
+ dev-perl/Test-Fatal
+ dev-perl/Test-LeakTrace
+ >=virtual/perl-Test-Simple-0.880.0
+ dev-perl/Test-Output
+ dev-perl/Test-Requires
+ dev-perl/Try-Tiny
+ )
+"
diff --git a/dev-perl/Mozilla-CA/Manifest b/dev-perl/Mozilla-CA/Manifest
index 5af6151442cf..4d8d0bc40894 100644
--- a/dev-perl/Mozilla-CA/Manifest
+++ b/dev-perl/Mozilla-CA/Manifest
@@ -1 +1,2 @@
DIST Mozilla-CA-20130114.tar.gz 139200 SHA256 82342614add1dbca8a00daa1ee55af3e0036245aed7d445537918c045008ccd7 SHA512 b50337990db16ab30427ade7feb87e38305e820ecf490c2f5ed9340957c24139128c12bcd8f23eac4bce83533a7dab22190e2df42ab19b1555d662efc04f3fdb WHIRLPOOL 29c41c41032a70c242e777205a9969e30f4d3d2fc94a932ddec8fad269edaa142dd31e394bf891829388836594cddcec3077c5f39ceb478857f847855f7b0135
+DIST Mozilla-CA-20150826.tar.gz 155342 SHA256 c159d134175db0723a347649961a8f83769d4e20e76e55e040286e1099f71369 SHA512 14ca46bd240dba9d41697ad65d22562d2b86fc81ac40dbbbe51ec41758ee164a7be3c9a3e82f2eed24affb6e47faa2f93e3d14e8940ef6a3363763182b9b559e WHIRLPOOL 84cbc502128da250985d898edcdc1e2287728113d194f53e33833fd1367e01c4ae38e6efa4769121a726eb37bb865f7537ca6f60bd806a777e99b9b8f4ee52f7
diff --git a/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild b/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild
new file mode 100644
index 000000000000..fc340a96b10b
--- /dev/null
+++ b/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=ABH
+inherit perl-module
+
+DESCRIPTION="Mozilla's CA cert bundle in PEM format"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Net-Amazon-S3/Manifest b/dev-perl/Net-Amazon-S3/Manifest
index dabaf00039a5..c97f0f407107 100644
--- a/dev-perl/Net-Amazon-S3/Manifest
+++ b/dev-perl/Net-Amazon-S3/Manifest
@@ -1,2 +1,2 @@
-DIST Net-Amazon-S3-0.56.tar.gz 36467 SHA256 62150d3a5ec539c06284dda3702e7dc4959ecdcc6907b03f068a73ad8095f765 SHA512 1d471bd6f3382fb872a03e29c0f8dc3dd9abc6379266f505975e6a2fa36a0d64fe081b202dd6e1c281b15479ac9bccc3a1d99ac832af502b81ad5c1426b2a981 WHIRLPOOL 0943758f0da05347eb127521f94a3496154ebbf53a7c6d22dcd9dc0b43b9510890f4a85b668fcdd2c20e3e8e5f879a66f27afbdfdb97dd9e7d2475a3f5c61c14
DIST Net-Amazon-S3-0.59.tar.gz 52272 SHA256 94f2bd6b317a9142e400d7d17bd573dc9d22284c3ceaa4864474ba674e0e2e9f SHA512 183fce9c9375a3c6d7ef9e1278e4684bb98a19e871c5cfe9bfb99607a0c3d697df1337c682d13305477fc143c22563b218325017506871c78e70f8e57c0a787f WHIRLPOOL e4c980d4f6cda542c8305c9bd1d190bd1136f17d7cc7a1cdffc07b849ca852c346c8e8b661be403cb4ffbdd9adc3bac04f7a824eb7b99f0b4a3b9942ac153c4b
+DIST Net-Amazon-S3-0.80.tar.gz 60202 SHA256 efb73dd9a96078742cb8564f7b58f5abe5168277342c7634961d63b4ef278848 SHA512 0a6a60e9c227e5646c21585b90c6d2cc437cb7c898cc69b8d4165ee426b9b22e14c94c5c95cffcbfc4b1f310a910dbcd2a03eba06d0eb86192d25458856ed254 WHIRLPOOL 141ace70bbafb91703066d6915dc5128348e8f573b820ab057e66707d24700c35f8e5fd097a3895a5c1811bf2016c62f669aef6a8463824d3624942adbf4b343
diff --git a/dev-perl/Net-Amazon-S3/Net-Amazon-S3-0.560.0.ebuild b/dev-perl/Net-Amazon-S3/Net-Amazon-S3-0.560.0.ebuild
deleted file mode 100644
index 5d3b0efe86b4..000000000000
--- a/dev-perl/Net-Amazon-S3/Net-Amazon-S3-0.560.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=PFIG
-MODULE_VERSION=0.56
-inherit perl-module
-
-DESCRIPTION="Framework for accessing the Amazon S3 Simple Storage Service"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-perl/Moose-1.990.0
- >=dev-perl/Data-Stream-Bulk-0.60.0
- dev-perl/DateTime-Format-HTTP
- dev-perl/Digest-HMAC
- dev-perl/Digest-MD5-File
- dev-perl/libwww-perl
- virtual/perl-IO
- dev-perl/LWP-UserAgent-Determined
- virtual/perl-MIME-Base64
- >=dev-perl/Moose-0.850.0
- >=dev-perl/MooseX-StrictConstructor-0.160.0
- >=dev-perl/MooseX-Types-DateTime-MoreCoercions-0.70.0
- dev-perl/regexp-common
- dev-perl/XML-LibXML
- dev-perl/URI"
-
-RDEPEND="${DEPEND}"
-
-SRC_TEST=no
diff --git a/dev-perl/Net-Amazon-S3/Net-Amazon-S3-0.800.0.ebuild b/dev-perl/Net-Amazon-S3/Net-Amazon-S3-0.800.0.ebuild
new file mode 100644
index 000000000000..d1b5fb7c1156
--- /dev/null
+++ b/dev-perl/Net-Amazon-S3/Net-Amazon-S3-0.800.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RCONOVER
+DIST_VERSION=0.80
+inherit perl-module
+
+DESCRIPTION="Framework for accessing the Amazon S3 Simple Storage Service"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ virtual/perl-Carp
+ dev-perl/Data-Stream-Bulk
+ dev-perl/DateTime-Format-HTTP
+ dev-perl/Digest-HMAC
+ virtual/perl-Digest-MD5
+ dev-perl/Digest-MD5-File
+ dev-perl/File-Find-Rule
+ virtual/perl-Getopt-Long
+ dev-perl/HTTP-Date
+ dev-perl/HTTP-Message
+ virtual/perl-IO
+ >=dev-perl/libwww-perl-6.30.0
+ dev-perl/LWP-UserAgent-Determined
+ virtual/perl-MIME-Base64
+ dev-perl/MIME-Types
+ >=dev-perl/Moose-0.850.0
+ >=dev-perl/MooseX-StrictConstructor-0.160.0
+ >=dev-perl/MooseX-Types-DateTime-MoreCoercions-0.70.0
+ dev-perl/Path-Class
+ dev-perl/regexp-common
+ dev-perl/Term-Encoding
+ dev-perl/Term-ProgressBar-Simple
+ dev-perl/URI
+ dev-perl/VM-EC2-Security-CredentialCache
+ dev-perl/XML-LibXML
+
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-File-Temp
+ dev-perl/Test-Exception
+ virtual/perl-Test-Simple
+ )
+"
diff --git a/dev-perl/Net-CIDR/Manifest b/dev-perl/Net-CIDR/Manifest
index f62ad09764bb..df961e9f1d2e 100644
--- a/dev-perl/Net-CIDR/Manifest
+++ b/dev-perl/Net-CIDR/Manifest
@@ -1 +1,2 @@
DIST Net-CIDR-0.17.tar.gz 10654 SHA256 4a968e700d382cf0946e47df420d0151fbd8e0135f037d404c7c63713b66daf0 SHA512 bb1ad29f79879e46afc221ddec1d790ea69d470e7363dc90e27ec3fb34e15cf753b457b76a4ea0e70db4afc0aeb11f3e2bbe7c204abb5aae967d13ae9605460f WHIRLPOOL 06bb2f5bc8a9827f6c52f6c773f6dcc1c523bae5da6d19bd641a80b5a0e2c25c28477eca45b06c9785ada98f320bea9392da81427eeb779f062c67555f1521b0
+DIST Net-CIDR-0.18.tar.gz 10761 SHA256 c3df7ea8d42b2d8ec328c187329c5f8c4db6a2470873f61e3d0dd91430ef1427 SHA512 26a8fd1fdb16b03f72c456edbd7dd0f158e6fcd76847be7634c470049eeabd1d41bf328d32e528aa26b7f34179b38904c65ba511ca3347acb0442fe93748bc63 WHIRLPOOL f1f137887c3fffde8fa9f7c69cef2e25bb46bb7ad8224774c55aebeeb796d6924263e7fbf0143f2737e6f1ef1dd474417e9ba0e2473bd2d5b387c511de57feea
diff --git a/dev-perl/Net-CIDR/Net-CIDR-0.180.0.ebuild b/dev-perl/Net-CIDR/Net-CIDR-0.180.0.ebuild
new file mode 100644
index 000000000000..738575259286
--- /dev/null
+++ b/dev-perl/Net-CIDR/Net-CIDR-0.180.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=MRSAM
+DIST_VERSION=0.18
+inherit perl-module
+
+DESCRIPTION="Manipulate netblock lists in CIDR notation"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+ virtual/perl-Carp
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Net-DBus/Manifest b/dev-perl/Net-DBus/Manifest
index 26b6f2de73b5..a4707a7f4004 100644
--- a/dev-perl/Net-DBus/Manifest
+++ b/dev-perl/Net-DBus/Manifest
@@ -1 +1,2 @@
DIST Net-DBus-1.0.0.tar.gz 100667 SHA256 bfd0f3bc8ae228b410952829d97ed5f9c1d53587ab645b9d99241f6b51e2590f SHA512 fa0c47360e204076168e9e62cf72f3443397e7cd83d09ab041b892ef78a017a1abc8f4d57a4114bb415c146cdded283c39dca5c262b5fda14fefbcd4fe634e51 WHIRLPOOL f5e06540dd4c6ed859055b9505aa253d860d70e89175d2a8cced09cb6c9862c94e258be25cd34a4696743ca4a22f528f9c13fca6bd331686efbb9bf5b96808e1
+DIST Net-DBus-1.1.0.tar.gz 2075154 SHA256 8391696db9e96c374b72984c0bad9c7d1c9f3b4efe68f9ddf429a77548e0e269 SHA512 96f5983ef1e33b4abea93277e39e779821c8ee4b1f2bc7a4a3aaa3612b9513a426b9f8e04094eb8449e89324c22c264df2d34b3d3e43dace85f443a57c770cc3 WHIRLPOOL 83b5c45c15c70d28853794a8ff839bb4812ba8672a0e7e286f1b9ba95b1bb41e1205a15fe64955cc831ddde8c477b9d6681d9ca7d6dc2f2d21717a330ff07600
diff --git a/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild b/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
new file mode 100644
index 000000000000..4cc855eed75c
--- /dev/null
+++ b/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=DANBERR
+inherit perl-module
+
+DESCRIPTION="Perl extension for the DBus message system"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+ sys-apps/dbus
+ virtual/perl-Time-HiRes
+ dev-perl/XML-Twig
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-Test-Simple
+ dev-perl/Test-Pod
+ dev-perl/Test-Pod-Coverage
+ )
+"
diff --git a/dev-perl/Net-DNS-SEC/Manifest b/dev-perl/Net-DNS-SEC/Manifest
index 721c374e990c..9663a6e09fd8 100644
--- a/dev-perl/Net-DNS-SEC/Manifest
+++ b/dev-perl/Net-DNS-SEC/Manifest
@@ -1 +1,2 @@
DIST Net-DNS-SEC-0.22.tar.gz 76844 SHA256 381830970220ee6175e19dfaa1d5589fd65137f6c54aa2542b61a826e1cb72ad SHA512 d51f35d778a0c1d2b461e1ac851a50534e56889ce2c6444c88bad268cb386aaed4be8e1314c5a16cfa825ddf5cfda23501b8536175c45c66c0da41954db29364 WHIRLPOOL 9360ed39b09b2df9eca0ca9bb4b771e566f9fe55edb66e95b0280b1174336724aa3ee031aaaad8cb87927b7fc498ae96e3a7a3a9c55c7e9646fa1eff5494eb73
+DIST Net-DNS-SEC-1.02.tar.gz 35915 SHA256 e78090addfd4a5d4068b173e6e071d984ae8b67dd803f8f33b73eb7692085fbf SHA512 cbbf0a4eb6948047a991cf473b0824cfa69c7f7e2d07190fbc9fe62be79106635ebfc02ab02a559079f2936ff354f5ff9275fd16cf37d7bc2d78a87cf0b103b0 WHIRLPOOL 299823533e31d1c90fb637179711053c3a658f8435699acb27f07983a1600b065e025d61f4bbebce5a6808b2c81767ff6665ef5b17b9476d29b28a32deecc704
diff --git a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.20.0.ebuild b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.20.0.ebuild
new file mode 100644
index 000000000000..f62333e20718
--- /dev/null
+++ b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.20.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=NLNETLABS
+DIST_VERSION=1.02
+inherit perl-module
+
+DESCRIPTION='DNSSEC extensions to Net::DNS'
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-perl/Crypt-OpenSSL-Bignum-0.40.0
+ >=dev-perl/Crypt-OpenSSL-DSA-0.140.0
+ >=dev-perl/Crypt-OpenSSL-RSA-0.270.0
+ >=virtual/perl-File-Spec-0.860.0
+ >=virtual/perl-MIME-Base64-2.110.0
+ >=dev-perl/Net-DNS-1.10.0
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-Test-Simple-0.470.0
+ )
+"
diff --git a/dev-perl/Net-DNS/Manifest b/dev-perl/Net-DNS/Manifest
index 70ad7bb16502..6791a5b0460b 100644
--- a/dev-perl/Net-DNS/Manifest
+++ b/dev-perl/Net-DNS/Manifest
@@ -1,2 +1,3 @@
DIST Net-DNS-0.74.tar.gz 200829 SHA256 ef64af502e94f2d0e0a672ab951d846fd1406544eca596a86943bc8f2da19c32 SHA512 f0bb5482247c9b01dc6e704d1d6f93881b209001d5b43488c453f24b48ddbb07aefa4bb8e71d1d61f3f5d81ad918627f66e56a8a14d2d9adcccf0fe1af15389d WHIRLPOOL dd15330e82b2d06867cae1461d6115b9545aaf0042e9c7e674022330870f18fbf2af4349fb3350bd755e35cdaca6437258ce39293d2f0cd6665b4ad8372babd7
DIST Net-DNS-0.81.tar.gz 197700 SHA256 b36c8ead6edf68da5d9de2b0a22a47d7216e2d7eb52c8cde96724988f68a6d46 SHA512 594d1de98012d7f364f3e9300c0904dc09deb4589cf40cd7c1377da11f7c9203b0171d7eb1f299c3aa519c2f595e644ef960703808d4a42818706dfc7ac7bf53 WHIRLPOOL 0f24e0e53c19a387f75975ddfbc6ecb071c8e28a2b86a687cadbfd7ac218c835ad3db294a1d2f1cda9c9a2c8c45701a9cd7ba1578193f224aeed3d3f85e8df4b
+DIST Net-DNS-1.04.tar.gz 245064 SHA256 4b9f220304c5722658fbdbe4db31ab77486b5f0aaada78c9d1b528e4b0680965 SHA512 ff32c1bf52e553fcd64f8a0f9fcd30f6eae4e1350c4c5c97da3b745f1713acd75533694ec834e1b1e9bee0a13b7a8ee0c347dfaa36433052f020e41e36829d59 WHIRLPOOL 5c09639ffc7bdaac4625bf9fc592c6109b43ebb7ab0eed29b9bb7cc42d35f155736a9125787adabb3ee47fb2374189b9d940ea6bf626fa8d837cd5be2511ea83
diff --git a/dev-perl/Net-DNS/Net-DNS-1.40.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.40.0.ebuild
new file mode 100644
index 000000000000..6082ded51ff8
--- /dev/null
+++ b/dev-perl/Net-DNS/Net-DNS-1.40.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=NLNETLABS
+DIST_VERSION=1.04
+inherit toolchain-funcs perl-module
+
+DESCRIPTION="Perl Net::DNS - Perl DNS Resolver Module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="ipv6 test"
+
+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
+ ipv6? (
+ dev-perl/IO-Socket-INET6
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-Test-Simple
+ dev-perl/Test-Pod
+ )
+"
+
+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}"
+}
diff --git a/dev-perl/Parse-CPAN-Meta/Manifest b/dev-perl/Parse-CPAN-Meta/Manifest
deleted file mode 100644
index 6af402a43a0e..000000000000
--- a/dev-perl/Parse-CPAN-Meta/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Parse-CPAN-Meta-1.4417.tar.gz 24808 SHA256 dd1df72c80390551563159f18f81a26baabeda8d4b0e94df7f1c223391967121 SHA512 2a7ac80bac66f9381149d1666345b92f3203c712a0ae1adefcac717069edf08e4d3f9b59b818400fe40b4aaf612c7c9244488d5459c536f51352f3c972d7b446 WHIRLPOOL cc0bef6ae59283db523825db1b5e060fb31b44c6c4e5d32ce7cdf2847d16f4bcac67ca5fc4b86f6c884f6d00e7c537e79330dadf95873cb88a6faf5a063e85a8
diff --git a/dev-perl/Parse-CPAN-Meta/Parse-CPAN-Meta-1.441.700.ebuild b/dev-perl/Parse-CPAN-Meta/Parse-CPAN-Meta-1.441.700.ebuild
deleted file mode 100644
index 4d274ff92ed5..000000000000
--- a/dev-perl/Parse-CPAN-Meta/Parse-CPAN-Meta-1.441.700.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=1.4417
-inherit perl-module
-
-DESCRIPTION="Parse META.yml and META.json CPAN metadata files"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? (
- virtual/perl-File-Spec
- )
- "
-
-SRC_TEST="do"
diff --git a/dev-perl/Parse-CPAN-Meta/metadata.xml b/dev-perl/Parse-CPAN-Meta/metadata.xml
deleted file mode 100644
index 7442b2cf6cf1..000000000000
--- a/dev-perl/Parse-CPAN-Meta/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>perl</herd>
- <maintainer>
- <email>monsieurp@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="cpan">Parse-CPAN-Meta</remote-id>
- <remote-id type="cpan-module">Parse::CPAN::Meta</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-perl/Role-Basic/Role-Basic-0.130.0.ebuild b/dev-perl/Role-Basic/Role-Basic-0.130.0.ebuild
index 256fde53c157..0f09865e5561 100644
--- a/dev-perl/Role-Basic/Role-Basic-0.130.0.ebuild
+++ b/dev-perl/Role-Basic/Role-Basic-0.130.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,8 @@ IUSE="test"
RDEPEND=""
DEPEND="${RDEPEND}
+ dev-perl/Module-Build
test? ( virtual/perl-Test-Simple )
"
-SRC_TEST="do"
+SRC_TEST="do parallel"
diff --git a/dev-perl/Term-Encoding/Manifest b/dev-perl/Term-Encoding/Manifest
new file mode 100644
index 000000000000..ac9994e76d09
--- /dev/null
+++ b/dev-perl/Term-Encoding/Manifest
@@ -0,0 +1 @@
+DIST Term-Encoding-0.02.tar.gz 11373 SHA256 f274e72346a0c0cfacfb53030ac1e38b57425512fc5bdc5cd9ef75ab0f26cfcc SHA512 cd4cee9991d857c40b8e8747a645429dcb1f416552d9bb6bd59da609bc4eb11c295a9b4d4c9b1a6e738af57fbc7179419d07387f3342658bf7ec6da90256efad WHIRLPOOL 5f06931398144e429c753478eb6f1ff07ba029a932b7cca5e151be45ce1993dcbbafff204cdb0ce7f5ceb13541e60b2ae21a203342e37fc9cd7cbea5a876c58a
diff --git a/dev-perl/Term-Encoding/Term-Encoding-0.20.0.ebuild b/dev-perl/Term-Encoding/Term-Encoding-0.20.0.ebuild
new file mode 100644
index 000000000000..c2cef9d42d01
--- /dev/null
+++ b/dev-perl/Term-Encoding/Term-Encoding-0.20.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=MIYAGAWA
+DIST_VERSION=0.02
+inherit perl-module
+
+DESCRIPTION="Detect encoding of the current terminal"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Term-Encoding/metadata.xml b/dev-perl/Term-Encoding/metadata.xml
new file mode 100644
index 000000000000..708bcbd30056
--- /dev/null
+++ b/dev-perl/Term-Encoding/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>perl</herd>
+</pkgmetadata>
diff --git a/dev-perl/Term-ProgressBar-Quiet/Manifest b/dev-perl/Term-ProgressBar-Quiet/Manifest
new file mode 100644
index 000000000000..1f6375d4c76f
--- /dev/null
+++ b/dev-perl/Term-ProgressBar-Quiet/Manifest
@@ -0,0 +1 @@
+DIST Term-ProgressBar-Quiet-0.31.tar.gz 1924 SHA256 25675292f588bc29d32e710cf3667da9a2a1751e139801770a9fdb18cd2184a6 SHA512 f48502ac57d236678159e7b6efd70007bb9ea7b27da7d933c53ccfeab562c6e88c291cd002fc65af8ccc98ff8843a5221048276351491cb324f548bf3cdf3934 WHIRLPOOL 38c68352dd14a7b76bf6ee183975e0bf584049057c81de0d415b2d601bab41fddb63f3bcf3d219835eda1d9db63c82957a827c68dea6392c38c6ead02688519f
diff --git a/dev-perl/Term-ProgressBar-Quiet/Term-ProgressBar-Quiet-0.310.0.ebuild b/dev-perl/Term-ProgressBar-Quiet/Term-ProgressBar-Quiet-0.310.0.ebuild
new file mode 100644
index 000000000000..e9bfbd4671df
--- /dev/null
+++ b/dev-perl/Term-ProgressBar-Quiet/Term-ProgressBar-Quiet-0.310.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=LBROCARD
+DIST_VERSION=0.31
+inherit perl-module
+
+DESCRIPTION="Provide a progress meter if run interactively"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-perl/IO-Interactive
+ dev-perl/Term-ProgressBar
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ dev-perl/Test-MockObject
+ virtual/perl-Test-Simple
+ )
+"
diff --git a/dev-perl/Term-ProgressBar-Quiet/metadata.xml b/dev-perl/Term-ProgressBar-Quiet/metadata.xml
new file mode 100644
index 000000000000..708bcbd30056
--- /dev/null
+++ b/dev-perl/Term-ProgressBar-Quiet/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>perl</herd>
+</pkgmetadata>
diff --git a/dev-perl/Term-ProgressBar-Simple/Manifest b/dev-perl/Term-ProgressBar-Simple/Manifest
new file mode 100644
index 000000000000..73c97897f1d1
--- /dev/null
+++ b/dev-perl/Term-ProgressBar-Simple/Manifest
@@ -0,0 +1 @@
+DIST Term-ProgressBar-Simple-0.03.tar.gz 3557 SHA256 a20db3c67d5bdfd0c1fab392c6d1c26880a7ee843af602af4f9b53a7043579a6 SHA512 68374d5261ef579d149faac84b829aaf39c29e064e5380e5f403746e89017c226a865d0f454cdf2c8dbc3401ced60215042de43aae43c1c0493027fa8f8f69d7 WHIRLPOOL d379cedd0252df205cafadbade2b855ebe565a4266d08873936fcd2e68e3bc1e3da5e79803bd743e0bd82b9f39db7381bcdf1c16943ce44dc7856f9891bd01c2
diff --git a/dev-perl/Term-ProgressBar-Simple/Term-ProgressBar-Simple-0.30.0.ebuild b/dev-perl/Term-ProgressBar-Simple/Term-ProgressBar-Simple-0.30.0.ebuild
new file mode 100644
index 000000000000..ba19bc3e75cd
--- /dev/null
+++ b/dev-perl/Term-ProgressBar-Simple/Term-ProgressBar-Simple-0.30.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=EVDB
+DIST_VERSION=0.03
+inherit perl-module
+
+DESCRIPTION="Simple progess bars"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-perl/Term-ProgressBar-Quiet
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Term-ProgressBar-Simple/metadata.xml b/dev-perl/Term-ProgressBar-Simple/metadata.xml
new file mode 100644
index 000000000000..708bcbd30056
--- /dev/null
+++ b/dev-perl/Term-ProgressBar-Simple/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>perl</herd>
+</pkgmetadata>
diff --git a/dev-perl/Test-MockObject/Test-MockObject-1.201.203.10-r1.ebuild b/dev-perl/Test-MockObject/Test-MockObject-1.201.203.10-r1.ebuild
index c9f1fec005e9..eb4d3eb0424f 100644
--- a/dev-perl/Test-MockObject/Test-MockObject-1.201.203.10-r1.ebuild
+++ b/dev-perl/Test-MockObject/Test-MockObject-1.201.203.10-r1.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
test? (
>=dev-perl/Test-Exception-0.310.0
>=dev-perl/Test-Warn-0.230.0
+ dev-perl/CGI
)
"
diff --git a/dev-perl/VM-EC2-Security-CredentialCache/Manifest b/dev-perl/VM-EC2-Security-CredentialCache/Manifest
new file mode 100644
index 000000000000..188522b8407e
--- /dev/null
+++ b/dev-perl/VM-EC2-Security-CredentialCache/Manifest
@@ -0,0 +1 @@
+DIST VM-EC2-Security-CredentialCache-0.25.tar.gz 9743 SHA256 fc7e9c152ff2b721ccb221ac40089934775cf58366aedb5cc1693609f840937b SHA512 9ba0546fc17cfc5fa5a7df8db31a1d55dc407ee67673d644b6d4d7a9e6e3b7065888529fefc0653c81df3d1d508dc9e022476c4c7742a7a5bfe098e3beadc5b4 WHIRLPOOL 4527ace881e902acc6805e0a592815c0817e704183867a29e2433d191023309fbf09c13a4aadf49d60304aff0c984040cd4a5fd27d524fafb1952370b6dc93f4
diff --git a/dev-perl/VM-EC2-Security-CredentialCache/VM-EC2-Security-CredentialCache-0.250.0.ebuild b/dev-perl/VM-EC2-Security-CredentialCache/VM-EC2-Security-CredentialCache-0.250.0.ebuild
new file mode 100644
index 000000000000..4971b813de1f
--- /dev/null
+++ b/dev-perl/VM-EC2-Security-CredentialCache/VM-EC2-Security-CredentialCache-0.250.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RCONOVER
+DIST_VERSION=0.25
+inherit perl-module
+
+DESCRIPTION="Cache credentials respecting expiration time for IAM roles"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-perl/DateTime-Format-ISO8601
+ dev-perl/VM-EC2
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/VM-EC2-Security-CredentialCache/metadata.xml b/dev-perl/VM-EC2-Security-CredentialCache/metadata.xml
new file mode 100644
index 000000000000..708bcbd30056
--- /dev/null
+++ b/dev-perl/VM-EC2-Security-CredentialCache/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>perl</herd>
+</pkgmetadata>
diff --git a/dev-perl/VM-EC2/Manifest b/dev-perl/VM-EC2/Manifest
new file mode 100644
index 000000000000..7bf53d4a3c63
--- /dev/null
+++ b/dev-perl/VM-EC2/Manifest
@@ -0,0 +1 @@
+DIST VM-EC2-1.28.tar.gz 360542 SHA256 b2b6b31745c57431fca0efb9b9d0b8f168d6081755e048fd9d6c4469bd108acd SHA512 c3adba06bf526340db441d546ccc5d738d7a83ae78ac90a25beb71a132bc163c1a992b000b7a4bc7601a2efbec1c7cf6541eedc4bd94f3d62b36ebfc6a27e6b2 WHIRLPOOL 188df2a232052bf4c005e4303af8a1952ad1b5c0ae15bd73524648e9bc4567f22b1ad91081b13f634f33f0c04e12f4a4e27ba6afca0f0405fdb4d812123f124e
diff --git a/dev-perl/VM-EC2/VM-EC2-1.280.0.ebuild b/dev-perl/VM-EC2/VM-EC2-1.280.0.ebuild
new file mode 100644
index 000000000000..fd1bc47fcae0
--- /dev/null
+++ b/dev-perl/VM-EC2/VM-EC2-1.280.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=LDS
+DIST_VERSION=1.28
+inherit perl-module
+
+DESCRIPTION="Interface to Amazon EC2, VPC, ELB, Autoscaling, and Relational DB services"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-perl/AnyEvent-7.40.0
+ >=dev-perl/AnyEvent-CacheDNS-0.80.0
+ >=dev-perl/AnyEvent-HTTP-2.150.0
+ >=virtual/perl-Digest-SHA-5.470.0
+ >=virtual/perl-File-Path-2.80.0
+ dev-perl/JSON
+ >=dev-perl/libwww-perl-5.835.0
+ >=virtual/perl-MIME-Base64-3.80.0
+ >=dev-perl/String-Approx-3.260.0
+ >=dev-perl/URI-1.690.0
+ >=dev-perl/XML-Simple-2.180.0
+"
+DEPEND="${RDEPEND}
+ dev-perl/Module-Build
+"
diff --git a/dev-perl/VM-EC2/metadata.xml b/dev-perl/VM-EC2/metadata.xml
new file mode 100644
index 000000000000..708bcbd30056
--- /dev/null
+++ b/dev-perl/VM-EC2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>perl</herd>
+</pkgmetadata>
diff --git a/dev-perl/namespace-autoclean/Manifest b/dev-perl/namespace-autoclean/Manifest
index 9762381808a3..b6d6929e5bc9 100644
--- a/dev-perl/namespace-autoclean/Manifest
+++ b/dev-perl/namespace-autoclean/Manifest
@@ -1,2 +1,3 @@
DIST namespace-autoclean-0.13.tar.gz 12954 SHA256 04d4708654016bfc157b0779e1f93362b38f7a4bccb3631b0649d19f5c9aa3f0 SHA512 9310f9d7081ac4cccecdc9ccb557b53b144f030d41acaf0aee08358bbf5cf52a348229deef6ade81e0a02b8fc1d0b8f8466c2b4a6875b5ecc09e2c4e9049b29a WHIRLPOOL 6938bc364423d6ae2717510ca14ff8bff9e223bd22eec84b9466a49f5390d49d98a2cf510c4d5f337eb1e8503e29562a3639db3ec767a8710d5653a23082805e
DIST namespace-autoclean-0.24.tar.gz 36241 SHA256 6069c95585cfd910f02592b0ef9aed5b3def014c413517b0ec3dae2fde7a4f57 SHA512 6fb224e27b631c8b8f14936812d40fe69a5a8e33a0afffd5a4a1e7bb26a2afacdf6179744621fa2eb5540d151676e81ad375de2d76d52c004252ff3304f4552c WHIRLPOOL d61de0bafc3b321d561d6ff888e46835dac80eecc111d15603420791920a896c8d130601d9f3786d59bbdd7abf90bb2f00a34b1ac7684615ecde73a9ffab8d7f
+DIST namespace-autoclean-0.28.tar.gz 36130 SHA256 cd410a1681add521a28805da2e138d44f0d542407b50999252a147e553c26c39 SHA512 2541f69862b334fcfe30059d025668175de1b182a5c8ee8f2619bf1d661c316a38fe2014f274bb23e887cd36959f98abb297154ac8ceb600e2e93cbd4a75e28d WHIRLPOOL 7841cb5d53cd8d9bc090e3d39ca81d2eee19262200e6601b1f9edce11dae18a39825aa7b623611c78fe5056648d42a14fcc72f6e72e1e4d90ba15e9f80ab46a5
diff --git a/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild b/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
new file mode 100644
index 000000000000..1820d0cf7a95
--- /dev/null
+++ b/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.28
+inherit perl-module
+
+DESCRIPTION="Keep imports out of your namespace"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+ >=dev-perl/B-Hooks-EndOfScope-0.120.0
+ virtual/perl-Scalar-List-Utils
+ dev-perl/Sub-Identify
+ >=dev-perl/namespace-clean-0.200.0
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-Carp
+ virtual/perl-ExtUtils-MakeMaker
+ virtual/perl-File-Spec
+ virtual/perl-Scalar-List-Utils
+ >=virtual/perl-Test-Simple-0.880.0
+ dev-perl/Test-Requires
+ )
+"
diff --git a/dev-perl/namespace-clean/Manifest b/dev-perl/namespace-clean/Manifest
index eb70006d1f79..b0455e3992d9 100644
--- a/dev-perl/namespace-clean/Manifest
+++ b/dev-perl/namespace-clean/Manifest
@@ -1,2 +1,3 @@
DIST namespace-clean-0.21.tar.gz 11809 SHA256 b16069bc9261f8c9f2bd541f96076e0961fa4424ce299dac0c9c5523a18e5836 SHA512 927ebed43fad2096705f6633d9eb5d7b4b3ec053b008fc8130886215be482ab373fb2a20ef3404b654ffb49c336e7a5e6a4a4ff6474e9e376b476478b86b68e1 WHIRLPOOL f4a75dd3309fe0744e153cb405b50a6f951640ccfa4001c290f97beeaabbd5640123ccc85fb1c4f7444a266d970b980de829a320246c37e40007c066c16f2a04
DIST namespace-clean-0.25.tar.gz 12816 SHA256 946a2b7b8219562818867ad915cd493637e2639f901db050b835500c8e6ecd04 SHA512 69d46adac8d3f249b36310583568705e9dea6a308ce9265f4986063ef48b8bdfd4fdff86c602639090edc5936422a1b455d0a5e89d9c3bd5d7443beba8de5d14 WHIRLPOOL 07211d70f5f61f7c37ac8e47a2be52565ef00875db1c85ee4949eff3e64ce3bbdef0f13c1f30eaeeba382956dcf49a4436b605bab9d141d03d99ed7f5f7c7d94
+DIST namespace-clean-0.26.tar.gz 15414 SHA256 73986e19c4ad0e634e35f4f26e81437f152d8026eb1d91fe795725746ce13eca SHA512 b3d0d9d4401abdc9c53a3a7d0b62804304786a71eabd05205c993157be2a2037325f865350b84bc80de93a966e16ec8c28f8aa84154896f8feab86500f63a9f9 WHIRLPOOL cd2005eb4e2c807e2cff63e56b1570f1e603939ab4278ef7b93f0561d4e9f08ba1064f703744a289761b24d5fc4f26a776c6a532a67d7cd5c193548e86239661
diff --git a/dev-perl/namespace-clean/namespace-clean-0.260.0.ebuild b/dev-perl/namespace-clean/namespace-clean-0.260.0.ebuild
new file mode 100644
index 000000000000..0719d939f13a
--- /dev/null
+++ b/dev-perl/namespace-clean/namespace-clean-0.260.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RIBASUSHI
+DIST_VERSION=0.26
+inherit perl-module
+
+DESCRIPTION="Keep imports and functions out of your namespace"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+ >=dev-perl/B-Hooks-EndOfScope-0.120.0
+ >=dev-perl/Package-Stash-0.230.0
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ >=virtual/perl-ExtUtils-CBuilder-0.270.0
+ test? (
+ >=virtual/perl-Test-Simple-0.880.0
+ )
+"
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 66ff666d9612..ce66c9a5baa8 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,2 +1,3 @@
DIST APCu-4.0.7.tgz 118670 SHA256 178a731ee3435b451f1144bc4a63c9d70d4909a2c434e17c6e07db554df90bd6 SHA512 50db51358c9268cc5fdd0d48fb444be9e9356f1690bc1ae021a9618c8819ce8873bf4502fe87a10467ffda2ef38267ccca2af55152b064400c69a8da92b7e98b WHIRLPOOL 3c721753764d6f3adbf6090710aafdb29d78b3d55e718c0101d7cad993b51d7b335931c61f120f8dad4623fe16cad9f13952367934968599ed15dd9c744b9725
+DIST apcu-4.0.10.tgz 119264 SHA256 8dee6680924107d2aaf827f9cb8ef0e8e09c47bb38712a3439eddabe3ce41b40 SHA512 8aabd51996270cff98b9e329413f9cfcaa9be33a0df8bf9ad50ac2dfd320e348aee6432b8ecd498e077c490714184a82502ea656d825a5fcab70966780064163 WHIRLPOOL c39d4d0953dc4f5168032641c89292c2efcf514c2afca4f9cf65a35564c169021a0a74543556b6e890972904007c7c846a88d8c3ce2ccc0167a1a74e18779b99
DIST apcu-4.0.8.tgz 119062 SHA256 bef4f5ae309526a332e0f6b98f0579a45d6000b928991babe684d4c22432d57d SHA512 990fbf3d6f490eeebf1d28eea5e7b0400c8c4badbfcf5ed1c5fc5b7186c5cd6d4ec87a99a8185e9bb27c64ccd371ca7b4324901f35a84644301e32fd9cfa8ef8 WHIRLPOOL 443f0f0a5a742933a19b22a18aa442587f3a7b75fc5e3739ea5dac9d8e31d9e40c41b8107b4d4953cb33f5baa49761a4d1c52a9f472377a5f7a4019750b08f64
diff --git a/dev-php/pecl-apcu/pecl-apcu-4.0.10.ebuild b/dev-php/pecl-apcu/pecl-apcu-4.0.10.ebuild
new file mode 100644
index 000000000000..2289285f9b1e
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-4.0.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="NOTICE README.md TECHNOTES.txt TODO"
+
+USE_PHP="php5-6 php5-5"
+
+S="${WORKDIR}/apcu-${PV}"
+PHP_EXT_S="${WORKDIR}/apcu-${PV}"
+
+inherit php-ext-pecl-r2 confutils eutils
+
+S="${WORKDIR}/apcu-${PV}"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="+mmap"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+ LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_configure() {
+ my_conf="--enable-apcu"
+ use mmap || my_conf+=" --disable-apcu-mmap"
+
+ enable_extension_enable "apcu-rwlocks" "lock_pthreadrw" 0
+
+ php-ext-source-r2_src_configure
+}
+
+src_install() {
+ php-ext-pecl-r2_src_install
+
+ dodir "${PHP_EXT_SHARED_DIR}"
+ insinto "${PHP_EXT_SHARED_DIR}"
+ doins apc.php
+}
+
+pkg_postinst() {
+ elog "The apc.php file shipped with this release of pecl-apcu was"
+ elog "installed into ${PHP_EXT_SHARED_DIR}/."
+}
diff --git a/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild b/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild
index 65805dc76bdb..160ab87d64ef 100644
--- a/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php5-5 php5-6 php5-4"
inherit base php-ext-pecl-r2
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
DESCRIPTION="PHP extension for interfacing with memcached via libmemcached library"
LICENSE="PHP-3"
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index 15db42a3eee1..9ffbf84199cd 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1 +1,2 @@
DIST alabaster-0.7.6.tar.gz 16598 SHA256 309d33e0282c8209f792f3527f41ec04e508ff837c61fc1906dde988a256deeb SHA512 90058e56365c59a4eed6034273ea83132fcf77ee26e3dfd2d9aa0233657192e1f32d8f40cd6477e307d063d0136ea5e18b94c6c0874a378d6386874dceccfdc8 WHIRLPOOL 2249f055772ce7a389df88a4a659a9a2b0b7c45992d9e225f93ecc79c9038c89474554fdf3557c78ff645242cffa0f1c4822f1b08831f1943140244931b7c812
+DIST alabaster-0.7.7.tar.gz 18996 SHA256 f416a84e0d0ddbc288f6b8f2c276d10b40ca1238562cd9ed5a751292ec647b71 SHA512 e19ec193d49ff5adf4552c1e3f9c77845045fd97cdb26285e774124960866bf790922a421cc70a8346f1bc98c1a5aa8b70211d4589e8429a9df4d4577880c0df WHIRLPOOL a9ba98e82461be443a3d7f1f19683db07612f28726c69b2c05038be9caaae70db5aa52f750ddb18c657dde2f6943d3265901460167eb1cb1e0889a5a251f9a68
diff --git a/dev-python/alabaster/alabaster-0.7.7.ebuild b/dev-python/alabaster/alabaster-0.7.7.ebuild
new file mode 100644
index 000000000000..d548dc01de5c
--- /dev/null
+++ b/dev-python/alabaster/alabaster-0.7.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
+HOMEPAGE="https://github.com/bitprophet/alabaster"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 74450d819a82..7860775ebadc 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,3 +1,4 @@
DIST astroid-1.3.8.tar.gz 155302 SHA256 3971c35c675dc7acfceb636eb1758b7df9fc3ad75b5f81ca89f57ccf51719442 SHA512 316d3a6a12d95b3bebe7ffe47de840cbff96f357c7c324f6684bb713bca191cfaf87fe226c3c1145049611a2035890bdf11845bf923f7d0087a0d1e565d5d5c5 WHIRLPOOL 456ebef20c278047ae0e85fb1386f63eb7c13dda295ddace9704df5255b5004887f6f5201097b2337cc678a9891f33aa5628cbf7acc01c4eb9ff3dc3c091408a
DIST astroid-1.4.1.tar.gz 179485 SHA256 2417a2c62f07bb77485efb6dd94567ac165808a4248ecb09754116662ffa9fc2 SHA512 5efc0235314cf68801ec4c4ca7688386bace0bbc5a0a92dffc6241d8fab69b5b7ddbe3385c1d909ebb2cb260174c93ce6f0408c3c0745ebbc7f6c1923a0ce59f WHIRLPOOL 7a2f5618d77eba504b7d1b8d39d3c488962d871d3b0ef5723d0bd5eb338cf7da8ce9d09a64e6c33ca22f175bcdf901f2d5f88df92cb3387d1a05dc810b3d12de
DIST astroid-1.4.2.tar.gz 181042 SHA256 b734fa504179a93aa03314df48b45fb1d9d0d8770a1126e7a126c9ac4aebd5c3 SHA512 faddbb830370232f4b3ea6cdd454da352a682b73062d9bac37ac28711dc6b17a071278d7b5019a7ba85ac4c1845752db42c0fe122be082bbc262a159b92276e2 WHIRLPOOL 18443d0dbfd6575836209c523b5d3c7eebf509a23395bb0e0e2bac43c117b3b2269c9bf6ddb4cfc896b1232f1f4d9a86ac3ebf40ba950a25070a8771e54cc7ac
+DIST astroid-1.4.3.tar.gz 181329 SHA256 8e9ce4e925a17442cec085a7fce05478b99e482c13819c619b7cdd793777bf6b SHA512 a4c607ef16bda0561254fa177c319e6f139de12385a277e780c8db641a4aac3cc49712be3bf9b529609f3e303194d1caa7ba44b564662aaf32c6847aab4808d0 WHIRLPOOL 1086fed0948d8135970a951f5e2c2d2f8678e1b5169898f9df1407b40bbeea7dbcd80d16c759686ed5effd962e8c2054778873848e38545961c450b72bae9e9e
diff --git a/dev-python/astroid/astroid-1.4.3.ebuild b/dev-python/astroid/astroid-1.4.3.ebuild
new file mode 100644
index 000000000000..3ea11164c7a3
--- /dev/null
+++ b/dev-python/astroid/astroid-1.4.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+# https://bitbucket.org/logilab/astroid/issues/276/testfailures-with-141
+RESTRICT=test
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+ dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/wrapt[${PYTHON_USEDEP}]"
+DEPEND="
+ app-arch/unzip
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+# test? (
+# ${RDEPEND}
+# >=dev-python/pylint-1.4.0[${PYTHON_USEDEP}]
+# dev-python/pytest[${PYTHON_USEDEP}]
+# $(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
+# )"
+# Required for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+ ${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
+}
diff --git a/dev-python/asyncio/asyncio-3.4.2.ebuild b/dev-python/asyncio/asyncio-3.4.2.ebuild
index cf4438139ab8..3753f5875ae6 100644
--- a/dev-python/asyncio/asyncio-3.4.2.ebuild
+++ b/dev-python/asyncio/asyncio-3.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
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=""
RDEPEND=""
diff --git a/dev-python/backports-abc/backports-abc-0.4.ebuild b/dev-python/backports-abc/backports-abc-0.4.ebuild
index b407fa7ffea7..7facd5ba25ec 100644
--- a/dev-python/backports-abc/backports-abc-0.4.ebuild
+++ b/dev-python/backports-abc/backports-abc-0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index f18c232deac6..74c3d2cc7490 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -1,2 +1,3 @@
DIST carbon-0.9.12.tar.gz 47450 SHA256 df4b521a449b888fc901d11abffc9e7eb070a8670e341caa0e13ab8f3029cddf SHA512 060b3d20cf2bd95be22fba30a24591361c772edaaaa99117616f4a01a31eab9395d84c5eb835408fac2c1bc36b70950e260d56456879489a9ee3248c6c4e3f33 WHIRLPOOL c6021492dc5ed3c9c4cefe173b1e0592b18e6c2d49e48cd74059c4d3822ea0b2cf253bedc9a67f7fa37dd8944e06835a1da959300e3c6e0f1759622b19b0c61e
DIST carbon-0.9.13.tar.gz 47509 SHA256 75aecd8114435430e06803ebaf1e9cac81f58fb231fc93d8904d667d971ae6cd SHA512 89c843ac67ed4b68c28273459e5a96594851e5d2694fdefdfb71cebcdc6555d4aac8c45c1c6d2ca61a15405bac7ba3d27836470fe152d5d7a4936bb2d00e6776 WHIRLPOOL 40000d912f3881dc4f197e1290d3e0fd092ec23bc6574a97fa31d0ffa77fa651abc4d4da529e45d88d74ea763f18cde20daf5fd70549d6afd38f4c5b88d1becb
+DIST carbon-0.9.14.tar.gz 50285 SHA256 e12539ca855f0777e326028a32fbff5022d75b7c3e6fcc7e4704305a650aee9a SHA512 e70275c0acce17287b3036668e45c75b9da9b54523faca0f5bdceda4b6b98c71ebf773740e85063ee3ea4e0bc64adee913bb7f8eab1f7016eb504b06f0b589e3 WHIRLPOOL 998c6a3d0b6cc9aa86cc9b79719e762610cf47012f2eebfd575a6bac3aeb78b64c34e94c5fedc5c88074400920268890e8b84e2f1b32ee4ba24bdd0bef31602d
diff --git a/dev-python/carbon/carbon-0.9.14.ebuild b/dev-python/carbon/carbon-0.9.14.ebuild
new file mode 100644
index 000000000000..93a5d95a4e20
--- /dev/null
+++ b/dev-python/carbon/carbon-0.9.14.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend data caching and persistence daemon for Graphite"
+HOMEPAGE="http://graphite.wikidot.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+# whisper appears to have been missed from listing in install_requires in setup.py
+RDEPEND="
+ dev-python/twisted-core[${PYTHON_USEDEP}]
+ dev-python/whisper[${PYTHON_USEDEP}]
+ dev-python/txAMQP[${PYTHON_USEDEP}]"
+
+PATCHES=(
+ # Do not install the configuration and data files. We install them
+ # somewhere sensible by hand. Patch for this vn. 0.9.14 has been extended
+ # due to redhat's init scripts set to install unconditionally in setup.py
+ "${FILESDIR}"/${P}-no-data-files.patch
+ )
+
+python_prepare_all() {
+ # This sets prefix to /opt/graphite. We want FHS-style paths instead.
+ rm setup.cfg || die
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ insinto /etc/carbon
+ doins conf/*
+
+ dodir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
+
+ newinitd "${FILESDIR}"/carbon.initd carbon-cache
+ newinitd "${FILESDIR}"/carbon.initd carbon-relay
+ newinitd "${FILESDIR}"/carbon.initd carbon-aggregator
+
+ newconfd "${FILESDIR}"/carbon.confd carbon-cache
+ newconfd "${FILESDIR}"/carbon.confd carbon-relay
+ newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
+}
+
+pkg_postinst() {
+ einfo 'This ebuild installs carbon into FHS-style paths.'
+ einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
+ einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
+ einfo '(see /etc/carbon/carbon.conf.example).'
+ einfo ' '
+ einfo 'OpenRC init script supports multiple instances !'
+ einfo 'Example to run an instance b of carbon-cache :'
+ einfo ' ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
+ einfo ' cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
+}
diff --git a/dev-python/carbon/files/carbon-0.9.14-no-data-files.patch b/dev-python/carbon/files/carbon-0.9.14-no-data-files.patch
new file mode 100644
index 000000000000..858d362d296d
--- /dev/null
+++ b/dev-python/carbon/files/carbon-0.9.14-no-data-files.patch
@@ -0,0 +1,32 @@
+diff -ur carbon-0.9.14.orig/setup.py carbon-0.9.14/setup.py
+--- setup.py 2015-11-07 13:50:29.000000000 +0800
++++ setup.py 2015-12-27 08:43:46.575905408 +0800
+@@ -13,20 +13,6 @@
+ setup_kwargs = dict()
+
+
+-storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
+- ('storage/log',[]), ('storage/rrd',[]) ]
+-conf_files = [ ('conf', glob('conf/*.example')) ]
+-
+-install_files = storage_dirs + conf_files
+-
+-# Let's include redhat init scripts, despite build platform
+-# but won't put them in /etc/init.d/ automatically anymore
+-init_scripts = [ ('examples/init.d', ['distro/redhat/init.d/carbon-cache',
+- 'distro/redhat/init.d/carbon-relay',
+- 'distro/redhat/init.d/carbon-aggregator']) ]
+-install_files += init_scripts
+-
+-
+ setup(
+ name='carbon',
+ version='0.9.14',
+@@ -39,7 +25,6 @@
+ package_dir={'' : 'lib'},
+ scripts=glob('bin/*'),
+ package_data={ 'carbon' : ['*.xml'] },
+- data_files=install_files,
+ install_requires=['twisted', 'txamqp'],
+ **setup_kwargs
+ )
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 938d5514e802..df285655fb34 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -4,3 +4,4 @@ DIST cffi-1.3.0.tar.gz 347342 SHA256 9daa53aff0b5cf64c85c10eab7ce6776880d0ee71b7
DIST cffi-1.3.1.tar.gz 351300 SHA256 d45dd39a770b4afb591c82555f6a8bbc1ac7eb019eda9b621eee1a0a72201220 SHA512 b89fe1b98a2e1492e05a9e69407104a5d5057dbe2730852fb91fae1db66751d35db53186d2f03dc950eb10dd9cecc83e44eb3e6954381dfd80d79519c7938288 WHIRLPOOL 37ea487ae7e5474a903cd259bac3428d04dc8f0ab0623edf8e12979e666d0779a04135e150073deb608a46b63084e51f66023e618637d3f71cc54f2eac84fdb9
DIST cffi-1.4.0.tar.gz 365067 SHA256 afeb3ce1c1e200aeb70313bc0bd94ebba4f2f37b2ae7ce00cabb648f548359eb SHA512 56b446a7635afff3cf33fea97451c98eb102589e19c5c2e249e3f751a38972152c4bcde901fa2a06703d5e01f10d994c5d9bc98af48f8278a8981de2522e45cc WHIRLPOOL 8b41807d02f203132b930247d9f4755e8c5e8c0e2594105cad8f46a902be013947d45420f7389ef34483673516e7ee58bce31f615ae582d4f445d344115fe4dc
DIST cffi-1.4.1.tar.gz 365194 SHA256 61fa9e32cc91744b92b3ec96f74c5910aa6c2f0a9fbba939fbad71dab558b974 SHA512 d58012af471aff5b8d8de84f837bf7f683928dcd4efb11e1b3d54e276e0eb0db143675e42c34ae757710817b9c0795ba97626734bf2e0930c93af055b1009ea6 WHIRLPOOL 74ca6952e3833441dd662b4a9f51c66a5746c74fa98cac5283492ddcfe17bf9314a79c5f4c0acf1592787d29f686e6e78d2a5f20334ca572d64e13d13875e272
+DIST cffi-1.4.2.tar.gz 365490 SHA256 8f1d177d364ea35900415ae24ca3e471be3d5334ed0419294068c49f45913998 SHA512 cdb265c4ae390b6498fab34a2f0920ee6eca65e6b543dfb92a0e64825bcef26e8bd4c9f1f43a15e7696128f38026e467fcdda057e00e939311a465b2b585fc34 WHIRLPOOL c3bad7b0bf27f6994bc21472f4ebadae2453e91a2e714b4801d3fb642bfdfbe838a84bc5c74a446a988629811857a28d49f3e08859c9914a385eebcf39e62f7f
diff --git a/dev-python/cffi/cffi-1.4.2.ebuild b/dev-python/cffi/cffi-1.4.2.ebuild
new file mode 100644
index 000000000000..ce2896f65967
--- /dev/null
+++ b/dev-python/cffi/cffi-1.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND="
+ virtual/libffi
+ dev-python/pycparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ py.test -x -v --ignore testing/test_zintegration.py c/ testing/ || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/distlib/distlib-0.2.1-r1.ebuild b/dev-python/distlib/distlib-0.2.1-r1.ebuild
index 1a438d68273d..8b8f7c9ecc86 100644
--- a/dev-python/distlib/distlib-0.2.1-r1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1-r1.ebuild
@@ -20,6 +20,7 @@ IUSE=""
PATCHES=(
"${FILESDIR}"/${P}-unbundle.patch
+ "${FILESDIR}"/${P}-online.patch
)
python_prepare_all() {
@@ -29,20 +30,24 @@ python_prepare_all() {
tests/test_shutil.py* \
tests/test_sysconfig.py* || die
+ distutils-r1_python_prepare_all
+
# Broken tests
# 1 fails due to it being sensitive to dictionary ordering
# inconsistency between code and test
sed \
-e 's:test_dependency_finder:_&:g' \
- -e 's:test_abi:_&:g' \
-i tests/*py || die
- distutils-r1_python_prepare_all
+ # Gentoo still doesn't report correct ABI
+ sed \
+ -e 's:test_abi:_&:g' \
+ -i tests/*py || die
}
python_test() {
sed \
-e '/PIP_AVAILABLE/s:True:False:g' \
-i tests/*py || die
- PYTHONHASHSEED=0 esetup.py test
+ SKIP_ONLINE=True PYTHONHASHSEED=0 esetup.py test
}
diff --git a/dev-python/distlib/files/distlib-0.2.1-online.patch b/dev-python/distlib/files/distlib-0.2.1-online.patch
new file mode 100644
index 000000000000..3d5d655e879c
--- /dev/null
+++ b/dev-python/distlib/files/distlib-0.2.1-online.patch
@@ -0,0 +1,113 @@
+ tests/test_index.py | 1 +
+ tests/test_locators.py | 10 ++++++++++
+ tests/test_util.py | 1 +
+ 3 files changed, 12 insertions(+)
+
+diff --git a/tests/test_index.py b/tests/test_index.py
+index a188816..dbef670 100644
+--- a/tests/test_index.py
++++ b/tests/test_index.py
+@@ -290,6 +290,7 @@ class PackageIndexTestCase(unittest.TestCase):
+ self.assertRaises(DistlibException, self.index.download_file, url, fn,
+ digest[:-1] + '8')
+
++ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
+ def test_search(self):
+ self.index = PackageIndex()
+ result = self.index.search({'name': 'tatterdema'})
+diff --git a/tests/test_locators.py b/tests/test_locators.py
+index de97541..436ea9d 100644
+--- a/tests/test_locators.py
++++ b/tests/test_locators.py
+@@ -29,6 +29,7 @@ PYPI_WEB_HOST = os.environ.get('PYPI_WEB_HOST', 'https://pypi.python.org/simple/
+ class LocatorTestCase(unittest.TestCase):
+
+ @unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
++ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
+ def test_xmlrpc(self):
+ locator = PyPIRPCLocator(PYPI_RPC_HOST)
+ try:
+@@ -53,6 +54,7 @@ class LocatorTestCase(unittest.TestCase):
+ self.assertGreater(len(names), 25000)
+
+ @unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
++ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
+ def test_json(self):
+ locator = PyPIJSONLocator(PYPI_RPC_HOST)
+ result = locator.get_project('sarge')
+@@ -69,6 +71,7 @@ class LocatorTestCase(unittest.TestCase):
+ self.assertRaises(NotImplementedError, locator.get_distribution_names)
+
+ @unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
++ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
+ def test_scraper(self):
+ locator = SimpleScrapingLocator('https://pypi.python.org/simple/')
+ for name in ('sarge', 'Sarge'):
+@@ -88,6 +91,7 @@ class LocatorTestCase(unittest.TestCase):
+ self.assertGreater(len(names), 25000)
+
+ @unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
++ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
+ def test_unicode_project_name(self):
+ # Just checking to see that no exceptions are raised.
+ NAME = '\u2603'
+@@ -166,6 +170,7 @@ class LocatorTestCase(unittest.TestCase):
+ sys.path.pop(0)
+
+ @unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
++ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
+ def test_aggregation(self):
+ d = os.path.join(HERE, 'fake_archives')
+ loc1 = DirectoryLocator(d)
+@@ -201,6 +206,7 @@ class LocatorTestCase(unittest.TestCase):
+ n2 = loc2.get_distribution_names()
+ self.assertEqual(locator.get_distribution_names(), n1 | n2)
+
++ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
+ def test_dependency_finder(self):
+ locator = AggregatingLocator(
+ JSONLocator(),
+@@ -280,6 +286,7 @@ class LocatorTestCase(unittest.TestCase):
+ for url1, url2 in cases:
+ self.assertEqual(default_locator.prefer_url(url1, url2), url1)
+
++ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
+ def test_prereleases(self):
+ locator = AggregatingLocator(
+ JSONLocator(),
+@@ -308,6 +315,7 @@ class LocatorTestCase(unittest.TestCase):
+ self.assertEqual(dists, set([actual[0], dist]))
+ self.assertFalse(problems)
+
++ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
+ def test_dist_reqts(self):
+ r = 'config (<=0.3.5)'
+ dist = default_locator.locate(r)
+@@ -316,6 +324,7 @@ class LocatorTestCase(unittest.TestCase):
+ self.assertTrue(dist.matches_requirement(r))
+ self.assertFalse(dist.matches_requirement('config (0.3.6)'))
+
++ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
+ def test_dist_reqts_extras(self):
+ r = 'config[doc,test](<=0.3.5)'
+ dist = default_locator.locate(r)
+@@ -323,6 +332,7 @@ class LocatorTestCase(unittest.TestCase):
+ self.assertTrue(dist.matches_requirement(r))
+ self.assertEqual(dist.extras, ['doc', 'test'])
+
++ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
+ def test_all(self):
+ d = default_locator.get_project('setuptools')
+ self.assertTrue('urls' in d)
+diff --git a/tests/test_util.py b/tests/test_util.py
+index 1b615d7..2908eee 100644
+--- a/tests/test_util.py
++++ b/tests/test_util.py
+@@ -461,6 +461,7 @@ class UtilTestCase(unittest.TestCase):
+ self.assertFalse(is_string_sequence(['a', 'b', None]))
+ self.assertRaises(AssertionError, is_string_sequence, [])
+
++ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
+ def test_package_data(self):
+ data = get_package_data(name='config', version='0.3.6')
+ self.assertTrue(data)
diff --git a/dev-python/futures/futures-3.0.3.ebuild b/dev-python/futures/futures-3.0.3.ebuild
index 128dbc4d01e3..45ff85880e58 100644
--- a/dev-python/futures/futures-3.0.3.ebuild
+++ b/dev-python/futures/futures-3.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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="doc"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index cac62665c17a..57a9ed4f3d76 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,5 +1,5 @@
DIST gst-python-0.10.22.tar.bz2 632651 SHA256 8f26f519a5bccd770864317e098e5e307fc5ad1201eb96329634b6508b253178 SHA512 bbbd6b661778cca990da0e216294d86da31a6e472049905989a3311459dd1227bf8f2ae3699a3cdbb66a16288569764352f1e1b93e696d3db4b0728bc38e5b12 WHIRLPOOL c6902554bc8f390b5d295d05598ee60fd6b2637d290125d83a48fc40bbd4e6e261a711430259831c96a30fee4c5ec5c89aea444424b117fb5d62c946b0263454
DIST gst-python-1.2.1.tar.bz2 410887 SHA256 8823e5a9ffc51212df412652da44dc3f2a0e23295da769de2d111c770280efd4 SHA512 ed318d94831d34687224d82b84735984b946c6f33704e6bda56847b633af06212f394b709257007cec5d3a3597b200fbe6b19eade6b76e7855e8668c5ebc270e WHIRLPOOL 959e976c5a481367eb298d24eed4b3bf125d173662ff30cf02506906c88cd369259e0f5cb2bbd31bae31c39934b4a894d2eae13a5e411301f055aef030dcebbb
DIST gst-python-1.4.0.tar.xz 350316 SHA256 b1e40c29ceb41b03f08d38aca6056054f0341d0706276326dceeec6ac8d53d3e SHA512 b970fd16a3b9d82f343fbf20642d165bff25fb815cfe20cc51db8c04c298a8fbd9b96f41811c2d26982eadf1f9a84495c70fbdad553778c68604f828e4773a94 WHIRLPOOL 248d91fc0aac1314c4f7b40866579601a8024c947a29a90b5b6c3585358984f1a50eb6d56aec26609d37fc9144fdf38d5edd7ad61364481d25b7cebfaeff1a96
-DIST gst-python-1.6.0.tar.xz 368100 SHA256 60dbc7f5ac2b6655ed4a7ed2cee63ee5a525d37cb16eaa6b9df7d7dfe4e9605f SHA512 6ca7e274d6aac580aec52d2bc635ffcd1361de73324a2818632d5304d59b71111433f888d89864ee2053ddd71cddec93a1f8dfe511414bd6e3ab2f26e87bfece WHIRLPOOL ef2c990a7949fc9e39b93761f817bba195fc53f314017a7223504930913fe883a6953aa1a3bdb7f1ebd2fef110b3bc2ec6e6e53108ae96125ea8f74a0cfa23e7
DIST gst-python-1.6.1.tar.xz 358396 SHA256 3cbe332e18fd2eaf23ddeee96c414f79ac1edc2f7d990582fa0ec5f977bd04f1 SHA512 f2df05ac3a9c4160eb785e2e750ceacdc2aaa4cef8571137d06495abbfe51a2607cfa6c66cd2722c0572153b2926bdbabcd6ddd652b99078007e02cb779eb1bc WHIRLPOOL 97b7bc4377280a96fcea38df9199389e36ef8f5782596f49101ae1e4221e9d49310c461f8e51f9e0e7f2c6aaf57d5bf5f45e783997f1b80e5b52ccf95dd499a0
+DIST gst-python-1.6.2.tar.xz 358316 SHA256 4e763e317079f48a2d6f37bd600bc19650d61597fac9f5763dbad293f72f9125 SHA512 1793a4853aee560e32a9a29553c2730a20ee140bd241f89eb8cb16407a1ea3296ff47d21304f801b3fca140cafb1b6dd2c3574d11e851c424206cad6d3dc750e WHIRLPOOL 160c5989f9d492c41b1208600d7fb524f5ca2fb126e00f648c31328863791b990f0335b74a53f0c41a8ed8352e4ac26f19a3b99f24b0c6295e5c9257b4b89a68
diff --git a/dev-python/gst-python/gst-python-1.2.1.ebuild b/dev-python/gst-python/gst-python-1.2.1.ebuild
index b2da6fdcd235..1fbc7dc26b81 100644
--- a/dev-python/gst-python/gst-python-1.2.1.ebuild
+++ b/dev-python/gst-python/gst-python-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="ia64 ppc"
IUSE="test" #examples , bug #506962
RDEPEND="
diff --git a/dev-python/gst-python/gst-python-1.6.0.ebuild b/dev-python/gst-python/gst-python-1.6.2.ebuild
index 53128bc120af..880e55289764 100644
--- a/dev-python/gst-python/gst-python-1.6.0.ebuild
+++ b/dev-python/gst-python/gst-python-1.6.2.ebuild
@@ -17,12 +17,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-
IUSE="test"
RDEPEND="
- dev-libs/libxml2
>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
- >=media-libs/gstreamer-1.6:1.0
- >=media-libs/gst-plugins-base-1.6:1.0
+ >=media-libs/gstreamer-${PV}:1.0[introspection]
+ >=media-libs/gst-plugins-base-${PV}:1.0[introspection]
"
DEPEND="${RDEPEND}
+ app-arch/xz-utils
virtual/pkgconfig
"
# XXX: unittests are not ported to 1.0 yet.
diff --git a/dev-python/httmock/Manifest b/dev-python/httmock/Manifest
index e6ffa3424571..6eb9009284f9 100644
--- a/dev-python/httmock/Manifest
+++ b/dev-python/httmock/Manifest
@@ -1 +1,2 @@
DIST httmock-1.2.2.tar.gz 4975 SHA256 4dd4eddd8dba38c2b279c6fc7487fb92e91b1ae5d945a496bf059ea2b2aaf06c SHA512 0be8ae754bd3ae34166b0b001a44e664b07488ba6d44ed3dc518b310b82418dc5ab2f15ef13cb20909109f19c22a6e13dfdfdfa37f26f3c0688b19f2321be767 WHIRLPOOL 7d1315845e7a72975d5e0f8ae483f17b5e033a230cf020c770e804091c7a0ef5e94c4649720db3f3f5c68d2a19d7a45ab5d696118719967913e4c1ee01f9234c
+DIST httmock-1.2.3.tar.gz 5203 SHA256 030cca3f3210b902aaa28524183dc061a2ef9afd3da6a9b40ce0c09d28d50d4d SHA512 23b7295f2685639eba44714b3dadbd6eca20b7f50e636d6490d5c3f581429d84e1f4b1e15f4ba31a7ccee1596768003e68a7f1591b75aeb3d5811b279b3f1bb1 WHIRLPOOL 4eea5a2637e88309a19a05ba5788f8d53a062f0e54458d9ace1e3262affc4104c7953ebceaef52c5fdabcc5b30a520557e75ca5aaa0473159a286d3340200221
diff --git a/dev-python/httmock/httmock-1.2.3.ebuild b/dev-python/httmock/httmock-1.2.3.ebuild
new file mode 100644
index 000000000000..c34228d46c0b
--- /dev/null
+++ b/dev-python/httmock/httmock-1.2.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A mocking library for requests"
+HOMEPAGE="https://github.com/patrys/httmock"
+SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/httmock/metadata.xml b/dev-python/httmock/metadata.xml
index e8c60cc3448d..e89fb65d5770 100644
--- a/dev-python/httmock/metadata.xml
+++ b/dev-python/httmock/metadata.xml
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
- <email>idella4@gentoo.org</email>
- </maintainer>
- <maintainer>
- <email>hydrapolic@gmail.com</email>
- <name>Tomas Mozes</name>
- <description>Proxy maintainer and target for all bugs</description>
- </maintainer>
- <upstream>
- <remote-id type="github">patrys/httmock</remote-id>
- </upstream>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>hydrapolic@gmail.com</email>
+ <name>Tomas Mozes</name>
+ <description>Proxy maintainer</description>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">patrys/httmock</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-python/jenkins-webapi/Manifest b/dev-python/jenkins-webapi/Manifest
index 353444b1171a..2e170351e6d2 100644
--- a/dev-python/jenkins-webapi/Manifest
+++ b/dev-python/jenkins-webapi/Manifest
@@ -1,2 +1,4 @@
+DIST jenkins-1.596.3.war 68396864 SHA256 85409f83b81ba90094ecc9e3ea6df0920ecfb3064b731a6a5c9b397eda18b47f SHA512 8652d4d18e3258208fe190c4a6aa5586faa66f690d7d7f7369c5490a587e3ec5e074dc22f2c8caedf5e5335f5b8f511717b2d6eb667a61e9948a703bf80310fe WHIRLPOOL ac6401ebe42a42495dc148d71a61daf49905292e6cbcbb5d8e41f520a01c8f1f783fd75baf908a3e99fbd9f25483366a3a5a005fa04b5843550c8e211f4d8e2d
DIST jenkins-webapi-0.3.2.tar.gz 14831 SHA256 8f67d86c1f95edb79928af9b3b7c60ef9a63bfbfd19b6fe0a892ef4039f25500 SHA512 2ac59c90bba48406cc9fe5595505d5836eab1147869fbc8c06577767891d37904bffa5516316af0cb25f7f9193ae5277c0219ecc9daf5e0efa093fd449d1f4f0 WHIRLPOOL e4562a1857d7c526aec8c5ecc35f6a0644c48bf69fad4bdfef20f0708fdc0dfb5595c428acdc03e1df02c3d21669d47c89e0f3a99c1ee09a9741f9e21ab83b48
DIST jenkins-webapi-0.4.0.tar.gz 16149 SHA256 7515b1e0503e07d50088e32205873146eda3b1132d8a6508e28f4e935c41e8b2 SHA512 ae40366e6fb6414391287ffa42ec92fba1971f070ac718d521c5b10f6e47d14ceea15a8c71f559380356530fdb2f826e08a6c611813b407dad73dab39fcddfeb WHIRLPOOL 30abf44c7d1ec6884baa3481c9d2f234f46f812d5ee6a8d9e49de8bc367ffef9c58f7653dcd30c24a308372cb8f6211e51f40e441e17f9ef15abd222de5d775b
+DIST jenkins-webapi-0.5.0.tar.gz 78813 SHA256 d3a730761bd5164683e1bfff53332b0bf056393e0660769ba8e09df6d555304d SHA512 dde91231e6fe6713eb5953efa038d44a820b51968c2b0591e5dd064c7a35c7dab4d1780370dc97a0a671b3d3cb7d8a48e571c7c0af4f0d5f8a65430c8c074eb3 WHIRLPOOL 2110593ae171efd30f4f0fd407d8bc526e85ce53a3670b5f4c09c73aa8a880cdcc314091104e1684485899a65227a2da18fba7c358a7d11a80f0de5ac99a26c7
diff --git a/dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild b/dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild
new file mode 100644
index 000000000000..296620dbc5ea
--- /dev/null
+++ b/dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+JENKINS_VERSION="1.596.3"
+
+DESCRIPTION="Module for interacting with the Jenkins CI server"
+HOMEPAGE="https://github.com/gvalkov/jenkins-webapi"
+SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? ( http://mirrors.jenkins-ci.org/war-stable/${JENKINS_VERSION}/jenkins.war -> jenkins-${JENKINS_VERSION}.war )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/requests-2.7.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( ${RDEPEND}
+ net-analyzer/netcat
+ net-misc/curl
+ app-arch/unzip
+ >=virtual/jre-1.7.0
+ >=dev-python/pytest-2.6.3[${PYTHON_USEDEP}]
+ >=dev-python/termcolor-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-cov-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/httmock-1.2.2[${PYTHON_USEDEP}] )
+ doc? (
+ >=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+ >=dev-python/alabaster-0.6.1[${PYTHON_USEDEP}] )"
+
+src_unpack() {
+ unpack ${P}.tar.gz
+
+ if use test; then
+ # tests fail with jenkins 1.6x
+ # https://github.com/gvalkov/jenkins-webapi/issues/14
+ mkdir -p "${P}/tests/tmp/latest"
+ cp "${DISTDIR}/jenkins-${JENKINS_VERSION}.war" "${P}/tests/tmp/latest/jenkins.war"
+ fi
+}
+
+python_test() {
+ emake test
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/jenkins-webapi/metadata.xml b/dev-python/jenkins-webapi/metadata.xml
index 469d770d7eb8..09bd92a7dcaa 100644
--- a/dev-python/jenkins-webapi/metadata.xml
+++ b/dev-python/jenkins-webapi/metadata.xml
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
- <email>idella4@gentoo.org</email>
- </maintainer>
- <maintainer>
- <email>hydrapolic@gmail.com</email>
- <name>Tomas Mozes</name>
- <description>Proxy maintainer and target for any bugs</description>
- </maintainer>
- <upstream>
- <remote-id type="github">gvalkov/jenkins-webapi</remote-id>
- </upstream>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>hydrapolic@gmail.com</email>
+ <name>Tomas Mozes</name>
+ <description>Proxy maintainer</description>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">gvalkov/jenkins-webapi</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-python/jenkinsapi/Manifest b/dev-python/jenkinsapi/Manifest
index 9fcafbe1cec6..2fa2541e3c0e 100644
--- a/dev-python/jenkinsapi/Manifest
+++ b/dev-python/jenkinsapi/Manifest
@@ -1 +1,3 @@
+DIST jenkins-1.596.3.war 68396864 SHA256 85409f83b81ba90094ecc9e3ea6df0920ecfb3064b731a6a5c9b397eda18b47f SHA512 8652d4d18e3258208fe190c4a6aa5586faa66f690d7d7f7369c5490a587e3ec5e074dc22f2c8caedf5e5335f5b8f511717b2d6eb667a61e9948a703bf80310fe WHIRLPOOL ac6401ebe42a42495dc148d71a61daf49905292e6cbcbb5d8e41f520a01c8f1f783fd75baf908a3e99fbd9f25483366a3a5a005fa04b5843550c8e211f4d8e2d
DIST jenkinsapi-0.2.26.tar.gz 76598 SHA256 68118e5abad7e5cd4191e1b20b08a950e5e563e816e3ba25e2f4ed994ba945f2 SHA512 5c04450bd285e2f576bcdd933ec8bd9df840f3fdcae9999305f96ea3f2e85bced4dfc5f961c763cd9137c2bfc2c9b79e032dc451978b6fc04a2fe8cb6e98d030 WHIRLPOOL 025d6c8cee081068d77350b7ffd6e03441dc2758be6b761d6ef6f00007c99ac41032ce3e1be3cf01496f6e59913e8b2f7a22ab9d66d5a8aeeca5c24922d4175b
+DIST jenkinsapi-0.2.29.tar.gz 87447 SHA256 e1ceabe0217a422e4bc1ab9aa43e976ca3307c8b4b3f03b70371a93ad090dad0 SHA512 9f80f3a9afe210aba7b67247775249e11c53bdbb3a6cc62e009fe7c6dea1bbc0c95cf4eb20b44a68e3a9978478bb3f8459b6404eeca64587139d68a9ad458802 WHIRLPOOL 71e7175b925027f747f5ac750b115dfa7714aef1052ea9260e0645b40e1b69af4170dd6c9082ac93a93a358ef0c98a9fd5d2b81a83f2709bd84b090a847ab888
diff --git a/dev-python/jenkinsapi/jenkinsapi-0.2.29.ebuild b/dev-python/jenkinsapi/jenkinsapi-0.2.29.ebuild
new file mode 100644
index 000000000000..8972f3e75e11
--- /dev/null
+++ b/dev-python/jenkinsapi/jenkinsapi-0.2.29.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+JENKINS_VERSION="1.596.3"
+
+DESCRIPTION="API to access resources on a Jenkins continuous-integration server"
+HOMEPAGE="https://github.com/salimfadhley/jenkinsapi"
+SRC_URI="https://github.com/salimfadhley/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? ( http://mirrors.jenkins-ci.org/war-stable/${JENKINS_VERSION}/jenkins.war -> jenkins-${JENKINS_VERSION}.war )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/pytz-2014.4[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.3.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( ${RDEPEND}
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}] )"
+
+src_unpack() {
+ unpack ${P}.tar.gz
+
+ if use test; then
+ cp "${DISTDIR}/jenkins-${JENKINS_VERSION}.war" "${P}/jenkinsapi_tests/systests/jenkins.war"
+ fi
+}
+
+python_test() {
+ # tests fail with jenkins 1.6x
+ # https://github.com/salimfadhley/jenkinsapi/issues/406
+ esetup.py test
+}
diff --git a/dev-python/jenkinsapi/metadata.xml b/dev-python/jenkinsapi/metadata.xml
index 6cfdf9a485e4..2c8e9674aa1b 100644
--- a/dev-python/jenkinsapi/metadata.xml
+++ b/dev-python/jenkinsapi/metadata.xml
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
- <email>idella4@gentoo.org</email>
- </maintainer>
- <maintainer>
- <email>hydrapolic@gmail.com</email>
- <name>Tomas Mozes</name>
- <description>Proxy maintainer and target for all bugs</description>
- </maintainer>
- <upstream>
- <remote-id type="github">salimfadhley/jenkinsapi</remote-id>
- </upstream>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>hydrapolic@gmail.com</email>
+ <name>Tomas Mozes</name>
+ <description>Proxy maintainer</description>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">salimfadhley/jenkinsapi</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild
index 38a18c0701a4..6a2c3c714260 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index d76ebb0ebcd4..338a2aceb0aa 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1 +1,2 @@
DIST libvirt-python-1.2.21.tar.gz 171250 SHA256 7ffb49fcb64ac06188fc626c853c99361e5965766ab020f8ea66f8fbcfc29684 SHA512 7e2481ffa26105ddde703bd6eafe74240b69990b2f2ce0042f20f7fceb1d326fb8a66bf26042bfe63a12cf3202d7c19b14b6d766dd42fb66af212393d7aaf332 WHIRLPOOL 18dd5bc0d565b6846c40960cf258d7fb3714054be15fe54507e2846c5a7c2cd81e9b209c8e70cbfd5319d5a06f00c2c5322995058637af87d1676276f8675b2e
+DIST libvirt-python-1.3.0.tar.gz 171195 SHA256 097d41bc52c300e50c5b04836e078bae5653fe222db92a9a10839f3e6b3afc7c SHA512 b207aa9aef63e7d1a8377b2f8a0fa8dc05893bd744672c2b41f4dafa2516cbddd2868f37b0caf72b125fccbbf56542fcf1b94b452c406757f30d8f02d6ee26b4 WHIRLPOOL 1bde1fd130e0760bfa8f62c2f85e4ded991fc0eadcaf10b38bbbcf754eaa7b3a0ccb72f304f65457115419e4d3d904d07172e33bd68d581a29e4fb8d0703b45a
diff --git a/dev-python/libvirt-python/libvirt-python-1.3.0.ebuild b/dev-python/libvirt-python/libvirt-python-1.3.0.ebuild
new file mode 100644
index 000000000000..cc59d1ba63b0
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-1.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
+ SRC_URI=""
+ KEYWORDS=""
+ RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+ SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="http://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}] )"
+
+# testsuite is currently not included in upstream tarball
+RESTRICT="test"
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index 75917627704c..de693d82ddb8 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -2,3 +2,4 @@ DIST Markups-0.2.4.tar.gz 8827 SHA256 0aab138698035e699fad1c88bebb3fa5e90a1876bc
DIST Markups-0.6.1.tar.gz 19116 SHA256 1f3d6f7b85ac9ddcb936b8b2b6fa15a42ddc9dfc22a075d83d9160b5d59f6d84 SHA512 f1354af48aadb43459e8f0c2013d283c4f6170f608c4ca4a2dd21e77c6fc2383bd6a1631efc9a8878c4a0ba59249528222ba01d1a38ed3f02c6890d42c6afdb9 WHIRLPOOL 2db23d6cb9a282eb461a6ff49b21d1e1a57b6bc970739413efe4bbffdff6bc55d076db4546f0ff458c9cd8b66c389daa21e9cad7341d614109891c9a2b46acc2
DIST Markups-0.6.3.tar.gz 19285 SHA256 e3ff5de2be018240c526e017972b37181cb3d5dfb7c96ad14eae6639140f58ef SHA512 61b3921595628f577d335c9eb7e405435c1547a6d5d06396e4181a0f3ac0bce8f5a72b5c51568ceeec96c86524ec4baa1cbcb807f545a630a87d807b9e12c97b WHIRLPOOL 9aad9486e57831fbca7124cb06dc84fd69df3036d7f08e8168b9969e83b58a32250cb82c90b70344f60d30c03fb3c7171f698fb8ba6ea23f5c296bb6d8b80ba2
DIST Markups-1.0.0.tar.gz 14841 SHA256 4d618b2af5c37fa0e4ae2e0798a87505d1e94f9eb78d0db6b893df1f91c37ec2 SHA512 081eb12d30de6c88a6e8a985326e1135fa7346ed5d625364565c53010557ea73a0411ae29e6b9fa4223c5c93bd5abbdcc3ce8dfc36d5bff69a144f865d59b965 WHIRLPOOL c2b94bff742478d65c384891facefecb99527b32301aafb3c976e6cfef12d21bf014143f8254d2e302175336ff664d13e134c9448eb21eb101ba15726c3377a5
+DIST Markups-1.0.1.tar.gz 14894 SHA256 74464b7532aa355f6ed2767fd5cfb5eb5b484dd773b33bae4016a7fa9354b4ee SHA512 f57f712f84413ed35f53643533d392e2164de02742e170f85fc4556094041ffa16ed1ff6d902bcafe996d22a4410e4c2794e4c96246fc06afbf878d6be85cf31 WHIRLPOOL f5bf7700b76dcad18aba9ec5503ba9516e8e7f8a34577b55b423531c9f88ee547690a90e8043997651fe36516c9990a6de103f8268c4fcf768f4605d8982829f
diff --git a/dev-python/markups/markups-1.0.1.ebuild b/dev-python/markups/markups-1.0.1.ebuild
new file mode 100644
index 000000000000..4ee77e1bc144
--- /dev/null
+++ b/dev-python/markups/markups-1.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+MY_PN="Markups"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A wrapper around various text markups"
+HOMEPAGE="
+ http://pythonhosted.org/Markups/
+ https://github.com/retext-project/pymarkups
+ https://pypi.python.org/pypi/Markups"
+SRC_URI="mirror://pypi/M/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"/${MY_P}
+
+DEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+ ${EPYTHON} -m unittest discover -s tests -v || die
+}
diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
index 3bde29fa6053..a98751d2621b 100644
--- a/dev-python/matplotlib/matplotlib-1.5.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
@@ -47,6 +47,12 @@ COMMON_DEPEND="
media-libs/freetype:2
media-libs/libpng:0
media-libs/qhull
+ cairo? (
+ || (
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/cairocffi[${PYTHON_USEDEP}]
+ )
+ )
gtk2? (
dev-libs/glib:2=
x11-libs/gdk-pixbuf
@@ -80,12 +86,6 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
- cairo? (
- || (
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/cairocffi[${PYTHON_USEDEP}]
- )
- )
excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
gtk3? (
diff --git a/dev-python/more-itertools/more-itertools-2.2-r1.ebuild b/dev-python/more-itertools/more-itertools-2.2-r1.ebuild
new file mode 100644
index 000000000000..7dd508dd40e2
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-2.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.python.org/pypi/more-itertools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ nosetests -w "${BUILD_DIR}" more_itertools --with-doctest \
+ || die "tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/more-itertools/more-itertools-2.2.ebuild b/dev-python/more-itertools/more-itertools-2.2.ebuild
index 75773852628d..f5a972c6bd32 100644
--- a/dev-python/more-itertools/more-itertools-2.2.ebuild
+++ b/dev-python/more-itertools/more-itertools-2.2.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit distutils-r1
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
index 9359a4076a4d..9ba675f3b2fc 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
@@ -23,3 +23,7 @@ SLOT="0"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild b/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
index c662b52fdc06..6ba50463a0e9 100644
--- a/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose/nose-1.3.7.ebuild b/dev-python/nose/nose-1.3.7.ebuild
index d2253f948a1a..7e9d80502246 100644
--- a/dev-python/nose/nose-1.3.7.ebuild
+++ b/dev-python/nose/nose-1.3.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples test"
RDEPEND="
diff --git a/dev-python/oslotest/oslotest-1.12.0.ebuild b/dev-python/oslotest/oslotest-1.12.0.ebuild
index 1ec97269040c..f9d83d19b12e 100644
--- a/dev-python/oslotest/oslotest-1.12.0.ebuild
+++ b/dev-python/oslotest/oslotest-1.12.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pip/pip-7.1.2.ebuild b/dev-python/pip/pip-7.1.2.ebuild
index 7f0d706350c6..b281787c36b0 100644
--- a/dev-python/pip/pip-7.1.2.ebuild
+++ b/dev-python/pip/pip-7.1.2.ebuild
@@ -58,10 +58,10 @@ python_install_all() {
COMPLETION="${T}"/completion.tmp
- "${PYTHON}" pip/__init__.py completion --bash > "${COMPLETION}" || die
+ "${PYTHON}" -m pip completion --bash > "${COMPLETION}" || die
newbashcomp "${COMPLETION}" ${PN}
- "${PYTHON}" pip/__init__.py completion --zsh > "${COMPLETION}" || die
+ "${PYTHON}" -m pip completion --zsh > "${COMPLETION}" || die
insinto /usr/share/zsh/site-functions
newins "${COMPLETION}" _pip
}
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 9744c9b95131..48e90e64a76e 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1 +1,2 @@
DIST plumbum-1.5.0.tar.gz 57390 SHA256 b759f9e3b6771dff3332f01bc0683d1a56218f44d97942dabd906a0cd1cfb756 SHA512 68c248cf6e40281bc97ef9ba69ff03b3e5b486f44d2a66674fd6073313bbce49abc729f8c99ec1988d9a8881f4c1ff8cf70ac238a38eabf9a3da76d452be525f WHIRLPOOL 9d9660a81546348f4a2c3910fa455b597429f9a23cd9c9a053bc2728e352e38bdb5d2b89f6f3a741e937522b7aabb7f5071f7d34efcdbe82d88e647854d1678d
+DIST plumbum-1.6.0.tar.gz 77092 SHA256 74c931a79d1c1851ee7a2d8b7f594c810930e46a6bdea7961e177d3670ed350e SHA512 0be9461720cb03c56aff8f56705b1753013e02df4b4d3dbc7e8379930b9efb3822df587483ca708f3a16f08d625f03459f8fe377bc50e59439d05f73669003cc WHIRLPOOL 27d24289327ed6e68f47fec995962b6929e804091d44220fcdbf115bd532b4dc0dca154d25077869c484f5682722238aed2cec5c1372846528d904cddefe88b6
diff --git a/dev-python/plumbum/plumbum-1.6.0.ebuild b/dev-python/plumbum/plumbum-1.6.0.ebuild
new file mode 100644
index 000000000000..6e6ebc3f7e56
--- /dev/null
+++ b/dev-python/plumbum/plumbum-1.6.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+inherit distutils-r1
+
+DESCRIPTION="A library for shell script-like programs in python"
+HOMEPAGE="http://plumbum.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/pycxx/pycxx-6.2.6.ebuild b/dev-python/pycxx/pycxx-6.2.6.ebuild
index a5c539c59988..a6ddf1494692 100644
--- a/dev-python/pycxx/pycxx-6.2.6.ebuild
+++ b/dev-python/pycxx/pycxx-6.2.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="doc examples"
python_prepare_all() {
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index da3eb99c5d8f..b518687c5ce8 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -2,3 +2,4 @@ DIST Pyro-3.16.tar.gz 298769 SHA256 1bed508453ef7a7556b51424a58101af2349b662baab
DIST Pyro4-4.25.tar.gz 295993 SHA256 ac2b0123badcb76c63eb716fcd95e0ee4021d345b5db05fda19253c59e39b384 SHA512 9a112e679a304d250549701d9a1baef0df6d3ea6f1eec559e7c433eab7ab09155c9ae440817f844be073f69dc8bf93836d48930b1d91311eaf6ab7e91c0a4faf WHIRLPOOL aa767569948af1cf222b95fa114d4dee08b601296f8be1ed9bce86502f1c9eeedf05930215da192ab9d237d740283f88a5f7efe1f53291acd1b90b51099a1801
DIST Pyro4-4.39.tar.gz 496566 SHA256 39c6ca7f86b0f0bebfeada687a5a8b99f66470a52b0f815195ae63c683266f24 SHA512 ac303401abe997b7ce0914a804538dcee9195bbe3fe1d07cf18be0592cbb4dbd161413e8d7a696a8dc1e29ff64fe98877ea1fa9811d9961340441cf414f31d98 WHIRLPOOL fc4377552f9e5f5666671d909b7c071095933625baea891535c976f735dab8f3d1b5b3f0132be2fcf9a003024d874a88ddd092b127127c0376807a1d2894d393
DIST Pyro4-4.40.tar.gz 501340 SHA256 00423d3710f60b2da146075a59e17bfa837f556ed2c8acafe05bc209dcaac3e9 SHA512 43ee1b0dd3e700d9fed16c5fceda30074dc6cd3cbd466efe911711eb81f1c4bce1967bed06225922e45812e04e36c49cd42d24c0edca1845159d1035326896e7 WHIRLPOOL fdc5f2f405a217db0840218201b1d943ef5828513cc606135dbe5dd7fb723dedec78ad25e8ea6cc2ca0a3e4b374eb8a73fe7db0dae6dcac117c0af9d0e757def
+DIST Pyro4-4.41.tar.gz 502294 SHA256 3af4749140e9d4032632277ac19e7fd4761856d2df0f0643c574d1e7174a9703 SHA512 01c3f16448b39cd7a83c845eec86013315ee183a3e50c6caee1d327308e67ff63732833b413b189ebcb77cdb3fc65bbd7417ecbfc8575775ff79550678bce020 WHIRLPOOL 4ff63737b01eca22bc1dcd7e61a81ad3285c90ac1e03764edffe85b003eade780a936bbd74773f8d58d2a34dbe562bdfe332c5dd8ddd052f5a3928caa736d882
diff --git a/dev-python/pyro/pyro-3.16-r1.ebuild b/dev-python/pyro/pyro-3.16-r1.ebuild
index a1465faacd1b..5ef32dcb507b 100644
--- a/dev-python/pyro/pyro-3.16-r1.ebuild
+++ b/dev-python/pyro/pyro-3.16-r1.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
MY_PN="Pyro"
MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Advanced and powerful Distributed Object Technology system written entirely in Python"
+DESCRIPTION="Distributed object middleware for Python (RPC)"
HOMEPAGE="http://www.xs4all.nl/~irmen/pyro3/ https://pypi.python.org/pypi/Pyro"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pyro/pyro-4.25.ebuild b/dev-python/pyro/pyro-4.25.ebuild
index 0f3c441dfd66..4ab34b54dcb0 100644
--- a/dev-python/pyro/pyro-4.25.ebuild
+++ b/dev-python/pyro/pyro-4.25.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
MY_PN="Pyro4"
MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Advanced and powerful Distributed Object Technology system written entirely in Python"
+DESCRIPTION="Distributed object middleware for Python (RPC)"
HOMEPAGE="http://www.xs4all.nl/~irmen/pyro/ https://pypi.python.org/pypi/Pyro4"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pyro/pyro-4.39.ebuild b/dev-python/pyro/pyro-4.39.ebuild
index 3ca6320e05e5..95944d868909 100644
--- a/dev-python/pyro/pyro-4.39.ebuild
+++ b/dev-python/pyro/pyro-4.39.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
MY_PN="Pyro4"
MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Advanced and powerful Distributed Object Technology system written entirely in Python"
+DESCRIPTION="Distributed object middleware for Python (RPC)"
HOMEPAGE="http://www.xs4all.nl/~irmen/pyro/ https://pypi.python.org/pypi/Pyro4 https://github.com/irmen/Pyro4"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pyro/pyro-4.40.ebuild b/dev-python/pyro/pyro-4.40.ebuild
index 9b71dd310aee..6a140ed38ecf 100644
--- a/dev-python/pyro/pyro-4.40.ebuild
+++ b/dev-python/pyro/pyro-4.40.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
MY_PN="Pyro4"
MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Advanced and powerful Distributed Object Technology system written entirely in Python"
+DESCRIPTION="Distributed object middleware for Python (RPC)"
HOMEPAGE="http://www.xs4all.nl/~irmen/pyro/ https://pypi.python.org/pypi/Pyro4 https://github.com/irmen/Pyro4"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pyro/pyro-4.41.ebuild b/dev-python/pyro/pyro-4.41.ebuild
new file mode 100644
index 000000000000..6a140ed38ecf
--- /dev/null
+++ b/dev-python/pyro/pyro-4.41.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Pyro4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Distributed object middleware for Python (RPC)"
+HOMEPAGE="http://www.xs4all.nl/~irmen/pyro/ https://pypi.python.org/pypi/Pyro4 https://github.com/irmen/Pyro4"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+ !dev-python/pyro:0
+ >=dev-python/serpent-1.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ )"
+
+S="${WORKDIR}/${MY_P}"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+ sed \
+ -e '/sys.path.insert/a sys.path.insert(1,"PyroTests")' \
+ -i tests/run_testsuite.py || die
+
+ # Disable tests requiring network connection.
+ sed \
+ -e "s/testBCstart/_&/" \
+ -e "s/testDaemonPyroObj/_&/" \
+ -e "s/testLookupAndRegister/_&/" \
+ -e "s/testMulti/_&/" \
+ -e "s/testRefuseDottedNames/_&/" \
+ -e "s/testResolve/_&/" \
+ -e "s/testBCLookup/_&/" \
+ -i tests/PyroTests/test_naming.py || die
+ sed \
+ -e "s/testOwnloopBasics/_&/" \
+ -e "s/testStartNSfunc/_&/" \
+ -i tests/PyroTests/test_naming2.py || die
+
+ sed \
+ -e "s/testServerConnections/_&/" \
+ -e "s/testServerParallelism/_&/" \
+ -i tests/PyroTests/test_server.py || die
+
+ sed \
+ -e "s/testBroadcast/_&/" \
+ -e "s/testGetIP/_&/" \
+ -e "s/testGetIpVersion[46]/_&/" \
+ -i tests/PyroTests/test_socket.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ cd "${S}"/tests || die
+ ${PYTHON} -E run_testsuite.py || die
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( docs/. )
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index 5db2a53ad52a..00a0e26d32f7 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,3 +1 @@
-DIST pysvn-1.7.10.tar.gz 352631 SHA256 cb8a7eca9fd5d077f4b086c79cc1115a2f38a37979eee836ff258b4da0aee517 SHA512 3404ce53f974ff91a7eecea29176f6b71f1dbb37a716880dfd3d2961d4c6e0c81f87aa46308994d4f7ed6a6cbca7f7451753e1de43ce95fef4443fc5f70ff3aa WHIRLPOOL 99ac425ad2e19355521c73947cf33b2c5bff0023af686d699fdfcd7abc8c5f965974c9762b0dbd3ae3cddfc833e35ac549af1de54ca2472d1354a8fa126e8c36
-DIST pysvn-1.7.9.tar.gz 352320 SHA256 8a58ea6405e5f5ffd0850fc5ed6bc29a93b3573da099293f49ef3241e5be1692 SHA512 966f9b57f63abc68d82a0f0f0d710d3109c2bd515eb0b0dacdca140b0db32154c802d27b4f79062da19f0d18ff6332b729c6f9c06e0a74742161a00b74bef7aa WHIRLPOOL 53f27a30ce97b723fe0d1a8540221e25e593fc00789eab7b6e2814f3ffe3ff8f485523ad7fe3bff7c1b5d101fb87d694a1c18111d2523895835ea72ea1ee6aab
DIST pysvn-1.8.0.tar.gz 366583 SHA256 39596f4884ed689cdb5a4e210e421724302a566c7ba756cc4d46bbfeb0c8326b SHA512 14a70b910be986eba638a903edde5046c93314fedb08a7c15d464dc51da1c7efeb87147cc68c00ff9ac1b4ca506d099d3aedf7e4d86f92642c7304ef9540653b WHIRLPOOL 90a795f4d6a1c353321a116f5676741ce2121122de0426d045893e2688cc10bcd248ffef98da6d920daba70e2406ce136fed972e8172b7e648c6dd02f04e608d
diff --git a/dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch b/dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch
deleted file mode 100644
index 18c7ea630dcf..000000000000
--- a/dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -ur pysvn-1.7.9.orig/Source/setup_configure.py pysvn-1.7.9/Source/setup_configure.py
---- Source/setup_configure.py 2014-02-02 22:19:59.000000000 +0800
-+++ Source/setup_configure.py 2014-08-15 08:15:44.676746371 +0800
-@@ -848,8 +848,8 @@
- def __init__( self, setup ):
- Compiler.__init__( self, setup )
-
-- self._addVar( 'CCC', 'g++' )
-- self._addVar( 'CC', 'gcc' )
-+ self._addVar( 'CCC', '$(CXX)' )
-+ self._addVar( 'CC', '$(CC)' )
-
- def getPythonExtensionFileExt( self ):
- return '.so'
-@@ -975,8 +975,8 @@
- else:
- arch_options = ''
-
-- self._addVar( 'CCC', 'g++ %s' % (arch_options,) )
-- self._addVar( 'CC', 'gcc %s' % (arch_options,) )
-+ self._addVar( 'CCC', '$(CXX) %s' % (arch_options,) )
-+ self._addVar( 'CC', '$(CC) %s' % (arch_options,) )
-
- self._find_paths_pycxx_dir = [
- '../Import/pycxx-%d.%d.%d' % pycxx_version,
-@@ -1031,11 +1031,11 @@
-
- def setupUtilities( self ):
- self._addVar( 'CCCFLAGS',
-- '-g '
-+ '$(CXXFLAGS) '
- '-Wall -fPIC -fexceptions -frtti '
- '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
- '-D%(DEBUG)s' )
-- self._addVar( 'LDEXE', '%(CCC)s -g' )
-+ self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' )
-
- def setupPySvn( self ):
- self._pysvnModuleSetup()
-@@ -1047,7 +1047,7 @@
- self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() )
-
- py_cflags_list = [
-- '-g',
-+ '$(CXXFLAGS) ',
- '-Wall -fPIC -fexceptions -frtti',
- '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
- '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
-@@ -1073,13 +1073,12 @@
-
- self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) )
- self._addVar( 'LDLIBS', ' '.join( py_ld_libs ) )
-- self._addVar( 'LDSHARED', '%(CCC)s -bundle -g '
-+ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -bundle '
- '-framework System '
- '%(PYTHON_FRAMEWORK)s '
- '-framework CoreFoundation '
- '-framework Kerberos '
-- '-framework Security '
-- '%(LDLIBS)s' )
-+ '-framework Security' )
-
- class UnixCompilerGCC(CompilerGCC):
- def __init__( self, setup ):
-@@ -1139,11 +1138,11 @@
-
- def setupUtilities( self ):
- self._addVar( 'CCCFLAGS',
-- '-g '
-+ '$(CXXFLAGS) '
- '-Wall -fPIC -fexceptions -frtti '
- '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
- '-D%(DEBUG)s' )
-- self._addVar( 'LDEXE', '%(CCC)s -g' )
-+ self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' )
-
- def setupPySvn( self ):
- self._pysvnModuleSetup()
-@@ -1154,6 +1153,7 @@
- self._addVar( 'PYTHON_ARCH_SPECIFIC_INC', distutils.sysconfig.get_python_inc( True ) )
-
- py_cflags_list = [
-+ '$(CXXFLAGS)',
- '-Wall -fPIC -fexceptions -frtti',
- '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
- '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
-@@ -1171,7 +1171,7 @@
-
- self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) )
- self._addVar( 'LDLIBS', ' '.join( self._getLdLibs() ) )
-- self._addVar( 'LDSHARED', '%(CCC)s -shared -g' )
-+ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -shared' )
-
- #--------------------------------------------------------------------------------
- class LinuxCompilerGCC(UnixCompilerGCC):
diff --git a/dev-python/pysvn/files/pysvn-1.7.9-respect_flags.patch b/dev-python/pysvn/files/pysvn-1.7.9-respect_flags.patch
deleted file mode 100644
index 7f1c35e59cb3..000000000000
--- a/dev-python/pysvn/files/pysvn-1.7.9-respect_flags.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ur pysvn-1.7.9.orig/Source/setup_configure.py pysvn-1.7.9/Source/setup_configure.py
---- Source/setup_configure.py 2014-02-02 22:19:59.000000000 +0800
-+++ Source/setup_configure.py 2014-08-15 08:15:44.676746371 +0800
-@@ -848,8 +848,8 @@
- def __init__( self, setup ):
- Compiler.__init__( self, setup )
-
-- self._addVar( 'CCC', 'g++' )
-- self._addVar( 'CC', 'gcc' )
-+ self._addVar( 'CCC', '$(CXX)' )
-+ self._addVar( 'CC', '$(CC)' )
-
- def getPythonExtensionFileExt( self ):
- return '.so'
-@@ -975,8 +975,8 @@
- else:
- arch_options = ''
-
-- self._addVar( 'CCC', 'g++ %s' % (arch_options,) )
-- self._addVar( 'CC', 'gcc %s' % (arch_options,) )
-+ self._addVar( 'CCC', '$(CXX) %s' % (arch_options,) )
-+ self._addVar( 'CC', '$(CC) %s' % (arch_options,) )
-
- self._find_paths_pycxx_dir = [
- '../Import/pycxx-%d.%d.%d' % pycxx_version,
-@@ -1031,12 +1031,12 @@
-
- def setupUtilities( self ):
- self._addVar( 'CCCFLAGS',
-- '-g '
-+ '$(CXXFLAGS) '
- '-no-long-double '
- '-Wall -fPIC -fexceptions -frtti '
- '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
- '-D%(DEBUG)s' )
-- self._addVar( 'LDEXE', '%(CCC)s -g' )
-+ self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' )
-
- def setupPySvn( self ):
- self._pysvnModuleSetup()
-@@ -1048,7 +1048,7 @@
- self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() )
-
- py_cflags_list = [
-- '-g',
-+ '$(CXXFLAGS) ',
- '-no-long-double',
- '-Wall -fPIC -fexceptions -frtti',
- '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
-@@ -1075,13 +1075,12 @@
-
- self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) )
- self._addVar( 'LDLIBS', ' '.join( py_ld_libs ) )
-- self._addVar( 'LDSHARED', '%(CCC)s -bundle -g '
-+ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -bundle '
- '-framework System '
- '%(PYTHON_FRAMEWORK)s '
- '-framework CoreFoundation '
- '-framework Kerberos '
-- '-framework Security '
-- '%(LDLIBS)s' )
-+ '-framework Security' )
-
- class UnixCompilerGCC(CompilerGCC):
- def __init__( self, setup ):
-@@ -1141,11 +1140,11 @@
-
- def setupUtilities( self ):
- self._addVar( 'CCCFLAGS',
-- '-g '
-+ '$(CXXFLAGS) '
- '-Wall -fPIC -fexceptions -frtti '
- '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
- '-D%(DEBUG)s' )
-- self._addVar( 'LDEXE', '%(CCC)s -g' )
-+ self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' )
-
- def setupPySvn( self ):
- self._pysvnModuleSetup()
-@@ -1156,6 +1155,7 @@
- self._addVar( 'PYTHON_ARCH_SPECIFIC_INC', distutils.sysconfig.get_python_inc( True ) )
-
- py_cflags_list = [
-+ '$(CXXFLAGS)',
- '-Wall -fPIC -fexceptions -frtti',
- '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
- '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
-@@ -1173,7 +1173,7 @@
-
- self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) )
- self._addVar( 'LDLIBS', ' '.join( self._getLdLibs() ) )
-- self._addVar( 'LDSHARED', '%(CCC)s -shared -g' )
-+ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -shared' )
-
- #--------------------------------------------------------------------------------
- class LinuxCompilerGCC(UnixCompilerGCC):
diff --git a/dev-python/pysvn/pysvn-1.7.10.ebuild b/dev-python/pysvn/pysvn-1.7.10.ebuild
deleted file mode 100644
index 5ea25360583c..000000000000
--- a/dev-python/pysvn/pysvn-1.7.10.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
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Object-oriented python bindings for subversion"
-HOMEPAGE="http://pysvn.tigris.org/"
-SRC_URI="http://pysvn.barrys-emacs.org/source_kits/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND="
- >=dev-python/pycxx-6.2.0[${PYTHON_USEDEP}]
- <dev-vcs/subversion-1.9"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-respect_flags.patch )
-
-python_prepare() {
- # Don't use internal copy of dev-python/pycxx.
- rm -r Import || die
-
- # http://pysvn.tigris.org/source/browse/pysvn?view=rev&revision=1469
- sed \
- -e "s/PYSVN_HAS_SVN_CLIENT_CTX_T__CONFLICT_FUNC_16/PYSVN_HAS_SVN_CLIENT_CTX_T__CONFLICT_FUNC_1_6/" \
- -i Source/pysvn_svnenv.hpp || die
-}
-
-python_configure() {
- cd Source || die
- # all config options from 1.7.6 are all already set
- esetup.py configure
-}
-
-python_compile() {
- cd Source || die
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-python_test() {
- cd Tests || die
- emake
-}
-
-python_install() {
- cd Source || die
- python_domodule pysvn
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( Docs/ )
- use examples && local EXAMPLES=( Examples/Client/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pysvn/pysvn-1.7.9.ebuild b/dev-python/pysvn/pysvn-1.7.9.ebuild
deleted file mode 100644
index 6cc28691f2d7..000000000000
--- a/dev-python/pysvn/pysvn-1.7.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit eutils distutils-r1 toolchain-funcs
-
-DESCRIPTION="Object-oriented python bindings for subversion"
-HOMEPAGE="http://pysvn.tigris.org/"
-SRC_URI="http://pysvn.barrys-emacs.org/source_kits/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND="
- >=dev-python/pycxx-6.2.0[${PYTHON_USEDEP}]
- <dev-vcs/subversion-1.9"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-respect_flags.patch )
-
-python_prepare() {
- # Don't use internal copy of dev-python/pycxx.
- rm -r Import || die
-
- # http://pysvn.tigris.org/source/browse/pysvn?view=rev&revision=1469
- sed -e "s/PYSVN_HAS_SVN_CLIENT_CTX_T__CONFLICT_FUNC_16/PYSVN_HAS_SVN_CLIENT_CTX_T__CONFLICT_FUNC_1_6/" -i Source/pysvn_svnenv.hpp
-}
-
-python_configure() {
- cd Source || die
- # all config options from 1.7.6 are all already set
- esetup.py configure
-}
-
-python_compile() {
- cd Source || die
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-python_test() {
- cd Tests || die
- emake
-}
-
-python_install() {
- cd Source || die
- python_domodule pysvn
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( Docs/ )
- use examples && local EXAMPLES=( Examples/Client/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pysvn/pysvn-1.8.0.ebuild b/dev-python/pysvn/pysvn-1.8.0.ebuild
index 2f797d4cb6c9..bf1a062b86a4 100644
--- a/dev-python/pysvn/pysvn-1.8.0.ebuild
+++ b/dev-python/pysvn/pysvn-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pysvn.barrys-emacs.org/source_kits/${P}.tar.gz"
LICENSE="Apache-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="doc examples"
DEPEND="
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
new file mode 100644
index 000000000000..beada9109a8a
--- /dev/null
+++ b/dev-python/python-efl/Manifest
@@ -0,0 +1 @@
+DIST python-efl-1.16.0.tar.xz 8737592 SHA256 3418ca7dc38f07bf610b9dcc7ce356bc8c45247a2100679bf840f640e2744e90 SHA512 6ee6f373b376af67af4124360482f7f0c2fb8b6e4c354ebba21c141a06be3f68ff17dcea45422c38d9e19595df035603df268aff74489007be6b9db13b861812 WHIRLPOOL 14cf92c31efae6a75de3d693075db8c3657519a60662db3373c8abef655d982f24e8ceddf10be605ec515b15d545ca4e2417767e3e48d68639e312f089bf2eff
diff --git a/dev-python/python-efl/metadata.xml b/dev-python/python-efl/metadata.xml
new file mode 100644
index 000000000000..71cdd7256211
--- /dev/null
+++ b/dev-python/python-efl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+<herd>enlightenment</herd>
+</pkgmetadata>
diff --git a/dev-python/python-efl/python-efl-1.16.0.ebuild b/dev-python/python-efl/python-efl-1.16.0.ebuild
new file mode 100644
index 000000000000..602a8f7b9d09
--- /dev/null
+++ b/dev-python/python-efl/python-efl-1.16.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+ EGIT_SUB_PROJECT="bindings/python"
+ EGIT_URI_APPEND="${PN}"
+ EGIT_REPO_URI="git://git.enlightenment.org/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}.git"
+ inherit git-2
+else
+ SRC_URI="https://download.enlightenment.org/rel/bindings/python/${MY_P}.tar.xz"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Enlightenment Fundation Libraries"
+HOMEPAGE="http://www.enlightenment.org"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-libs/efl-${PV}
+ >=media-libs/elementary-${PV}
+ >dev-python/dbus-python-0.83[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/cython-0.17[${PYTHON_USEDEP}]
+ doc? (
+ media-gfx/graphviz[python]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ )
+ doc? ( >dev-python/sphinx-1.0[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+ if use doc ; then
+ # Point sphinx to right location with builded sources
+ sed -i 's|"../build/"+d|"'"${BUILD_DIR}"'/lib"|g' doc/conf.py
+ esetup.py build_doc --build-dir "${S}"/build/doc/
+ fi
+}
+
+python_test() {
+ cd "${S}"/tests
+ rm -f ecore/test_09_file_download.py # violates sandbox
+ sed -i 's:verbosity=1:verbosity=3:' 00_run_all_tests.py || die
+ ${PYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && DOCS=( "${S}"/build/doc/html )
+ use examples && EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch
new file mode 100644
index 000000000000..dd3ee52ad46d
--- /dev/null
+++ b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch
@@ -0,0 +1,19 @@
+--- poppler.defs 2009-09-27 16:07:59.000000000 +0700
++++ poppler.defs 2015-12-22 16:36:14.000000000 +0600
+@@ -579,16 +579,4 @@
+ )
+
+-(define-enum Orientation
+- (in-module "Poppler")
+- (c-name "PopplerOrientation")
+- (gtype-id "POPPLER_TYPE_ORIENTATION")
+- (values
+- '("portrait" "POPPLER_ORIENTATION_PORTRAIT")
+- '("landscape" "POPPLER_ORIENTATION_LANDSCAPE")
+- '("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN")
+- '("seascape" "POPPLER_ORIENTATION_SEASCAPE")
+- )
+-)
+-
+ (define-enum PageTransitionType
+ (in-module "Poppler")
diff --git a/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild b/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild
index 6da0020a1a12..b9dbfea911c9 100644
--- a/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild
+++ b/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI="5"
+
PYTHON_COMPAT=( python2_7 )
inherit autotools-utils eutils python-r1
@@ -31,6 +32,7 @@ PATCHES=(
"${FILESDIR}"/${P}-79_78.diff
"${FILESDIR}"/${P}-poppler0.15.0-changes.patch
"${FILESDIR}"/${P}-poppler-0.18.0-minimal-fix.patch
+ "${FILESDIR}"/${P}-poppler-0.39.0-changes.patch
)
src_configure() {
diff --git a/dev-python/python-systemd/python-systemd-230.ebuild b/dev-python/python-systemd/python-systemd-230.ebuild
index 3ea466f5a592..94a0ee0e96fc 100644
--- a/dev-python/python-systemd/python-systemd-230.ebuild
+++ b/dev-python/python-systemd/python-systemd-230.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 ~sparc x86"
IUSE=""
DEPEND="sys-apps/systemd"
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index d36010c5a204..277f10a7367d 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,4 +1,4 @@
DIST requests-2.7.0.tar.gz 451723 SHA256 398a3db6d61899d25fd4a06c6ca12051b0ce171d705decd7ed5511517b4bb93d SHA512 a93223c3fd21c58f7c0c901b17be17c23dba4efeed8c4347da9d4e04d96a6698e08e01482205661cb7757cc7560d9ae2e62b18f2b422af0cb90fd998fe963ff2 WHIRLPOOL b805d76ad747fc8a754fb0ca0439e8f303df057c2b256ed7f57533b311322e4e28b0d8f22111a3c5ad283823c1256cd24c93fec2aeabc6946013c17ab3540dd9
DIST requests-2.8.0.tar.gz 457879 SHA256 b2f003589b60924909c0acde472590c5ea83906986a7a25b6f7929eb20923b7b SHA512 cf41db4b1a4639e940c2b5c1e0edaf2c4dedf0a8ead8381e211fd9e350f491e252f10cfba09bb64b4a062be98ee43e133957f489649db15116a1811e06958bb3 WHIRLPOOL 5e7e889bc016f403e221af05d01aebbec4c96175c983e240128d288884768dc0c119d76c022fd3ae5d2222cfda5415c866052fa5c5f325ee22cebb33c780df16
DIST requests-2.8.1.tar.gz 480803 SHA256 84fe8d5bf4dcdcc49002446c47a146d17ac10facf00d9086659064ac43b6c25b SHA512 bccec89165596df3af3f46eb43b5b28b595752485b00ed73978ef76fa6b8a8961c3db046c3f91ff34fa390f037322f6e13b141ba9b600a836a6d798086bd13fb WHIRLPOOL 445e0e12f5900c3396ae7a76d0010b9c4a4ff2c79c51dfc88f117918e436a4d67ea25de39f252cacaabd737b7b1542374172a2b6f482d7ffe1f7514d1cb4a06b
-DIST requests-2.9.0.tar.gz 483589 SHA256 4881966532b5a36c552244fd909de66d1b8c4a26086f56fd5837cfcde63f8eb8 SHA512 8df3dd0a803f44eea269275e247f823c0d676b04ee44c719135e3661c6d951a0d94fac305766b99e10ba09f5f602e3f57883b0ae764aa7fce8bd1d92e86be85e WHIRLPOOL 1fc936a628fa32b4eb7c2ebfe3b049ddc3d5412f1dac686a1eadc9834e8f9738443c0e96f351b51fba6e2ef2730a6da93489d4193f525149fc523cafb9d7053d
+DIST requests-2.9.1.tar.gz 484252 SHA256 c577815dd00f1394203fc44eb979724b098f88264a9ef898ee45b8e5e9cf587f SHA512 0b2b64b2ebb68703f2a222a3e5d0227cf15250319195a13497e38959c64b82359b70221157eab2ab828dfc79bcfec13ede4d6272f0202ae1b22ae79d5810adb9 WHIRLPOOL 9d942b97168c8a869b703db324a263ed3f5279a17e18444f7311e3d3a06aac99ef939c1d3f966025d6ac9e2967415880669b3bac6766c2d39c2faee43cb146c3
diff --git a/dev-python/requests/requests-2.9.0.ebuild b/dev-python/requests/requests-2.9.1.ebuild
index 4d4a6086e01f..4d4a6086e01f 100644
--- a/dev-python/requests/requests-2.9.0.ebuild
+++ b/dev-python/requests/requests-2.9.1.ebuild
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index be397d9c47dd..96dd61c2e1fc 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1 +1,2 @@
DIST rpyc-3.2.3.tar.gz 48371 SHA256 80782d78863bc4f803b2534452dc37c5dcb6e85230af77fe0ce5a0206e37f661 SHA512 b0cc7a9429b062b0b796a7e4f6bc8056041db7e63b04dc8cbc67c5e2f343f1c1299e0e3fc88ff651f484caf5d3305cb4346523dee555e8315c9a1e1141da8b28 WHIRLPOOL 4fc6383571bb84aaed7c6e1b360c2e9b55c40f3ba2a7ca9dfd41527b889f3713003f5286edda625fcfbe4e293854389ddff437f54d18188187b3fd2a83a35cbe
+DIST rpyc-3.3.0.tar.gz 53541 SHA256 43fa845314f0bf442f5f5fab15bb1d1b5fe2011a8fc603f92d8022575cef8b4b SHA512 c586ab79d2ab3a8e14128c7ac5ae49a3311de0723453f801edb805819b06037ae015825fda32ac7620d99fdeceacbcbc5d1b4fadc3c7b2ac778e883ba9406793 WHIRLPOOL c8cd0dbf8c5c45690b3443fcd6e8a62043fbbfafc8f778dd492467bb6d1e5916d2c489fdd668817006d1105a07e87b7b707e3483b250ae68e745d51ed10e05d4
diff --git a/dev-python/rpyc/rpyc-3.3.0.ebuild b/dev-python/rpyc/rpyc-3.3.0.ebuild
new file mode 100644
index 000000000000..a771f1fe7fce
--- /dev/null
+++ b/dev-python/rpyc/rpyc-3.3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
+HOMEPAGE="http://rpyc.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-python/plumbum"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index e5bb4c89d294..011fad4af519 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -6,3 +6,4 @@ DIST setuptools-18.7.tar.gz 628702 SHA256 c57c1f5aa3b83e4c5e0ce5b144a7f96eea1dab
DIST setuptools-18.8.1.tar.gz 629889 SHA256 ac472c7c4752e8cd44d646fcb4f15d13e72a4ae20e4d853c61adba3b9cabe1d5 SHA512 4ebb36cb54a1c581e3b06ce224fdd97211da9b93962eeae0151b064ac107244dab9111dd1441e76997275f9c559dca2cf0c480544f526c8643bf21beda30bf14 WHIRLPOOL a82fba00a874de1b1cc832f062ed27dae17d34e2782a6353ad980884f6b839990acf3f8f1b00066e14ddc96b3ea35e9dc2ed27cda52ef792f6227db03283cf82
DIST setuptools-18.8.tar.gz 629367 SHA256 04180e33a40a114ff9b458f31786d885964612af2b2111c3d0efdc9a1ac76c4d SHA512 718f8ef19e639450f62e1751715bac65ce2bd218b81614d07c9283a01be3a085ec5422ff9d96a54e74c05135a1a4bb167ece6d4ecece588716d05982c9f25811 WHIRLPOOL 412545b8b2625675612c9d79b366c7b5287e0f6f48596a49fdbd1b358a4efefcd4cbf8993ff42ad7d7f14868fc86e5136c7af650dfe954ab015060ea57268523
DIST setuptools-19.1.1.tar.gz 640997 SHA256 32ebb08b72aee11fefa6907ddf5db5a81e0eef9cf62c7fa6b58d8e32da249960 SHA512 480aaed577ab9bc4d3cae71d957407ecb71e743dab7fb06f165b76683445f356ce141e1057b5a057101f9546df8c62e2abc2c35ebd751e4bb3febb846a71ac41 WHIRLPOOL 608af5cb22e9b87de3cb0181519058cc7437b7e74b7be4774337d18a562e869cb361edf17f0488c2594039e87dcdc1f201723520568490b0e0be105992abeb37
+DIST setuptools-19.2.tar.gz 641777 SHA256 f90ed8eb70b14b0594ba74e9de4ffca040c0ec8ee505cbf3570499467859f71a SHA512 2494606930d6d422e8c105e8e5b40a07b23709f361164c5df40ff24c80328b861179652c7212fa38137534206c187bc4de42d249bc686d43fad18f23d0a26126 WHIRLPOOL ee861dc97a48ec7a07eadc3ceb42077b396a14c1448f0c3d8c6edf2266f4da241bb0e9f31922bc687b6e943802b95b440aea9f2e5d60b8d338c8392102353100
diff --git a/dev-python/setuptools/setuptools-19.2.ebuild b/dev-python/setuptools/setuptools-19.2.ebuild
new file mode 100644
index 000000000000..914eeaef7b67
--- /dev/null
+++ b/dev-python/setuptools/setuptools-19.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://pypi.python.org/pypi/setuptools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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="test"
+
+RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+PDEPEND=">=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+ rm -r ./pkg_resources/_vendor || die
+ # disable tests requiring a network connection
+ rm setuptools/tests/test_packageindex.py || die
+
+ # don't run integration tests
+ rm setuptools/tests/test_integration.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+ # It tries to sandbox the test in a tempdir
+ HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+ export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+ distutils-r1_python_install
+}
diff --git a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
index e23c97b3b517..6b40c34a9ca0 100644
--- a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
+++ b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PF}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index b00b76cf9777..cb6a767b3815 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -26,16 +26,6 @@ PATCHES=(
"${FILESDIR}"/1.9.0-mapping.patch
)
-pkg_setup() {
- six_dir_check() {
- local dir="${ROOT%/}$(python_get_sitedir)"/six
- if [[ -d "${dir}" ]]; then
- die "${PN} doesn't work if ${dir} is a directory #546730"
- fi
- }
- python_foreach_impl six_dir_check
-}
-
python_prepare_all() {
# https://bitbucket.org/gutworth/six/issues/139/
sed \
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index 07f34b9d542c..df14bed195ed 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1 +1,2 @@
DIST snowballstemmer-1.2.0.tar.gz 49639 SHA256 6d54f350e7a0e48903a4e3b6b2cabd1b43e23765fbc975065402893692954191 SHA512 3359657867b9478bb58e6cc67a08212a490d5af07fed7098871b1e6a59def0031bd0c2a846cc9a0d70c94c64ba4d2ccb2f41afedde61d4a7235d26f68374bd02 WHIRLPOOL bf84c482c35ef9e121f13865e43bfc4bcc6ed13959069d5da4f047309986795bcaf09a5cecaf16361d8ea8365f9bf26ca6987574b7ad2cc25572d0992946a44b
+DIST snowballstemmer-1.2.1.tar.gz 49626 SHA256 919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128 SHA512 09f860f383d84d12a83c87ef6654fba4ac10bca07e8d2ce88dd428c72754110d56a4b698e125a18818699a289455bf61cf67ea68e349ee8a12d6dfff0a3fbed9 WHIRLPOOL 4e622a80688a70d29554b313ba0d15cb9e4c93c07832279c4b1c2510aeaaf051c532a53f0aea4a3e64d12ad59608b9ae6c6d881d3878f55c44c09f03e3443347
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
new file mode 100644
index 000000000000..052d121f9dd0
--- /dev/null
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
+HOMEPAGE="https://github.com/shibukawa/snowball_py https://pypi.python.org/pypi/snowballstemmer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 90304d2a3c63..b5a84bfefa24 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,5 +1,6 @@
DIST SQLAlchemy-0.7.10.tar.gz 3541639 SHA256 77aa39d65c9d043eba6ba329b359ff867424fd6c403b7c0cb112b65e507e1d66 SHA512 631bc4ffb419defa531a66d82449fe48f93c88371ba0b8ab4217d900a0d1d90efe9699d8a9048d5c2ed33948c6d2f7cae46452ee45d442914018f3361e804367 WHIRLPOOL 74ffc17efbcbb2ac67712b9e11aa48431d18970f46ae5985aaa345aa8691f96e4acc4cf6fa37606699fbba83fcb7f74b0360fea2ac5e93a451585019e110f2ed
DIST SQLAlchemy-0.9.8.tar.gz 4080098 SHA256 de3ac04ecab0a7e0af64eee30a71e723ba5886b958205f7354dd62439da60389 SHA512 3df7d7a64cdfe7b684be98e7e9d6836da54c391343bb047224a11df888041034bcc54cc30d15dc3d56b5d397b35e6aabe5732e7ca8fbf553bd8d98731c249ea5 WHIRLPOOL 2cedf7713753a6cf8838741fcf06c5510387aa4e661ea3c0ecc2bb7bdb5b03fb90f072ccd1a5671f03943952340c6c3525836e1ebe9246506143b055a1ca1991
DIST SQLAlchemy-1.0.10.tar.gz 4705865 SHA256 963415bf4ea4fa13698893464bc6917d291331e0e8202dddd0ebfed2864ef7e3 SHA512 c28663a28e460abc724998f1fa605c31d0060e77f654f7c392da75f36e337158e9955cb37ba1c6ee517ef182f42c25e682a279d6865c9ee438bfb13dffa475c5 WHIRLPOOL 7f15d92722e54bc38a991f5639d7dae645f8845d1229a54bf0eff854aef5de7ff4c2df4a51db0d9fe74c08129cd4b1fc09e5e99dd0af7ff52ea374f732efa355
+DIST SQLAlchemy-1.0.11.tar.gz 4708987 SHA256 0b24729787fa1455009770880ea32b1fa5554e75170763b1aef8b1eb470de8a3 SHA512 b7f4d97faffefad65bbfb0c16c1ac0e27addc28546637ad323273311cfe4ef17be6e77e6279331b575ffd6cfdc6e57634666e4898aa484b275142cf665ba4920 WHIRLPOOL 24f434d6baeffb478636517e9d5fbf49f8f5fd80dbd8ce7cdb065de61055cd873a79c5afbfb2be2fbb07a14bf65a91f33d93ca180b27f07c08cb5a4619adc9bf
DIST SQLAlchemy-1.0.8.tar.gz 4627601 SHA256 950c79c0abf9e9f99c43c627c51d40d14a946810a90c35e7cd827bfd0bffe46f SHA512 921f847a20548095cb1f41fe6147b393110e08f8f3ff0aee6081e7811e7c15b3c03583afd41ddf5aacdc1dde090c0512afb94c7cc33d9c27135a5525ed121e74 WHIRLPOOL 757f2a3832c8fefd5789cd981eb1b2028419362ed2714927198df6b91742236896d4ab0131969afa08e5508843e32e018a1361e28df3f22a15f811d78275f8cf
DIST SQLAlchemy-1.0.9.tar.gz 4662673 SHA256 c3d37501e36ec5d74c2d7b4a3764719db86a9cdab4a24431bf58b386743ab10e SHA512 5032977e4fd3ff12d7ae10ca87f0ec9cd2d9eb5d200020b74faad1309eb1de5bacc9b4f5e53cb1b0b0b9c7f59b923a87a12ba050b37a631f9c77af2b896eb076 WHIRLPOOL 5e824f8581b98ac26f47d0bc8ae706783602ebe6bf921c6767f46db83b8322b022ea51603d1002017052144946256583c4fd9d2a92742c752333b530ed356121
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.11.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.11.ebuild
new file mode 100644
index 000000000000..aaa990b83a3c
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.11.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+ )"
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+ # Disable tests hardcoding function call counts specific to Python versions.
+ rm -r test/aaa_profiling || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ if ! python_is_python3; then
+ local CFLAGS=${CFLAGS}
+ append-cflags -fno-strict-aliasing
+ fi
+ distutils-r1_python_compile
+}
+
+python_test() {
+ # Create copies of necessary files in BUILD_DIR.
+ # https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+ cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" > /dev/null || die
+ if [[ "${EPYTHON}" == "python3.2" ]]; then
+ 2to3 --no-diffs -w test || die
+ fi
+ # Recently upstream elected to make the testsuite also pytest capable
+ # "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+ py.test test || die "Testsuite failed under ${EPYTHON}"
+ popd > /dev/null
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( doc/. )
+ use examples && local EXAMPLES=( examples/. )
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ if ! has_version dev-python/mysql-python; then
+ elog "For MySQL support, install dev-python/mysql-python"
+ fi
+
+ if ! has_version dev-python/pymssql; then
+ elog "For mssql support, install dev-python/pymssql"
+ fi
+
+ if ! has_version dev-python/psycopg:2; then
+ elog "For postgresql support, install dev-python/psycopg:2"
+ fi
+ fi
+
+ elog "mysql backend support can be enabled by installing mysql-python for cpython py2.7 only,"
+ elog "or mysql-connector-python for support of cpythons 2.7 3.3 and 3.4"
+}
diff --git a/dev-python/urllib3/urllib3-1.12.ebuild b/dev-python/urllib3/urllib3-1.12.ebuild
index dcf20ac6b0dc..f0a5e4d27163 100644
--- a/dev-python/urllib3/urllib3-1.12.ebuild
+++ b/dev-python/urllib3/urllib3-1.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
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="doc test"
RDEPEND="
diff --git a/dev-python/whisper/Manifest b/dev-python/whisper/Manifest
index 73445e31e2cb..8816b56a0da8 100644
--- a/dev-python/whisper/Manifest
+++ b/dev-python/whisper/Manifest
@@ -1 +1,2 @@
DIST whisper-0.9.13.tar.gz 14028 SHA256 6ba106b7271a69ead72b63f6dd5192aa1816cbec376caa491b4e63af28c17262 SHA512 b4b46bb7f31ecb766495f5f592fb2f9a754f5f38f83f071b533d4302b95808b9b4046bf7769bfa0d7713633344c7c693b57dd550b52acec4617257eba68634c1 WHIRLPOOL c9fdffdcd1bb539037a2e880a82335020c05d2196033842b2da1eb84809184747e7454b3696b11cf3fe9877bf313dea27cac47f7d784b01e9c8fc06796e1e499
+DIST whisper-0.9.15.tar.gz 15655 SHA256 426b92cba867728a90a743e26dba4c71634c411450307934137e73cb3bbc13b2 SHA512 bdc9d299ed713a3fc6104938c347682562d5f17a7f3650d823f9814410dc934899b81bb2f42f52e9cc25313d8ed33f7b4def6d8945561d63f6237492bda2a5e6 WHIRLPOOL 43b1c2c4897f3aa6c714dec8c44d81adc3cf2a5f19c45e93afa874dde6a8c204ce33c70301b206e9a220e75980f086b681a7816966dcebe922553fdffdfba82b
diff --git a/dev-python/whisper/whisper-0.9.15.ebuild b/dev-python/whisper/whisper-0.9.15.ebuild
new file mode 100644
index 000000000000..e16feac7b33e
--- /dev/null
+++ b/dev-python/whisper/whisper-0.9.15.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Fixed size round-robin style database"
+HOMEPAGE="http://graphite.wikidot.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 27ace154cf1f..3dffc8af6161 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,2 +1,3 @@
DIST wrapt-1.10.5.tar.gz 119157 SHA256 4fd82193b23f60e1a39f3e10c81143c1e29e26cd5fc9afe1a7dc0f5e4b4a67d7 SHA512 450b32eea67774081d23c0e020ed7eea3c8ac458925a16cd606a4f95ee5b7631bda5ff00ceb914e9ccc28a5e0a7302534b6711bb23d637c77327a8a9d228cb55 WHIRLPOOL 7cfa9477f525e60f16a7b1689ba43b327192837bea34e96977442b9cd143a63fafdfa7d0b3895c93052b0e6f426e76fa439b155ee4e481dd5e922c529676691c
+DIST wrapt-1.10.6-r1.tar.gz 120259 SHA256 b540e23753d3f7017ec0d38f16daf77f9e9cf170d5040abc3d87573ba20fc4f3 SHA512 658c780971dddf444070b9d30a8ac7c08ee0088b8f4378bcc9c22126608e52b338dc00969b08828b0318070abcf0e875bc2b7c6228a71fbbca362033088b4314 WHIRLPOOL 7aed77677a1448d6b3795be7fb56989be98a691a7470096adf45002ca124a99b5cab3e42b319493b4c8300684e488a07cf96d1c5a01e9fc9f181f765a0542254
DIST wrapt-1.10.6.tar.gz 25134 SHA256 9576869bb74a43cbb36ee39dc3584e6830b8e5c788e83edf0a397eba807734ab SHA512 d0c326fd401bc84656d69ec5da446b459f5596873a1ec01d616bebcc3d11237949eaafcfdf5de78e43f59927a0eaeee3da3f462975fa46fa22fd6c1593509e04 WHIRLPOOL 2d3c56d0a6e9e9af0a59708ce70190097da2459d80bdaa8d8f884a849905b44cdfb6bedb412ccd1e74be1e975492309a398e05d4b6c61a6852d3cd125230846a
diff --git a/dev-python/wrapt/metadata.xml b/dev-python/wrapt/metadata.xml
index 0b54579018a8..307d493367cb 100644
--- a/dev-python/wrapt/metadata.xml
+++ b/dev-python/wrapt/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>python</herd>
<maintainer>
<email>alunduil@gentoo.org</email>
<name>Alex Brandt</name>
diff --git a/dev-python/wrapt/wrapt-1.10.6-r1.ebuild b/dev-python/wrapt/wrapt-1.10.6-r1.ebuild
new file mode 100644
index 000000000000..dfa21edb25d3
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.10.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}-r1.tar.gz"
+S="${S}-r1"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+
+DEPEND="
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND=""
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_compile() {
+ local WRAPT_EXTENSIONS=true
+
+ distutils-r1_python_compile
+}
+
+python_test() {
+ py.test -vv || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-ruby/activesupport/activesupport-4.2.5.ebuild b/dev-ruby/activesupport/activesupport-4.2.5.ebuild
index 0784235f0df0..b8476a9a5eac 100644
--- a/dev-ruby/activesupport/activesupport-4.2.5.ebuild
+++ b/dev-ruby/activesupport/activesupport-4.2.5.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index 7d3bf99b44ce..ac840966b569 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1 +1,2 @@
DIST asciidoctor-1.5.2.tar.gz 494239 SHA256 f10242d7ea5e8c3b6279c9535e67d58fb0b8ffe2c5625e7b211af3dd683dd368 SHA512 5d50134d4bed58bb5dc610929c30b1272c8d75e9748f6587a4e00cd8d76b4f86e8edd17b04a8579d984e9ce3864c3d96a81bc526988a6c6d71e418923c94d67a WHIRLPOOL 67cf1cdd71dd4819c2d829d729057ec0b7b6ac107a5754333eb257a80545c4229870a1ae83b14172bd52e5e8b145bc1f56db6bca6af341d6ee7ca6b63267e7c8
+DIST asciidoctor-1.5.3.tar.gz 509233 SHA256 b6aa27203bf9fc8ca55d0c0468f8f3e70ae1b3aa60f1bb50dd6aa53497275841 SHA512 17e5c930b2d2d1727b5b5f2100f6b625edf3af73e98aadf84135bdf01bbbef8587b310fe513508ae575ee6b8a08d573ac512fbfc3d6e9ea9e144048786865c35 WHIRLPOOL 9333bee73633e18b9c334d6f622df07e8d07c1a491852b710b2edc31c892ebbc00e2d915a9234253f7a13611988f8d53e3a791a73e4ca6cbd82e90444dce9fe1
diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild
new file mode 100644
index 000000000000..ff08e44858fa
--- /dev/null
+++ b/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST="test features"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_PATCHES=( ${P}-slim-options.patch )
+
+ruby_add_bdepend "test? (
+ dev-util/cucumber
+ dev-ruby/rspec-expectations:*
+ dev-ruby/asciimath
+ dev-ruby/coderay
+ dev-ruby/erubis
+ dev-ruby/haml
+ dev-ruby/nokogiri
+ dev-ruby/slim
+ dev-ruby/tilt )"
+
+all_ruby_prepare() {
+ rm Gemfile || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ doman man/asciidoctor.1
+}
diff --git a/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch b/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch
new file mode 100644
index 000000000000..3494269743db
--- /dev/null
+++ b/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch
@@ -0,0 +1,31 @@
+From 04b9d6153d1e289bd450a2f52bffde754ef4d1b0 Mon Sep 17 00:00:00 2001
+From: Antonio Terceiro <terceiro@softwarelivre.org>
+Date: Tue, 17 Nov 2015 11:17:16 -0200
+Subject: [PATCH] Initialize slim-related attributes regardless of when slim
+ was loaded
+
+Setting instance attributes of the Template class cannot depend on
+whether slim has been loaded before or not.
+---
+ lib/asciidoctor/converter/template.rb | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/asciidoctor/converter/template.rb b/lib/asciidoctor/converter/template.rb
+index 10eaa99..43be87b 100644
+--- a/lib/asciidoctor/converter/template.rb
++++ b/lib/asciidoctor/converter/template.rb
+@@ -253,10 +253,10 @@ def scan_dir template_dir, pattern, template_cache = nil
+ unless defined? ::Slim
+ # slim doesn't get loaded by Tilt, so we have to load it explicitly
+ Helpers.require_library 'slim'
+- if @safe && ::Slim::VERSION >= '3.0'
+- slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
+- slim_asciidoc_opts[:safe] ||= @safe
+- end
++ end
++ if @safe && ::Slim::VERSION >= '3.0'
++ slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
++ slim_asciidoc_opts[:safe] ||= @safe
+ end
+ # load include plugin when using Slim >= 2.1
+ require 'slim/include' unless (defined? ::Slim::Include) || ::Slim::VERSION < '2.1'
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
new file mode 100644
index 000000000000..1621793a3be2
--- /dev/null
+++ b/dev-ruby/asciimath/Manifest
@@ -0,0 +1 @@
+DIST asciimath-1.0.2.gem 13824 SHA256 d3c4485b6f32a61732d007337f74f6242d02ff572873b44bdbc1110cac9cfc37 SHA512 109995b8c67dc159671a1498f4507d926bdb10bb6c3a84552137fc84aa3477a237aa6c739de3011981f6815cd70fd9a0dc4ce47e172ab24d02a55f80ada0af46 WHIRLPOOL b83b33b31d059e0615f7eb84cc27540f1daa342b53f21e0ba57b7743a8914a73acf1a4f01225c3f5670776a4bc558deb11a24d19659fe603a8a4873d4bd86bf2
diff --git a/dev-ruby/asciimath/asciimath-1.0.2.ebuild b/dev-ruby/asciimath/asciimath-1.0.2.ebuild
new file mode 100644
index 000000000000..9ae5eddf57c5
--- /dev/null
+++ b/dev-ruby/asciimath/asciimath-1.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
+HOMEPAGE="https://github.com/pepijnve/asciimath"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+each_ruby_test() {
+ RSPEC_VERSION=3 ruby-ng_rspec test
+}
diff --git a/dev-ruby/asciimath/metadata.xml b/dev-ruby/asciimath/metadata.xml
new file mode 100644
index 000000000000..6e2907d1a894
--- /dev/null
+++ b/dev-ruby/asciimath/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>ruby</herd>
+ <upstream>
+ <remote-id type="github">pepijnve/asciimath</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/coffee-script-source/Manifest b/dev-ruby/coffee-script-source/Manifest
index 2f127dbb6fb5..afbc6cc4f30f 100644
--- a/dev-ruby/coffee-script-source/Manifest
+++ b/dev-ruby/coffee-script-source/Manifest
@@ -1,4 +1,2 @@
DIST coffee-script-source-1.10.0.gem 58880 SHA256 e0e341d3717e0bc72c9e0d7113bed29ee8449723493ac8de5d83ce9cd3788ecc SHA512 09b8a25f185feac94e6d0226accdaf2bee207995a46ede77b6daa581afce7b5c2fc87acc4660d8467fae881d15b2c78c64bc5f1084b68a51ac287efe09a3b053 WHIRLPOOL 6783c1656a67af168c198856cdf85b4fbb518e7af3f25bab2623b00258ef465d97cdfd18f1fe1dfd5156e791fadd0caed1a63ecd30ce2f01dca1b6fa7b436dd6
-DIST coffee-script-source-1.7.1.gem 54272 SHA256 509b3ed091e2cdaf09f23b4fe2c4137a7c3d3959af4f081ecc552a229ac8fa41 SHA512 86896054d2edcf00bd81827f00bea1d22973486bafb0b4dbcf09720727365b22ee756fcb5e92dd0bd8f5e84eca486540afe2459f28808976646afcaa0775e31f WHIRLPOOL 1628af327f509cce2773651925c58f8e7cc48c34018fe8a93e012383032779d82ebdb5f7236142c16ce98d3aea6371462d66dab66b1959bbae4975031640b34e
-DIST coffee-script-source-1.9.1.1.gem 58368 SHA256 05bbce02078abdb6969abfee5b18b9b914b475895222acac3d5613fe3dcf2eab SHA512 4d37f65b2e5e4aeb8692d7022a2d048ae49520cc247fcb3da7fabb620270982d537d68b17619842f357ed00bcb297e9709362b3a56ad8325a7dd9a820956cdcc WHIRLPOOL c3dd0eaad0a20a72c5b67967a1be927655b1fccc53e988ac744af4d13c1c7929894a007f4f081d7ddd1e6b60760f931b9a468c8adfaeee7b2a3f1748003e767e
DIST coffee-script-source-1.9.3.gem 58880 SHA256 d2e34f9541e1bb57131dc64881b7bdc0835706216f06a13f6b3a73e4da0ced45 SHA512 099a656499b72bd532d5c6d365f168f82dfdec91c79edb385ed939f9d78055926846c1a03084b41aa1e789f5b32873d5d86e8079bc081acb61654996371c829b WHIRLPOOL 89df9e62d02ca8a275618deb8852a019e600bccdae278565f01cd467269715b64a9b8aae6fa949ca65997c902aa3b6381d13d2c17a5a1f3f6e7d1a2f0354cac3
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.7.1.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.7.1.ebuild
deleted file mode 100644
index e0c8102f9635..000000000000
--- a/dev-ruby/coffee-script-source/coffee-script-source-1.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby CoffeeScript is a bridge to the official CoffeeScript compiler"
-HOMEPAGE="http://jashkenas.github.io/coffee-script/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos ~x86-solaris"
-
-IUSE=""
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.9.1.1.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.9.1.1.ebuild
deleted file mode 100644
index e3e0dcc61588..000000000000
--- a/dev-ruby/coffee-script-source/coffee-script-source-1.9.1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby CoffeeScript is a bridge to the official CoffeeScript compiler"
-HOMEPAGE="http://jashkenas.github.io/coffee-script/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos ~x86-solaris"
-
-IUSE=""
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild
index c0fa9109a660..9d86eef6c84f 100644
--- a/dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild
+++ b/dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild
@@ -15,6 +15,6 @@ HOMEPAGE="http://jashkenas.github.io/coffee-script/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos ~x86-solaris"
IUSE=""
diff --git a/dev-ruby/coffee-script/Manifest b/dev-ruby/coffee-script/Manifest
index 6ab96f558428..b0c6ad21f1c4 100644
--- a/dev-ruby/coffee-script/Manifest
+++ b/dev-ruby/coffee-script/Manifest
@@ -1,2 +1 @@
-DIST coffee-script-2.2.0.gem 5120 SHA256 acdd9f907950cfcf2342bc621ac9d11c9b0f34e2be8ab02de7845c673fb96c8c SHA512 5d131a93a6d195da7a0969e5dbc62e4fa14f3b074e2d25228aa7ab4c71ae5d6d211f1ebef1fed76ac57cce1393becab7efd78120e7a4babdc1254dcc330d4359 WHIRLPOOL 73b904d16cc1a61cc7f5d58e526264423b156630bc93bb79f36f0014556e06c97b628e83a79122a12bdfe0fedf467a5a4bc892673bcd39ecfb3a77d9df098c98
DIST coffee-script-2.4.1.gem 6656 SHA256 82fe281e11b93c8117b98c5ea8063e71741870f1c4fbb27177d7d6333dd38765 SHA512 5f19e3dd099408c633243d110fb6a3aece7753eed398c6568388b943a4a068fd5c2085f4e5408ebb7ea7eef529154995fe6e8ca4d437d491ec728a876bfd6492 WHIRLPOOL d06ea281c6bee32271cde2602e89568abb0a94f7043a2d4524f49773f2e0d7d917a9cef664de91db8d8851151e685c6b7e4a95584397c58a871869fd11738838
diff --git a/dev-ruby/coffee-script/coffee-script-2.2.0-r1.ebuild b/dev-ruby/coffee-script/coffee-script-2.2.0-r1.ebuild
deleted file mode 100644
index 9bec52ea529d..000000000000
--- a/dev-ruby/coffee-script/coffee-script-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby CoffeeScript is a bridge to the official CoffeeScript compiler"
-HOMEPAGE="https://github.com/josh/ruby-coffee-script https://github.com/rails/coffee-rails"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
-
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/coffee-script-source dev-ruby/execjs"
diff --git a/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild b/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
index 0e5c80b0a0aa..4e93d5eb3898 100644
--- a/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
+++ b/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rails/ruby-coffee-script https://github.com/rails/c
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
IUSE=""
diff --git a/dev-ruby/color/Manifest b/dev-ruby/color/Manifest
index b58ce3960963..16d936a69e10 100644
--- a/dev-ruby/color/Manifest
+++ b/dev-ruby/color/Manifest
@@ -1,2 +1 @@
-DIST color-1.7.1.tar.gz 40780 SHA256 36deaa02dc327452f7ac4e35fe1ae1c2d7faa9bb2a0b0d9b6c1a112fe29d7f7b SHA512 78e0b4c171ab2754531cf0874088e7b9cc495957fa3de5c3899f176fd629f1677f1fd9bdb68c0a3784cd5939242f8a4127cda8932f114800052c973431739f07 WHIRLPOOL eb719f91162c15aef89f81e263940c41941e18f0fd7007b27377ca3fd781239951eb0dca80df142bb2f22a84e9917ffd322cb9640a684e95227c43d6f0678256
DIST color-1.8.tar.gz 42530 SHA256 de87df57b7eb6dcdb9f43559bd6f273c543210c567894cc0549fdb4b8e63c470 SHA512 be48a8895b5dd33326a9debe250c87df37025eb2dca05a0eb61b82b31dbc1ee27c175fc1e37262bce88729e882dfb66f449a3a29c76b9ef0ac2064ffa2b4266c WHIRLPOOL 55fb543fbc6bf3d2b4c234b87ede2767f6ce63c27957e913acb8e0e686d82412b61f5a6d6a16592b361c5a02dcb75e5f7a2de56f88e8189ba9360eb5a3cf9493
diff --git a/dev-ruby/color/color-1.7.1-r1.ebuild b/dev-ruby/color/color-1.7.1-r1.ebuild
deleted file mode 100644
index a590cdc729f0..000000000000
--- a/dev-ruby/color/color-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Colour management with Ruby"
-HOMEPAGE="http://color.rubyforge.org/"
-SRC_URI="https://github.com/halostatue/color/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/minitest-5.0
- )"
-
-each_ruby_test() {
- ${RUBY} -Ilib:test:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/color/color-1.7.1.ebuild b/dev-ruby/color/color-1.7.1.ebuild
deleted file mode 100644
index 3926d934cea3..000000000000
--- a/dev-ruby/color/color-1.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Colour management with Ruby"
-HOMEPAGE="http://color.rubyforge.org/"
-SRC_URI="https://github.com/halostatue/color/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/minitest-5.0
- )"
-
-each_ruby_test() {
- ${RUBY} -S testrb -Ilib test/test_*.rb || die
-}
diff --git a/dev-ruby/color/color-1.8.ebuild b/dev-ruby/color/color-1.8.ebuild
index c970b7f25824..f8baa872bfcf 100644
--- a/dev-ruby/color/color-1.8.ebuild
+++ b/dev-ruby/color/color-1.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/halostatue/color/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/dalli/dalli-2.7.4.ebuild b/dev-ruby/dalli/dalli-2.7.4.ebuild
index 817d61f0c037..5d664e1e524e 100644
--- a/dev-ruby/dalli/dalli-2.7.4.ebuild
+++ b/dev-ruby/dalli/dalli-2.7.4.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_TEST="test"
diff --git a/dev-ruby/dalli/dalli-2.7.5.ebuild b/dev-ruby/dalli/dalli-2.7.5.ebuild
index c6e45e5c4625..e7ef12706b41 100644
--- a/dev-ruby/dalli/dalli-2.7.5.ebuild
+++ b/dev-ruby/dalli/dalli-2.7.5.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_TEST="test"
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
new file mode 100644
index 000000000000..d6f460a374b9
--- /dev/null
+++ b/dev-ruby/did_you_mean/Manifest
@@ -0,0 +1 @@
+DIST did_you_mean-1.0.0.gem 174080 SHA256 d6830606c288f4e1b05dd6631b77f6de597766e7da2f0de60e0a091700d5978b SHA512 c108925491cef340fc06d5efd020e81d6537f329cd6dcc793b585d9d53fd549cf86ec85670a6a965902ff20a798f28d20d15ba8e7769ed2870e8eaa343394045 WHIRLPOOL d6c49c44e02646cfd81db9bdeb32493b71bdd143826ef66d53d56a10f11f58fd41cfc9da2ec2aefd23a63949cfa9d4d3da449684a8e3f79325f71597aa8cda37
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.0.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.0.0.ebuild
new file mode 100644
index 000000000000..0a520a7dd57e
--- /dev/null
+++ b/dev-ruby/did_you_mean/did_you_mean-1.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="'did you mean?'experience in Ruby"
+HOMEPAGE="https://github.com/yuki24/did_you_mean"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/did_you_mean/metadata.xml b/dev-ruby/did_you_mean/metadata.xml
new file mode 100644
index 000000000000..6d3e7a1525ed
--- /dev/null
+++ b/dev-ruby/did_you_mean/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>ruby</herd>
+ <upstream>
+ <remote-id type="github">yuki24/did_you_mean</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/execjs/execjs-2.6.0.ebuild b/dev-ruby/execjs/execjs-2.6.0.ebuild
index 7dd05739d6a0..c6abf27d48ae 100644
--- a/dev-ruby/execjs/execjs-2.6.0.ebuild
+++ b/dev-ruby/execjs/execjs-2.6.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
IUSE="test"
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index 79c04cdf2e86..f0f81ae2d38f 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,2 +1 @@
-DIST gruff-0.5.1.gem 315904 SHA256 34a3cea74d8f87182dcd8ae0a7981e58a49870cd8bb9aedb4b11e5cf56bccb2d SHA512 30453b6af286548be4727c124662df1b05ef93acb25a443cdb7b02c7076dddcbd71769fa249402456e5f54e27d40e4bb6cd8ba012c1746b3190c7a27c505b8f3 WHIRLPOOL bdd8f72c78780fd2b070edfe21a5f7e0d84c86baf6026bd53e40cf934d279c2cc36f139042fbe1e32fe4dc9e0016771b781ffcff304b1043258f7f9cfb7dc441
DIST gruff-0.6.0.gem 316416 SHA256 d44116afdc914a98143fd455004f4aeb725942e8a61650c93e1fde7d307de4b2 SHA512 4771637157d11c85d437d41d63d018915d1214fd09dc7078b883c98f640821aec3ddc64fcd4516ca4bfd06c9523ee5a4b60dc6233903e03d7336ad10989613cb WHIRLPOOL dc55cfe4ca44c85ae753395272492bc8c0091145b48421e7e3da67347525deb07cfb5470c95e7c00bd5369634566794c645059f9dad2e12744578140a92b5207
diff --git a/dev-ruby/gruff/gruff-0.5.1-r1.ebuild b/dev-ruby/gruff/gruff-0.5.1-r1.ebuild
deleted file mode 100644
index 8e5a9a1d7d3a..000000000000
--- a/dev-ruby/gruff/gruff-0.5.1-r1.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-inherit ruby-fakegem
-
-ruby_add_rdepend '>=dev-ruby/rmagick-2'
-ruby_add_bdepend "
- test? (
- dev-ruby/hoe
- )"
-
-DESCRIPTION="RMagick Implementation for JRuby"
-HOMEPAGE="http://rubyforge.org/projects/gruff/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE=""
-
-RUBY_PATCHES=(
- ${PN}-0.3.6-spider.patch
-)
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with truetype
-# support and this cannot be expressed in the rmagick dependency. Tests
-# also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-each_ruby_test() {
- ruby-ng_testrb-2 test/test_*.rb
-}
diff --git a/dev-ruby/gruff/gruff-0.5.1.ebuild b/dev-ruby/gruff/gruff-0.5.1.ebuild
deleted file mode 100644
index c94fcd28467b..000000000000
--- a/dev-ruby/gruff/gruff-0.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-inherit ruby-fakegem
-
-ruby_add_rdepend '>=dev-ruby/rmagick-2'
-ruby_add_bdepend "
- test? (
- dev-ruby/hoe
- )"
-
-DESCRIPTION="RMagick Implementation for JRuby"
-HOMEPAGE="http://rubyforge.org/projects/gruff/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-macos"
-IUSE=""
-
-RUBY_PATCHES=(
- ${PN}-0.3.6-spider.patch
-)
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with
-# truetype support and this cannot be expressed in the rmagick
-# dependency. Test also require imagemagick to have jpeg support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,truetype] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-each_ruby_test() {
- ruby-ng_testrb-2 test/test_*.rb
-}
diff --git a/dev-ruby/gruff/gruff-0.6.0.ebuild b/dev-ruby/gruff/gruff-0.6.0.ebuild
index 8bbcde4f7ce3..161187c002d0 100644
--- a/dev-ruby/gruff/gruff-0.6.0.ebuild
+++ b/dev-ruby/gruff/gruff-0.6.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/topfunky/gruff"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-macos"
+KEYWORDS="amd64 x86 ~x86-macos"
IUSE=""
RUBY_PATCHES=(
diff --git a/dev-ruby/heredoc_unindent/Manifest b/dev-ruby/heredoc_unindent/Manifest
index 6aad714434e6..13c4e5555e75 100644
--- a/dev-ruby/heredoc_unindent/Manifest
+++ b/dev-ruby/heredoc_unindent/Manifest
@@ -1,2 +1 @@
-DIST heredoc_unindent-1.1.2.gem 11776 SHA256 698fea6db6d871f34f94498da8bf6e29330792a4f114f87136579fc63586f5ed SHA512 647a976a8f68cb7d8b69886782685d9efb30892e06df6233f23388fd65db85c5d3cbd09af521f9b528a1df49760fbf8507d20b9feca21e7cf40e9dc4278706bb WHIRLPOOL 1530e0b3eb5014d51d05b5c84d5037b328bebd015bcfe881dfd7bbe664517ca4b6e478fb78b40136f5afdef37165b692c20d2f0ac3f0871a915139c008c71c20
DIST heredoc_unindent-1.2.0.gem 10240 SHA256 dc87002a9d89e3ad06722e53c7f6db9b28677b69017dc5a69c1972a99dc83292 SHA512 a975ffdc2ae3716a7fb90145270df03d6f3d45d42d3fca3125044a2b960a9c8ffc74a7fb0e315b6021cb6ce535b08207a40351573ed89c27fe0c8e196ea02c76 WHIRLPOOL f5a7960c3c93e22fbae52ad56c85f35acca4716e2181ad082e14c456100cec6250a9480178c5b8c45fbd4bda16d8db5b8284fbf54e0bf507c0753b000bd06480
diff --git a/dev-ruby/heredoc_unindent/heredoc_unindent-1.1.2-r3.ebuild b/dev-ruby/heredoc_unindent/heredoc_unindent-1.1.2-r3.ebuild
deleted file mode 100644
index 142de0139a0e..000000000000
--- a/dev-ruby/heredoc_unindent/heredoc_unindent-1.1.2-r3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc Wishlist.rdoc"
-DESCRIPTION="Removes leading whitespace from Ruby heredocs"
-HOMEPAGE="https://github.com/adrianomitre/heredoc_unindent"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/hoe-2.8.0 dev-ruby/test-unit:2 )
- doc? ( >=dev-ruby/hoe-2.8.0 )"
-
-all_ruby_prepare() {
- sed -i -e '1igem "test-unit"' test/test_heredoc_unindent.rb || die
-}
diff --git a/dev-ruby/heredoc_unindent/heredoc_unindent-1.1.2-r4.ebuild b/dev-ruby/heredoc_unindent/heredoc_unindent-1.1.2-r4.ebuild
deleted file mode 100644
index 3e9570e3e543..000000000000
--- a/dev-ruby/heredoc_unindent/heredoc_unindent-1.1.2-r4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc Wishlist.rdoc"
-DESCRIPTION="Removes leading whitespace from Ruby heredocs"
-HOMEPAGE="https://github.com/adrianomitre/heredoc_unindent"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/hoe-2.8.0 dev-ruby/test-unit:2 )
- doc? ( >=dev-ruby/hoe-2.8.0 )"
-
-all_ruby_prepare() {
- sed -i -e '1igem "test-unit"' test/test_heredoc_unindent.rb || die
-}
diff --git a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild
index 7ff6d7999669..8076f1ac7c44 100644
--- a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild
+++ b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/adrianomitre/heredoc_unindent"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_bdepend "test? ( >=dev-ruby/hoe-2.8.0 dev-ruby/test-unit:2 )
diff --git a/dev-ruby/htmlentities/Manifest b/dev-ruby/htmlentities/Manifest
index 08ed78bcd6c4..44c5763eb52e 100644
--- a/dev-ruby/htmlentities/Manifest
+++ b/dev-ruby/htmlentities/Manifest
@@ -1,2 +1 @@
-DIST htmlentities-4.3.1.gem 33280 SHA256 d199741b653ea3e84a55e07f4d8190806465e693b04031c63c2a215b382e0397 SHA512 6da6e1c2903622972ede1633e3d139d41bbe580097301848d9cd89e0f76d1b97ab512e444f7669763e2a4403c774bcbf0333b2b17465801c7c905f8c2acc8df6 WHIRLPOOL fe3fa7a5d9cde399bd3e42f7b6826c66c698346d73eb2434454f05e82f8047a91960c5b60d5442407e883cfbf05bb56cec6e15370821cc050d2c3ef5bd3e7ca7
DIST htmlentities-4.3.4.gem 31744 SHA256 125a73c6c9f2d1b62100b7c3c401e3624441b663762afa7fe428476435a673da SHA512 0163d6c014ffebb4ee9bdb15d32884c8d6af60681f240d3f0177811d37647776b8f8fd0aa4f1c7559403f36a5538ce8da6926bc16cc8105bd6eed5c180db700b WHIRLPOOL 1f4454f2113eaf3cb6dc2dfe8dee97aecc4fdcf53ea71dca1aacab1fe6c65d27c2ce635ae54cf959bcf7b3625845d438afcbf28765e32a10013c4a86765a7a0c
diff --git a/dev-ruby/htmlentities/htmlentities-4.3.1-r1.ebuild b/dev-ruby/htmlentities/htmlentities-4.3.1-r1.ebuild
deleted file mode 100644
index 30866d414bc6..000000000000
--- a/dev-ruby/htmlentities/htmlentities-4.3.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple library for encoding/decoding entities in (X)HTML documents"
-HOMEPAGE="http://htmlentities.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-macos"
-IUSE=""
-
-each_ruby_test() {
- ${RUBY} -Ilib:. -S testrb test/*_test.rb || die "tests failed"
-}
diff --git a/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild b/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
index 9fbdb234edb2..a47486850e0e 100644
--- a/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
+++ b/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/threedaymonk/htmlentities"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-macos"
+KEYWORDS="amd64 x86 ~x86-macos"
IUSE=""
each_ruby_test() {
diff --git a/dev-ruby/i18n/files/i18n-0.7.0-frozen-classes.patch b/dev-ruby/i18n/files/i18n-0.7.0-frozen-classes.patch
new file mode 100644
index 000000000000..ff6019498fc5
--- /dev/null
+++ b/dev-ruby/i18n/files/i18n-0.7.0-frozen-classes.patch
@@ -0,0 +1,31 @@
+From bbbdedc0c78ec941a84d161d5c610a358310cf99 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Tue, 20 Jan 2015 14:34:44 +0100
+Subject: [PATCH] Ignore metadata for frozen classes.
+
+---
+ lib/i18n/backend/metadata.rb | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/lib/i18n/backend/metadata.rb b/lib/i18n/backend/metadata.rb
+index 52c0a29..a8d922a 100644
+--- a/lib/i18n/backend/metadata.rb
++++ b/lib/i18n/backend/metadata.rb
+@@ -21,11 +21,15 @@ class << self
+ def included(base)
+ Object.class_eval do
+ def translation_metadata
+- @translation_metadata ||= {}
++ unless self.frozen?
++ @translation_metadata ||= {}
++ else
++ {}
++ end
+ end
+
+ def translation_metadata=(translation_metadata)
+- @translation_metadata = translation_metadata
++ @translation_metadata = translation_metadata unless self.frozen?
+ end
+ end unless Object.method_defined?(:translation_metadata)
+ end
diff --git a/dev-ruby/i18n/i18n-0.7.0-r1.ebuild b/dev-ruby/i18n/i18n-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..a25c19978c2e
--- /dev/null
+++ b/dev-ruby/i18n/i18n-0.7.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="test"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_PATCHES=( ${P}-frozen-classes.patch )
+
+ruby_add_bdepend "test? (
+ >=dev-ruby/activesupport-3.2 <dev-ruby/activesupport-4.3
+ dev-ruby/bundler
+ dev-ruby/mocha:0.13
+ dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+ # Remove bundler lock files since we cannot depend on specific
+ # versions in Gentoo.
+ rm gemfiles/*.lock || die
+}
+
+each_ruby_test() {
+ case ${RUBY} in
+ *ruby22)
+ versions="4.2"
+ ;;
+ *)
+ versions="3.2 4.0 4.1 4.2"
+ ;;
+ esac
+
+ for version in ${versions} ; do
+ if has_version "dev-ruby/activesupport:${version}" ; then
+ einfo "Running tests with activesupport ${version}"
+ BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+ fi
+ done
+}
diff --git a/dev-ruby/json/json-1.8.3.ebuild b/dev-ruby/json/json-1.8.3.ebuild
index a41ea976a46d..99a81bc47e1a 100644
--- a/dev-ruby/json/json-1.8.3.ebuild
+++ b/dev-ruby/json/json-1.8.3.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_TASK_DOC="doc"
RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.rdoc README-json-jruby.markdown"
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index d65c363be8b6..c1bfa8b16d29 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -1,5 +1,3 @@
-DIST mime-types-1.23.gem 55296 SHA256 fa29671c5f80a5dbafe3111814f1bf289af91f422c1d1fa4c10bda63fab305b2 SHA512 d2e3c87c776d0e242c2b97c9ec8d630af05e504f815340137fbaeb19251ba096dc486117adddc9830940a80d3c0a81f0862c5c50838dc54c3d04c0231537d0df WHIRLPOOL 7112ceb83e3c6641c7b6ee114dd1f950036a23d085555e61b735973932c85b2f851a90c259339efd5496a9f3236a2dd3bd3e12998509fa1b98b7d2df2453661b
DIST mime-types-1.25.1.gem 61440 SHA256 88ef3c596481678710ffd4018fa40f1999b02d97babea39682ba7d5badd21f56 SHA512 50a79bc0378bb9bf694656b15ac69446447fc863a5a6556e68ad736768627c9f43e59c68b0ed141cee5dbd81a8ccca1a33a61aa01af7d0a5949b00d6edb6525e WHIRLPOOL 65da6addc3f1f4b6c730eadbeabf285a0a85452d90ff036820d3cb1940311248cdcf12a21e836c4b3d03af8ea73f33f642d071f2bb8fdf9556b05cdf974b16d4
-DIST mime-types-2.4.3.gem 118272 SHA256 38f29a89a273d15bfb99e839c6fe5cf7c463f223dd7ac5ee3c9287b1acd6d19a SHA512 7b04ad54819cb813480d90e2f831f3613f5e8d07581f23c632899c7b511c2579c54f402e7b216ca9baea6eff62ad5ddd7602b21f13e1c51aab5416eb629d1bdd WHIRLPOOL 1c28b4fc52460d03f85b7fb86bbe7840775d5f0d3d50f33b04b660879460f12478a08db29aa3c4cadedf2f2bee2332b65687d491cc2b2928f0198950da1ee28c
DIST mime-types-2.6.2.gem 190976 SHA256 b595583540f1228dd24978c0f87cf1918e4f2c709fe5d517fb6706cbb35ede8c SHA512 a083d865ba39e1b0e468c26823e82472d6bcb501e7dda047f1206b538e2f018d51d8bb31fd6734ba706a8352ade42bb40c52df1837402c3cb4fa01778772485c WHIRLPOOL 63fd4a3a2ed82a479be3bc6883c3a14b7592269609d8f6a97292eb8435f449189c1b7961ab477ca66ae1048b453e1e8edcb2f5c235e319c7af3f80704d7e8cf9
DIST mime-types-3.0.gem 44032 SHA256 2a7f8a73648ee1de0e97eb9692e8ca3761bf420c8df64024f21befa4d060d2ea SHA512 762ad862714f31cf68c9f872f23efc9c85ab0ab4f451553dd4a7ec30ac5bfce804037a413ae05bad253f4a4f82ba6578e3f3e87aa11b5e525d3f237fdf547850 WHIRLPOOL d195d9bdbfbdc786875cedf5ee7d1b08fb4fc3efd33dce11a4dc3329b40ba969ad9ecfeb600ac843096b55ed72f302ae4c12cffe8b61d968259fd1e90261b587
diff --git a/dev-ruby/mime-types/mime-types-1.23.ebuild b/dev-ruby/mime-types/mime-types-1.23.ebuild
deleted file mode 100644
index d226730f2490..000000000000
--- a/dev-ruby/mime-types/mime-types-1.23.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
-HOMEPAGE="https://github.com/halostatue/mime-types/"
-
-LICENSE="MIT Artistic GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( virtual/ruby-minitest )"
-
-each_ruby_test() {
- ${RUBY} -Ilib -S testrb test/test_*.rb || die
-}
diff --git a/dev-ruby/mime-types/mime-types-1.25.1.ebuild b/dev-ruby/mime-types/mime-types-1.25.1.ebuild
index fec9f86dfece..917c9b13dc2a 100644
--- a/dev-ruby/mime-types/mime-types-1.25.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-1.25.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/halostatue/mime-types/"
LICENSE="MIT Artistic GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
diff --git a/dev-ruby/mime-types/mime-types-2.4.3.ebuild b/dev-ruby/mime-types/mime-types-2.4.3.ebuild
deleted file mode 100644
index 79b1e5ca9e0e..000000000000
--- a/dev-ruby/mime-types/mime-types-2.4.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc History-Types.rdoc README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
-HOMEPAGE="https://github.com/halostatue/mime-types/"
-
-LICENSE="MIT Artistic GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
- # Handle minitest ourselves to avoid bundler dependency.
- sed -i -e '2igem "minitest", "~> 5.0"; require "minitest/autorun"' test/test_*.rb || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/mime-types/mime-types-2.6.2.ebuild b/dev-ruby/mime-types/mime-types-2.6.2.ebuild
index a8313be0e837..5a70489644d3 100644
--- a/dev-ruby/mime-types/mime-types-2.6.2.ebuild
+++ b/dev-ruby/mime-types/mime-types-2.6.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
LICENSE="MIT Artistic GPL-2"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
diff --git a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
index 4c0ff15c0e80..1a6d448001dc 100644
--- a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
+++ b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -21,5 +21,5 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
IUSE="doc test"
each_ruby_test() {
- ${RUBY} -Ilib:bin:test:. -S testrb test || die
+ ${RUBY} -Ilib:bin:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
}
diff --git a/dev-ruby/minitest/minitest-5.8.3.ebuild b/dev-ruby/minitest/minitest-5.8.3.ebuild
index 29bbfb9a1da3..9face99cfa5c 100644
--- a/dev-ruby/minitest/minitest-5.8.3.ebuild
+++ b/dev-ruby/minitest/minitest-5.8.3.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/narray/narray-0.6.1.1.ebuild b/dev-ruby/narray/narray-0.6.1.1.ebuild
index b4f9ba5daaa3..03821aa48078 100644
--- a/dev-ruby/narray/narray-0.6.1.1.ebuild
+++ b/dev-ruby/narray/narray-0.6.1.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/masa16/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~mips ppc ~ppc64 x86"
IUSE=""
diff --git a/dev-ruby/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
new file mode 100644
index 000000000000..882372b55603
--- /dev/null
+++ b/dev-ruby/net-telnet/Manifest
@@ -0,0 +1 @@
+DIST net-telnet-0.1.1.tar.gz 12794 SHA256 ecd6430f8e6f9e8b4be84c54572e5a8f9c0ec194b303c378f923e1e83068826a SHA512 769d83bae55826bb99f189d06a8fb8a6d497d6c7687289f5aad2efced6f282484e5f766dc95f0158045b824532cd8f0a674ecc69883018814a009bc29d6fe29d WHIRLPOOL ae165104e8f1fa5f5c734937319006a103d76c8557aaa0e1e363b2fec4a2fe453c3b7e39770a35b6c17dc32084b005993841cbb276d398b4f13e82d81027cd3d
diff --git a/dev-ruby/net-telnet/metadata.xml b/dev-ruby/net-telnet/metadata.xml
new file mode 100644
index 000000000000..066bbd2805df
--- /dev/null
+++ b/dev-ruby/net-telnet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>ruby</herd>
+ <upstream>
+ <remote-id type="github">ruby/net-telnet</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/net-telnet/net-telnet-0.1.1.ebuild b/dev-ruby/net-telnet/net-telnet-0.1.1.ebuild
new file mode 100644
index 000000000000..806e92a47e7c
--- /dev/null
+++ b/dev-ruby/net-telnet/net-telnet-0.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides telnet client functionality"
+HOMEPAGE="https://github.com/ruby/net-telnet"
+SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/nio4r/Manifest b/dev-ruby/nio4r/Manifest
index be8c800220fc..e1d7b0cac216 100644
--- a/dev-ruby/nio4r/Manifest
+++ b/dev-ruby/nio4r/Manifest
@@ -1,3 +1,2 @@
-DIST nio4r-1.0.1.gem 88576 SHA256 0b3dd204fe0174711dbd9683b3b581f3ca7d94325cdcdc8e0d99daeeea48ea7f SHA512 5a2cd7a5df221315bd145c14eef839a9bcbe5fac08b39537ef9a9cbd4522ea621b0b1172309df479c634f639eb84b97d3b52a968e6e06e600d33bd633125ab99 WHIRLPOOL 7b26d3291bcd3af4e1386868cb8ca8c95168a86e9cfb4404df85b1666815024b5dd1405d33bb86fa6e9a89efd22942bccc7096fe19617e8daf1f15be1c79fd5c
-DIST nio4r-1.1.0.gem 90112 SHA256 503e591f2fad4b34b6349f636d528fcd19af312677af96d1cf2ae674bd409af5 SHA512 c54bcd1534161d2eaf1ef12e2faa436dc7ee59f4ca4b2b5eb1260e98593d8f0e0e3c670753d1dd2dc84053952a8df39ec13aa67b325198ae63ec811cd329256c WHIRLPOOL 02776eaae219efecd4988d56832415bfcfc746bf073910eb6cbbe5373ef5d1e0ce1f9ba1335bd12d7497a1f69dfc4f3b196690a76edcdd18c9d6f34253dcd164
DIST nio4r-1.1.1.gem 91648 SHA256 5d86fd9f8872982fd4fa623bdaafe45efe21353b64fd09632e486f1b4d40959e SHA512 3163fd7efe05200ff88d284e932244f9a8f2e3b0145c6e732cdf8cd253ca334e1ade5b7d9c61a2d69ce193fa86501f1756ab3602181754426c7a268996537ff6 WHIRLPOOL 29501589d7eac09717c898dfdf80107653e68dcf5e84a9f96d1609c377d371447f17c8119313de99e4a9b3d0d984dbf44ab8ce3cdf3358ce99667266aabbd8a9
+DIST nio4r-1.2.0.gem 93696 SHA256 3427522115c07a9326c5859ca3cb261d0d7075f4289e27dd3982806902de6cbc SHA512 6d51195658f32873ce7698ccf30b1b8852d1e5cd4fdaba46533dbb56a3a999df0d22badf7504193d5f8458b362f147f3a9768b5d981b2c696246e1f21c6f1579 WHIRLPOOL ce492b96af9ae27e90f501a900097ba75209a2afc3d7e18737ce3c01b3238fec7647a89fb453c19ecc83416791d2b81efd2004f4d7f8265f63d48957f9d190be
diff --git a/dev-ruby/nio4r/nio4r-1.0.1.ebuild b/dev-ruby/nio4r/nio4r-1.0.1.ebuild
deleted file mode 100644
index b797d655aa58..000000000000
--- a/dev-ruby/nio4r/nio4r-1.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance selector API for monitoring IO objects"
-HOMEPAGE="https://github.com/celluloid/nio4r"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64"
-IUSE=""
-
-# Note that nio4r bundles a patched copy of libev, and without these
-# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
-
-all_ruby_prepare() {
- sed -i -e '/[Cc]overalls/d' -e '/[Bb]undler/d' spec/spec_helper.rb || die
- sed -e '/extension/ s:^:#:' -i Rakefile || die
-}
-
-each_ruby_configure() {
- ${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext/${PN}
- cp ext/${PN}/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/nio4r/nio4r-1.1.0.ebuild b/dev-ruby/nio4r/nio4r-1.2.0.ebuild
index ef39ae30f689..d7f368bf183f 100644
--- a/dev-ruby/nio4r/nio4r-1.1.0.ebuild
+++ b/dev-ruby/nio4r/nio4r-1.2.0.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/celluloid/nio4r"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# Note that nio4r bundles a patched copy of libev, and without these
diff --git a/dev-ruby/omniauth/Manifest b/dev-ruby/omniauth/Manifest
index d8ac736c2819..25a8c6c9cac6 100644
--- a/dev-ruby/omniauth/Manifest
+++ b/dev-ruby/omniauth/Manifest
@@ -1 +1,2 @@
DIST omniauth-1.2.2.gem 27648 SHA256 939eabc200dc19d624ad02020b9f9258a69429b2250b883e47ce2cf76c6a10b8 SHA512 5451ad281be5cd1dc45c66d295476f182904d08818c23a08a6245dbb517eeb49b29ff5810f67680073fb4cde2407eee164a2aae2b06397d7ea71b149fb86789e WHIRLPOOL d7ca6d180eea30583163a2eb60d14498c09fbd1baf78b1e6539e187028a5f943c7f7dd0f3a47a9b95acb59995f8c7bf39eb6a53b69cfb1fa9d39e87010975c7b
+DIST omniauth-1.3.1.tar.gz 23759 SHA256 a5043cd38442600320cfd92672f9985be3dc556f51fef63989f46bc21d69aa9e SHA512 4959d568cf8d2b4e874fd2a5a8e842a8be4705a5df525ad691a1a1d31de0d702023327cc8f9bc934539c25bcde06dc65714f830eaeb8f97b323fc297b99c4c0a WHIRLPOOL 5363a764e2526b9ffab9b17c939ccc31d5fb5fec365566b6b1bb90918f5c0bc8a9daee5075719a6c61a57d3610c466553443d7988249bb9ada73e0407a85f1b4
diff --git a/dev-ruby/omniauth/omniauth-1.3.1.ebuild b/dev-ruby/omniauth/omniauth-1.3.1.ebuild
new file mode 100644
index 000000000000..86f9ee6fd165
--- /dev/null
+++ b/dev-ruby/omniauth/omniauth-1.3.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A generalized Rack framework for multiple-provider authentication"
+HOMEPAGE="https://github.com/intridea/omniauth"
+SRC_URI="https://github.com/intridea/omniauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*
+ >=dev-ruby/hashie-1.2:* <dev-ruby/hashie-4:*"
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+ test? ( dev-ruby/rack-test )"
+
+all_ruby_prepare() {
+ sed -i -e '/[Bb]undler/d' \
+ Rakefile ${PN}.gemspec || die "sed failed"
+ sed -i -e '/RUBY_VERSION/,/^end/ s:^:#:' spec/helper.rb || die "sed failed"
+ # maruku fails, resorting to default markdown implementation
+ sed -i -e '/maruku/d' .yardopts || die "sed failed"
+
+ sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+ all_fakegem_compile
+
+ if use doc ; then
+ yard || die "yard failed"
+ fi
+}
diff --git a/dev-ruby/pkg-config/pkg-config-1.1.6.ebuild b/dev-ruby/pkg-config/pkg-config-1.1.6.ebuild
index a9b097a61d86..e957c3286373 100644
--- a/dev-ruby/pkg-config/pkg-config-1.1.6.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.1.6.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A pkg-config implementation by Ruby"
HOMEPAGE="https://github.com/rcairo/pkg-config"
LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
SLOT="0"
IUSE="test"
diff --git a/dev-ruby/power_assert/files/power_assert-0.2.6-ruby23-tests.patch b/dev-ruby/power_assert/files/power_assert-0.2.6-ruby23-tests.patch
new file mode 100644
index 000000000000..39aee08396c2
--- /dev/null
+++ b/dev-ruby/power_assert/files/power_assert-0.2.6-ruby23-tests.patch
@@ -0,0 +1,53 @@
+From b1bf60605303a4d60fd398fb75e04e4ff1568b0d Mon Sep 17 00:00:00 2001
+From: Kazuki Tsujimoto <kazuki@callcc.net>
+Date: Sat, 26 Dec 2015 17:57:03 +0900
+Subject: [PATCH] Encoding::CompatibilityError is no longer raised as of ruby
+ 2.3.0
+
+---
+ test/test_power_assert.rb | 31 +++++++++++--------------------
+ 1 file changed, 11 insertions(+), 20 deletions(-)
+
+diff --git a/test/test_power_assert.rb b/test/test_power_assert.rb
+index 272b8d1..863f8cc 100644
+--- a/test/test_power_assert.rb
++++ b/test/test_power_assert.rb
+@@ -345,27 +345,18 @@ def test_inspection_failure
+ assertion_message { BasicObjectSubclass.new.foo }
+
+
+- verbose = $VERBOSE
+- default_external = Encoding.default_external
+- default_internal = Encoding.default_internal
+- begin
+- $VERBOSE = nil
+- Encoding.default_external = 'cp932'
+- Encoding.default_internal = 'utf-8'
+- ary = ["\u3042"]
+- assert_match Regexp.new(<<END.chomp.gsub('|', "\\|")), assertion_message {
+- ary.length
+- | |
+- | 1
+- InspectionFailure: Encoding::CompatibilityError: .*
+-END
+- ary.length
+- }
+- ensure
+- Encoding.default_internal = default_internal
+- Encoding.default_external = default_external
+- $VERBOSE = verbose
++ o = Object.new
++ def o.inspect
++ raise
+ end
++ assert_equal <<END.chomp.b, assertion_message {
++ o.class
++ | |
++ | Object
++ InspectionFailure: RuntimeError:
++END
++ o.class
++ }
+ end
+
+ def test_assertion_message_with_incompatible_encodings
diff --git a/dev-ruby/power_assert/power_assert-0.2.6.ebuild b/dev-ruby/power_assert/power_assert-0.2.6.ebuild
index 4b6cc803590c..428732999b32 100644
--- a/dev-ruby/power_assert/power_assert-0.2.6.ebuild
+++ b/dev-ruby/power_assert/power_assert-0.2.6.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="README.rdoc"
@@ -19,6 +19,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
SLOT="0"
IUSE=""
+RUBY_PATCHES=( ${P}-ruby23-tests.patch )
+
all_ruby_prepare() {
sed -i -e '/bundler/d' Rakefile || die
}
diff --git a/dev-ruby/racc/racc-1.4.14.ebuild b/dev-ruby/racc/racc-1.4.14.ebuild
index 364e8e5ca09b..7cbe7bf0761d 100644
--- a/dev-ruby/racc/racc-1.4.14.ebuild
+++ b/dev-ruby/racc/racc-1.4.14.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_TASK_DOC="docs"
diff --git a/dev-ruby/rake/rake-10.4.2.ebuild b/dev-ruby/rake/rake-10.4.2.ebuild
index fe54d2a7d4ba..5654bf3bfd72 100644
--- a/dev-ruby/rake/rake-10.4.2.ebuild
+++ b/dev-ruby/rake/rake-10.4.2.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
diff --git a/dev-ruby/rdoc/rdoc-4.2.0.ebuild b/dev-ruby/rdoc/rdoc-4.2.0.ebuild
index 4bf6a50f095c..af78e10b4775 100644
--- a/dev-ruby/rdoc/rdoc-4.2.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-4.2.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/rdoc/rdoc/"
LICENSE="Ruby 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"
+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 "
diff --git a/dev-ruby/rdoc/rdoc-4.2.1.ebuild b/dev-ruby/rdoc/rdoc-4.2.1.ebuild
index 4a28db3a18c3..81301264d1ba 100644
--- a/dev-ruby/rdoc/rdoc-4.2.1.ebuild
+++ b/dev-ruby/rdoc/rdoc-4.2.1.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/recog/recog-2.0.14-r1.ebuild b/dev-ruby/recog/recog-2.0.14-r1.ebuild
index 585356a0ee5a..6a96593e01ff 100644
--- a/dev-ruby/recog/recog-2.0.14-r1.ebuild
+++ b/dev-ruby/recog/recog-2.0.14-r1.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
inherit ruby-fakegem
DESCRIPTION="Pattern recognition for hosts, services, and content"
-HOMEPAGE="https://github.com/rapid7/${PN}"
+HOMEPAGE="https://github.com/rapid7/recog"
LICENSE="BSD-2"
SLOT="${PV}"
diff --git a/dev-ruby/recog/recog-2.0.6-r1.ebuild b/dev-ruby/recog/recog-2.0.6-r1.ebuild
index 06559067d77a..217322c57732 100644
--- a/dev-ruby/recog/recog-2.0.6-r1.ebuild
+++ b/dev-ruby/recog/recog-2.0.6-r1.ebuild
@@ -8,7 +8,7 @@ RUBY_FAKEGEM_BINWRAP=""
inherit ruby-fakegem
DESCRIPTION="Pattern recognition for hosts, services, and content"
-HOMEPAGE="https://github.com/rapid7/${PN}"
+HOMEPAGE="https://github.com/rapid7/recog"
SRC_URI="mirror://rubygems/${P}.gem"
LICENSE="BSD"
diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index 3d484d848dd4..c3c2e9b653af 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1,3 +1,4 @@
DIST redcarpet-3.2.3.tar.gz 100245 SHA256 1de6a5b6e3d672b3f3102a6e4b9e98cc9b847de90bd0b4aef7367676ee1876f5 SHA512 2da50028274f2431a75c74c201c650c53c4c5e717790581b927cf455813b219aeebd79c0279a19d34475f5382ebd5783be295c6ea9f26f0ad5c2e92d0a0a8332 WHIRLPOOL e2f22ea230a3318003e318b655cf6721f7f6f9c1a241e44c5e4736683d2ff99ad26bb91f7ab4d32b6f2e13940a9b809b7e8f1b5ec84b10adff2c5f0fa6fd1fd5
DIST redcarpet-3.3.2.tar.gz 102671 SHA256 67781fd469195fae606f96be0c51658fc74f0dfd559afcaef8f7e506faef0790 SHA512 3d9d7d77bcc7f16e5710cc1ca2a95dff969ce927538d475c37ce82138de9c3ff88a235c65c97e017e5e0258ebaa52eeed6c2d2e5e34011f7f13f0f8392e580a0 WHIRLPOOL 188dd0f735a7e54e9589a4096b4ea052f63180a32330e6196ddf9e9afb29376422d7dcebdb965996b3cb01c861eb1016f02c8d6435d06a23a95e947b31861bbb
DIST redcarpet-3.3.3.tar.gz 103667 SHA256 3014febfac7afb25edac5f10e4ccf070d5dfb1f278c8a76623eb1903052b093c SHA512 60a69b5e41c152c2f42c69fd8c36020325131e57d8bc5d8f02dccfa8688e48a7bfbebaba38cd1cf7547864b308b676281d77e9e0ef182a2416b3a9e3a8ef7357 WHIRLPOOL 9ecf4d194706f05091cae1ddf08c84b92e5b4ab8e3d0836761a156972f93bdc63f585ed84b037054ec936675882940a306f3d7568284259ffe60284ffcfdeeba
+DIST redcarpet-3.3.4.tar.gz 103992 SHA256 ccafe9bf0459ec123efb4696674d447b44c267d5a4f1bd16813611a6a523a088 SHA512 bcd4123ea8d6e9cd28e78bd21d3e2aa90e6522e9fee3dd321a6c23d6450bde478054e2fde6b0c8a35d8b9af61d3b5ca3a9f2ebe19d89aea5091f7505bfe92d42 WHIRLPOOL d63f34bc46e0a0191907883d359654f8050d267c2f07a8ff4d07a995c3aedf09274a086f20f890303250494a82bc9d45de2c8bbdea741c405c0b3a700878d1c0
diff --git a/dev-ruby/redcarpet/redcarpet-3.3.4.ebuild b/dev-ruby/redcarpet/redcarpet-3.3.4.ebuild
new file mode 100644
index 000000000000..83d91ce7e032
--- /dev/null
+++ b/dev-ruby/redcarpet/redcarpet-3.3.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOCS="README.markdown CONTRIBUTING.md CHANGELOG.md doc"
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+inherit multilib ruby-fakegem
+
+SRC_URI="https://github.com/vmg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A Ruby wrapper for Upskirt"
+HOMEPAGE="https://github.com/vmg/redcarpet"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/d' -e 's/=> :compile//' Rakefile || die
+
+ # Avoid unneeded dependency on rake-compiler
+ sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+}
+
+each_ruby_prepare() {
+ sed -i -e "s#ruby#${RUBY}#" bin/redcarpet || die
+}
+
+each_ruby_configure() {
+ ${RUBY} -Cext/redcarpet extconf.rb || die
+}
+
+each_ruby_compile() {
+ emake V=1 -Cext/${PN}
+ cp ext/${PN}/*$(get_modname) lib || die
+}
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild
index 0e22166403f8..164d82e87d9d 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.5.ebuild
@@ -20,7 +20,7 @@ RUBY_S="$MY_P"/bindings/ruby
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="graph test"
REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.17.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.17.ebuild
index 4eb3476c7ee3..1a6087d42d2d 100644
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.17.ebuild
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.17.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A Ruby interface to some LDAP libraries"
HOMEPAGE="http://ruby-ldap.sourceforge.net/"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-macos"
IUSE="ssl"
DEPEND=">=net-nds/openldap-2
dev-libs/cyrus-sasl
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild
index bf9bfefa0db9..ffa3df40e0e3 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
RDEPEND+=" dev-db/oracle-instantclient-basic"
diff --git a/dev-ruby/ruby-opengl/ruby-opengl-0.9.2.ebuild b/dev-ruby/ruby-opengl/ruby-opengl-0.9.2.ebuild
index a64e25d06941..0115f26b83df 100644
--- a/dev-ruby/ruby-opengl/ruby-opengl-0.9.2.ebuild
+++ b/dev-ruby/ruby-opengl/ruby-opengl-0.9.2.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://github.com/larskanis/opengl"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
IUSE=""
diff --git a/dev-ruby/ruby-openid/Manifest b/dev-ruby/ruby-openid/Manifest
index 198c42286cd4..da9a479f50e2 100644
--- a/dev-ruby/ruby-openid/Manifest
+++ b/dev-ruby/ruby-openid/Manifest
@@ -1,2 +1 @@
-DIST ruby-openid-2.6.0.tar.gz 514492 SHA256 5c820410d4d83a02cbc778d647e81848a74c7e2f08db0fa560c481ec3d562df3 SHA512 ffe544a8c34c0f2b85073ee679728a6138f0c4da9d16d54001c5aa50251bf51e097baeda5ea748218d06c3bdb69f4f0948c561f888741c88c829bd5d58e7ba44 WHIRLPOOL 11b26774069831a232cbc893c2d6d47fcf71a366b45a92a6e3732a31fa10c879b4cc12217bec16ea42d51938cdeb8b31d9b1d49dd036635fab7135af755df3cd
DIST ruby-openid-2.7.0.tar.gz 513958 SHA256 3281528cb8fd42d239b841147b5a560292bda1899bd79fa83b407b1c1b24e40e SHA512 e53104d4cf0198953172a2ed567877c3d1cc11664acbab8ca424823e2249d9fa13ad9b931a7318709f2865f3f16e0e38714428d12accf16080aa1818b673d8cd WHIRLPOOL f293b3f76c9ebeaa0229327c6900a4eeae36cfc9abb97af5ac1c00ad99eb0b13f8765178789b7c9c16c7d783e0c3cfc43885112178b90be2ae22989497977f7c
diff --git a/dev-ruby/ruby-openid/ruby-openid-2.6.0.ebuild b/dev-ruby/ruby-openid/ruby-openid-2.6.0.ebuild
deleted file mode 100644
index bd89b3cf18f2..000000000000
--- a/dev-ruby/ruby-openid/ruby-openid-2.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md NOTICE UPGRADE.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A robust library for verifying and serving OpenID identities"
-HOMEPAGE="http://ruby-openid.rubyforge.org/"
-SRC_URI="https://github.com/openid/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-macos"
-IUSE="test"
-
-all_ruby_prepare() {
- sed -i -e "/[Bb]undler/d" Rakefile || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- insinto /usr/share/doc/${PF}
- doins -r examples
-}
diff --git a/dev-ruby/ruby-openid/ruby-openid-2.7.0.ebuild b/dev-ruby/ruby-openid/ruby-openid-2.7.0.ebuild
index f67622804764..18ec10070296 100644
--- a/dev-ruby/ruby-openid/ruby-openid-2.7.0.ebuild
+++ b/dev-ruby/ruby-openid/ruby-openid-2.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/openid/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-macos"
IUSE="test"
all_ruby_prepare() {
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 6714730b2ea8..1b5bad92987c 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,2 +1,3 @@
DIST rubygems-2.2.5.tgz 416772 SHA256 0f015d63ee3f48be2cc440332d992a33f6df113ced25b7a0007372d304bfeaa4 SHA512 eac6d7c4801d7bf65ac8e244ff88677929e491db8c5054a31d936eaf1e1fabfc8c4b560040c01c7d9707758cfbad9a8063144bb37b494dd1b6f66a0222871e03 WHIRLPOOL 6e02359ce84352f39b13c3f59d9fd82788a5a2ae88d069df05642d5349cb33c06c3477de56c937a44742fb6aa6cfdb7b32dbadac131fb12e6387f983564879c6
DIST rubygems-2.4.8.tgz 447712 SHA256 5a4335fef5904ceb76d912a9d4a2464fbbb172df3b2abcb0c67003e77764845e SHA512 1cc2e9e19d665268f475ce90547377d41a4ea5ce9a9afab4979de0247a0dd82b04529c087c899d9ced5564fa9051e1d2fe23ddb764ba411915bab2ce344ac419 WHIRLPOOL e9fa65b3ff24a05082fd6ded221706c45e8d7c6677ccc31e6971991320800d47fef99651fb338c797e20ab4ab7775c7192e09f4575fc815640c4f2a8d5ea273b
+DIST rubygems-2.5.1.tgz 469494 SHA256 02d4bb76687983d973ea8700912e798ca23be32bcce7956171254c93a2365273 SHA512 fd333398f9ce3a0c734fc66bf936a8287a64f8dfafe01987cf85497be57f021fc64c1015de9b4f0a36d24ffda152c2b02055a425c05cbd43266f55c0b1d5f052 WHIRLPOOL 8f4a7ee94cb9825ea35606347734e53c95dabfdf458cc6914ca4eb875451314a520a4849c607aff61afb25f29e6e44e7ed0667b0757ea15fe53f9d4a71710e3d
diff --git a/dev-ruby/rubygems/rubygems-2.5.1.ebuild b/dev-ruby/rubygems/rubygems-2.5.1.ebuild
new file mode 100644
index 000000000000..6928ad4d503c
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-2.5.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+
+PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/minitest-4:0
+ dev-ruby/rdoc
+ )"
+
+all_ruby_prepare() {
+
+ mkdir -p lib/rubygems/defaults || die
+ cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
+
+ eprefixify lib/rubygems/defaults/operating_system.rb
+
+ # Disable broken tests when changing default values:
+ sed -i -e '/test_default_path/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die
+
+ # Skip tests for default gems that all fail
+ sed -i -e '/test_default_gems_use_full_paths/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die
+ sed -i -e '/test_execute_ignore_default_gem_verbose/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
+ sed -i -e '/test_execute_default_gem/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
+ sed -i -e '/test_execute_default_details/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
+ sed -i -e '/test_execute_all/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
+ sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^ end/ s:^:#:' \
+ test/rubygems/test_{gem_installer,require}.rb || die
+ sed -i -e '/test_\(load_default_gem\|default_spec_stub\)/,/^ end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+ sed -i -e '/test_uninstall_default_gem/,/^ end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
+ rm -f test/rubygems/test_gem_indexer.rb || die
+
+ # Avoid tests playing tricks with ruby engine that don't seem to
+ # work for us.
+ rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
+
+ # Avoid test requiring network access
+ sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
+}
+
+each_ruby_compile() {
+ # Not really a build but...
+ sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ #unset RUBYOPT
+
+ if [[ "${EUID}" -ne "0" ]]; then
+ RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
+ -e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+ else
+ ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+ eerror "Testsuite will not be run."
+ fi
+}
+
+each_ruby_install() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ unset RUBYOPT
+ export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+ pushd lib &>/dev/null
+ doruby -r *
+ popd &>/dev/null
+
+ local sld=$(ruby_rbconfig_value 'sitelibdir')
+ insinto "${sld#${EPREFIX}}" # bug #320813
+ newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
+
+ newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
+}
+
+all_ruby_install() {
+ dodoc History.txt README.rdoc
+
+ if use server; then
+ newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
+ newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
+ eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+ fi
+
+ ewarn
+ ewarn "To switch between available Ruby profiles, execute as root:"
+ ewarn "\teselect ruby set ruby(20|21|...)"
+ ewarn
+}
diff --git a/dev-ruby/test-unit/test-unit-3.1.5-r1.ebuild b/dev-ruby/test-unit/test-unit-3.1.5-r1.ebuild
new file mode 100644
index 000000000000..01c6f4d3a2d8
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.1.5-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+inherit ruby-fakegem
+
+# Assume for now that ruby23 is not eselected yet and only
+# depend on yard for the other ruby implementations. Without this
+# assumption bootstrapping ruby23 won't be possible due to the yard
+# dependency tree.
+USE_RUBY="${USE_RUBY/ruby23/}" ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+DESCRIPTION="An xUnit family unit testing framework for Ruby"
+HOMEPAGE="https://rubygems.org/gems/test-unit"
+
+LICENSE="|| ( Ruby GPL-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/power_assert"
+
+all_ruby_compile() {
+ all_fakegem_compile
+
+ if use doc; then
+ yard doc --title ${PN} || die
+ fi
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die "testsuite failed"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ newbin "${FILESDIR}"/testrb-3 testrb-2
+}
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.5-r2.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.5-r2.ebuild
index 6286a5efd6b8..135ebc749b0a 100644
--- a/dev-ruby/test_declarative/test_declarative-0.0.5-r2.ebuild
+++ b/dev-ruby/test_declarative/test_declarative-0.0.5-r2.ebuild
@@ -5,7 +5,7 @@
EAPI=5
# ruby22: fails due to minitest incompatabilities.
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_TEST=""
RUBY_FAKEGEM_TASK_DOC=""
@@ -25,5 +25,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
IUSE=""
each_ruby_test() {
- ${RUBY} test/test_declarative_test.rb || die "Tests failed."
+ case ${RUBY} in
+ *ruby22)
+ einfo "Tests do not work with ruby22"
+ ;;
+ *)
+ ${RUBY} test/test_declarative_test.rb || die "Tests failed."
+ ;;
+ esac
}
diff --git a/dev-util/dialog/dialog-1.2.20150920.ebuild b/dev-util/dialog/dialog-1.2.20150920.ebuild
index fa2c987675e3..5db1eb88d10f 100644
--- a/dev-util/dialog/dialog-1.2.20150920.ebuild
+++ b/dev-util/dialog/dialog-1.2.20150920.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="examples minimal nls static-libs unicode"
RDEPEND="
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild
index bdb50043c7fa..58ced432c30d 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -74,11 +74,11 @@ pkg_setup() {
}
src_unpack() {
- CHECKREQS_MEMORY="1536"
+ CHECKREQS_MEMORY="1536M"
if use doc || use source ; then
- CHECKREQS_DISK_BUILD="3072"
+ CHECKREQS_DISK_BUILD="3072M"
else
- CHECKREQS_DISK_BUILD="1536"
+ CHECKREQS_DISK_BUILD="1536M"
fi
check_reqs
diff --git a/dev-util/eclipse-sdk/metadata.xml b/dev-util/eclipse-sdk/metadata.xml
index 24d1f1cf72fd..83b1cb59b4e4 100644
--- a/dev-util/eclipse-sdk/metadata.xml
+++ b/dev-util/eclipse-sdk/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>java</herd>
-<longdescription>
+ <herd>java</herd>
+ <longdescription>
The Eclipse Project is an open source project of eclipse.org, overseen by
a Project Management Committee (PMC) and project leaders. The work is done
in subprojects working against a CVS repository. The Eclipse Project
diff --git a/dev-util/kdevelop-php-docs/Manifest b/dev-util/kdevelop-php-docs/Manifest
index 0d2d38e1100a..6bd9032d5aca 100644
--- a/dev-util/kdevelop-php-docs/Manifest
+++ b/dev-util/kdevelop-php-docs/Manifest
@@ -1,2 +1 @@
-DIST kdevelop-php-docs-1.7.1.tar.xz 32840 SHA256 ae8acbffb882cdc20c32a22a8e522e0aea0c69b3d93376afa79e7b3bcad47568 SHA512 9a78b2d3051fe81b0fc91cb7cea586d0d3391959f55fc5cc05c3ff1f9c4d2a9a83957e50a9feac050d6d01a831fdfd7fa8e0f9dcd6f801723f8b638f60663592 WHIRLPOOL 97e77ce5019ba707b3d37c058a16edd1788055a83f24bdcc6058197e723161dcbc484a8557d32dadc02dd98c1acbd2a5dc732f122bca5e10bcd482e92fb43a5a
DIST kdevelop-php-docs-1.7.2.tar.xz 32892 SHA256 2dff2f54f631296c87007be84a0dc439d328d473717577c0d1450a9fc7e6e828 SHA512 5bbc3a4a61fa87b96182bfa1b3df28f26a35e4eb7ee021c822a031cb71b5900b53bacbac0d4892d8ff021dcc90b74097a0d67f31b17a4c3b7248170b19b54e16 WHIRLPOOL 5ef5309986dc42d41fe90333025075b132d3bfe3107802b97e54e4a1f2f36c37234b87dad3fcaf6d15ab3d79567fd4dae1ae1155403e7f1dfbd3bebf8d2ab32f
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.1.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.1.ebuild
deleted file mode 100644
index 74755cb42206..000000000000
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW"
-KMNAME="kdevelop"
-EGIT_REPONAME="kdev-php-docs"
-EGIT_BRANCH="1.7"
-inherit kde4-base
-
-DESCRIPTION="PHP documentation plugin for KDevelop 4"
-LICENSE="GPL-2 LGPL-2"
-IUSE="debug"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="amd64 x86"
-fi
-
-RDEPEND="
- !=dev-util/kdevelop-plugins-1.0.0
-"
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild
index 6ebff0e8e75c..74755cb42206 100644
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.7.2.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2"
IUSE="debug"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
RDEPEND="
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 41a092e3dd7a..d1e6da57ba81 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,2 +1 @@
-DIST kdevelop-php-1.7.1.tar.xz 658088 SHA256 396300d605032ac458489fb760801233e94117825ca6a3251ee02090aa694826 SHA512 7602d905cd33299e071452e98539886110bf1f3fbbee3025a6ec2218aac8fef16665b81d23a1810ee22e9eb3eedbe55c00c8951a56b86fad2955ed4846959866 WHIRLPOOL 7e235c05bb0618365752c6c721fea1fd462eba7098e77ca303885c4bb50faf3d2f695f01fed982bc34827bb04f84490eaf5dfa4a37ed29875c1a8493d797b68e
DIST kdevelop-php-1.7.2.tar.xz 658060 SHA256 75de9a5afe32ecaa35eb14e1ae04dd9c6d3e9abf87274ca4537fbdc3b296a369 SHA512 419ac3865c15ba30997e08f655d4ba61877ff15b6f3c0261a52a74e7d158e7a82a638326d2ccae1a435b846f40f76723807ff318ea3242651fb8fee263cdf5e1 WHIRLPOOL bad67fdbff98c2d47dd3034f56abafbb7ff8d1fb17aec3e7004177a50f1f131808b56d80f3c89bb234613ab71badcf2fdd4e67420a3902eda33f2f94489ca2f0
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.7.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.7.1.ebuild
deleted file mode 100644
index 50ae3d9cb3ee..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-1.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nl pl pt
-pt_BR ru sk sl sv tr uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-KDEBASE="kdevelop"
-KMNAME="kdev-php"
-EGIT_REPONAME="${KMNAME}"
-EGIT_BRANCH="1.7"
-inherit kde4-base
-
-DESCRIPTION="PHP plugin for KDevelop 4"
-LICENSE="GPL-2 LGPL-2"
-IUSE="debug doc"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="amd64 x86"
-fi
-
-RESTRICT="test"
-
-DEPEND="
- >=dev-util/kdevelop-pg-qt-1.0.0:4
-"
-RDEPEND="
- dev-util/kdevelop:${SLOT}
- doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
-"
-
-PATCHES=( "${FILESDIR}/${PN}"-1.2.0-parmake.patch )
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.7.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.7.2.ebuild
index 6407675e5047..50ae3d9cb3ee 100644
--- a/dev-util/kdevelop-php/kdevelop-php-1.7.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-1.7.2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2 LGPL-2"
IUSE="debug doc"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
RESTRICT="test"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index d9fe8ec91c7d..3d62d441d678 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,2 +1 @@
-DIST kdev-python-1.7.1.tar.xz 3666536 SHA256 6d95834ffbdc9c74f0c5cca589344b02189902e01901169615484c5b163dbc06 SHA512 f40fad121d5a8106c25fa5b8827f34074f8add115db9a26282b7bb087df2b57665b4bc6d772cd72784e5989eb6319d2807ac7278012b0be4e29ccb6864e79349 WHIRLPOOL 81feab1b3262aa406f4c59989be59d5a73bd8fbd0fed62e207434c0d65656ef10b7ccdcd54c2d1e4b7bab6e7213ef7e0b2638021823507cdc0750e091a88f09f
DIST kdev-python-1.7.2.tar.xz 3668764 SHA256 949254984bd489cd5597d4c4986057c43b60febde329f6f9d1b42228aef9444d SHA512 d49a65786516d6709808126c3ec1ea90ccce8f3a7fbdfd39082e6327d3186089fe9d64380587023f0d4d9eea2304f76d8ff510b52cb29169918596652508bae4 WHIRLPOOL 7a01d9afa3151b3139fde5a0609d4eec2be330afe0e7bd241c22658007108ec78be9fbcaf37b8d55bde34b1b354d5043e2b6e79ed52b194ab40744c196ed5124
diff --git a/dev-util/kdevelop-python/kdevelop-python-1.7.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.7.1.ebuild
deleted file mode 100644
index 704fac896303..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-1.7.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDEBASE="kdevelop"
-KMNAME="kdev-python"
-KDE_LINGUAS="ca de en_GB es et fi fr it nl pl pt pt_BR sk sl sv tr uk"
-PYTHON_COMPAT=( python2_7 )
-EGIT_BRANCH="1.7"
-MY_P="${KMNAME}-${PV}"
-inherit kde4-base python-any-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${MY_P}.tar.xz"
- KEYWORDS="amd64 x86"
- S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="Python plugin for KDevelop 4"
-IUSE="debug"
-
-DEPEND="
- ${PYTHON_DEPS}
-"
-RDEPEND="
- dev-util/kdevelop:4
-"
-
-RESTRICT="test"
-
-pkg_setup() {
- python-any-r1_pkg_setup
- kde4-base_pkg_setup
-}
-
-src_compile() {
- pushd "${WORKDIR}"/${P}_build > /dev/null
- emake parser
- popd > /dev/null
-
- kde4-base_src_compile
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild
index ad790219c8ec..e0db81fd8dce 100644
--- a/dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-1.7.2.ebuild
@@ -14,7 +14,7 @@ inherit kde4-base python-any-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${MY_P}.tar.xz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
S=${WORKDIR}/${MY_P}
fi
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 33bd8d86347e..d11c6f53791c 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,2 +1 @@
-DIST kdevelop-4.7.1.tar.xz 4441540 SHA256 e3ad5377f53739a67216d37cda3f88c03f8fbb0c96e2a9ef4056df3c124e95c1 SHA512 a5fcdb4b83f6b9512350d73314df3ed8fd4f8a6544f358c480295f1f1f81799f18e30b44c24b73b4db244e63f01c29990854532688bf0a866c7fe83f924a48bd WHIRLPOOL 630802a540db94a6f56b0c15ff8910ea6168401f88aaf3e14476461d169f4e456f83444fbf8f9c927c7c196b0797c40d58972d1b05a912eeb18d8d5b1239e4f9
DIST kdevelop-4.7.2.tar.xz 4441896 SHA256 5801a38a9abfebead18b74c0a0f5a6d68118b297c96ef1e2f75c8bfae3463b19 SHA512 f05643f185a02ce9f07b5e48b0cf61de5e0e2ed892b4fbe4edf749319c37466a2e904c7b64604cdff3b1c5c20e384ea23e7fdd1e30ed15642fd70f5e172e570a WHIRLPOOL 2caf928f84e22aacfa2691fc7a2752f84a38cdfccc4b3c176c04c0f81445a25548f7723ee57da293a921f7934789386bce7e4c50751cd4d61da2d15c39490695
diff --git a/dev-util/kdevelop/files/kdevelop-4.7.1-gdb.patch b/dev-util/kdevelop/files/kdevelop-4.7.1-gdb.patch
deleted file mode 100644
index 4643310bfffc..000000000000
--- a/dev-util/kdevelop/files/kdevelop-4.7.1-gdb.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 633b49c4bd7e434185c69a3dea1841755b75dcba Mon Sep 17 00:00:00 2001
-From: Fernando Rodriguez <frodriguez.developer@outlook.com>
-Date: Sun, 2 Aug 2015 16:20:37 +0200
-Subject: [PATCH] Set the replyReceived flag only if the current command is
- exec-run.
-
-Fixes various MI errors in remote debugging scenarios.
-
-BUG: 346827
----
- debuggers/gdb/gdb.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/debuggers/gdb/gdb.cpp b/debuggers/gdb/gdb.cpp
-index 4642087..df9f3b0 100644
---- a/debuggers/gdb/gdb.cpp
-+++ b/debuggers/gdb/gdb.cpp
-@@ -255,7 +255,8 @@ void GDB::processLine(const QByteArray& line)
- emit internalCommandOutput(QString::fromUtf8(line) + '\n');
-
- if (result.reason == "thread-group-started") {
-- receivedReply_ = true;
-+ if (currentCmd_->cmdToSend().contains("exec-run"))
-+ receivedReply_ = true;
- // (gdb) -exec-run
- // =thread-group-started,id="i1",pid="16768"
- if (line.contains("pid=\"")) {
---
-2.4.6
-
diff --git a/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild b/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild
deleted file mode 100644
index 18e369aa7ec1..000000000000
--- a/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
-VIRTUALX_REQUIRED="test"
-EGIT_BRANCH="4.7"
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment, supporting KDE/Qt, C/C++ and much more"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug +gdbui okteta qthelp"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="amd64 ppc x86"
-fi
-
-DEPEND="
- dev-libs/qjson
- dev-qt/qtdeclarative:4[webkit]
- gdbui? (
- $(add_kdebase_dep ksysguard)
- $(add_kdebase_dep libkworkspace)
- )
- okteta? ( $(add_kdeapps_dep okteta) )
- qthelp? ( dev-qt/qthelp:4 )
-"
-RDEPEND="${DEPEND}
- $(add_kdeapps_dep kapptemplate)
- $(add_kdeapps_dep kdebase-kioslaves)
- cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-RESTRICT="test"
-# see bug 366471
-
-PATCHES=( "${FILESDIR}/${P}-gdb.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build cmake)
- $(cmake-utils_use_build cmake cmakebuilder)
- $(cmake-utils_use_build cxx cpp)
- $(cmake-utils_use_with gdbui KDE4Workspace)
- $(cmake-utils_use_with okteta LibKasten)
- $(cmake-utils_use_with okteta LibOkteta)
- $(cmake-utils_use_with okteta LibOktetaKasten)
- $(cmake-utils_use_build qthelp)
- )
-
- kde4-base_src_configure
-}
diff --git a/dev-util/kdevelop/kdevelop-4.7.2.ebuild b/dev-util/kdevelop/kdevelop-4.7.2.ebuild
index 4aa87cf2c323..a28709bcedc7 100644
--- a/dev-util/kdevelop/kdevelop-4.7.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.7.2.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2 LGPL-2"
IUSE="+cmake +cxx debug +gdbui okteta qthelp"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="amd64 ~ppc ~x86"
+ KEYWORDS="amd64 ppc x86"
fi
DEPEND="
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index fdbb34000556..5e400b9cf3d5 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,2 +1 @@
-DIST kdevplatform-1.7.1.tar.xz 1930560 SHA256 dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac SHA512 b19c925c973ab00b25b03f1bcf1e34a98b8108728f20e7b058bd391a1dde78e33b80705c39632ff594ecf834878e1c54732031b8110400433266c258632468d0 WHIRLPOOL 9e687644b1f31ca317bb3fa0000f388aca80ee305eaa3b43d044181d2b2374ad57613104a400a8a052ed07e5157fbbdc26b7174314cc04ca5b8c788afe4c8f4f
DIST kdevplatform-1.7.2.tar.xz 1929976 SHA256 0afcde7a746adb83b00f2bd6b02efb4022adbd61b6ba4325fb63b71902f1f4e4 SHA512 b95a1837b61d6c63cdd5183194ea70301bb32720df8c5317ba891a91c24c1e174aa69d10131024701bfe710f4848ac50059bc4513cf334d39415d37f4a445d66 WHIRLPOOL 4656a52becd50e9d827010e798941465731872b014400529fde4c45410d7f77d063c7fed237f94991742af997e845145772dbb199df74ae9777d41c2bdc21693
diff --git a/dev-util/kdevplatform/files/kdevplatform-1.7.1-boost-1.57.patch b/dev-util/kdevplatform/files/kdevplatform-1.7.1-boost-1.57.patch
deleted file mode 100644
index 5abf3c593bc1..000000000000
--- a/dev-util/kdevplatform/files/kdevplatform-1.7.1-boost-1.57.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a430a60a274d369d98105b9d51285d5a9a6bc86f Mon Sep 17 00:00:00 2001
-From: Kevin Funk <kfunk@kde.org>
-Date: Fri, 4 Sep 2015 17:52:15 +0200
-Subject: [PATCH] Make compile (cf. BOOST_JOIN)
-
-Also see https://bugreports.qt.io/browse/QTBUG-22829
----
- plugins/classbrowser/documentclassesfolder.cpp | 2 ++
- plugins/classbrowser/documentclassesfolder.h | 3 +++
- 2 files changed, 5 insertions(+)
-
-diff --git a/plugins/classbrowser/documentclassesfolder.cpp b/plugins/classbrowser/documentclassesfolder.cpp
-index c578305..55cb637 100644
---- a/plugins/classbrowser/documentclassesfolder.cpp
-+++ b/plugins/classbrowser/documentclassesfolder.cpp
-@@ -29,7 +29,9 @@
- #include <QTimer>
- #include <KIcon>
-
-+#ifndef Q_MOC_RUN
- #include <boost/foreach.hpp>
-+#endif
-
- using namespace KDevelop;
- using namespace ClassModelNodes;
-diff --git a/plugins/classbrowser/documentclassesfolder.h b/plugins/classbrowser/documentclassesfolder.h
-index 91edfe8..80f6fb6 100644
---- a/plugins/classbrowser/documentclassesfolder.h
-+++ b/plugins/classbrowser/documentclassesfolder.h
-@@ -23,9 +23,12 @@
- #define KDEVPLATFORM_PLUGIN_DOCUMENTCLASSESFOLDER_H
-
- #include "classmodelnode.h"
-+
-+#ifndef Q_MOC_RUN
- #include <boost/multi_index_container.hpp>
- #include <boost/multi_index/member.hpp>
- #include <boost/multi_index/ordered_index.hpp>
-+#endif
-
- namespace ClassModelNodes
- {
---
-2.4.6
-
diff --git a/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild b/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild
deleted file mode 100644
index b6e1a272b493..000000000000
--- a/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KMNAME="kdevelop"
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nl pl pt
-pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-EGIT_REPONAME="${PN}"
-EGIT_BRANCH="1.7"
-inherit kde4-base
-
-DESCRIPTION="KDE development support libraries and apps"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+classbrowser cvs debug +konsole reviewboard subversion"
-
-if [[ $PV == *9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="amd64 ppc x86"
-fi
-
-RESTRICT="test"
-
-COMMON_DEPEND="
- dev-libs/grantlee:0
- reviewboard? ( dev-libs/qjson )
- subversion? (
- dev-libs/apr
- dev-libs/apr-util
- dev-vcs/subversion
- )
-"
-DEPEND="${COMMON_DEPEND}
- classbrowser? ( dev-libs/boost )
-"
-RDEPEND="${COMMON_DEPEND}
- konsole? ( $(add_kdeapps_dep konsole) )
- cvs? ( dev-vcs/cvs )
- !<dev-util/kdevelop-${KDEVELOP_VERSION}:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-boost-1.57.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build classbrowser)
- $(cmake-utils_use_build cvs)
- $(cmake-utils_use_build konsole)
- $(cmake-utils_use_find_package reviewboard QJSON)
- $(cmake-utils_use_build subversion)
- )
-
- kde4-base_src_configure
-}
diff --git a/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild b/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild
index eaed9fa11857..8fe0854a20a5 100644
--- a/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2"
IUSE="+classbrowser cvs debug +konsole reviewboard subversion"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="amd64 ~ppc ~x86"
+ KEYWORDS="amd64 ppc x86"
fi
RESTRICT="test"
diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest
index a0cf0690c2a5..719868408cb0 100644
--- a/dev-util/osc/Manifest
+++ b/dev-util/osc/Manifest
@@ -1,2 +1,2 @@
DIST osc-0.148.2.tar.gz 6818939 SHA256 573d23d84e47316bd2eaed16e37696a1b87b8bc8cb457be5403ecfcb4da44c4c SHA512 4e17c8fb8f78a3f9a279f27e3c52fa1a4d6ee62825e06a5943b144ff39a3c53650d31c1b8033ee78cf6f3d4e85c140b2fc0c7f86b3d134cea59fc8da24e3fd16 WHIRLPOOL 20160e3148f21ff78074f4858928fee20227defe1065c8971c9e1823ab7cb5195edab2ac9da4662667be49ad2dc772c1d260a83eae59166c362f3050b88fd19d
-DIST osc-0.150.1.tar.gz 329415 SHA256 a6ebb67cfe2b878f51dfa3a725cda176d28bef586bc23e4255d35fc830823386 SHA512 8d9d601b6e5ae89e5319e70465dfa7ad2550248107d7bfb1f5c31b991743f78e7fd53f7766773d76aa884da1f535edac50d82ae4505d80801354e323e7f8fa3c WHIRLPOOL 594f29e8998a27075a0b3f1c153bd42805ff8704256ee1c6e64a63e315b66c94b7e3db87c94ef723081a94fa5010e15900d3feece1048e23c5dea10a38498417
+DIST osc-0.152.0.tar.gz 331512 SHA256 e30508cb6197c48a4ac6364eb60e47a850a67faa705cc2eafbce4f1072c30b41 SHA512 273bad36565d4f90b1a1f9af965367728559e5d0d8060689b1086f1df12fd3ef575900064973888cba1c06fb2d7c0e998161d65c04581a040750ef34281f035a WHIRLPOOL f2937f91649f04a9c6710851cb6e52f5cf1614169c643e8ce82c8c3ad611f252e96b9002f7dfb2a9be762c86f9feb12f2e6b39f5f57fcf5b6a33e12ff975a3bc
diff --git a/dev-util/osc/osc-0.150.1.ebuild b/dev-util/osc/osc-0.152.0.ebuild
index e394d17376fc..356fef01c623 100644
--- a/dev-util/osc/osc-0.150.1.ebuild
+++ b/dev-util/osc/osc-0.152.0.ebuild
@@ -31,7 +31,7 @@ IUSE=""
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
[[ "${PV}" == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DEPEND="
dev-python/urlgrabber[${PYTHON_USEDEP}]
diff --git a/dev-util/plan9port/files/plan9port-freebsd-10.patch b/dev-util/plan9port/files/plan9port-freebsd-10.patch
new file mode 100644
index 000000000000..cc46dc6f4509
--- /dev/null
+++ b/dev-util/plan9port/files/plan9port-freebsd-10.patch
@@ -0,0 +1,11 @@
+--- a/bin/9l 2015-12-09 19:12:50.000000000 +0000
++++ b/bin/9l 2015-12-09 19:13:00.000000000 +0000
+@@ -19,7 +19,7 @@ case "$tag" in
+ 5.2.*)
+ extralibs="$extralibs -lkse"
+ ;;
+- [5-9].*)
++ [5-9].*|10.*)
+ extralibs="$extralibs -lpthread"
+ ;;
+ esac
diff --git a/dev-util/plan9port/plan9port-20140306-r2.ebuild b/dev-util/plan9port/plan9port-20140306-r2.ebuild
new file mode 100644
index 000000000000..05fdf5f63d92
--- /dev/null
+++ b/dev-util/plan9port/plan9port-20140306-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multiprocessing toolchain-funcs
+
+DESCRIPTION="Port of many Plan 9 programs and libraries"
+HOMEPAGE="http://swtch.com/plan9port/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
+
+LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X aqua truetype"
+REQUIRED_USE="?? ( X aqua )"
+
+DEPEND="X? ( x11-apps/xauth )
+ truetype? ( media-libs/freetype
+ media-libs/fontconfig )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PLAN9=/usr/lib/plan9
+EPLAN9="${EPREFIX}"${PLAN9}
+QA_MULTILIB_PATHS="${PLAN9}/.*/.*"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch"
+ case ${CHOST} in
+ *freebsd10.*) # patch 9l to use -pthread also on FreeBSD-10
+ epatch "${FILESDIR}/${PN}-freebsd-10.patch" ;;
+ *apple*)
+ sed -i 's/--noexecstack/-noexecstack/' src/mkhdr ||
+ die "Failed to sed AFLAGS" ;;
+ esac
+
+ # don't hardcode /bin and /usr/bin in PATH
+ sed -i '/PATH/s,/bin:/usr/bin:,,' INSTALL || die "sed on INSTALL failed"
+
+ # don't hardcode /usr/{,local/}include and prefix /usr/include/*
+ for f in src/cmd/fontsrv/freetyperules.sh INSTALL \
+ $(find -name makefile); do
+ sed -r -i -e 's,-I/usr(|/local)/include ,,g' \
+ -e "s,-I/usr(|/local)/include,-I${EPREFIX}/usr\1/include,g" ${f} \
+ || die "sed on ${f} failed"
+ done
+
+ # Fix paths, done in place of ./INSTALL -c
+ einfo "Fixing hard-coded /usr/local/plan9 paths"
+ grep --null -l -r '/usr/local/plan9' |
+ xargs --null sed -i "s,/usr/local/plan9,${EPLAN9},g"
+}
+
+src_configure() {
+ local myconf=()
+ if use X; then
+ myconf+=("X11=${EPREFIX}/usr" WSYSTYPE=x11)
+ elif use aqua; then
+ local wsystype=$(echo ${MACOSX_DEPLOYMENT_TARGET} |
+ awk '{if ($1 > 10.5) print "osx-cocoa"; else print "osx"}')
+ myconf+=("WSYSTYPE=${wsystype}")
+ else
+ myconf+=(WSYSTYPE=nowsys)
+ fi
+
+ if use truetype; then
+ myconf+=(FONTSRV=fontsrv)
+ else
+ myconf+=(FONTSRV=)
+ fi
+ printf '%s\n' "${myconf[@]}" >> LOCAL.config
+}
+
+src_compile() {
+ export NPROC=$(makeopts_jobs)
+ export CC9=$(tc-getCC)
+
+ # The INSTALL script builds mk then [re]builds everything using that
+ einfo "Compiling Plan 9 from User Space can take a very long time"
+ einfo "depending on the speed of your computer. Please be patient!"
+ ./INSTALL -b || die "Please report bugs to bugs.gentoo.org, NOT Plan9Port."
+}
+
+src_install() {
+ dodir "${PLAN9}"
+
+ # P9P's man does not handle compression
+ docompress -x $PLAN9/man
+
+ # do* plays with the executable bit, and we should not modify them
+ cp -a * "${ED}/${PLAN9}"
+
+ # build the environment variables and install them in env.d
+ cat > "${T}/30plan9" <<-EOF
+ PLAN9="${EPLAN9}"
+ PATH="${EPLAN9}/bin"
+ ROOTPATH="${EPLAN9}/bin"
+ MANPATH="${EPLAN9}/man"
+ EOF
+ doenvd "${T}/30plan9"
+}
+
+pkg_postinst() {
+ elog "Plan 9 from User Space has been successfully installed into"
+ elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
+ elog "also been appropriately set, please use env-update and"
+ elog "source /etc/profile to bring that into immediate effect."
+ elog
+ elog "Please note that ${PLAN9}/bin has been appended to the"
+ elog "*end* or your PATH to prevent conflicts. To use the Plan9"
+ elog "versions of common UNIX tools, use the absolute path:"
+ elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
+ elog
+ elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
+}
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index 1c952cf13bc5..af31faad38c2 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -2,3 +2,4 @@ DIST rebar-2.3.1.tar.gz 147014 SHA256 dddb3c13a3a875dd91c368e3294619ab377cfc88bc
DIST rebar-2.4.0.tar.gz 152328 SHA256 43ae0d9c1439d935086db349c5b6a8646707f5538720167b2bbcc1ad32516b6a SHA512 dda9915d8b8b2408d65156f5af8387858ad19ed4b29b99d3e5d8f9131ea6b76a218b99520d4f9501c0b698b11216076e779ccebba16b6c1ccdae13d333b4dae7 WHIRLPOOL b573a83b823ef451901fd334f54bf49f1ac6c87a647a012fc2540fc850324988427ed9f3dee0d7a7bc0927667d4f6928cd6c4feb6dfb82c9204a3c11fc42988e
DIST rebar-2.5.0.tar.gz 152390 SHA256 d585fa4c7f59c66017d2552764bb423abeed3a3c99503be91b41fb931245ccbe SHA512 6fbb15d6c2bd3f4f7f83c35f4f8fa9d6dafc6bc9a739ac5e002a046d34d9da4216d64c5ea59b73a1b54cb11b9de32d0618f821912c26e63b8bbfdea9bd08f1fa WHIRLPOOL 712be4b52959230217a1a25e3f618db983626a0e06d0260afed3fe2ab319affc111a2beedc401d844663132f097b9a65591c217109e0fd777caf0d22d333a410
DIST rebar-2.5.1.tar.gz 154486 SHA256 86cb849a0d2b8275dcfdbc9a2b0a374d21c7eaa73312d74f0ab83cc0ab062bf9 SHA512 4617397d415f222ad0245ae2b55619c5418f049851aa953908778e9a96a9f0dfc57803ba08ebb757cd62a6bddce064fe73b2a33df25a8cc44183188d73e4938a WHIRLPOOL 403786ef632b69b991d5c3b52954e20bfd1adcecaa60627aaa2611a5f7c82b38ce898108afe9abba9e83eb21bd92d59dce08498af5e5fc3488d0a1bb990313e0
+DIST rebar-2.6.0.tar.gz 186357 SHA256 9f30ea5ab9da8638273cb55b49780e58fed1f4aa8623b835bcdd983bb451f7a7 SHA512 848a28a40215bc54bbbb1aeb101fb5c3578ce9668212f9f270be05ba268a63cf740ec6ed88e6df962da60a6f6e336c0e1b1e3cca3112c32e3bd8f5b3dd121c41 WHIRLPOOL fa9b8d159db884408ad6c20d2e9d4e1b12ff1ab0aa227b365846892fb5820a7a50e9f014fdc5b7cda0eeb8e8608d607281274f9ff566091f66fc473ab87052bf
diff --git a/dev-util/rebar/rebar-2.6.0.ebuild b/dev-util/rebar/rebar-2.6.0.ebuild
new file mode 100644
index 000000000000..bd9cf0c839bd
--- /dev/null
+++ b/dev-util/rebar/rebar-2.6.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1
+
+DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
+HOMEPAGE="https://github.com/rebar/rebar"
+SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/erlang"
+DEPEND="${RDEPEND}"
+
+src_test() {
+ emake xref
+}
+
+src_install() {
+ dobin rebar
+ dodoc rebar.config.sample THANKS
+ dobashcomp priv/shell-completion/bash/${PN}
+}
diff --git a/dev-util/suse-build/Manifest b/dev-util/suse-build/Manifest
index f88d30dfc443..517c58ed2bcb 100644
--- a/dev-util/suse-build/Manifest
+++ b/dev-util/suse-build/Manifest
@@ -1,2 +1,2 @@
-DIST obs-build-20140220.tar.gz 156717 SHA256 af959c30a9da0237cbb32a79dd55347156cd68d73f3c8f6e818a74b6c915b328 SHA512 3a66c7ded80f928d8930cb60011a115ec3d6ffa616a290907176fbe65e0dd0abc23b083271fb0d8598d699d1e6a100cc98be908f0079c0db157b8c4c6b960191 WHIRLPOOL 6609726de2f7d8f8d3e082b6323f4046d1121cc81fc58086d8666ddb677ac721e0e4be8597ba1316240d447c7942d2fd8f213bb39e4539c22e2ea0571a0812ce
DIST obs-build-20140918.tar.gz 192320 SHA256 3b8263fa9f5320d34bcf7c731b5eda9bcedda5f65c2583a57f8640a925dcdbcf SHA512 3eddb6d131cbc405200add39c681365abc704965adb39f52a03936653dd9439d479f6ad8ee7492248399bb015f101c0e41396b70a205bde2cceea2c6646f7c51 WHIRLPOOL 79be4deca3806c2ffbbf2cb55d8e71e9f630b580fa87cfe2bd13bc81634cce83276701ca5bfb464c8bf3f0bbc01229716dbfb5d1da99c2c17d56d2666ef2dbfb
+DIST obs-build-20151105.tar.gz 231249 SHA256 e498bd32223b88bece019abfa23501bca7343ce1e8156e00f94200bb3ff24079 SHA512 7b6be4a0d6cd82501c05e41e2a08fa2ad30fe28f28ed72d06b2e4acfdb4d5d6759254291510e8797d214e6330d5c186a85d0f104454d0cde2221d94451bbfb23 WHIRLPOOL 86c4a59de6de6a9b1092a082d9ec15222cf55ace638f8843260485f19c90085a82dcd41ebe71fc31a2f130a5b30d2783624189333ba0e88cfb9651475a9f3b64
diff --git a/dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch b/dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch
deleted file mode 100644
index 49b1813a66e0..000000000000
--- a/dev-util/suse-build/files/suse-build-20140220-libexec-paths.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-diff -Naru obs-build-20140220-bak/build obs-build-20140220/build
---- obs-build-20140220-bak/build 2014-03-02 17:04:18.655731128 +0000
-+++ obs-build-20140220/build 2014-03-02 17:04:56.710281988 +0000
-@@ -12,7 +12,7 @@
- exec /.build/build "$@"
- fi
-
--test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/build
-+test -z "$BUILD_DIR" && BUILD_DIR=/usr/libexec/suse-build
- test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/build-root
- test -z "$CONFIG_DIR" && CONFIG_DIR="$BUILD_DIR/configs"
-
-diff -Naru obs-build-20140220-bak/createarchdeps obs-build-20140220/createarchdeps
---- obs-build-20140220-bak/createarchdeps 2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/createarchdeps 2014-03-02 17:04:56.710281988 +0000
-@@ -3,7 +3,7 @@
- # Archlinux support, based on the GSoC work of Nikolay Rysev <mad.f3ka@gmail.com>
-
- BEGIN {
-- unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/lib/build");
-+ unshift @INC, ($::ENV{"BUILD_DIR"} || "/usr/libexec/suse-build");
- }
-
- use strict;
-diff -Naru obs-build-20140220-bak/createrepomddeps obs-build-20140220/createrepomddeps
---- obs-build-20140220-bak/createrepomddeps 2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/createrepomddeps 2014-03-02 17:04:56.710281988 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
-
- BEGIN {
-- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
-
- use strict;
-diff -Naru obs-build-20140220-bak/createrpmdeps obs-build-20140220/createrpmdeps
---- obs-build-20140220-bak/createrpmdeps 2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/createrpmdeps 2014-03-02 17:04:56.710281988 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
-
- BEGIN {
-- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
-
- use Build;
-diff -Naru obs-build-20140220-bak/createyastdeps obs-build-20140220/createyastdeps
---- obs-build-20140220-bak/createyastdeps 2014-03-02 17:04:18.656731116 +0000
-+++ obs-build-20140220/createyastdeps 2014-03-02 17:04:56.711281976 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
-
- BEGIN {
-- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
-
- use Build;
-diff -Naru obs-build-20140220-bak/download obs-build-20140220/download
---- obs-build-20140220-bak/download 2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/download 2014-03-02 17:04:56.711281976 +0000
-@@ -3,7 +3,7 @@
- use Net::SSL ();
- BEGIN {
- $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0,
-- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
-
- use LWP::UserAgent;
-diff -Naru obs-build-20140220-bak/expanddeps obs-build-20140220/expanddeps
---- obs-build-20140220-bak/expanddeps 2014-03-02 17:04:18.658731091 +0000
-+++ obs-build-20140220/expanddeps 2014-03-02 17:04:56.711281976 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
-
- BEGIN {
-- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
-
- use strict;
-diff -Naru obs-build-20140220-bak/getbinaryid obs-build-20140220/getbinaryid
---- obs-build-20140220-bak/getbinaryid 2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/getbinaryid 2014-03-02 17:04:56.711281976 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl
-
- BEGIN {
-- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
-
- use Build;
-diff -Naru obs-build-20140220-bak/getoptflags obs-build-20140220/getoptflags
---- obs-build-20140220-bak/getoptflags 2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/getoptflags 2014-03-02 17:05:22.777976219 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
-
- BEGIN {
-- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
-
- use strict;
-diff -Naru obs-build-20140220-bak/changelog2spec obs-build-20140220/changelog2spec
---- obs-build-20140220-bak/changelog2spec 2014-03-02 17:04:18.658731091 +0000
-+++ obs-build-20140220/changelog2spec 2014-03-02 17:05:24.268958777 +0000
-@@ -5,7 +5,7 @@
- #
-
- BEGIN {
-- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
-
- use Date::Parse;
-diff -Naru obs-build-20140220-bak/init_buildsystem obs-build-20140220/init_buildsystem
---- obs-build-20140220-bak/init_buildsystem 2014-03-02 17:04:18.655731128 +0000
-+++ obs-build-20140220/init_buildsystem 2014-03-02 17:05:24.268958777 +0000
-@@ -16,7 +16,7 @@
- export YAST_IS_RUNNING="instsys"
- export DEBIAN_FRONTEND=noninteractive
- export DEBIAN_PRIORITY=critical
--export BUILD_DIR=${BUILD_DIR:-/usr/lib/build}
-+export BUILD_DIR=${BUILD_DIR:-/usr/libexec/suse-build}
- # need to restore build root owner for non-root builds
- browner=0
- definesnstuff=()
-diff -Naru obs-build-20140220-bak/initvm.c obs-build-20140220/initvm.c
---- obs-build-20140220-bak/initvm.c 2014-03-02 17:04:18.658731091 +0000
-+++ obs-build-20140220/initvm.c 2014-03-02 17:05:24.269958765 +0000
-@@ -54,9 +54,10 @@
- #define SYSFS_BINFMT_MISC_REG "/proc/sys/fs/binfmt_misc/register"
- #define SYSFS_BINFMT_MISC_STAT "/proc/sys/fs/binfmt_misc/status"
-
--/* /usr/lib/build/x paths are copied to /.build inside a virtual machine */
-+/* /usr/libexec/suse-build/x paths are copied to /.build inside a virtual machine */
- #define BINFMT_REGF_0 "/.build/qemu-reg"
--#define BINFMT_REGF_1 "/usr/lib/build/qemu-reg"
-+#define BINFMT_REGF_1 "/usr/libexec/suse-build/qemu-reg"
-+#define BINFMT_REGF_2 "/usr/lib/build/qemu-reg"
- #define BUILD "/.build/build"
-
- /* useful constant arrays */
-@@ -324,9 +325,13 @@
- fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
- BINFMT_REGF_0);
- if (!binfmt_register(BINFMT_REGF_1, SYSFS_BINFMT_MISC_REG)) {
-- fprintf(stderr, "%s: binfmt registration failed\n",
-+ fprintf(stderr, "%s: failed. Trying alternate binfmt file\n",
- BINFMT_REGF_1);
-- exit(1);
-+ if (!binfmt_register(BINFMT_REGF_2, SYSFS_BINFMT_MISC_REG)) {
-+ fprintf(stderr, "%s: binfmt registration failed\n",
-+ BINFMT_REGF_2);
-+ exit(1);
-+ }
- }
- }
- }
-diff -Naru obs-build-20140220-bak/mkdrpms obs-build-20140220/mkdrpms
---- obs-build-20140220-bak/mkdrpms 2014-03-02 17:04:18.656731116 +0000
-+++ obs-build-20140220/mkdrpms 2014-03-02 17:05:24.269958765 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
-
- BEGIN {
-- unshift @INC, '/usr/lib/build';
-+ unshift @INC, '/usr/libexec/suse-build';
- unshift @INC, $::ENV{'BUILD_DIR'} if $::ENV{'BUILD_DIR'};
- }
-
-diff -Naru obs-build-20140220-bak/order obs-build-20140220/order
---- obs-build-20140220-bak/order 2014-03-02 17:04:18.658731091 +0000
-+++ obs-build-20140220/order 2014-03-02 17:05:24.269958765 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
-
- BEGIN {
-- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
-
- use Build;
-diff -Naru obs-build-20140220-bak/spectool obs-build-20140220/spectool
---- obs-build-20140220-bak/spectool 2014-03-02 17:04:18.658731091 +0000
-+++ obs-build-20140220/spectool 2014-03-02 17:05:24.269958765 +0000
-@@ -116,7 +116,7 @@
- my $builddir;
-
- BEGIN {
-- $builddir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+ $builddir = ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- unshift @INC, $builddir;
- }
-
-diff -Naru obs-build-20140220-bak/substitutedeps obs-build-20140220/substitutedeps
---- obs-build-20140220-bak/substitutedeps 2014-03-02 17:04:18.659731079 +0000
-+++ obs-build-20140220/substitutedeps 2014-03-02 17:05:24.269958765 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
-
- BEGIN {
-- unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
-+ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/libexec/suse-build');
- }
-
- use strict;
diff --git a/dev-util/suse-build/suse-build-2014.02.20.ebuild b/dev-util/suse-build/suse-build-2015.11.05.ebuild
index ca7de4d187a4..f8812e3f866f 100644
--- a/dev-util/suse-build/suse-build-2014.02.20.ebuild
+++ b/dev-util/suse-build/suse-build-2015.11.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -26,7 +26,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="symlink"
[[ "${PV}" == "9999" ]] || \
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="
virtual/perl-Digest-MD5
@@ -40,10 +40,6 @@ RDEPEND="
S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
-src_prepare() {
- epatch "${FILESDIR}/suse-build-20140220-libexec-paths.patch"
-}
-
src_compile() { :; }
src_install() {
@@ -57,7 +53,8 @@ src_install() {
mv "${i}" "${i/man1\//man1/suse-}"
use !symlink || dosym "${i/man1\//suse-}" "/usr/${i}"
done
+ find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|' {} +
# create symlink for default build config
- dosym /usr/libexec/suse-build/configs/sl13.2.conf /usr/libexec/suse-build/configs/default.conf
+ dosym /usr/libexec/suse-build/configs/sl42.1.conf /usr/libexec/suse-build/configs/default.conf
}
diff --git a/dev-util/suse-build/suse-build-9999.ebuild b/dev-util/suse-build/suse-build-9999.ebuild
index 3056206b4e11..2e11350682f5 100644
--- a/dev-util/suse-build/suse-build-9999.ebuild
+++ b/dev-util/suse-build/suse-build-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -56,5 +56,5 @@ src_install() {
find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|' {} +
# create symlink for default build config
- dosym /usr/libexec/suse-build/configs/sl13.2.conf /usr/libexec/suse-build/configs/default.conf
+ dosym /usr/libexec/suse-build/configs/sl42.1.conf /usr/libexec/suse-build/configs/default.conf
}
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index da0b60197cab..dbb8835a49b2 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,4 +1,3 @@
DIST hg-git-0.7.0.tar.gz 42956 SHA256 9db9cd87b9b173c192b29336b4029122a4fe2858c369dc8c5a59228515bc61a9 SHA512 732dbd12184a5346310b6d14bb0b24c2255ff607ef54d064387b7cadd64aa84dd2d6909e6dde36f9fa8ac8131c1adc315c2bae2e068066864c086b239524d5d4 WHIRLPOOL 0c8216da9fdaebc2fcb56d7bec12e9a087570cf032d253e77833cbf8f31a2d581d85b820c51e37cd519ce720bd49fec5be27211b58b64fb9c18b1fff1c24d26e
-DIST hg-git-0.8.0.tar.gz 46004 SHA256 91a16e34612595eca8c4e23d847c6ab697267b68008594926123c6c0064298dc SHA512 6281ef070b110d0449f5667888f9f97c3c310a840890283d14f7b0d35a397bdc995af0726acc28737aa35ff99631406b575dad141a1bd16dab88eac7fb855199 WHIRLPOOL 99dac4e75cb322b68a3b7990f0130acb0ef8245583e612432f0f4af06d8ce411d7f211291683bb1adcd1866d2125796c64b37d690738bb5f4a3efd2e114934fe
-DIST hg-git-0.8.1.tar.gz 46817 SHA256 ceeddfb48dc160e4c6be8c15a722a44b8554b7f68e1838f6af1018ed78b9451d SHA512 58ed927bf843f2d9ce25b17b43866bc1cfeba0361ebba3a276967a82b7f1a0fbc9e5eed673248f1812f97c8924176a54b5df5e4a349d6f58faaaf4d28df61f57 WHIRLPOOL 8082755ad1889059071b821019bd695be920f3b3361cdde02f74e2d099fa4e5f6b36ee410956b205b7ffd1b971c366c9374e810a984f91cc6d8bb56f60b5c897
DIST hg-git-0.8.2.tar.gz 48461 SHA256 fea6f48da28cef3fc30a51b1cfec0a52df405b35c85b2d92607158f6b089e043 SHA512 7315e60d494b73862e6c3a90624f5ba0698c885f9b66e4bfe636bb74cd178a0d5a23614c647b6d16db7f78c06516e9a8415c443effb6cc1a102cf87ac76aa041 WHIRLPOOL 1437bfa6a0ccf2e15cc3eef195a6b176606f2be74d2b1381524a1fef3431e1f8b8e0c537325daa5a11d1b709630cc282acebdffddbf602144f115e76aea61270
+DIST hg-git-0.8.3.tar.gz 48198 SHA256 5c624af512c969ac3628fd658670e9170812f570eb02d2a6c76c216b80341179 SHA512 857961004103ccdabb7d15d778ef7044a5f17dd0dd045f402269b5cbf8faf1a9a4f56d2d0d5b9d24a2d6c54a0d791ad079598d5f930f4d12d3290ad3f9b90207 WHIRLPOOL 657d5cb85fe003596919db44bd53eba60e88b56fd7ca6ef8f8833c37a9b5088cceea180e83e8edde9e2a8ccd3a356722d6d01d7980819aac6460ea789fdb4406
diff --git a/dev-vcs/hg-git/hg-git-0.8.0.ebuild b/dev-vcs/hg-git/hg-git-0.8.0.ebuild
deleted file mode 100644
index 2dbdf94eac10..000000000000
--- a/dev-vcs/hg-git/hg-git-0.8.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://pypi.python.org/pypi/hg-git"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
- >=dev-vcs/mercurial-1.9.3[${PYTHON_USEDEP}]
- <dev-vcs/mercurial-3.3.3[${PYTHON_USEDEP}]
- >=dev-python/dulwich-0.9.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-vcs/hg-git/hg-git-0.8.1.ebuild b/dev-vcs/hg-git/hg-git-0.8.3.ebuild
index e2c3fb37b851..e2c3fb37b851 100644
--- a/dev-vcs/hg-git/hg-git-0.8.1.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.8.3.ebuild
diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
index b0fe3f0ab129..86279652b1ac 100644
--- a/eclass/fortran-2.eclass
+++ b/eclass/fortran-2.eclass
@@ -77,13 +77,16 @@ for _f_use in ${FORTRAN_NEEDED}; do
;;
esac
done
+unset _f_use
# @FUNCTION: fortran_int64_abi_fflags
-# @DESCRIPTION: Return the Fortran compiler flag to enable 64 bit integers for
+# @DESCRIPTION:
+# Return the Fortran compiler flag to enable 64 bit integers for
# array indices
# @CODE
fortran_int64_abi_fflags() {
debug-print-function ${FUNCNAME} "${@}"
+
_FC=$(tc-getFC)
if [[ ${_FC} == *gfortran* ]]; then
echo "-fdefault-integer-8"
@@ -99,6 +102,8 @@ fortran_int64_abi_fflags() {
# @DESCRIPTION:
# writes fortran test code
_fortran_write_testsuite() {
+ debug-print-function ${FUNCNAME} "${@}"
+
local filebase=${T}/test-fortran
# f77 code
@@ -125,6 +130,8 @@ _fortran_write_testsuite() {
# Takes fortran compiler as first argument and dialect as second.
# Checks whether the passed fortran compiler speaks the fortran dialect
_fortran_compile_test() {
+ debug-print-function ${FUNCNAME} "${@}"
+
local filebase=${T}/test-fortran
local fcomp=${1}
local fdia=${2}
@@ -150,6 +157,8 @@ _fortran_compile_test() {
# @DESCRIPTION:
# See if the fortran supports OpenMP.
_fortran-has-openmp() {
+ debug-print-function ${FUNCNAME} "${@}"
+
local flag
local filebase=${T}/test-fc-openmp
local fcode=${filebase}.f
@@ -177,6 +186,8 @@ _fortran-has-openmp() {
# @DESCRIPTION:
# Detailed description how to handle fortran support
_fortran_die_msg() {
+ debug-print-function ${FUNCNAME} "${@}"
+
echo
eerror "Please install currently selected gcc version with USE=fortran."
eerror "If you intend to use a different compiler then gfortran, please"
@@ -192,6 +203,8 @@ _fortran_die_msg() {
# Internal test function for working fortran compiler.
# It is called in fortran-2_pkg_setup.
_fortran_test_function() {
+ debug-print-function ${FUNCNAME} "${@}"
+
local dialect
: ${F77:=$(tc-getFC)}
@@ -256,6 +269,8 @@ _fortran-2_pkg_setup() {
# Setup functionality,
# checks for a valid fortran compiler and optionally for its openmp support.
fortran-2_pkg_setup() {
+ debug-print-function ${FUNCNAME} "${@}"
+
case ${EAPI:-0} in
0|1|2|3)
eqawarn "Support for EAPI < 4 will be removed from the"
@@ -272,7 +287,7 @@ fortran-2_pkg_setup() {
}
case ${EAPI:-0} in
- 0|1|2|3|4|5) EXPORT_FUNCTIONS pkg_setup ;;
+ 0|1|2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass
index f71116bd50f2..5466c0b5b20d 100644
--- a/eclass/ghc-package.eclass
+++ b/eclass/ghc-package.eclass
@@ -225,7 +225,8 @@ ghc-package-exists() {
}
# @FUNCTION: check-for-collisions
-# @DESCRIPTION: makes sure no packages
+# @DESCRIPTION:
+# makes sure no packages
# have the same version as initial package setup
check-for-collisions() {
local localpkgconf=$1
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index d300fd22b39c..37c0f81c0f4f 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -4,7 +4,7 @@
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
-# Qt herd <qt@gentoo.org>
+# qt@gentoo.org
# @AUTHOR:
# Davide Pesavento <pesa@gentoo.org>
# @BLURB: Common functions for qmake-based packages.
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index ade46daabd65..51a2f303d091 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -4,7 +4,7 @@
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
-# Qt herd <qt@gentoo.org>
+# qt@gentoo.org
# @AUTHOR:
# Davide Pesavento <pesa@gentoo.org>
# @BLURB: Eclass for Qt4 split ebuilds with multilib support.
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
deleted file mode 100644
index 54c305cac84d..000000000000
--- a/eclass/qt4-build.eclass
+++ /dev/null
@@ -1,806 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# @DEAD
-
-# @ECLASS: qt4-build.eclass
-# @MAINTAINER:
-# Qt herd <qt@gentoo.org>
-# @BLURB: Eclass for Qt4 split ebuilds.
-# @DESCRIPTION:
-# This eclass contains various functions that are used when building Qt4.
-
-case ${EAPI} in
- 4|5) : ;;
- *) die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
-esac
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-HOMEPAGE="https://www.qt.io/"
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="4"
-
-case ${PV} in
- 4.?.9999)
- QT4_BUILD_TYPE="live"
- EGIT_REPO_URI=(
- "git://code.qt.io/qt/qt.git"
- "https://code.qt.io/git/qt/qt.git"
- "https://github.com/qtproject/qt.git"
- )
- EGIT_BRANCH=${PV%.9999}
- inherit git-r3
- ;;
- *)
- QT4_BUILD_TYPE="release"
- MY_P=qt-everywhere-opensource-src-${PV/_/-}
- SRC_URI="http://download.qt.io/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
- S=${WORKDIR}/${MY_P}
- ;;
-esac
-
-IUSE="aqua debug pch"
-[[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions"
-
-DEPEND="virtual/pkgconfig"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
- DEPEND+=" dev-lang/perl"
-fi
-
-# @FUNCTION: qt4-build_pkg_setup
-# @DESCRIPTION:
-# Sets up PATH and LD_LIBRARY_PATH.
-qt4-build_pkg_setup() {
- # Warn users of possible breakage when downgrading to a previous release.
- # Downgrading revisions within the same release is safe.
- if has_version ">${CATEGORY}/${P}-r9999:4"; then
- ewarn
- ewarn "Downgrading Qt is completely unsupported and can break your system!"
- ewarn
- fi
-
- PATH="${S}/bin${PATH:+:}${PATH}"
- if [[ ${CHOST} != *-darwin* ]]; then
- LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
- else
- DYLD_LIBRARY_PATH="${S}/lib${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}"
- # On MacOS we *need* at least src/gui/kernel/qapplication_mac.mm for
- # platform detection. Note: needs to come before any directories to
- # avoid extract failure.
- [[ ${CHOST} == *-apple-darwin* ]] && \
- QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm
- ${QT4_EXTRACT_DIRECTORIES}"
- fi
-}
-
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array variable containing all the patches to be applied. This variable
-# is expected to be defined in the global scope of ebuilds. Make sure to
-# specify the full path. This variable is used in src_prepare phase.
-#
-# Example:
-# @CODE
-# PATCHES=(
-# "${FILESDIR}/mypatch.patch"
-# "${FILESDIR}/patches_folder/"
-# )
-# @CODE
-
-# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Space-separated list of directories that will be extracted
-# from Qt tarball.
-
-# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Space-separated list of directories that will be configured,
-# compiled, and installed. All paths must be relative to ${S}.
-
-# @FUNCTION: qt4-build_src_unpack
-# @DESCRIPTION:
-# Unpacks the sources.
-qt4-build_src_unpack() {
- setqtenv
-
- if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then
- ewarn
- ewarn "Using a GCC version lower than 4.4 is not supported."
- ewarn
- fi
-
- if [[ ${PN} == qtwebkit ]]; then
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
- ewarn "You may experience really long compilation times and/or increased memory usage."
- ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
- ewarn "For more info check out https://bugs.gentoo.org/307861"
- ewarn
- fi
- eshopts_pop
- fi
-
- case ${QT4_BUILD_TYPE} in
- live)
- git-r3_src_unpack
- ;;
- release)
- local tarball="${MY_P}.tar.gz" target= targets=
- for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
- src/{qbase,qt_targets,qt_install}.pri bin config.tests \
- mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
- do
- targets+="${MY_P}/${target} "
- done
-
- ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
- tar -xzf "${DISTDIR}/${tarball}" ${targets}
- eend $? || die "failed to unpack"
- ;;
- esac
-}
-
-# @FUNCTION: qt4-build_src_prepare
-# @DESCRIPTION:
-# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
-# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf.
-qt4-build_src_prepare() {
- setqtenv
-
- if [[ ${QT4_BUILD_TYPE} == live ]]; then
- QTDIR="." ./bin/syncqt || die "syncqt failed"
- fi
-
- # avoid X11 dependency in non-gui packages
- local nolibx11_pkgs="qtbearer qtcore qtdbus qtscript qtsql qttest qtxmlpatterns"
- has ${PN} ${nolibx11_pkgs} && qt_nolibx11
-
- if use aqua; then
- # provide a proper macx-g++-64
- use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
-
- sed -e '/^CONFIG/s:app_bundle::' \
- -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
- -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
- fi
-
- if [[ ${CATEGORY}/${PN} != dev-qt/qtcore ]]; then
- skip_qmake_build
- skip_project_generation
- symlink_binaries_to_buildtree
- else
- # Bug 373061
- # qmake bus errors with -O2 or -O3 but -O1 works
- if [[ ${CHOST} == *86*-apple-darwin* ]]; then
- replace-flags -O[23] -O1
- fi
-
- # Bug 503500
- # undefined reference with -Os and --as-needed
- if use x86; then
- replace-flags -Os -O2
- fi
- fi
-
- # Bug 261632
- if use ppc64; then
- append-flags -mminimal-toc
- fi
-
- # Bug 417105
- # graphite on gcc 4.7 causes miscompilations
- if [[ $(gcc-version) == "4.7" ]]; then
- filter-flags -fgraphite-identity
- fi
-
- if use_if_iuse c++0x; then
- append-cxxflags -std=c++0x
- fi
-
- # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
- sed -e "/^SYSTEM_VARIABLES=/i \
- CC='$(tc-getCC)'\n\
- CXX='$(tc-getCXX)'\n\
- CFLAGS='${CFLAGS}'\n\
- CXXFLAGS='${CXXFLAGS}'\n\
- LDFLAGS='${LDFLAGS}'\n\
- QMakeVar set QMAKE_CFLAGS_RELEASE\n\
- QMakeVar set QMAKE_CFLAGS_DEBUG\n\
- QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
- QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
- QMakeVar set QMAKE_LFLAGS_RELEASE\n\
- QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
- -i configure \
- || die "sed SYSTEM_VARIABLES failed"
-
- # Respect CC, CXX, LINK and *FLAGS in config.tests
- find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
- sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
- 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
- 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
- || die "sed config.tests failed"
-
- # Bug 172219
- sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
-
- if [[ ${CHOST} == *-darwin* ]]; then
- # Set FLAGS *and* remove -arch, since our gcc-apple is multilib
- # crippled (by design) :/
- local mac_gpp_conf=
- if [[ -f mkspecs/common/mac-g++.conf ]]; then
- # qt < 4.8 has mac-g++.conf
- mac_gpp_conf="mkspecs/common/mac-g++.conf"
- elif [[ -f mkspecs/common/g++-macx.conf ]]; then
- # qt >= 4.8 has g++-macx.conf
- mac_gpp_conf="mkspecs/common/g++-macx.conf"
- else
- die "no known conf file for mac found"
- fi
- sed \
- -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
- -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
- -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
- -e "s:-arch\s\w*::g" \
- -i ${mac_gpp_conf} \
- || die "sed ${mac_gpp_conf} failed"
-
- # Fix configure's -arch settings that appear in qmake/Makefile and also
- # fix arch handling (automagically duplicates our -arch arg and breaks
- # pch). Additionally disable Xarch support.
- local mac_gcc_confs="${mac_gpp_conf}"
- if [[ -f mkspecs/common/gcc-base-macx.conf ]]; then
- mac_gcc_confs+=" mkspecs/common/gcc-base-macx.conf"
- fi
- sed \
- -e "s:-arch i386::" \
- -e "s:-arch ppc::" \
- -e "s:-arch x86_64::" \
- -e "s:-arch ppc64::" \
- -e "s:-arch \$i::" \
- -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
- -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
- -e "s:-Xarch_x86_64::g" \
- -e "s:-Xarch_ppc64::g" \
- -i configure ${mac_gcc_confs} \
- || die "sed -arch/-Xarch failed"
-
- # On Snow Leopard don't fall back to 10.5 deployment target.
- if [[ ${CHOST} == *-apple-darwin10 ]]; then
- sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
- -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
- -i configure ${mac_gpp_conf} \
- || die "sed deployment target failed"
- fi
- fi
-
- # this one is needed for all systems with a separate -liconv, apart from
- # Darwin, for which the sources already cater for -liconv
- if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
- sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
- -i config.tests/unix/iconv/iconv.pro \
- || die "sed iconv.pro failed"
- fi
-
- # we need some patches for Solaris
- sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
- mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
- # use GCC over SunStudio
- sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
- # do not flirt with non-Prefix stuff, we're quite possessive
- sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
- mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
-
- # apply patches
- [[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
- epatch_user
-}
-
-# @FUNCTION: qt4-build_src_configure
-# @DESCRIPTION:
-# Default configure phase
-qt4-build_src_configure() {
- setqtenv
-
- local conf="
- -prefix ${QTPREFIXDIR}
- -bindir ${QTBINDIR}
- -libdir ${QTLIBDIR}
- -docdir ${QTDOCDIR}
- -headerdir ${QTHEADERDIR}
- -plugindir ${QTPLUGINDIR}
- -importdir ${QTIMPORTDIR}
- -datadir ${QTDATADIR}
- -translationdir ${QTTRANSDIR}
- -sysconfdir ${QTSYSCONFDIR}
- -examplesdir ${QTEXAMPLESDIR}
- -demosdir ${QTDEMOSDIR}
- -opensource -confirm-license
- -shared -fast -largefile -stl -verbose
- -nomake examples -nomake demos"
-
- # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
- # $(tc-arch). Therefore we convert it to supported values.
- case "$(tc-arch)" in
- amd64|x64-*) conf+=" -arch x86_64" ;;
- ppc-macos) conf+=" -arch ppc" ;;
- ppc|ppc64|ppc-*) conf+=" -arch powerpc" ;;
- sparc|sparc-*|sparc64-*) conf+=" -arch sparc" ;;
- x86-macos) conf+=" -arch x86" ;;
- x86|x86-*) conf+=" -arch i386" ;;
- alpha|arm|ia64|mips|s390) conf+=" -arch $(tc-arch)" ;;
- arm64|hppa|sh) conf+=" -arch generic" ;;
- *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
- esac
-
- conf+=" -platform $(qt_mkspecs_dir)"
-
- [[ $(get_libdir) != lib ]] && conf+=" -L${EPREFIX}/usr/$(get_libdir)"
-
- # debug/release
- if use debug; then
- conf+=" -debug"
- else
- conf+=" -release"
- fi
- conf+=" -no-separate-debug-info"
-
- # exceptions USE flag
- conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
-
- # disable rpath (bug 380415), except on prefix (bug 417169)
- use prefix || conf+=" -no-rpath"
-
- # precompiled headers don't work on hardened, where the flag is masked
- conf+=" $(qt_use pch)"
-
- # -reduce-relocations
- # This flag seems to introduce major breakage to applications,
- # mostly to be seen as a core dump with the message "QPixmap: Must
- # construct a QApplication before a QPaintDevice" on Solaris.
- # -- Daniel Vergien
- [[ ${CHOST} != *-solaris* ]] && conf+=" -reduce-relocations"
-
- # this one is needed for all systems with a separate -liconv, apart from
- # Darwin, for which the sources already cater for -liconv
- if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
- conf+=" -liconv"
- fi
-
- if use_if_iuse glib; then
- local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
- # avoid the -pthread argument
- conf+=" ${glibflags//-pthread}"
- unset glibflags
- fi
-
- if use aqua; then
- # On (snow) leopard use the new (frameworked) cocoa code.
- if [[ ${CHOST##*-darwin} -ge 9 ]]; then
- conf+=" -cocoa -framework"
- # We need the source's headers, not the installed ones.
- conf+=" -I${S}/include"
- # Add hint for the framework location.
- conf+=" -F${QTLIBDIR}"
-
- # We are crazy and build cocoa + qt3support :-)
- if use qt3support; then
- sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
- -i configure || die
- fi
- else
- conf+=" -no-framework"
- fi
- else
- # freetype2 include dir is non-standard, thus pass it to configure
- conf+=" $(pkg-config --cflags-only-I freetype2)"
- fi
-
- conf+=" ${myconf}"
- myconf=
-
- echo ./configure ${conf}
- ./configure ${conf} || die "./configure failed"
-
- prepare_directories ${QT4_TARGET_DIRECTORIES}
-}
-
-# @FUNCTION: qt4-build_src_compile
-# @DESCRIPTION:
-# Actual compile phase
-qt4-build_src_compile() {
- setqtenv
-
- build_directories ${QT4_TARGET_DIRECTORIES}
-}
-
-# @FUNCTION: qt4-build_src_test
-# @DESCRIPTION:
-# Runs tests only in target directories.
-qt4-build_src_test() {
- # QtMultimedia does not have any test suite (bug #332299)
- [[ ${CATEGORY}/${PN} == dev-qt/qtmultimedia ]] && return
-
- for dir in ${QT4_TARGET_DIRECTORIES}; do
- emake -j1 check -C ${dir}
- done
-}
-
-# @FUNCTION: fix_includes
-# @DESCRIPTION:
-# For MacOS X we need to add some symlinks when frameworks are
-# being used, to avoid complications with some more or less stupid packages.
-fix_includes() {
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- local frw dest f h rdir
- # Some packages tend to include <Qt/...>
- dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
-
- # Fake normal headers when frameworks are installed... eases life later
- # on, make sure we use relative links though, as some ebuilds assume
- # these dirs exist in src_install to add additional files
- f=${QTHEADERDIR}
- h=${QTLIBDIR}
- while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do
- f=${f#*/}
- h=${h#*/}
- done
- rdir=${h}
- f="../"
- while [[ ${h} == */* ]] ; do
- f="${f}../"
- h=${h#*/}
- done
- rdir="${f}${rdir}"
-
- for frw in "${D}${QTLIBDIR}"/*.framework; do
- [[ -e "${frw}"/Headers ]] || continue
- f=$(basename ${frw})
- dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
- dosym "${rdir}"/${f}/Headers "${dest}"
-
- # Link normal headers as well.
- for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do
- h=$(basename ${hdr})
- dosym "../${rdir}"/${f}/Headers/${h} \
- "${QTHEADERDIR#${EPREFIX}}"/Qt/${h}
- done
- done
- fi
-}
-
-# @FUNCTION: qt4-build_src_install
-# @DESCRIPTION:
-# Perform the actual installation including some library fixes.
-qt4-build_src_install() {
- setqtenv
-
- install_directories ${QT4_TARGET_DIRECTORIES}
- install_qconfigs
- fix_library_files
- fix_includes
-
- # remove .la files since we are building only shared libraries
- prune_libtool_files
-}
-
-# @FUNCTION: setqtenv
-# @INTERNAL
-setqtenv() {
- # Set up installation directories
- QTPREFIXDIR=${EPREFIX}/usr
- QTBINDIR=${QTPREFIXDIR}/bin
- QTLIBDIR=${QTPREFIXDIR}/$(get_libdir)/qt4
- QTPCDIR=${QTPREFIXDIR}/$(get_libdir)/pkgconfig
- QTDOCDIR=${QTPREFIXDIR}/share/doc/qt-${PV}
- QTHEADERDIR=${QTPREFIXDIR}/include/qt4
- QTPLUGINDIR=${QTLIBDIR}/plugins
- QTIMPORTDIR=${QTLIBDIR}/imports
- QTDATADIR=${QTPREFIXDIR}/share/qt4
- QTTRANSDIR=${QTDATADIR}/translations
- QTSYSCONFDIR=${EPREFIX}/etc/qt4
- QTEXAMPLESDIR=${QTDATADIR}/examples
- QTDEMOSDIR=${QTDATADIR}/demos
- QMAKE_LIBDIR_QT=${QTLIBDIR}
-
- PLATFORM=$(qt_mkspecs_dir)
- unset QMAKESPEC
-
- export XDG_CONFIG_HOME="${T}"
-}
-
-# @FUNCTION: prepare_directories
-# @USAGE: < directories >
-# @INTERNAL
-# @DESCRIPTION:
-# Generates Makefiles for the given list of directories.
-prepare_directories() {
- for x in "$@"; do
- pushd "${S}"/${x} >/dev/null || die
- einfo "Running qmake in: ${x}"
- "${S}"/bin/qmake \
- "LIBS+=-L${QTLIBDIR}" \
- "CONFIG+=nostrip" \
- || die "qmake failed"
- popd >/dev/null || die
- done
-}
-
-# @FUNCTION: build_directories
-# @USAGE: < directories >
-# @INTERNAL
-# @DESCRIPTION:
-# Compiles the code in the given list of directories.
-build_directories() {
- for x in "$@"; do
- pushd "${S}"/${x} >/dev/null || die
- emake \
- AR="$(tc-getAR) cqs" \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- LINK="$(tc-getCXX)" \
- RANLIB=":" \
- STRIP=":"
- popd >/dev/null || die
- done
-}
-
-# @FUNCTION: install_directories
-# @USAGE: < directories >
-# @INTERNAL
-# @DESCRIPTION:
-# Runs emake install in the given directories, which are separated by spaces.
-install_directories() {
- for x in "$@"; do
- pushd "${S}"/${x} >/dev/null || die
- emake INSTALL_ROOT="${D}" install
- popd >/dev/null || die
- done
-}
-
-# @ECLASS-VARIABLE: QCONFIG_ADD
-# @DESCRIPTION:
-# List options that need to be added to QT_CONFIG in qconfig.pri
-: ${QCONFIG_ADD:=}
-
-# @ECLASS-VARIABLE: QCONFIG_REMOVE
-# @DESCRIPTION:
-# List options that need to be removed from QT_CONFIG in qconfig.pri
-: ${QCONFIG_REMOVE:=}
-
-# @ECLASS-VARIABLE: QCONFIG_DEFINE
-# @DESCRIPTION:
-# List variables that should be defined at the top of QtCore/qconfig.h
-: ${QCONFIG_DEFINE:=}
-
-# @FUNCTION: install_qconfigs
-# @INTERNAL
-# @DESCRIPTION:
-# Install gentoo-specific mkspecs configurations.
-install_qconfigs() {
- local x
- if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
- for x in QCONFIG_ADD QCONFIG_REMOVE; do
- [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
- done
- insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
- doins "${T}"/${PN}-qconfig.pri
- fi
-
- if [[ -n ${QCONFIG_DEFINE} ]]; then
- for x in ${QCONFIG_DEFINE}; do
- echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
- done
- insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo
- doins "${T}"/gentoo-${PN}-qconfig.h
- fi
-}
-
-# @FUNCTION: generate_qconfigs
-# @INTERNAL
-# @DESCRIPTION:
-# Generates gentoo-specific qconfig.{h,pri}.
-generate_qconfigs() {
- if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == dev-qt/qtcore ]]; then
- local x qconfig_add qconfig_remove qconfig_new
- for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
- [[ -f ${x} ]] || continue
- qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
- qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
- done
-
- # these error checks do not use die because dying in pkg_post{inst,rm}
- # just makes things worse.
- if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
- # start with the qconfig.pri that qtcore installed
- if ! cp "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri \
- "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
- eerror "cp qconfig failed."
- return 1
- fi
-
- # generate list of QT_CONFIG entries from the existing list
- # including qconfig_add and excluding qconfig_remove
- for x in $(sed -n 's/^QT_CONFIG +=//p' \
- "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
- has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
- done
-
- # replace the existing QT_CONFIG list with qconfig_new
- if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
- "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
- eerror "Sed for QT_CONFIG failed"
- return 1
- fi
-
- # create Gentoo/qconfig.h
- if [[ ! -e ${ROOT}${QTHEADERDIR}/Gentoo ]]; then
- if ! mkdir -p "${ROOT}${QTHEADERDIR}"/Gentoo; then
- eerror "mkdir ${QTHEADERDIR}/Gentoo failed"
- return 1
- fi
- fi
- : > "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
- for x in "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-*-qconfig.h; do
- [[ -f ${x} ]] || continue
- cat "${x}" >> "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
- done
- else
- rm -f "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri
- rm -f "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
- rmdir "${ROOT}${QTDATADIR}"/mkspecs \
- "${ROOT}${QTDATADIR}" \
- "${ROOT}${QTHEADERDIR}"/Gentoo \
- "${ROOT}${QTHEADERDIR}" 2>/dev/null
- fi
- fi
-}
-
-# @FUNCTION: qt4-build_pkg_postrm
-# @DESCRIPTION:
-# Regenerate configuration when the package is completely removed.
-qt4-build_pkg_postrm() {
- generate_qconfigs
-}
-
-# @FUNCTION: qt4-build_pkg_postinst
-# @DESCRIPTION:
-# Regenerate configuration, plus throw a message about possible
-# breakages and proposed solutions.
-qt4-build_pkg_postinst() {
- generate_qconfigs
-}
-
-# @FUNCTION: skip_qmake_build
-# @INTERNAL
-# @DESCRIPTION:
-# Patches configure to skip qmake compilation, as it's already installed by qtcore.
-skip_qmake_build() {
- sed -i -e "s:if true:if false:g" "${S}"/configure || die
-}
-
-# @FUNCTION: skip_project_generation
-# @INTERNAL
-# @DESCRIPTION:
-# Exit the script early by throwing in an exit before all of the .pro files are scanned.
-skip_project_generation() {
- sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die
-}
-
-# @FUNCTION: symlink_binaries_to_buildtree
-# @INTERNAL
-# @DESCRIPTION:
-# Symlinks generated binaries to buildtree, so they can be used during compilation time.
-symlink_binaries_to_buildtree() {
- for bin in qmake moc uic rcc; do
- ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
- done
-}
-
-# @FUNCTION: fix_library_files
-# @INTERNAL
-# @DESCRIPTION:
-# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and
-# moves the *.pc files into the pkgconfig directory.
-fix_library_files() {
- local libfile
- for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
- if [[ -e ${libfile} ]]; then
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
- fi
- done
-
- # pkgconfig files refer to WORKDIR/bin as the moc and uic locations
- for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
- if [[ -e ${libfile} ]]; then
- sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed on ${libfile} failed"
-
- # Move .pc files into the pkgconfig directory
- dodir ${QTPCDIR#${EPREFIX}}
- mv ${libfile} "${D}"/${QTPCDIR}/ || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
- fi
- done
-
- # Don't install an empty directory
- rmdir "${D}"/${QTLIBDIR}/pkgconfig
-}
-
-# @FUNCTION: qt_use
-# @USAGE: < flag > [ feature ] [ enableval ]
-# @DESCRIPTION:
-# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
-# "-no-${feature}" if it's disabled. If [feature] is not specified, <flag>
-# will be used for that. If [enableval] is not specified, it omits the
-# "-${enableval}" part.
-qt_use() {
- use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
-}
-
-# @FUNCTION: qt_mkspecs_dir
-# @RETURN: the specs-directory w/o path
-# @DESCRIPTION:
-# Allows us to define which mkspecs dir we want to use.
-qt_mkspecs_dir() {
- local spec=
-
- case "${CHOST}" in
- *-freebsd*|*-dragonfly*)
- spec=freebsd ;;
- *-openbsd*)
- spec=openbsd ;;
- *-netbsd*)
- spec=netbsd ;;
- *-darwin*)
- if use aqua; then
- # mac with carbon/cocoa
- spec=macx
- else
- # darwin/mac with x11
- spec=darwin
- fi
- ;;
- *-solaris*)
- spec=solaris ;;
- *-linux-*|*-linux)
- spec=linux ;;
- *)
- die "${FUNCNAME}(): Unknown CHOST '${CHOST}'" ;;
- esac
-
- case "$(tc-getCXX)" in
- *g++*)
- spec+=-g++ ;;
- *icpc*)
- spec+=-icc ;;
- *)
- die "${FUNCNAME}(): Unknown compiler '$(tc-getCXX)'" ;;
- esac
-
- # Add -64 for 64bit profiles
- if use x64-freebsd ||
- use amd64-linux ||
- use x64-macos ||
- use x64-solaris ||
- use sparc64-solaris
- then
- spec+=-64
- fi
-
- echo "${spec}"
-}
-
-# @FUNCTION: qt_nolibx11
-# @INTERNAL
-# @DESCRIPTION:
-# Skip X11 tests for packages that don't need X libraries installed.
-qt_nolibx11() {
- sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' "${S}"/configure || die
-}
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst
diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index 5a95ba0ab479..1273f1d8156b 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -4,7 +4,7 @@
# @ECLASS: qt4-r2.eclass
# @MAINTAINER:
-# Qt herd <qt@gentoo.org>
+# qt@gentoo.org
# @BLURB: Eclass for Qt4-based packages, second edition.
# @DESCRIPTION:
# This eclass contains various functions that may be useful when
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 66ba82916989..a31d57008e6e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -4,7 +4,7 @@
# @ECLASS: qt5-build.eclass
# @MAINTAINER:
-# Qt herd <qt@gentoo.org>
+# qt@gentoo.org
# @AUTHOR:
# Davide Pesavento <pesa@gentoo.org>
# @BLURB: Eclass for Qt5 split ebuilds.
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index ad25456cae50..4842e0dd9f71 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -20,6 +20,7 @@
# * ruby20 - Ruby (MRI) 2.0.x
# * ruby21 - Ruby (MRI) 2.1.x
# * ruby22 - Ruby (MRI) 2.2.x
+# * ruby23 - Ruby (MRI) 2.3.x
# * ree18 - Ruby Enterprise Edition 1.8.x
# * jruby - JRuby
# * rbx - Rubinius
diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass
index d365272c26e3..9e16d4ac9bc4 100644
--- a/eclass/ruby-utils.eclass
+++ b/eclass/ruby-utils.eclass
@@ -31,7 +31,7 @@ if [[ ! ${_RUBY_UTILS} ]]; then
RUBY_TARGETS_PREFERENCE="ruby20 ruby19 "
# All other active ruby targets
-RUBY_TARGETS_PREFERENCE+="ruby21 ruby22 "
+RUBY_TARGETS_PREFERENCE+="ruby21 ruby22 ruby23"
_ruby_implementation_depend() {
@@ -59,6 +59,10 @@ _ruby_implementation_depend() {
rubypn="dev-lang/ruby"
rubyslot=":2.2"
;;
+ ruby23)
+ rubypn="dev-lang/ruby"
+ rubyslot=":2.3"
+ ;;
ree18)
rubypn="dev-lang/ruby-enterprise"
rubyslot=":1.8"
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index db1ecfa58b17..b56baa670acf 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -205,7 +205,7 @@ virtx() {
export DISPLAY=:${XDISPLAY}
# Do not break on error, but setup $retval, as we need
# to kill Xvfb
- debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\""
+ debug-print "${FUNCNAME}: $@"
if has "${EAPI}" 2 3; then
"$@"
retval=$?
@@ -218,7 +218,7 @@ virtx() {
kill $(cat /tmp/.X${XDISPLAY}-lock)
# die if our command failed
- [[ ${retval} -ne 0 ]] && die "${FUNCNAME}: the ${VIRTUALX_COMMAND} failed."
+ [[ ${retval} -ne 0 ]] && die "Failed to run '$@'"
return 0 # always return 0, it can be altered by failed kill for Xvfb
}
diff --git a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
index 14341dad79ba..da10dccf841a 100644
--- a/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/supertuxkart/SuperTuxKart/${PV}/${P}-src.tar.xz
LICENSE="GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="debug fribidi wiimote"
# don't unbundle irrlicht and bullet
diff --git a/games-arcade/alienwave/alienwave-0.4.0.ebuild b/games-arcade/alienwave/alienwave-0.4.0.ebuild
index 734e752c22cb..717a91209579 100644
--- a/games-arcade/alienwave/alienwave-0.4.0.ebuild
+++ b/games-arcade/alienwave/alienwave-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.alessandropira.org/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
IUSE=""
DEPEND="sys-libs/ncurses:0"
diff --git a/games-board/blokish/blokish-0.9.4-r2.ebuild b/games-board/blokish/blokish-0.9.4-r2.ebuild
index a471c27df60c..3d2ae0443aae 100644
--- a/games-board/blokish/blokish-0.9.4-r2.ebuild
+++ b/games-board/blokish/blokish-0.9.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/blokish/${MY_P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
diff --git a/games-board/gnuchess/gnuchess-6.2.2-r1.ebuild b/games-board/gnuchess/gnuchess-6.2.2-r1.ebuild
index 67be01a6efef..282b753be4c7 100644
--- a/games-board/gnuchess/gnuchess-6.2.2-r1.ebuild
+++ b/games-board/gnuchess/gnuchess-6.2.2-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Console based chess interface"
HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
SRC_URI="mirror://gnu/chess/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
LICENSE="GPL-3"
SLOT="0"
IUSE=""
diff --git a/games-board/openyahtzee/openyahtzee-1.9.2.ebuild b/games-board/openyahtzee/openyahtzee-1.9.2.ebuild
index b1170a605847..8e976410ce11 100644
--- a/games-board/openyahtzee/openyahtzee-1.9.2.ebuild
+++ b/games-board/openyahtzee/openyahtzee-1.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openyahtzee/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
index 5321a2c7b60c..f907be223d80 100644
--- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
inherit subversion
else
SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libsigc26.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libsigc26.patch
new file mode 100644
index 000000000000..bd986764cfb7
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libsigc26.patch
@@ -0,0 +1,17 @@
+From: Etienne Millon <me@emillon.org>
+Subject: Remove deprecated header in sigccompat.h
+
+libsigc++ 2.5.2 removed the <sigc++/object.h> header as it was useless.
+Removing the #include directive makes the build succeed with later versions of
+libsigc++.
+
+--- a/src/gtk/sigccompat.h
++++ b/src/gtk/sigccompat.h
+@@ -25,7 +25,6 @@
+ #include <sigc++/connection.h>
+
+ #include <sigc++/slot.h>
+-#include <sigc++/object.h>
+ #include <sigc++/functors/mem_fun.h>
+
+
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild
new file mode 100644
index 000000000000..a2090db167bb
--- /dev/null
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic autotools games
+
+DESCRIPTION="gameboy, gameboy color, and gameboy advance emulator"
+HOMEPAGE="http://vba.ngemu.com/"
+SRC_URI="mirror://sourceforge/vba/VisualBoyAdvance-src-${PV}.tar.gz
+ mirror://gentoo/${P}-deprecatedsigc++.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="gtk cpu_flags_x86_mmx nls"
+
+RDEPEND="media-libs/libpng:0
+ media-libs/libsdl[sound,video]
+ sys-libs/zlib[minizip]
+ gtk? (
+ >=x11-libs/gtk+-2.4:2
+ >=dev-cpp/gtkmm-2.4:2.4
+ >=dev-cpp/libglademm-2.4:2.4
+ >=dev-libs/libsigc++-2.6:2
+ )
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ cpu_flags_x86_mmx? ( dev-lang/nasm )
+ nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/VisualBoyAdvance-${PV}
+
+src_prepare() {
+ cat >> src/i386/2xSaImmx.asm <<-EOF
+ %ifidn __OUTPUT_FORMAT__,elf
+ section .note.GNU-stack noalloc noexec nowrite progbits
+ %endif
+ EOF
+
+ epatch \
+ "${FILESDIR}"/${PV}-homedir.patch \
+ "${FILESDIR}"/${PV}-gcc34.patch \
+ "${FILESDIR}"/${PV}-gcc41.patch \
+ "${FILESDIR}"/${P}-gcc47.patch \
+ "${WORKDIR}"/${P}-deprecatedsigc++.patch \
+ "${FILESDIR}"/${P}-uninit.patch \
+ "${FILESDIR}"/${P}-glibc2.10.patch \
+ "${FILESDIR}"/${P}-ovflfix.patch \
+ "${FILESDIR}"/${P}-libpng15.patch \
+ "${FILESDIR}"/${P}-zlib.patch \
+ "${FILESDIR}"/${P}-zlib-1.2.6.patch \
+ "${FILESDIR}"/${P}-sys-types.patch \
+ "${FILESDIR}"/${P}-libsigc26.patch
+
+ mv configure.in configure.ac || die
+ eautoreconf
+
+ sed -i \
+ -e 's:$(localedir):/usr/share/locale:' \
+ -e 's:$(datadir)/locale:/usr/share/locale:' \
+ $(find . -name 'Makefile.in*') || die
+}
+
+src_configure() {
+ # -O3 causes GCC to behave badly and hog memory, bug #64670.
+ replace-flags -O3 -O2
+
+ append-cxxflags -std=c++11
+
+ # Removed --enable-c-core as it *should* determine this based on arch
+ egamesconf \
+ $(use_with cpu_flags_x86_mmx mmx) \
+ $(use_enable gtk gtk 2.4) \
+ $(use_enable nls)
+}
+
+src_install() {
+ default
+ if use gtk ; then
+ newicon src/gtk/images/vba-64.png ${PN}.png
+ make_desktop_entry gvba VisualBoyAdvance
+ fi
+ prepgamesdirs
+}
diff --git a/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild b/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
index babf5c50dffa..2800b832f478 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scummvm/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
IUSE="flac iconv mad png vorbis"
RESTRICT="test" # some tests require external files
diff --git a/games-engines/stratagus/stratagus-2.3.0.ebuild b/games-engines/stratagus/stratagus-2.3.0.ebuild
index 2e11ba09bdad..8bf2240e29c5 100644
--- a/games-engines/stratagus/stratagus-2.3.0.ebuild
+++ b/games-engines/stratagus/stratagus-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/stratagus/trunk/2.3/+download/stratagus_${PV}.ori
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="bzip2 debug doc fluidsynth mikmod mng theora vorbis"
RDEPEND="dev-db/sqlite:3
diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
index c0be00dca798..e21ce3ac5d90 100644
--- a/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
+++ b/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="gog? ( ${GOG_FILE} )"
LICENSE="DUKE3D gog? ( GOG-EULA )"
SLOT="0"
-KEYWORDS="amd64 hppa ppc ~x86"
+KEYWORDS="amd64 hppa ppc x86"
IUSE="gog"
REQUIRED_USE="^^ ( cdinstall gog )"
RESTRICT="mirror bindist gog? ( fetch )"
diff --git a/games-fps/rott/rott-1.1.2.ebuild b/games-fps/rott/rott-1.1.2.ebuild
index 8dba97c9ca4a..53c411882342 100644
--- a/games-fps/rott/rott-1.1.2.ebuild
+++ b/games-fps/rott/rott-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.icculus.org/rott/releases/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="demo"
RDEPEND="media-libs/libsdl[sound,joystick,video]
diff --git a/games-puzzle/enigma/enigma-1.21-r2.ebuild b/games-puzzle/enigma/enigma-1.21-r2.ebuild
index f1c6028ba52f..c65d418ebccd 100644
--- a/games-puzzle/enigma/enigma-1.21-r2.ebuild
+++ b/games-puzzle/enigma/enigma-1.21-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="nls"
COMMON_DEPS="media-libs/sdl-ttf
diff --git a/games-roguelike/angband/angband-4.0.3.ebuild b/games-roguelike/angband/angband-4.0.3.ebuild
index da72dbb28f08..d9cfb5fb5b3e 100644
--- a/games-roguelike/angband/angband-4.0.3.ebuild
+++ b/games-roguelike/angband/angband-4.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="ncurses sdl +sound X"
RDEPEND="X? ( x11-libs/libX11 )
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.71.0-r1.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.71.0-r1.ebuild
index 3d3141c3fc34..ba20a9014c39 100644
--- a/games-roguelike/crossfire-client/crossfire-client-1.71.0-r1.ebuild
+++ b/games-roguelike/crossfire-client/crossfire-client-1.71.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/crossfire/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="lua opengl sdl sound"
RDEPEND="
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index 6f79ddc69a29..f4f8e16fae4c 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -1,2 +1,2 @@
DIST df_40_24_linux.tar.bz2 12921246 SHA256 da37c6263a679123e6ac57fe0dd6def11f1d61efee3c5913de09495c88ce9234 SHA512 2242e471b7dbc996e819e2f74b2bbfda30a9a301755bc025ddcccdffdd3afe2e48bbedca31a332283ef829d023069398e57d6a87e26c582ddbce4a67ff7fd755 WHIRLPOOL 03cb652a2564d2b0c809be8252f7754d893f69ac1b95124ea108ed0fde9ac742c498d9e369339775695861e430a2ded0741b018f85551d48731730f98303dc69
-DIST df_42_03_linux.tar.bz2 13759711 SHA256 6bc36b3562da0a8d6e1f14d269e2a4ce04b8f2f6ffc516b542bc7ac8ae50b3cc SHA512 1f32c932b55a85fd25fb3b0dd0621bc7228befdeb03ff12cd4c8a1008c05daabd3c181dc618d9d866dd14ebf7ea3e872bfa744ceb9671d024778087cc4f34406 WHIRLPOOL a13a28290702f768e4fa0bb7236f1db267cf091f8ab678ac5fb636ae0b0b4b3fa075759429fabb48e05eba333e6fdbc20fdf0afb3474347f6c6c294d52703ad7
+DIST df_42_04_linux.tar.bz2 13776171 SHA256 f281f7e8b477abe37cc1423258be2ea56b5c1d12b0843ed3a66994ce0e7924ce SHA512 d0b3bf0311e70c6f823d216e002d2acc62ebdeb540cfd79c5cf91d53612f6acee802321c65b3926db688b055f5b865aa1256f29a82ef769c5fab65bd42c383b5 WHIRLPOOL 859a2fddf9a72ac2c05d64cff01fdd3c9658ce57eecb34991fbd9cbd51ae007c56bc61e9aac76ec837734593c89d822868c15c641416a82f142af40425ef666b
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.03.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.04.ebuild
index b0b9b37e9118..b0b9b37e9118 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.03.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.04.ebuild
diff --git a/games-strategy/hedgewars/hedgewars-0.9.22.ebuild b/games-strategy/hedgewars/hedgewars-0.9.22.ebuild
index 09e19d87b63c..0122db8e325b 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.22.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.22.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://download.gna.org/hedgewars/${MY_P}.tar.bz2"
LICENSE="GPL-2 Apache-2.0 FDL-1.3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
QA_FLAGS_IGNORED=${GAMES_BINDIR}/hwengine # pascal sucks
QA_PRESTRIPPED=${GAMES_BINDIR}/hwengine # pascal sucks
diff --git a/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild b/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
index d056ac0534cc..e1d5ec3520de 100644
--- a/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
+++ b/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${MY_P}.tar.gz
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc gles2 gtk libcaca +maps nls +ogg openmp readline test"
# yes, cunit is rdep
diff --git a/games-strategy/scorched3d/scorched3d-44-r1.ebuild b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
index d82dfe32e86c..058665dc4ee1 100644
--- a/games-strategy/scorched3d/scorched3d-44-r1.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="dedicated mysql"
RDEPEND="media-libs/libsdl[video]
diff --git a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
index 9727e0fd0e6f..59bb840074eb 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
IUSE="dbus dedicated doc fribidi nls server"
RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
diff --git a/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild b/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild
index a8077e1a2917..d94413669e0c 100644
--- a/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild
+++ b/games-util/gtkevemon/gtkevemon-1.8-r1.ebuild
@@ -2,9 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
-
-inherit eutils
+EAPI=5
+inherit eutils flag-o-matic
IUSE=""
if [[ ${PV} == *9999* ]]; then
@@ -42,6 +41,8 @@ src_prepare() {
epatch "${DISTDIR}/${P}-learning.patch.gz"
# pthreads build fix, bug #423305
epatch "${FILESDIR}/${P}-pthreads-build-fix.patch"
+
+ append-cxxflags -std=c++11
}
src_install() {
diff --git a/games-util/nml/nml-0.4.2-r1.ebuild b/games-util/nml/nml-0.4.2-r1.ebuild
index 7e07528c27ec..ac95465b7540 100644
--- a/games-util/nml/nml-0.4.2-r1.ebuild
+++ b/games-util/nml/nml-0.4.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
dev-python/ply[${PYTHON_USEDEP}]"
diff --git a/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild b/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild
index 8522a25d6d47..5881c238079f 100644
--- a/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild
+++ b/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch
new file mode 100644
index 000000000000..8ec7006fce5b
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch
@@ -0,0 +1,171 @@
+From b4546ab43c2c7ef6fb6cb7e5db83dc3975b56e8e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
+Date: Mon, 27 Oct 2014 18:41:34 +0200
+Subject: desktop-entries: support multiple desktops in XDG_CURRENT_DESKTOP
+
+This is based on glib commit:
+5a5e16e93c4f11e635918ecdb41681f63fd05a39
+---
+ libmenu/desktop-entries.c | 110 ++++++++++++++++++++++------------------------
+ 1 file changed, 52 insertions(+), 58 deletions(-)
+
+diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
+index 326f311..bd4f886 100644
+--- a/libmenu/desktop-entries.c
++++ b/libmenu/desktop-entries.c
+@@ -85,32 +85,27 @@ unix_basename_from_path (const char *path)
+ return path;
+ }
+
+-static const char *
+-get_current_desktop (void)
++static const gchar * const *
++get_current_desktops (void)
+ {
+- static char *current_desktop = NULL;
++ static gchar **result;
+
+- /* Support XDG_CURRENT_DESKTOP environment variable; this can be used
+- * to abuse gnome-menus in non-GNOME desktops. */
+- if (!current_desktop)
++ if (g_once_init_enter (&result))
+ {
+- const char *desktop;
++ const gchar *desktops;
++ gchar **tmp;
+
+- desktop = g_getenv ("XDG_CURRENT_DESKTOP");
++ desktops = g_getenv ("XDG_CURRENT_DESKTOP");
+
+- /* Note: if XDG_CURRENT_DESKTOP is set but empty, do as if it
+- * was not set */
+- if (!desktop || desktop[0] == '\0')
+- current_desktop = g_strdup ("GNOME");
+- else
+- current_desktop = g_strdup (desktop);
+- }
++ if (desktops)
++ desktops = "";
+
+- /* Using "*" means skipping desktop-related checks */
+- if (g_strcmp0 (current_desktop, "*") == 0)
+- return NULL;
++ tmp = g_strsplit (desktops, ":", 0);
++
++ g_once_init_leave (&result, tmp);
++ }
+
+- return current_desktop;
++ return (const gchar **) result;
+ }
+
+ static GIcon *
+@@ -151,52 +146,58 @@ key_file_get_icon (GKeyFile *key_file)
+ static gboolean
+ key_file_get_show_in (GKeyFile *key_file)
+ {
+- const gchar *current_desktop;
+- gchar **strv;
++ const gchar * const *current_desktops;
++ gchar **only_show_in;
++ gchar **not_show_in;
+ gboolean show_in = TRUE;
+- int i;
+-
+- current_desktop = get_current_desktop ();
+- if (!current_desktop)
+- return TRUE;
+-
+- strv = g_key_file_get_string_list (key_file,
+- DESKTOP_ENTRY_GROUP,
+- "OnlyShowIn",
+- NULL,
+- NULL);
+- if (strv)
++ gint i;
++
++ current_desktops = get_current_desktops ();
++ only_show_in = g_key_file_get_string_list (key_file,
++ DESKTOP_ENTRY_GROUP,
++ "OnlyShowIn",
++ NULL,
++ NULL);
++ not_show_in = g_key_file_get_string_list (key_file,
++ DESKTOP_ENTRY_GROUP,
++ "NotShowIn",
++ NULL,
++ NULL);
++
++ for (i = 0; current_desktops[i]; i++)
+ {
+- show_in = FALSE;
+- for (i = 0; strv[i]; i++)
++ gint j;
++
++ if (only_show_in)
+ {
+- if (!strcmp (strv[i], current_desktop))
++ show_in = FALSE;
++ for (j = 0; only_show_in[j]; j++)
+ {
+- show_in = TRUE;
+- break;
++ if (g_str_equal (only_show_in[j], current_desktops[i]))
++ {
++ show_in = TRUE;
++ goto out;
++ }
+ }
+ }
+- }
+- else
+- {
+- strv = g_key_file_get_string_list (key_file,
+- DESKTOP_ENTRY_GROUP,
+- "NotShowIn",
+- NULL,
+- NULL);
+- if (strv)
++
++ if (not_show_in)
+ {
+ show_in = TRUE;
+- for (i = 0; strv[i]; i++)
++ for (j = 0; not_show_in[j]; j++)
+ {
+- if (!strcmp (strv[i], current_desktop))
++ if (g_str_equal (not_show_in[j], current_desktops[i]))
+ {
+ show_in = FALSE;
++ goto out;
+ }
+ }
+ }
+ }
+- g_strfreev (strv);
++
++out:
++ g_strfreev (only_show_in);
++ g_strfreev (not_show_in);
+
+ return show_in;
+ }
+@@ -579,14 +580,7 @@ gboolean
+ desktop_entry_get_show_in (DesktopEntry *entry)
+ {
+ if (entry->type == DESKTOP_ENTRY_DESKTOP)
+- {
+- const char *current_desktop = get_current_desktop ();
+-
+- if (current_desktop == NULL)
+- return TRUE;
+- else
+- return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, current_desktop);
+- }
++ return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, NULL);
+ return ((DesktopEntryDirectory*)entry)->showin;
+ }
+
+--
+cgit v0.11.2
+
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch
new file mode 100644
index 000000000000..966b060eac27
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch
@@ -0,0 +1,27 @@
+From 4befe76fbdb76aa6a986297ef71d1601b2ced42e Mon Sep 17 00:00:00 2001
+From: Josselin Mouette <joss@debian.org>
+Date: Sun, 14 Dec 2014 20:36:36 +0100
+Subject: desktop-entries: fix trivial bug in handling of multiple desktops in
+ XDG_CURRENT_DESKTOP.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=741505
+---
+ libmenu/desktop-entries.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
+index bd4f886..a463d79 100644
+--- a/libmenu/desktop-entries.c
++++ b/libmenu/desktop-entries.c
+@@ -97,7 +97,7 @@ get_current_desktops (void)
+
+ desktops = g_getenv ("XDG_CURRENT_DESKTOP");
+
+- if (desktops)
++ if (!desktops)
+ desktops = "";
+
+ tmp = g_strsplit (desktops, ":", 0);
+--
+cgit v0.11.2
+
diff --git a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
new file mode 100644
index 000000000000..9b90894c75fe
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Library for the Desktop Menu fd.o specification"
+HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="+introspection test"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.29.15:2
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+# Older versions of slot 0 install the menu editor and the desktop directories
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gnome-menus-3.0.1-r1:0
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.40
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? ( dev-libs/gjs )
+"
+
+src_prepare() {
+ # Don't show KDE standalone settings desktop files in GNOME others menu
+ epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch"
+
+ # desktop-entries: support multiple desktops in XDG_CURRENT_DESKTOP
+ # (from 'master')
+ epatch "${FILESDIR}"/${P}-multiple-desktop{,2}.patch
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+ # Do NOT compile with --disable-debug/--enable-debug=no
+ # It disables api usage checks
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ --disable-static
+}
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 10a13b85bcbb..25f364a060e6 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,2 +1,3 @@
DIST cinnamon-2.6.13.tar.gz 2967812 SHA256 f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86 SHA512 41192b25ac34c542596f9625a671d019531aa466f057777da12ca0fda0f23daa10929c9f7a4e3c1a7137887fc9b0b556836a82f42645128b620949386387efec WHIRLPOOL 0c7c7ed6375964a93217adf43cc6236f7e7b92b75facfc94ded86f914890452b92753486d1c46b8a6531eef49993a0bc9fc0d387e8ea2a5bc4f05dd80571462a
DIST cinnamon-2.8.4.tar.gz 3025109 SHA256 4ae7ed062e2bfacabdac66002c14666c4709182d45a6f0140a577800e28b0326 SHA512 d2be926c17262c20aff7253b8fb25f7955328fbd7ee4271ec1f29d847c1768f1dffc90c1d9dd843c4bcd4a8a0503200b078e01d6dd6cc8fa66894f1b5fcd9a37 WHIRLPOOL a9726b360958799c6b8614b088acb0b38c544e5e78739d0e5f35e14d801d1aae32d0bc12064efd405eea01bddf6f5350f1e1298c2c11c10a07f27c54a2bc1566
+DIST cinnamon-2.8.6.tar.gz 3025161 SHA256 c262ae64320d4db8bffdfa7f05ab5a82449e96035b35dd8fb9353741323cb9a2 SHA512 fb683aaea1704eec5a1d2221d55c5e0e6530897f7aefc6ff9b9ff9d15818737a0d5d15aaa1d1f830e1f01e462324db026ac8c4475e39630cd6fd4a67dca9bddf WHIRLPOOL 488c215daf441be87d8f552bd4f0d8e55683286db143b2fbe5f8dd43a53df8e5c1e03b9230708ca149b85e3d9a93df58618b50afa014755a5ea943e33123edb8
diff --git a/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
new file mode 100644
index 000000000000..62a193c98954
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+
+MY_PV="${PV/_p/-UP}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# bluetooth support dropped due bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.7 and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ python_targets_python2_7
+ || ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+ app-accessibility/at-spi2-atk:2
+ app-misc/ca-certificates
+ dev-libs/dbus-glib
+ >=dev-libs/glib-2.35.0:2[dbus]
+ >=dev-libs/gobject-introspection-0.10.1:=
+ >=dev-libs/json-glib-0.13.2
+ >=dev-libs/libcroco-0.6.2:0.6
+ dev-libs/libxml2:2
+ gnome-base/gconf:2[introspection]
+ gnome-base/librsvg
+ >=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
+ gnome-extra/cinnamon-menus[introspection]
+ >=gnome-extra/cjs-2.8.0
+ >=media-libs/clutter-1.10:1.0[introspection]
+ media-libs/cogl:1.0=[introspection]
+ >=gnome-base/gsettings-desktop-schemas-2.91.91
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-sound/pulseaudio:0=[glib]
+ net-libs/libsoup:2.4[introspection]
+ >=sys-auth/polkit-0.100[introspection]
+ x11-libs/gdk-pixbuf:2[introspection]
+ >=x11-libs/gtk+-3.9.12:3[introspection]
+ x11-libs/pango[introspection]
+ >=x11-libs/startup-notification-0.11
+ x11-libs/libX11
+ >=x11-libs/libXfixes-5.0
+ >=x11-wm/muffin-2.5[introspection]
+ ${PYTHON_DEPS}
+ networkmanager? (
+ gnome-base/libgnome-keyring
+ >=net-misc/networkmanager-0.8.999[introspection] )
+"
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
+
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+# user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+ >=gnome-base/dconf-0.4.1
+ >=gnome-base/libgnomekbd-2.91.4[introspection]
+ || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
+
+ >=gnome-extra/cinnamon-session-2.4
+ >=gnome-extra/cinnamon-settings-daemon-2.4
+
+ >=sys-apps/accountsservice-0.6.14[introspection]
+
+ >=app-accessibility/caribou-0.3
+
+ x11-misc/xdg-utils
+
+ dev-python/dbus-python[python_targets_python2_7]
+ dev-python/gconf-python:2[python_targets_python2_7]
+ dev-python/lxml[python_targets_python2_7]
+ dev-python/pexpect[python_targets_python2_7]
+ dev-python/pycairo[python_targets_python2_7]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/pyinotify[python_targets_python2_7]
+ dev-python/pypam[python_targets_python2_7]
+ dev-python/pillow[python_targets_python2_7]
+
+ x11-themes/gnome-themes-standard[gtk]
+ x11-themes/gnome-icon-theme-symbolic
+
+ >=gnome-extra/nemo-2.4
+ >=gnome-extra/cinnamon-control-center-2.4
+ >=gnome-extra/cinnamon-screensaver-2.4
+
+ gnome-extra/polkit-gnome
+
+ networkmanager? (
+ gnome-extra/nm-applet
+ net-misc/mobile-broadband-provider-info
+ sys-libs/timezone-data )
+ nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+"
+#bluetooth? ( net-wireless/cinnamon-bluetooth )
+
+DEPEND="${COMMON_DEPEND}
+ dev-python/polib[python_targets_python2_7]
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40
+ gnome-base/gnome-common
+ !!=dev-lang/spidermonkey-1.8.2*
+"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+
+S="${WORKDIR}/Cinnamon-${PV}"
+
+pkg_setup() {
+ python_setup
+}
+
+src_prepare() {
+ # Fix backgrounds path as cinnamon doesn't provide them
+ # https://github.com/linuxmint/Cinnamon/issues/3575
+ epatch "${FILESDIR}"/${PN}-2.8.0-background.patch
+
+ # Fix automagic gnome-bluetooth dep, bug #398145
+ epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+ # Optional NetworkManager, bug #488684
+ epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+ # Use wheel group instead of sudo (from Fedora/Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3576
+ epatch "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
+
+ # Fix GNOME 3.14 support (from Fedora/Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3577
+ epatch "${FILESDIR}"/${PN}-2.8.3-gnome-3.14.patch
+
+ # Use pkexec instead of gksu (from Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3565
+ sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
+
+ # Add polkit agent to required components (from Fedora/Arch), bug #523958
+ # https://github.com/linuxmint/Cinnamon/issues/3579
+ sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+ files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
+
+ if ! use networkmanager; then
+ rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+ fi
+
+ epatch_user
+
+ # python 2-and-3 shebang fixing craziness
+ local p
+ python_setup 'python3*'
+ for p in $(grep -rl '#!.*python3'); do
+ python_fix_shebang "${p}"
+ done
+
+ python_setup 'python2*'
+ for p in $(grep -rl '#!.*python[^3]'); do
+ python_fix_shebang "${p}"
+ done
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=536374
+ # https://github.com/linuxmint/Cinnamon/issues/3843
+ append-ldflags $(no-as-needed)
+
+ gnome2_src_configure \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --disable-rpath \
+ --disable-jhbuild-wrapper-script \
+ $(use_enable networkmanager) \
+ --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+ BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
+ --without-bluetooth
+}
+
+src_install() {
+ gnome2_src_install
+ python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
+
+ # Required for gnome-shell on hardened/PaX, bug #398941
+ pax-mark mr "${ED}usr/bin/cinnamon"
+
+ # Doesn't exist on Gentoo, causing this to be a dead symlink
+ rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
+
+ # Ensure authentication-agent is started, bug #523958
+ # https://github.com/linuxmint/Cinnamon/issues/3579
+ insinto /etc/xdg/autostart/
+ doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+ ewarn "To make use of Cinnamon's built-in screen recording utility,"
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+ ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+ fi
+
+ if ! has_version ">=x11-base/xorg-server-1.11"; then
+ ewarn "If you use multiple screens, it is highly recommended that you"
+ ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+ ewarn "pointer barriers which will make it easier to use hot corners."
+ fi
+
+ if has_version "<x11-drivers/ati-drivers-12"; then
+ ewarn "Cinnamon has been reported to show graphical corruption under"
+ ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
+ ewarn "open-source drivers."
+ fi
+}
diff --git a/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
index 023974368734..1187727508e3 100644
--- a/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
+++ b/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
@@ -5,6 +5,7 @@
EAPI="5"
GCONF_DEBUG="no"
PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+VALA_MIN_API_VERSION="0.30"
VALA_USE_DEPEND="vapigen"
inherit gnome2 python-single-r1 vala virtualx
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 01ccb2bb6bc8..bd723a6437e5 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,2 +1,4 @@
DIST gnome-calendar-3.16.2.tar.xz 2226324 SHA256 b530e1de58f3e3db9ab1470ee5f2bbb72b5aedca0d127cf093c8416e90be1c6f SHA512 28777a2e87e519392b3f90f225c8450dab52e8cc1d4793820316b3ca2e681d924629e2621a88a3e4d198673a7ec5f548fb99b2e0a5915a6c3b10195849467727 WHIRLPOOL 63f61f2b779c1890fb236af902944ba21a9de00fdc7b5656eba289ad714215b6ecefb8ae5cc21097089d3a47649aadc4828bcb9fd29ee036dba4388d2dbd5ccc
DIST gnome-calendar-3.18.1.tar.xz 2287668 SHA256 96f307c79952fa55bfdfc2b256085c568384dde2312b2815ee5e8e21e6adf2b9 SHA512 ba8e5b3d5cab84d51f87dfc6ef4ab3b9e334391f791a1836a430459b21f1834518d751d932302a9d3764d1a130c55fc1a1c11c6c92bc762bb3d08f1bf9d514d6 WHIRLPOOL 3139eabd280ff7bfe30d939f0702ebf84204b1773482a62cf0411a6e6dea0c18742efb4c30062c09d980aa755aa06ac7e7d975ace2b8b0e7316f21768c992a6e
+DIST gnome-calendar-3.18.2.1.tar.xz 2290232 SHA256 eedd9b10da837db6e7dc02794a942e9a98b3cdaa975b0d46226aa0cdaf88c0f6 SHA512 4d9af8ac2eb003e82aa2c0264783792a0c0d42d668d7326cb7f40efc30b2047ec3c440c94b5773e2b43790c27c35338cd375cfc9c2848baee7632fa9aea0d005 WHIRLPOOL 4bd99847d5e011feb0d8d2161dd7aeb588c7674b031be3bc01069a57f6768fa5eb714d383f3e34c864176727c35a3552ba62f9357dae61e14ba7bafd53ef4be8
+DIST gnome-calendar-3.18.2.tar.xz 2287948 SHA256 c3759e4d751cdc26103999712190a24da6118353dc2ae399a9032b4e23e005b3 SHA512 cff6be9bdda0d01b8bd1162f9664f21b0060114734d5225b97b85e99d0f6bbf47510a6ddcba093f6434808dcb7da920e49ec38ac0619f51dba899f365fc7b208 WHIRLPOOL 48800d4ad85b62141d51307a01e72ecffab8c8d1b917890904a3f8ea31efaa1d6a56d5ee1b1073415e1bf548b7353891c0335cdfe372491e2e01b56d01c25e2f
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild
new file mode 100644
index 000000000000..6161be99d601
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+RDEPEND="
+ >=dev-libs/glib-2.43.4:2
+ >=dev-libs/libical-1.0.1
+ >=gnome-extra/evolution-data-server-3.17.1:=
+ >=net-libs/gnome-online-accounts-3.2.0:=
+ >=x11-libs/gtk+-3.15.4:3
+"
+DEPEND="${RDEPEND}
+ dev-libs/appstream-glib
+ dev-util/gdbus-codegen
+ >=dev-util/intltool-0.40.6
+ sys-devel/gettext
+ virtual/pkgconfig
+"
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.ebuild
new file mode 100644
index 000000000000..6161be99d601
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+RDEPEND="
+ >=dev-libs/glib-2.43.4:2
+ >=dev-libs/libical-1.0.1
+ >=gnome-extra/evolution-data-server-3.17.1:=
+ >=net-libs/gnome-online-accounts-3.2.0:=
+ >=x11-libs/gtk+-3.15.4:3
+"
+DEPEND="${RDEPEND}
+ dev-libs/appstream-glib
+ dev-util/gdbus-codegen
+ >=dev-util/intltool-0.40.6
+ sys-devel/gettext
+ virtual/pkgconfig
+"
diff --git a/gnome-extra/gnome-dvb-daemon/Manifest b/gnome-extra/gnome-dvb-daemon/Manifest
index 3d742554d249..413ebc89fb7c 100644
--- a/gnome-extra/gnome-dvb-daemon/Manifest
+++ b/gnome-extra/gnome-dvb-daemon/Manifest
@@ -1 +1,2 @@
DIST gnome-dvb-daemon-0.2.10.tar.xz 696372 SHA256 c23fcd4744c91bda065036a1a9b4a77b4665d7ca237f489e89a4c2f3133adcfb SHA512 9bf99f3b9d3c6a96a0fd193e41d98017f60ffa6255ae5fea52d2360fed0a3f292fc28c59060f54eb58e321e32e06693f5443bd3a4aba41cbd579a07a3c9691fb WHIRLPOOL 18eaa5739788ae3d9c44ce596105b64fcf608a875d4aba224abe18c8e1eac14d388c22126a61c92abe5efbf54c1cfc37400eb6b70fb457f597b4cdc1cb3573d6
+DIST gnome-dvb-daemon-0.2.90.tar.xz 700504 SHA256 8d1f3cc6cd8cdb5e032841ea136d27c432f2c8a9b9e46fc8e7d752e22c875a5f SHA512 73e18ed5b267f1ef1ceebfe4ff25ccac3222bca9d7da164dd16acf9367c6b9f9710e915c81ef851c54b6fcae9b08f36d0c78665f4af425afc41b4c08eba49c40 WHIRLPOOL 618584c1e25be5ef4ad4a6c551a61e9a8bab8f8d1b308e863193dbde97af44554b82116d6b1ec86d88367defdc76c8c50ea10e4bf19be54c8f5325f2169f12f6
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild
index 1b2e4a9bf0b9..6a3fc9b26c99 100644
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild
+++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,9 +10,9 @@ VALA_MIN_API_VERSION="0.16"
inherit eutils python gnome2 multilib vala
DESCRIPTION="Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer"
-HOMEPAGE="https://live.gnome.org/DVBDaemon"
+HOMEPAGE="https://wiki.gnome.org/action/show/Projects/DVBDaemon"
-LICENSE="GPL-2"
+LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64"
IUSE="nls totem vala"
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
new file mode 100644
index 000000000000..6b2e8bdd1a9f
--- /dev/null
+++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_3,3_4} )
+VALA_MIN_API_VERSION="0.25"
+
+inherit eutils gnome2 multilib python-any-r1 vala
+
+DESCRIPTION="Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer"
+HOMEPAGE="https://wiki.gnome.org/action/show/Projects/DVBDaemon"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="nls totem vala"
+
+RDEPEND=">=dev-libs/glib-2.32.0:2
+ >=media-libs/gstreamer-1.4.0:1.0
+ >=media-libs/gst-plugins-good-1.4.0:1.0
+ >=media-libs/gst-plugins-bad-1.4.0:1.0
+ >=dev-libs/libgee-0.8:0.8
+ >=dev-db/sqlite-3.4
+ >=media-libs/gst-rtsp-server-1.4.5:1.0
+ media-plugins/gst-plugins-dvb:1.0
+ dev-python/gst-python:1.0
+ >=dev-python/pygobject-3.2.1:3
+ >=dev-libs/gobject-introspection-1.44.0
+ x11-libs/gtk+:3[introspection]
+ virtual/libgudev
+ vala? ( $(vala_depend) )
+ totem? ( media-video/totem )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=dev-lang/perl-5.8.1
+ >=dev-util/intltool-0.40.0
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ >=sys-devel/libtool-2.2.6"
+
+pkg_setup() {
+ G2CONF="${G2CONF} \
+ $(use_enable nls)
+ $(use_enable totem totem-plugin)"
+ use totem && G2CONF="${G2CONF} \
+ --with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins"
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ python_fix_shebang .
+ gnome2_src_prepare
+ use vala && vala_src_prepare
+}
+
+pkg_postinst() {
+ use totem && python_optimize
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ use totem && python_optimize
+ gnome2_pkg_postrm
+}
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu.patch
new file mode 100644
index 000000000000..5c8ca713858f
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu.patch
@@ -0,0 +1,29 @@
+From 1958ce779467f03672e8d72afa45e2ab14bee5f5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 16 Dec 2015 22:32:59 +0100
+Subject: apps-menu: Remove unused variable
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759004
+---
+ extensions/apps-menu/extension.js | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
+index 3180f3a..925d344 100644
+--- a/extensions/apps-menu/extension.js
++++ b/extensions/apps-menu/extension.js
+@@ -405,10 +405,8 @@ const ApplicationsButton = new Lang.Class({
+ continue;
+ }
+ let app = appSys.lookup_app(id);
+- if (appInfo.should_show()) {
+- let menu_id = dir.get_menu_id();
++ if (appInfo.should_show())
+ this.applicationsByCategory[categoryId].push(app);
+- }
+ } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
+ let subdir = iter.get_directory();
+ if (!subdir.get_is_nodisplay())
+--
+cgit v0.11.2
+
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu2.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu2.patch
new file mode 100644
index 000000000000..31dbaf279b40
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-apps-menu2.patch
@@ -0,0 +1,44 @@
+From 79c76a87e29e5ca70e74f3d62857c341a4ecae6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 16 Dec 2015 18:46:42 +0100
+Subject: apps-menu: Fix .desktop entries in subdirectories
+
+GMenu's TreeEntries return an AppInfo that is created from the
+.desktop filename, not from a desktop ID as expected by the
+AppSystem. As a result, g_app_info_get_id() will simply return
+the file's basename, which only matches the desktop ID if no
+prefix-to-subdirectory mapping as described in the menu spec
+is involved.
+Fix this by basing the app lookup on the entry's desktop ID instead
+of the AppInfo.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759004
+---
+ extensions/apps-menu/extension.js | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
+index 925d344..796d235 100644
+--- a/extensions/apps-menu/extension.js
++++ b/extensions/apps-menu/extension.js
+@@ -397,15 +397,14 @@ const ApplicationsButton = new Lang.Class({
+ while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
+ if (nextType == GMenu.TreeItemType.ENTRY) {
+ let entry = iter.get_entry();
+- let appInfo = entry.get_app_info();
+ let id;
+ try {
+- id = appInfo.get_id(); // catch non-UTF8 filenames
++ id = entry.get_desktop_file_id(); // catch non-UTF8 filenames
+ } catch(e) {
+ continue;
+ }
+ let app = appSys.lookup_app(id);
+- if (appInfo.should_show())
++ if (app.get_app_info().should_show())
+ this.applicationsByCategory[categoryId].push(app);
+ } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
+ let subdir = iter.get_directory();
+--
+cgit v0.11.2
+
diff --git a/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-revert-encodings.patch b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-revert-encodings.patch
new file mode 100644
index 000000000000..8764998aac61
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/files/gnome-shell-extensions-3.18.2-revert-encodings.patch
@@ -0,0 +1,35 @@
+From d1bf592539095ed6a1fd5f0f9ff0351e56bfa156 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Fri, 31 Jul 2015 02:14:58 +0200
+Subject: apps-menu: Handle non-UTF8 filename encodings more gracefully
+
+Instead of failing completely if any .desktop file uses a filename
+encoding other than UTF-8, just filter out the offending apps.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=651503
+---
+ extensions/apps-menu/extension.js | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
+index 0c7e6c6..ddd8458 100644
+--- a/extensions/apps-menu/extension.js
++++ b/extensions/apps-menu/extension.js
+@@ -393,7 +393,13 @@ const ApplicationsButton = new Lang.Class({
+ if (nextType == GMenu.TreeItemType.ENTRY) {
+ let entry = iter.get_entry();
+ let appInfo = entry.get_app_info();
+- let app = appSys.lookup_app(entry.get_desktop_file_id());
++ let id;
++ try {
++ id = appInfo.get_id(); // catch non-UTF8 filenames
++ } catch(e) {
++ continue;
++ }
++ let app = appSys.lookup_app(id);
+ if (appInfo.should_show()) {
+ let menu_id = dir.get_menu_id();
+ this.applicationsByCategory[categoryId].push(app);
+--
+cgit v0.11.2
+
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r1.ebuild
new file mode 100644
index 000000000000..5a134350eaa4
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 readme.gentoo
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.26:2
+ >=gnome-base/libgtop-2.28.3[introspection]
+ >=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-libs/gjs-1.29
+ dev-libs/gobject-introspection:=
+ dev-libs/atk[introspection]
+ gnome-base/gnome-menus:3[introspection]
+ >=gnome-base/gnome-shell-3.14.2
+ media-libs/clutter:1.0[introspection]
+ net-libs/telepathy-glib[introspection]
+ x11-libs/gdk-pixbuf:2[introspection]
+ x11-libs/gtk+:3[introspection]
+ x11-libs/pango[introspection]
+ x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+# eautoreconf needs gnome-base/gnome-common
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the https://extensions.gnome.org/ web interface, the
+gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell
+enabled-extensions gsettings key from the command line or a script."
+
+src_prepare() {
+ # Revert commit because of https://bugs.gentoo.org/show_bug.cgi?id=567126
+ # https://bugzilla.gnome.org/show_bug.cgi?id=759879
+ epatch -R "${FILESDIR}"/${PN}-3.18.2-revert-encodings.patch
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure --enable-extensions=all
+}
+
+src_install() {
+ gnome2_src_install
+
+ local example="example@gnome-shell-extensions.gcampax.github.com"
+ if use examples; then
+ mv "${ED}usr/share/gnome-shell/extensions/${example}" \
+ "${ED}usr/share/doc/${PF}/" || die
+ else
+ rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ ebegin "Updating list of installed extensions"
+ eselect gnome-shell-extensions update
+ eend $?
+
+ readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r2.ebuild
new file mode 100644
index 000000000000..5601a69121da
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.2-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 readme.gentoo
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.26:2
+ >=gnome-base/libgtop-2.28.3[introspection]
+ >=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-libs/gjs-1.29
+ dev-libs/gobject-introspection:=
+ dev-libs/atk[introspection]
+ gnome-base/gnome-menus:3[introspection]
+ >=gnome-base/gnome-shell-3.14.2
+ media-libs/clutter:1.0[introspection]
+ net-libs/telepathy-glib[introspection]
+ x11-libs/gdk-pixbuf:2[introspection]
+ x11-libs/gtk+:3[introspection]
+ x11-libs/pango[introspection]
+ x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+# eautoreconf needs gnome-base/gnome-common
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the https://extensions.gnome.org/ web interface, the
+gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell
+enabled-extensions gsettings key from the command line or a script."
+
+src_prepare() {
+ # Fix https://bugzilla.gnome.org/show_bug.cgi?id=759004 (from
+ # 'master')
+ epatch "${FILESDIR}"/${PN}-3.18.2-apps-menu{,2}.patch
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure --enable-extensions=all
+}
+
+src_install() {
+ gnome2_src_install
+
+ local example="example@gnome-shell-extensions.gcampax.github.com"
+ if use examples; then
+ mv "${ED}usr/share/gnome-shell/extensions/${example}" \
+ "${ED}usr/share/doc/${PF}/" || die
+ else
+ rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ ebegin "Updating list of installed extensions"
+ eselect gnome-shell-extensions update
+ eend $?
+
+ readme.gentoo_print_elog
+}
diff --git a/gnome-extra/libgda/libgda-5.2.2.ebuild b/gnome-extra/libgda/libgda-5.2.2.ebuild
index 955f8e42a79c..696604c9eb0e 100644
--- a/gnome-extra/libgda/libgda-5.2.2.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.2.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
dev-libs/libxslt
sys-libs/readline:0=
sys-libs/ncurses:0=
- berkdb? ( sys-libs/db )
+ berkdb? ( sys-libs/db:* )
firebird? ( dev-db/firebird )
gtk? (
>=x11-libs/gtk+-3.0.0:3
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 275458c199fc..54654fae0ff8 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,2 +1,3 @@
+DIST network-manager-applet-1.0.10.tar.xz 1374084 SHA256 b045ac3eaa68ccbbefe91510ad67b4002a7e09d1e5ce1c4bf9a67619bd2cf0eb SHA512 dc13881243e5232d0c45563442f906a93c4d196a69c52c45d335f755bbc73c4d3131ba59180a102f65ca2066d40127b9db8cf85da2b41ec18efda482a9d210aa WHIRLPOOL c1a731927289ebef627cfcd930574f4653d971b787a55acc10c8cc21933ca41010845daec72ec6a918fba894b134fdaa558da0f6e91e65f84b1d1f97587c4431
DIST network-manager-applet-1.0.6.tar.xz 1339672 SHA256 5d4d53e0d2221d97cd214c3817a77cbeeed0e198d565101b6822ecb49ca940fa SHA512 4f34cbfc0158090f9b3f32f3b29a2c771cbf35b6334c9444c222a7b87f958b59bd1179f4241e82dd7ec354f6ef3067dde58d461fe38464b7593fad9f710f8a60 WHIRLPOOL f8c93545123d7c24b0270337cf0c09b89d9604947ad101e8493e7772db4931fc33be13163d42ca7dd8270b8d0504e1208a8e7c93a0dbc23d38146cb633506a6f
DIST network-manager-applet-1.0.8.tar.xz 1362976 SHA256 b85f8dbb8fd21950709a97f7076ce3e3729b1711b24917ac59666ac0588420be SHA512 9795985bbabf2333c3adc02b532b8884f2cc69dd1a3426fbc5924873b23bc397f2d53bca4af05ae594e4059fc1e696aa7d4424623b8401f7f0f5b536d4f07bb0 WHIRLPOOL 96801b1230d25d4317a1c5b07f176a693f8bd30a7041dff18d2794963066bfaeab1c7348a42c17ea67f1680534c8d3e48669d52e273a84cf93162e983a4dc622
diff --git a/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild b/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild
new file mode 100644
index 000000000000..4a4a8759eef4
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome2
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="bluetooth +introspection modemmanager"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ app-crypt/libsecret
+ >=dev-libs/glib-2.32:2[dbus]
+ >=dev-libs/dbus-glib-0.88
+ >=sys-apps/dbus-1.4.1
+ >=sys-auth/polkit-0.96-r1
+ >=x11-libs/gtk+-3.4:3[introspection?]
+ >=x11-libs/libnotify-0.7.0
+
+ app-text/iso-codes
+ >=net-misc/networkmanager-1.0.0[introspection?]
+ net-misc/mobile-broadband-provider-info
+
+ bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6:= )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+ modemmanager? ( >=net-misc/modemmanager-0.7.990 )
+ virtual/freedesktop-icon-theme
+ virtual/libgudev:=
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=dev-util/intltool-0.50.1
+"
+
+PDEPEND="virtual/notification-daemon" #546134
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-more-warnings \
+ --disable-static \
+ --disable-migration \
+ --localstatedir=/var \
+ $(use_with bluetooth) \
+ $(use_enable introspection) \
+ $(use_with modemmanager modem-manager-1)
+}
diff --git a/kde-base/kinfocenter/kinfocenter-4.11.19.ebuild b/kde-base/kinfocenter/kinfocenter-4.11.19.ebuild
index d5f238ed51fe..7c8226936b21 100644
--- a/kde-base/kinfocenter/kinfocenter-4.11.19.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.11.19.ebuild
@@ -34,4 +34,4 @@ src_configure() {
)
kde4-meta_src_configure
-} \ No newline at end of file
+}
diff --git a/kde-base/kinfocenter/kinfocenter-4.11.22.ebuild b/kde-base/kinfocenter/kinfocenter-4.11.22.ebuild
index f49b2b41437b..5969d69219c0 100644
--- a/kde-base/kinfocenter/kinfocenter-4.11.22.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.11.22.ebuild
@@ -34,4 +34,4 @@ src_configure() {
)
kde4-meta_src_configure
-} \ No newline at end of file
+}
diff --git a/kde-misc/colord-kde/colord-kde-0.3.0.ebuild b/kde-misc/colord-kde/colord-kde-0.3.0.ebuild
index e0596cded20c..c348cc7374b6 100644
--- a/kde-misc/colord-kde/colord-kde-0.3.0.ebuild
+++ b/kde-misc/colord-kde/colord-kde-0.3.0.ebuild
@@ -23,6 +23,8 @@ RDEPEND="${DEPEND}
x11-misc/colord
"
+PATCHES=( "${FILESDIR}/${P}-cmake34.patch" )
+
pkg_postinst() {
kde4-base_pkg_postinst
if ! has_version "gnome-extra/gnome-color-manager"; then
diff --git a/kde-misc/colord-kde/files/colord-kde-0.3.0-cmake34.patch b/kde-misc/colord-kde/files/colord-kde-0.3.0-cmake34.patch
new file mode 100644
index 000000000000..671482dc191a
--- /dev/null
+++ b/kde-misc/colord-kde/files/colord-kde-0.3.0-cmake34.patch
@@ -0,0 +1,11 @@
+Fix build with >cmake-3.4
+
+Gentoo-bug: 569602
+
+--- a/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake
+@@ -1,3 +1,4 @@
++include(CheckIncludeFiles)
+ include(CheckTypeSize)
+ include(FindPkgConfig)
+
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.5.0.1.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.5.0.1.ebuild
index 7c61f27ec62f..4b608a7d6570 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.5.0.1.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.5.0.1.ebuild
@@ -12,4 +12,6 @@ SRC_URI="mirror://kde/stable/plasma/5.5.0/${P}.tar.xz"
KEYWORDS=" ~amd64 ~x86"
IUSE=""
+PATCHES=( "${FILESDIR}/${PN}-5.5.2-cmake-version.patch" )
+
S=${WORKDIR}/${PN}-5.5.0
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.5.1.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.5.1.ebuild
index 06e094e4b0d0..35d462c81b5d 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.5.1.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.5.1.ebuild
@@ -11,3 +11,5 @@ HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
LICENSE="LGPL-2.1+"
KEYWORDS=" ~amd64 ~x86"
IUSE=""
+
+PATCHES=( "${FILESDIR}/${PN}-5.5.2-cmake-version.patch" )
diff --git a/kde-plasma/breeze-gtk/files/breeze-gtk-5.5.2-cmake-version.patch b/kde-plasma/breeze-gtk/files/breeze-gtk-5.5.2-cmake-version.patch
new file mode 100644
index 000000000000..4164033e80da
--- /dev/null
+++ b/kde-plasma/breeze-gtk/files/breeze-gtk-5.5.2-cmake-version.patch
@@ -0,0 +1,18 @@
+commit ec9bdbd443d2ee15e6a9da335b74039c01153d7a
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue Dec 22 21:47:08 2015 +0100
+
+ Relax cmake version requirement to rest of plasma
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 240f497..9af6b67 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,6 +3,6 @@ project(breeze-gtk)
+ set(PROJECT_VERSION_MAJOR 5)
+
+-cmake_minimum_required(VERSION 3.2)
++cmake_minimum_required(VERSION 2.8.12)
+
+ find_package(ECM 0.0.9 REQUIRED NO_MODULE)
+ include(FeatureSummary)
diff --git a/licenses/Quartus-prime-megacore b/licenses/Quartus-prime-megacore
new file mode 100644
index 000000000000..bd37fed18380
--- /dev/null
+++ b/licenses/Quartus-prime-megacore
@@ -0,0 +1,1828 @@
+QUARTUS(R) PRIME LICENSE AGREEMENT VERSION 15.1, ALL
+DISTRIBUTIONS (WEB DOWNLOAD, DVDS)
+
+
+Copyright (C) 1991-2015 Altera(R) Corporation. All rights
+reserved. "Quartus" is a registered trademark of Altera Corporation
+in the U.S. and other countries. Any other trademarks and trade names
+referenced here are the property of their respective owners. Certain
+files, programs, or other materials provided in connection with the
+Licensed Software may originate or contain components from Third Party
+Licensors and are licensed to You pursuant to the terms of the
+applicable Third Party License appearing upon activation or
+installation of the Licensed Software, and/or are contained or
+described in associated release notes, header source files, or other
+documentation. Any such additional terms, and conditions or
+restrictions will also be listed in a separate file called "Third
+Party Licenses document". You agree to carefully review and comply
+with the terms of such Third Party Licenses. NOTWITHSTANDING ANYTHING
+TO THE CONTRARY IN THE AGREEMENT, AS BETWEEN LICENSEE AND ALTERA, AND
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, ALL SUCH THIRD
+PARTY LICENSES SHALL BE SUBJECT TO PARAGRAPH 11 (DISCLAIMER OF
+WARRANTIES), PARAGRAPH 13 (LIMITATION OF LIABILITY) AND PARAGRAPH 14
+(GOVERNING LAW). ALTERA OFFERS NO WARRANTIES (WHETHER EXPRESS OR
+IMPLIED); INDEMNIFICATION; AND/OR SUPPORT OF ANY KIND WITH RESPECT TO
+THIRD PARTY MATERIALS, EXCEPT THAT WE WILL PASS THROUGH TO YOU, IF AND
+TO THE EXTENT AVAILABLE, ANY WARRANTIES EXPRESSLY PROVIDED TO US BY
+THIRD PARTY LICENSORS RELATING TO SUCH THIRD PARTY MATERIALS.
+
+PLEASE REVIEW THE FOLLOWING TERMS AND CONDITIONS IN THIS QUARTUS PRIME
+VERSION 15.1 STANDARD LICENSE AGREEMENT (THE "QUARTUS
+AGREEMENT" OR "AGREEMENT") CAREFULLY BEFORE DOWNLOADING, INSTALLING OR
+USING THE LICENSED SOFTWARE. BY (A) DOWNLOADING, INSTALLING OR USING
+THE LICENSED SOFTWARE; OR (B) PAYING A LICENSE FEE OR OTHER FEE TO
+ALTERA; OR (C) PAYING A FEE TO AN AUTHORIZED DISTRIBUTOR, YOU INDICATE
+YOUR ACCEPTANCE OF THIS QUARTUS AGREEMENT OR THE AGREEMENT BETWEEN YOU
+AND THE AUTHORIZED DISTRIBUTOR FROM WHICH YOU HAVE ACQUIRED THE
+LICENSE. IN THE EVENT OF ANY INCONSISTENCY BETWEEN THE TERMS OF THIS
+QUARTUS AGREEMENT AND YOUR AGREEMENT WITH AN AUTHORIZED DISTRIBUTOR,
+THIS QUARTUS AGREEMENT WILL GOVERN AND CONTROL, EXCEPT WITH REGARDS TO
+PAYMENT TERMS.
+
+IF YOU DO NOT AGREE WITH THE TERMS AND CONDITIONS OF THIS QUARTUS
+AGREEMENT OR THE TERMS OF ANY THIRD PARTY LICENSES, DO NOT DOWNLOAD,
+INSTALL, OR USE THE LICENSED SOFTWARE. IF YOU HAVE ALREADY
+DOWNLOADED THE LICENSED SOFTWARE, PLEASE UNINSTALL IT AND IRREVOCABLY
+DESTROY IT AND ANY COPIES YOU HAVE MADE AS SOON AS POSSIBLE. IF YOU
+HAVE RECEIVED A COPY OF THE LICENSED SOFTWARE ON A DVD OR OTHER MANNER
+THAN ELECTRONIC DOWNLOAD, PLEASE RETURN THE LICENSED SOFTWARE UNUSED
+TO ALTERA OR THE AUTHORIZED DISTRIBUTOR FROM WHICH YOU OBTAINED THE
+LICENSE PROMPTLY.
+
+1. Definitions.
+
+"Altera" means Altera Corporation, a Delaware corporation with a place
+of business at 101 Innovation Drive, San Jose, California 95134 U.S.A.
+including its affiliates and subsidiaries worldwide.
+
+"Altera Devices" means programmable logic devices, including field
+programmable gate arrays ("FPGAs") devices, complex programmable logic
+devices ("CPLDs"), SoC devices, and/or any other semiconductor
+devices designed, developed or manufactured by or on behalf of Altera.
+
+"Authorized Distributor" means a reseller, OEM, ODM, or any
+distributor that is authorized by Altera to license the Licensed
+Software to end users in a valid agreement entered into between Altera
+and such reseller or distributor.
+
+"Checkout License" means a time-limited license granted by Altera
+associated with an existing Floating License to install and Use the
+Licensed Software on a single fixed standalone computer for use by a
+single user. This license shall expire after a specified time as
+designated by Altera. The total number of Checkout Licenses that may
+be granted in relation to a single Floating License may not exceed the
+total number of individual Seats associated with such Floating
+License.
+
+"Concurrent Users" means the number of simultaneous Users accessing
+the Licensed Software. For example, a 20-use concurrent use license
+would allow 20 Users to log in and use the Licensed Software at one
+time, but the 21st User attempting to log in would be blocked and
+unable to do so until one other User logs out.
+
+"Confidential Information" means and includes, but is not limited to:
+(i) the Licensed Software (whether provided in source code or binary
+form, including any modifications, derivatives, updates and upgrades
+thereto) and the algorithms, concepts, techniques, methods, and
+processes embodied therein; (ii) the Licensed Products and all
+information and specifications associated therewith; (iii) any
+business, marketing, technical, scientific or financial information
+disclosed to Licensee or You by Altera or an Authorized Distributor;
+or (iv) any information which, at the time of disclosure, is
+designated in writing as confidential or proprietary, or similar
+designation, is disclosed in circumstances of confidence, or would be
+reasonably understood by a person, exercising business judgment, to be
+confidential.
+
+"Designated Equipment" means the computer system that is owned or
+leased by You and operated on Your premises, and identified by a
+network interface card ("NIC") or host ID number on which the Licensed
+Software is installed and Used, and which has the configuration,
+capacity, operating system version level, and pre-requisite
+applications described in the Documentation as necessary for the
+operation of the Licensed Software, and is designated by the NIC/host
+ID in the License Key as the computer system on which the License Key
+management software will be installed.
+
+"Documentation" means technical data in human or machine readable form
+furnished by Altera which: (i) provides operating instructions for
+using the Licensed Software, or (ii) explains the capabilities and
+functions of the Licensed Software, and any full or partial copies of
+any such technical data.
+
+"Fixed with Companion License" means a license to install: the
+Licensed Software on a fixed standalone computer for Use by a single
+User, and (ii) the Licensed Software on up to two companion fixed
+standalone computers. Under this license, only one Seat may be used
+by a single User at any given time.
+
+"Floating Node Seat" is a license that allows the Licensed Software to
+be: (i) installed on and accessed from any number of computers on a
+network environment; (ii) Used by the permitted number of Concurrent
+Users that is equal to the number of Seats licensed as determined by
+the License Key; and (iii) Used for the sole purposes of developing,
+programming, synthesizing, testing and verifying designs for Altera
+Devices.
+
+"Intellectual Property Rights" means all (i) patents, patent
+applications, patent disclosures and inventions (whether patentable or
+not); (ii) trademarks, service marks, trade dress, trade names, logos,
+corporate names, Internet domain names, and registrations and
+applications for the registration for any of them, together with all
+goodwill associated with any of them; (iii) copyrights and
+copyrightable works (including computer programs and mask works) and
+registrations and applications for registration; (iv) trade secrets,
+know-how and other Confidential Information; (v) waivable or
+assignable rights of publicity, waivable or assignable moral rights;
+(vi) unregistered and registered design rights and any applications
+for registration; (vii) database rights and all other forms of
+intellectual property, such as data; and (viii) any and all similar or
+equivalent rights throughout the world.
+
+"IP Megafunctions or Components" means one or more design files,
+including encrypted net lists, RTL, test vectors, simulation models
+(such as VHDL, Verilog HDL, Quartus simulation, Matlab, Simulink,
+Verisity Specman, Synopsys Vera, etc.), and other models, which may be
+provided either as unencrypted source code, or in encrypted netlist or
+encrypted source code format, that are designed to implement or
+support the design of at least one logic function into an Altera logic
+device. "IP Megafunctions or Components" includes any modified
+versions, or updates thereto as may be provided by Altera, in its sole
+and absolute discretion, to You under this Agreement. However, for
+purposes of this Agreement, the term "IP Megafunctions or Components"
+does not include any software or design files for any MegaCore(R)
+functions (including the Nios(R) II embedded processor) which are
+covered by and licensed under a separate MegaCore(R) Agreement.
+
+"License Key" means a FlexNet license key, license file, license
+manager, dongle or other key, code or information provided by Altera
+that: (i) enables a User to download, install, operate and/or regulate
+User access to the Licensed Software; and (ii) describes the version
+number of the Licensed Software and lists the number of Concurrent
+Users authorized to Use the Licensed Software.
+
+"License Period" means the period of time Licensee has Use of the
+Licensed Software as governed by the License Key.
+
+"Licensee" means an individual, corporation or other legal entity to
+which Altera has issued a Seat.
+
+"Licensed Software" means the specific software enabled via the
+License Key, but does not include Unlicensed Software components,
+files, or portions specifically identified as not being included,
+licensed or enabled via the License Key.
+
+"Maintenance Expiration Date" is set as twelve (12) months from the
+latter of date of license/ license renewal and license activation.
+The Maintenance Expiration date for each seat license is noted in the
+license key. Further description is provided in Paragraph 12 below.
+
+"Seat" means the right granted under this Agreement by Altera or under
+a license agreement by an Authorized Distributor, to Use the Licensed
+Software by a single User in accordance with the terms and conditions
+of this Agreement or an Authorized Distributor's license agreement. A
+Seat is either a Floating Node Seat or a Fixed with Companion License,
+which is enabled via a License Key.
+
+"Support" means any support or maintenance services provided to
+Licensee by Altera, an Authorized Distributor, and/or authorized
+Altera representatives in responding to email, telephone, or other
+inquiries from You for maintenance, technical, or other support
+requests in connection with the Licensed Software.
+
+"Third Party Licenses" is a separate file, header, or release notes
+that contains additional terms, conditions or restrictions imposed by
+Third Party Licensors. Such Third Party Licenses will be identified
+in a Third Party Licenses Document describing each Third Party License
+associated with every Altera product. A hyperlink to an Altera
+database containing the text of all Third Party Licenses may be
+accessed by clicking on the applicable line in the Third Party
+Licenses Document.
+
+"Third Party Licensors" means and includes any third party that
+licenses or provides Third Party Materials to Altera.
+
+"Third Party Materials" are materials or components included in the
+download or the DVD, as applicable, that include but are not limited
+to software, code portions or files owned by Third Party Licensors,
+and are provided subject to Third Party Licenses.
+
+"Unlicensed Software" means any Altera computer programs or code in
+any format for which Licensee does not hold an active License Key
+issued by Altera, including but not limited to any non-subscribed or
+disabled features.
+
+"Use" means downloading, installing and copying all or any portion of
+the Licensed Software into the Designated Equipment for processing the
+instructions contained in the Licensed Software, and/or loading data
+into or displaying, viewing or extracting output results from, or
+otherwise operating, any portion of the Licensed Software.
+
+"User" or "You" means each individual identified by Licensee as a
+person authorized to Use the Licensed Software on behalf of and for
+the benefit of Licensee. If Licensee is an individual who obtained a
+Seat for his/her individual use, Licensee and User are and will be one
+and the same.
+
+2. Grant of License and License Key.
+
+ 2.1 Grant of License. Subject to and conditioned upon
+Licensee's compliance with the terms and conditions of this Agreement,
+Altera hereby grants to Licensee, a personal, perpetual (but subject
+to termination as otherwise described in this Agreement), worldwide,
+non-exclusive, non-transferable license with no right to sublicense,
+to Use under Altera's copyrights and trade secret rights in and to the
+Licensed Software (and any updates or upgrades thereof for which
+Licensee has paid a license fee or other applicable fee to Altera or
+an Authorized Distributor) on the terms and conditions set forth in
+this Agreement. Licensee may: (i) use the Licensed Software on a
+single computer (or, if Licensee has purchased a Floating Node Seat,
+the number of Concurrent Users for which Licensee has obtained
+licenses from Altera may use the Licensed Software on networked
+workstations); (ii) use the Licensed Software for the sole purpose of
+creating, simulating, verifying, placing and routing, and programming
+designs on logic devices manufactured by Altera and sold by Altera or
+its Authorized Distributors (although if You have obtained the
+Licensed Software through Altera's University Program , You are only
+permitted to use the Licensed Software for educational and academic
+purposes, and cannot use the Licensed Software for any commercial
+purposes); (iii) make one copy of the Licensed Software in any
+computer-readable or printed form for back-up or archival purposes, or
+as otherwise permitted under this Agreement; and (iv) modify the
+Licensed Software, provided all Intellectual Property Rights notices
+(including all copyright and restricted rights notices on the
+Licensed Software) are included on any modified, merged, or combined
+portion of the Licensed Software. Any copy of the Licensed Software
+or portions thereof merged or combined into another program will
+continue to be subject to the terms and conditions of this Agreement.
+Licensee's end customers may use Altera's logic devices that have been
+programmed with the Licensed Software.
+
+ 2.2 License Key. Altera will deliver the License Key to
+Licensee after Altera's receipt of all information required to
+generate the License Key, including the host identification number for
+the designated equipment onto which You will install the License Key
+management software. In accordance with its distribution method,
+Altera may include with the Licensed Software additional Unlicensed
+Software to which the License Key will not permit access. Inclusion
+of such Unlicensed Software in no way implies a license from Altera to
+access or use such Unlicensed Software, and You agree not to access or
+Use such Unlicensed Software, unless the License Key specifically
+authorizes such access and Use.
+
+ 2.3 Transfer of Licensed Software. The Licensed Software may
+be transferred to a third party, provided such third party agrees in
+writing to accept the terms and conditions of this Agreement and You
+notify Altera in writing of the identity of such third party. If You
+transfer the Licensed Software in accordance with the foregoing, You
+must: (i) at the same time either transfer all copies or portions
+thereof, whether in printed or in computer-readable form, to such
+third party, or (ii) destroy any copies not transferred, including all
+portions of the Licensed Software contained or merged into another
+program, and certify the same in writing to Altera.
+
+ 2.4 Floating Node Seat. If Licensee has purchased a Floating
+Node Seat, You may also copy the Licensed Software onto another
+computer (or access it through networked workstations) for use by
+another User or contractor, but only internally, with any remote
+access limited solely to such Users or contractors; provided that all
+Users agree to accept the terms and conditions of this Agreement in
+writing.
+
+ 2.5 IP Megafunctions or Components License. IP
+Megafunctions or Components are provided to You free of charge, in
+source code form, and You may modify, create derivative works of, and
+freely distribute any such IP Megafunctions or Components, and any
+modifications or derivative works thereof, provided that the IP
+Megafunctions or Components may not be used to program any non-Altera
+Devices.
+
+3. Delivery of Licensed Software. The Licensed Software will be
+delivered electronically, and will be accepted upon delivery.
+
+4. Designated Equipment. For all accepted orders, You will provide
+Altera with the Designated Equipment's host identification number,
+which Altera will include in the applicable License Key. Any time
+that the Designated Equipment is inoperative due to malfunction,
+repair, or maintenance, You may submit a request to change the
+Designated Equipment and receive a new License Key from Altera at no
+additional charge. Except for such temporary transfer, You and/or
+Licensee may not transfer or install the License Key on any other
+server or relocate the Designated Equipment without prior written
+consent of Altera. Whenever You receive a new License Key in order
+to effect a transfer to new Designated Equipment, You will immediately
+cease to use the Licensed Software under the previously issued License
+Key. You acknowledge and agree that You will not operate more than
+the number of seats of the Licensed Software associated with your
+License Key.
+
+5. Confidential Information. The Confidential Information
+constitutes trade secrets and confidential and proprietary information
+of Altera and its licensors, and You and Licensee agree not to access
+or Use the Licensed Software, directly or indirectly, except and to
+the extent expressly permitted under this Agreement or by applicable
+law. Altera and its licensors retain all rights in and to the
+Licensed Software and Documentation, modifications, derivatives,
+updates, and upgrades, and all Intellectual Property Rights associated
+with any of the foregoing. You and Licensee agree not to remove,
+alter or obscure any copyright, - patent, or other proprietary notices
+in the Licensed Software or Documentation. No other rights or
+licenses are granted by implication, estoppel or otherwise, to
+Licensee, You or any third party.
+
+ 5.1 With respect to Confidential Information, You and
+Licensee agree: (a) to use at least the same degree of care as You use
+with respect to Your own Confidential Information of similar
+importance, but in no event less than reasonable care, to prevent any
+Confidential Information from being disclosed to any third party,
+except as otherwise permitted by this Agreement; (b) not to use or
+disclose Confidential Information for any purpose except to the extent
+necessary and for the purpose of programming Altera Devices with the
+Licensed Software (the "Intended Purpose"); and (c) to restrict the
+disclosure and possession of Confidential Information solely to those
+of Licensee's Users, employees and Authorized Contractors with a need
+to know/need to access for the Intended Purpose, who agree to be bound
+by written confidentiality agreements no less strict than those this
+Agreement. Licensee agrees to be liable to Altera for any breaches by
+Licensee, its Users, employees and Authorized Contractors of the
+confidentiality obligations in this Section.
+
+ 5.2 You and Licensee will have no obligations of
+confidentiality with respect to any Confidential Information to the
+extent that it is: (a) already in the public domain or falls into the
+public domain through no breach of this Agreement (or any other
+obligation to Altera) by Licensee and Authorized Contractors; (b)
+already rightfully known to Licensee without any obligation of
+confidentiality; (c) is rightfully obtained by Licensee from a third
+party; or (d) developed independently by Licensee, its employees or
+Authorized Contractors without breach of Licensee's obligation of
+confidentiality under this Agreement. With respect to a disclosure
+required by order of a court or an authorized government agency, You
+may disclose Confidential Information, provided: (i) that You give
+prompt written notice of any such required disclosure to Altera; (ii)
+You disclose the Confidential Information only to the extent required
+by such court or governmental agency; and (iii) You provide reasonable
+assistance to Altera in its efforts to protect the confidentiality of
+the Confidential Information required to be disclosed.
+
+ 5.3 Notwithstanding anything in this Agreement to the
+contrary, You and Licensee agree that Altera may disclose Licensee's
+identity by name and address, and identify the Licensed Software
+licensed to Licensee, to the extent required by its agreement with its
+licensors and Authorized Distributors.
+
+6. Restrictions on Use. You and Licensee may not use, copy,
+modify, distribute, or otherwise transfer the Licensed Software or any
+portions thereof, or permit any remote access thereof by any person or
+entity, except as expressly provided for in this Agreement. You shall
+not use the Licensed Software to program any device other than Altera
+Devices. If You or Licensee transfer possession the Licensed
+Software, or any modifications or portions thereof to another party
+except as expressly provided herein, this license shall automatically
+terminate. You and Licensee may not decompile, disassemble, reverse
+engineer, or otherwise attempt to access the source code of the
+Licensed Software or reduce it to a human readable form ("Reverse
+Engineer") except as otherwise permitted by applicable law. In such
+case, You or Licensee may Reverse Engineer, but only after giving
+written notice to Altera, and only to the extent permitted by
+applicable law. You or Licensee may not publish or disclose the
+results of any benchmarking or testing of the Licensed Software, or
+use such results for Licensee's own software development activities,
+without the prior written permission of Altera.
+
+7. No Other Licenses or Intellectual Property Rights. The software
+code licensed under the Agreement (the "Licensed Software") is
+protected by copyright law and international treaties. Other than
+the rights expressly granted to Licensee in the Agreement, Altera
+and its licensors retain and own all right, title and interest in and
+to the Licensed Software, including any modifications, derivatives
+and updates thereof, and all Intellectual Property Rights in all of
+the foregoing. Nothing in this Agreement shall be construed to: (i)
+transfer any rights of ownership and/or interest in and to the
+Documentation and Licensed Software or portions thereof, or any
+derivative works of the foregoing to You, except as specifically
+provided in the Agreement; or (ii) enable You to exercise the rights
+granted herein with respect to the Licensed Software with: (A)
+products other than Your products; or (B) using the Licensed Software
+to program any non-Altera Devices. We expressly reserve all other
+rights in and to the Licensed Software, Documentation, and
+Intellectual Property Rights not granted to You under this Agreement.
+
+ You acknowledge and agree that: (i) this Agreement does not grant You
+or Licensee any right to practice, or any other right at all with
+respect to any patent of Altera or its licensors, and a separate
+license agreement from Altera or its licensors is needed to use or
+practice any patent of Altera or its licensors. You, on behalf of
+Licensee and its affiliates and subsidiaries, agree not to contend in
+any context that, as a result of this Quartus Agreement, either Altera
+or its licensors have any obligation to extend, or You, Licensee, or
+any other party has obtained any right to, any license, whether
+express or implied, with respect to any patent of Altera or its
+licensors, for any purpose whatsoever.
+
+8. Third Party Licensors. The Licensed Software may contain or
+include Third Party Materials licensed or provided to Altera by third
+parties (the "Third Party Licensors") which may be subject to
+additional terms and conditions or restrictions imposed by such Third
+Party Licensors in a separate license agreement (the "Third Party
+Licenses"). Such Third Party Licenses will be identified in the
+Third Party Licenses document describing each such Third Party
+Licenses associated with every Altera product. A hyperlink to an
+Altera webpage containing the text of all Third Party Licenses may be
+accessed at http://dl.altera.com/eula.
+
+9. Term and Termination. The license is effective until terminated
+by either party, or terminated in accordance with its terms, whichever
+occurs first. You may terminate it at any time by uninstalling and
+irrevocably destroying the Licensed Software, including all
+modifications, copies, and all portions of the foregoing, and
+certifying to such destruction in a writing signed by an officer of
+Licensee. Altera may terminate the license if You or Licensee fail to
+comply with any material term or condition of this Agreement,
+including but not limited to Licensee's or Your breach of the license
+rights granted to Licensee in this Agreement, or breach of Licensee's
+obligations of confidentiality, and may also terminate the license in
+accordance with the terms of the Agreement.
+
+10. Limited Warranty and Remedies.
+
+ 10.1 Limited Warranty. For a period of ninety (90) days from
+the date of Licensee's first receipt from Altera or the Authorized
+Distributor, as the case may be, of the License Key (the "Warranty
+Period"), Altera warrants to Licensee that: (i) the Licensed Software
+will perform substantially in accordance with Altera's Documentation,
+if used in full compliance with the terms of this Agreement; and (ii)
+the DVD (if applicable) on which the Licensed Software is installed
+will be free from defects in materials and workmanship under normal
+use. This warranty is personal in nature, provided only to Licensee,
+and is not transferable to Licensee's end users, customers, or to any
+third party.
+
+ 10.2 Exceptions to Warranty. During the Warranty Period, (i)
+Altera (either directly or through its Authorized Distributor) will
+replace any Licensed Software or DVD not meeting the foregoing
+warranty which is returned to Altera or the Authorized Distributor
+with adequate proof of purchase; or (ii) if Altera (either directly or
+through the Authorized Distributor) is unable to deliver replacement
+Licensed Software that performs substantially in accordance with
+Altera's Documentation or a DVD that is free of defects in materials
+or workmanship, Licensee may terminate this Agreement by either
+returning to Altera or irrevocably destroying the Licensed Software,
+and providing the certification described in Paragraph 8 above. Any
+replacement Licensed Software or DVD will be warranted for the
+remainder of the original Warranty Period or thirty (30) days,
+whichever is longer. The foregoing warranty extends only to the
+Licensed Software in the form delivered by Altera to Licensee, and not
+to any: (i) modifications not made by Altera or its Authorized
+Distributor; (ii) misuse, abuse, or use of the Licensed Software in a
+manner not contemplated by this Agreement; (iii) failure to use
+compatible Altera Devices as set forth in the Documentation; (iv)
+Third Party Materials; and (v) any DVD (if applicable) that has been
+damaged as a result of accident, misuse, or abuse.
+
+11. Disclaimer of Warranties. EXCEPT AS EXPRESSLY SET FORTH ABOVE,
+AND NOTWITHSTANDING ANYTHING TO THE CONTRARY IN THIS QUARTUS
+AGREEMENT, NO OTHER WARRANTIES OR CONDITIONS, EITHER EXPRESS OR
+IMPLIED, ARE MADE WITH RESPECT TO THE LICENSED SOFTWARE AND/OR SUPPORT
+PROVIDED BY ALTERA, ITS LICENSORS, OR ANY AUTHORIZED DISTRIBUTOR,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
+NONINFRINGEMENT. ALTERA, ITS LICENSORS, AND AUTHORIZED DISTRIBUTORS
+EXPRESSLY DISCLAIM ALL LIABILITY FOR DAMAGES, INCLUDING, BUT NOT
+LIMITED TO, DIRECT, INDIRECT, SPECIAL, INCIDENTAL, AND CONSEQUENTIAL
+DAMAGES, SUCH AS EXPENSES, RECALL COSTS, BUSINESS INTERRUPTION
+DAMAGES, LOSS OF OR DAMAGE TO INFORMATION, LOSS OF GOODWILL, LOST
+PROFITS, LOST SAVINGS, OTHER DAMAGES ARISING OUT OF THE USE OF OR
+INABILITY TO USE THE LICENSED SOFTWARE; THAT THE FUNCTIONS CONTAINED
+IN THE LICENSED SOFTWARE WILL MEET LICENSEE REQUIREMENTS; OR THAT THE
+OPERATION OF THE LICENSED SOFTWARE WILL BE UNINTERRUPTED OR ERROR-
+FREE. LICENSEE ALSO ASSUMES RESPONSIBILITY FOR THE SELECTION OF THE
+LICENSED SOFTWARE TO ACHIEVE ITS INTENDED RESULTS AND FOR THE
+INSTALLATION, USE, AND RESULTS OBTAINED FROM THE LICENSED SOFTWARE.
+YOUR'S AND LICENSEE'S SOLE REMEDIES AND ALTERA'S, ITS LICENSORS' AND
+THE AUTHORIZED DISTRIBUTORS' ENTIRE LIABILITY ARE AS SET FORTH ABOVE.
+Some jurisdictions do not permit the exclusion of implied warranties,
+so the above exclusion may not apply to You or Licensee, but shall be
+interpreted to apply to the maximum extent permissible under
+applicable law.
+
+12. Support Services. After expiration of the Warranty Period, upon
+payment of the applicable support fee Altera or its Authorized
+Distributor, as the case may be, Altera or the Authorized Distributor
+shall: (i) be obligated to provide Support for the Licensed Software
+(including bug fixes, error corrections and any other updates) made
+generally available by Altera to licensees that purchase support and
+maintenance for a period of 12 months from the date of the license
+purchase or renewal, or the date of the license activation, whichever
+is later; and (ii) use commercially reasonable efforts to respond by
+telephone or email to Your inquiries for support for the Licensed
+Software. Any information collected by Altera or the Authorized
+Distributor arising from or relating to Your requests for Support,
+including but not limited to design files compiled using the Licensed
+Software provided by You or Licensee for purposes of design
+assistance, enhancement, and troubleshooting, may be used internally
+by Altera for the purpose of improving future versions of the Licensed
+Software and developing future products. Any such information will
+not be disclosed by Altera to any third parties other than its
+subsidiaries, its Authorized Distributors, its authorized sales
+representatives, and to You.
+
+13. Limitation of Liability. Under no circumstances shall Altera,
+its licensors, or an Authorized Distributor be liable to You, Licensee
+or to any third party in an amount greater than One Thousand Dollars
+($1,000.00) or the subscription fee paid by Licensee to Altera or the
+Authorized Distributor for the Licensed Software covered by this
+Quartus Agreement. You or Licensee may not sublicense, assign, or
+transfer the license rights granted herein, or disclose any trade
+secrets associated with the Licensed Software, except as expressly
+provided in this Quartus Agreement. Any attempt to sublicense,
+assign, or transfer any of the rights, duties, or obligations
+hereunder is void and shall automatically terminate any licenses and
+rights granted under this Quartus Agreement.
+
+14. Choice of Law/Venue. This Agreement will be governed by the laws
+of the State of California, United States of America, without
+reference to its choice of laws provisions. You and Licensee agree
+to submit to the exclusive jurisdiction of the state and federal
+courts in the County of Santa Clara, State of California for the
+resolution of any dispute or claim arising out of or relating to this
+Agreement. The prevailing party in any legal action, settlement or
+arbitration arising out of this Agreement shall be entitled to
+reimbursement for its expenses, including court costs and reasonable
+attorneys' fees, in addition to any other rights and remedies such
+party may have.
+
+15. Export Control. You and Licensee shall not transfer any
+Confidential Information, the Licensed Software, the Documentation or
+any modifications or portions of any of the foregoing to any U.S.
+sanctioned or embargoed country, or to nationals or residents of such
+countries, including but not limited to a foreign national having a
+last citizenship or permanent residency of Cuba, Iran, Lybia, North
+Korea, Sudan, or Syria, and/or to any country subject to trade
+sanctions, as may be revised from time to time; or transfer the
+Licensed Software to any party where the end use involves hazardous
+uses, including but not limited to nuclear, chemical, and/or
+biological weapons, missiles, drones, or space launch systems capable
+of delivering such weapons.
+
+16. U.S. Government Restricted Rights. You and Licensee acknowledge
+and agree that all software and software-related items licensed to
+Licensee by Altera pursuant to this Agreement are "Commercial Computer
+Software" or "Commercial Computer Software Documentation" as defined
+in FAR 12.212 for civilian agencies and DFARS 227-7202 for military
+agencies (as amended) and in the event You are permitted under this
+Quartus Agreement to provide such items to the U.S. government, such
+items shall be provided under terms that are at least as restrictive
+as the provisions of this Quartus Agreement. The
+Contractor/manufacturer is Altera Corporation, 101 Innovation Drive,
+San Jose, CA 95134 and its licensors.
+
+17. Assignment. Altera reserves the right to transfer any and all
+information collected by the TalkBack feature from users of the
+Licensed Software to a third party in the event that we sell, merge
+or transfer all or substantially all of our assets related to the
+Licensed Software to such third party.
+
+18. Access to Information on the ALTERA Cloud Site. If enabled, all
+users have the ability to view the compile data transmitted by logging
+into the https://cloud.altera.com ALTERA cloud site with the same user
+account specified when enabling the Quartus Prime notifications feature.
+From this site, any users can browse the compile status data, or
+delete/purge results as they wish.
+
+19. TalkBack(TM) and Problem Reporter Notice, Consent and Opt-Out.
+
+ 19.1 Information Collected and Transmission of Information.
+TalkBack is a feature of the Licensed Software that electronically
+transmits to Altera various data concerning Your Use of the Licensed
+Software. No actual logic designs or machine-executable binary form
+of cores used to program an Altera Device that are processed with the
+Licensed Software will be collected or transmitted with TalkBack. The
+types of data TalkBack transmits to Altera include: (i) constraint
+data (location assignments, clock and timing requirement and
+assignments, and any constraints set via the Quartus PRIME GUI
+(graphical user interface); (ii) device data (targeted device and
+family); (iii) compilation data (device, memory and I/O utilization,
+and time of compilation); (iv) design data (the number of each type of
+file used, name of top file, intellectual property cores/MegaCore
+logic functions used, and intellectual property parametrization); (v)
+Licensed Software tools (synthesis, simulation and timing analysis
+tools used, and version and build of the Licensed Software); (vi)
+platform data (operating system, speed and number of processors and
+main memory); (vii) license file identification number (T-Guard, host
+ID, NIC ID or C: drive); (viii) GUI activities and Licensed Software
+errors log data (previous exit status); and (ix) help access data.
+Altera may correlate the data collected by TalkBack primarily through
+the FlexNet License Key to determine the identity of Licensee and
+Users.
+
+ 19.2 Transmission of Information. TalkBack functions by
+bundling the collected data resulting from Your Use of the Licensed
+Software and writing it to html and/or xml files which are
+electronically transmitted over the internet to Altera by hypertext
+transfer protocol secure post (https). TalkBack will only maintain up
+to fifteen (15) files at any given time (i.e., the last five (5) sent
+files and up to ten (10) unsent files). As new files are created,
+prior files (whether or not previously transmitted) will be deleted.
+Each saved file will be less than 500 KB in size and can be viewed as
+text files found in the temporary directory on Your hard drive
+(typically in /tmp, c:/temp, or c:\documents and
+setting\username\local settings\temp). If the https transmission
+fails, or an internet connection is not available at the time of the
+attempted transmission, the data is stored as an html and/or xml file.
+TalkBack will not initiate an internet connection. Once an internet
+connection is achieved, the https transmission will be attempted again
+upon re-compilation. Files that have not been successfully
+transmitted will be named "quartus_talkback*.xml", while successfully
+transmitted files will be renamed as "sent_quartus_talkback*.xml."
+The performance of the Licensed Software will not be materially
+affected by the operation of TalkBack.
+
+ 19.3 Non-disclosure and Protection of Information Collected; Use
+of Information. Altera uses the data received through TalkBack in
+order to continuously improve the Licensed Software and other
+products, technology and services Altera offers to customers. This
+information will not be used to send You any sales and marketing
+communications, and we will only send You such information if You have
+previously consented to receive such communications.
+
+ Altera uses all reasonable efforts to maintain the privacy of the
+data during transmission and after receipt by Altera through firewalls
+and other commonly available physical and technical security measures.
+However, due to technological limitations and the transmission of data
+through internet service providers not under contract with Altera, and
+the risk of unlawful interceptions and accessing of transmissions
+and/or data, Altera cannot guarantee, and You and Licensee should not
+expect, that Licensee's information will be absolutely protected or be
+maintained with absolute confidentiality at all times. The
+information collected by the TalkBack feature will not be disclosed
+to any third parties other than Altera's subsidiaries and the company
+on behalf of whom You are using the Quartus Prime software (collectively,
+"Partners"). In addition to disclosures to Altera Partners, Altera
+may disclose data collected by Talkback related to Licensee and its
+Users with or without prior notice, when Altera reasonably believes
+applicable law requires such disclosure, in response to subpoenas or
+official requests from governmental or administrative agencies, to
+protect Altera's business or systems, or to respond to an emergency.
+
+ 19.4 Enabling/Disabling TalkBack. TalkBack will collect
+and provide certain information to Altera. By downloading,
+installing, copying or using the Licensed Software, or by paying a
+subscription fee, You hereby agree that you have been fully informed
+about the purposes for which your information will be used, and You
+give Your consent for Altera to use this information both within and
+outside of the European Union for the purposes described in this
+TalkBack disclosure notice. You may disable or enable TalkBack by
+running QTB_INSTALL.EXE located in Licensee's Quartus/bin folder.
+
+ 19.5 Enabling/Disabling Problem Reporter. Problem
+Reporter will collect and provide certain information to Altera
+concerning Your Use of the Licensed Software, in the event of a
+software crash. No logic designs or machine-executable binary form
+of cores used to program an Altera Device that are processed with the
+Licensed Software will be collected or transmitted with Problem
+Reporter. The types of data Problem Reporter transmits to Altera
+include: (i) Licensed Software tools (tools used, and version and
+build of the Licensed Software); (ii) platform data (operating
+system); and (iii) Licensed Software errors log data (previous exit
+status). By downloading, installing, copying or using the Licensed
+Software, or by paying a subscription fee, You hereby agree that you
+have been fully informed about the purposes for which your information
+will be used, and You give Your consent for Altera to use this
+information both within and outside of the European Union for the
+purposes described in this Problem Reporter disclosure notice. You
+may disable or enable Problem Reporter at any time by making the
+appropriate setting in the Quartus Prime "Options > Internet
+Connectivity" dialog box in the Quartus Prime software graphical user
+interface.
+
+20. General Terms. This Quartus Agreement is entered into for the
+benefit of Altera, its licensors and Authorized Distributors, and all
+rights granted to You and Licensee, and all obligations owed to
+Altera, its licensors and the Authorized Distributors shall be
+enforceable by Altera, its licensors and the Authorized Distributors.
+No modification of this Quartus Agreement will be binding unless in
+writing and signed by authorized representatives of each party. If
+any of the provisions of this Quartus Agreement are found to be in
+violation of applicable law, void, or unenforceable, then such
+provisions shall be deemed to be deleted from the Quartus Agreement,
+but the remaining provisions of the Quartus Agreement shall remain in
+full force and effect. If You have any questions concerning this
+Quartus Agreement, including questions relating to software
+maintenance or warranty service, please contact Altera Corporation,
+101 Innovation Drive, San Jose, CA 95134.
+
+By downloading, installing, copying or using the Licensed Software, or
+by paying a subscription or other applicable fee, You acknowledge that
+You have read this Quartus Agreement, understand it, and agree to be
+bound by its terms and conditions. You further agree that the
+Quartus Agreement is the complete and entire agreement of the parties
+with respect to the subject matter hereof. No statements, promises or
+representations have been made by one party to the other, or are
+relied upon by either party when entering into this Quartus Agreement.
+All prior and contemporaneous discussions and negotiations, whether
+verbal or written, are merged into and superseded by the Quartus
+Agreement. No entity or person not a party hereto shall have any
+interest under this Quartus Agreement, or be deemed to be a third
+party beneficiary of the Quartus Agreement. If the Agreement
+terminates for any reason, all definitions in this Agreement and the
+rights, obligations, and restrictions under Paragraphs 1
+(Definitions); 5 (Confidential Information; 6 (Restrictions on Use); 7
+(No Other Licenses or Intellectual Property Rights); 8 (Third Party
+Licensors); 10 (Limited Warranty and Remedies); 11 (Disclaimer of
+Warranties); 13 (Limitation of Liability); 14 (Choice of Law/Venue);
+15 (Export Control); 16 (U.S. Government Restricted Rights); 17
+(Assignment); and 20 (General Terms) shall survive termination of this
+Agreement.
+
+
+[END OF QUARTUS PRIME, VERSION 15.1 LICENSE AGREEMENT]
+
+MEGACORE(R) FUNCTION VERSION 15.1 LICENSE AGREEMENT
+
+
+Copyright (C) 1991-2015 Altera(R) Corporation. All rights
+reserved. "Megacore" is a registered trademark of Altera Corporation
+in the U.S. and other countries. Any other trademarks and trade names
+referenced here are the property of their respective owners.
+
+PLEASE REVIEW THE FOLLOWING TERMS AND CONDITIONS IN THIS MEGACORE
+FUNCTION LICENSE AGREEMENT (THE "MEGACORE AGREEMENT" OR "AGREEMENT")
+CAREFULLY BEFORE DOWNLOADING, INSTALLING OR USING THE LICENSED
+SOFTWARE. BY: (A) DOWNLOADING, INSTALLING, COPYING OR USING THE
+LICENSED SOFTWARE; OR (B) PAYING A LICENSE FEE OR OTHER FEE TO ALTERA;
+OR (C) PAYING A FEE TO AN AUTHORIZED DISTRIBUTOR, YOU INDICATE YOUR
+ACCEPTANCE OF THIS MEGACORE AGREEMENT. IN THE EVENT OF ANY
+INCONSISTENCY BETWEEN THE TERMS OF THE MEGACORE AGREEMENT AND YOUR
+AGREEMENT WITH AN AUTHORIZED DISTRIBUTOR, THIS MEGACORE AGREEMENT WILL
+GOVERN AND CONTROL, EXCEPT WITH REGARDS TO PAYMENT TERMS.
+
+Certain files, programs, or other materials provided in connection
+with the Licensed Software may originate or contain components from
+Third Party Licensors and are licensed to Licensee pursuant to the
+terms of the applicable Third Party License appearing upon activation
+or installation of the Licensed Software, and/or are contained or
+described in associated release notes, header source files, or other
+documentation. Any such additional terms, and conditions or
+restrictions will also be listed in a separate file called "Third
+Party Licenses Document". You agree to carefully review and comply
+with the terms of such Third Party Licenses. NOTWITHSTANDING ANYTHING
+TO THE CONTRARY IN THE AGREEMENT, AS BETWEEN LICENSEE AND ALTERA, AND
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, ALL SUCH THIRD
+PARTY LICENSES SHALL BE SUBJECT TO SECTION 5.3 (DISCLAIMER OF
+WARRANTIES), SECTION 10 (LIMITATION OF LIABILITY) AND SECTION 11.6
+(GOVERNING LAW). ALTERA OFFERS NO WARRANTIES (WHETHER EXPRESS OR
+IMPLIED); INDEMNIFICATION; AND/OR SUPPORT OF ANY KIND WITH RESPECT TO
+THIRD PARTY MATERIALS, EXCEPT THAT WE WILL PASS THROUGH TO YOU, IF AND
+TO THE EXTENT AVAILABLE, ANY WARRANTIES EXPRESSLY PROVIDED TO US BY
+THIRD PARTY LICENSORS RELATING TO SUCH THIRD PARTY MATERIALS.
+
+IF YOU DO NOT AGREE WITH THE TERMS AND CONDITIONS OF THIS MEGACORE
+AGREEMENT OR THE TERMS OF ANY OF ITS THIRD PARTY LICENSES, DO NOT
+DOWNLOAD, COPY, INSTALL OR USE THE LICENSED SOFTWARE. IF YOU HAVE
+ALREADY DOWNLOADED THE LICENSED SOFTWARE, PLEASE UNINSTALL IT AND
+IRREVOCABLY DESTROY ANY COPIES YOU HAVE MADE AS SOON AS POSSIBLE. IF
+YOU HAVE RECEIVED A COPY OF THE LICENSED SOFTWARE ON DVD OR OTHER
+MANNER THAN ELECTRONIC DOWNLOAD, PLEASE RETURN THE LICENSED SOFTWARE
+UNUSED TO ALTERA OR THE AUTHORIZED DISTRIBUTOR FROM WHICH YOU OBTAINED
+THE LICENSE PROMPTLY.
+
+1. Definitions.
+
+"Altera" means Altera Corporation, including its affiliates and
+subsidiaries worldwide.
+
+"Altera Devices" means programmable logic devices, including field
+programmable gate arrays ("FPGAs") devices or complex programmable
+logic devices ("CPLDs") structured application specific integrated
+circuit devices, and/or any other semiconductor devices designed,
+developed or manufactured by or on behalf of Altera.
+
+"Authorized Contractors" means a person, company, or other entity
+that: (i) provides design, testing, or integration services for
+Licensee, but such integration services shall be performed solely for
+implementation within Altera Devices; and who is (ii) is subject to a
+written confidentiality agreement protecting Altera's Confidential
+Information with restrictions no less restrictive than those contained
+in this MegaCore Agreement, and Licensee shall enforce such agreement
+in the same fashion as it would enforce its own confidentiality
+agreements of similar importance. Any access to or use of the
+Licensed Software or the Licensed Product by the Authorized Contractor
+is subject to the following: (a) such access and/or use shall be for
+the sole benefit of Licensee; (b) a breach of the MegaCore Agreement
+or the terms of any other Altera agreement by the Authorized
+Contractor shall be deemed to be a breach of such agreement(s) by
+Licensee, and Licensee shall be liable for any acts or omissions of
+the Authorized Contractor; (c) Licensee shall ensure that in no event
+will any such Authorized Contractor be a competitor of Altera.
+
+"Authorized Distributor(s)" means a reseller, OEM, ODM, or any other
+distributor that is authorized by Altera to license the Licensed
+Software in a valid agreement entered into between Altera and such
+reseller or distributor.
+
+"Checkout License" means a time-limited license granted by Altera
+associated with an existing Floating License to install and Use the
+Licensed Software on a single fixed standalone computer for use by a
+single user. This license shall expire after a specified time as
+designated by Altera. The total number of Checkout Licenses that may
+be granted in relation to a single Floating License may not exceed the
+total number of individual Seats associated with such Floating
+License.
+
+"Concurrent Users" means the number of simultaneous users accessing
+the Licensed Software. For example, a 20-seat concurrent use license
+would allow 20 users to log in and use the Licensed Software at one
+time, but the 21st user attempting to check in would be blocked and
+unable to do so until one other user checks out.
+
+"Confidential Information" means and includes, but is not limited to:
+(i) the Licensed Software (whether provided in source code or binary
+form, including any modifications, derivatives, updates and upgrades
+thereto) and the algorithms, concepts, techniques, methods and
+processes embodied therein; (ii) the Licensed Products and all
+information and specifications associated therewith; (iii) any
+business, marketing, technical, scientific, or financial information
+disclosed to You by Altera or an Authorized Distributor; or (iv) any
+information which, at the time of disclosure, is designated in writing
+as confidential or proprietary, or similar designation, is disclosed
+in circumstances of confidence, or would be reasonably understood by a
+person, exercising business judgment, to be confidential.
+
+"Designated Equipment" means the computer system that is owned or
+leased by You and operated on Your premises, and identified by a
+network interface card ("NIC") or host ID number on which the Licensed
+Software is installed and Used, and which has the configuration,
+capacity, operating system version level, and pre-requisite
+applications described in the Documentation as necessary for the
+operation of the Licensed Software, and is designated by the NIC /host
+ID in the License Key as the computer system on which the License Key
+management software will be installed.
+
+"Derivative Works" means any derivatives or modifications of the
+Licensed Software created by You or by a third party on Your behalf,
+including: (i) for copyrightable or copyrighted material, any
+translation, abridgement, revision or other form in which an existing
+work may be recast, transformed or adapted; (ii) for work protected by
+topography or mask right, any translation, abridgement, revision or
+other form in which an existing work may be recast, transformed or
+adapted; (iii) for patentable or patented material, any improvements;
+and (iv) for material protected by trade secret, any new material
+derived from or employing such trade secret.
+
+ "Fixed with Companion License" means a license to install: (i) the
+Licensed Software on a fixed standalone computer for Use by a single
+User; and (ii) the Licensed Software on up to two companion fixed
+standalone computers. Under this license, only one Seat may be used
+by a single User at any given time.
+
+ "Floating Node Seat" is a license that allows the Licensed Software
+to be: (i) installed on and accessed from any number of computers on a
+network environment; (ii) Used by the permitted number of Concurrent
+Users that is equal to the number of Seats licensed as determined by
+the License Key; and (iii) Used for the sole purposes of developing,
+programming, synthesizing, testing and verifying designs for Altera
+Devices.
+
+"Intellectual Property Rights" means all (i) patents, patent
+applications, patent disclosures and inventions (whether patentable or
+not); (ii) trademarks, service marks, trade dress, trade names, logos,
+corporate names, Internet domain names, and registrations and
+applications for the registration for any of them, together with all
+goodwill associated therewith; (iii) copyrights and copyrightable
+works (including computer programs and mask works) and registrations
+and applications for registration; (iv) trade secrets, know-how and
+other such Confidential Information; (v) waivable or assignable rights
+of publicity, waivable or assignable moral rights; (vi) unregistered
+and registered design rights and any applications for registration;
+(vii) database rights and all other forms of intellectual property,
+such as data; and (viii) any and all similar or equivalent rights
+throughout the world.
+
+"License Key" means a FlexNet license key, license file, license
+manager, dongle or other key, code or information provided by Altera
+that: (i) enables a User to, operate and/or regulate User access to
+the Licensed Software; and (ii) describes the version number of the
+Licensed Software and lists the number of Concurrent Users authorized
+to Use the Licensed Software.
+
+"License Period" means the period of time Licensee has Use of the
+Licensed Software as governed by the License Key.
+
+"Licensee" means an individual, corporation or other legal entity to
+which Altera has issued a Seat of the Licensed Software.
+
+"Licensed Software" means (i) the applicable MegaCore Function; (ii)
+any format test benches (if applicable) and/or suite of test vectors
+(if applicable); and (iii) the Specification (if applicable) related
+to the foregoing, and is enabled via the License Key, but does not
+include Unlicensed Software components, files, or portions
+specifically identified as not being included, licensed or enabled via
+the License Key.
+
+"Licensed Products" means any Altera Device(s) in which the Licensed
+Software, in whole or in part (or as modified by Licensee or an
+Authorized Contractor) are incorporated or implemented pursuant to the
+provisions of this MegaCore Agreement.
+
+
+"Maintenance Expiration Date" is set as 12 months from the latter of
+date of license/ license renewal and license activation. The
+Maintenance Expiration date for each seat license is noted in the
+license key. Further description is provided in Section 9.1 below.
+
+"MegaCore Function" means one or more design files, including
+encrypted netlists, RTL, test vectors, simulation models (such as VHDL
+, Verilog HDL, Quartus simulation, Matlab, Simulink, Verisity,
+Specman, Synopsys, Vera, etc.) and other models, each of which may be
+provided in either as unencrypted source code or object code formats,
+or in encrypted netlist or encrypted source code formats, and memory
+controllers provided in source code format, where each is designed to
+implement or supports the design of a specific function into an Altera
+Device, together with any updates Altera may provide to You pursuant
+to this MegaCore Agreement, except for components, files, or portions
+that are subject to any license agreement(s) set forth in any Third
+Party Licenses document or file.
+
+"OpenCore Plus Evaluation Mode" means a limited licensing feature
+offered by Altera that permits free evaluation of a MegaCore Function
+upon installation and prior to payment of a licensing fee.
+
+"Seat" means the right granted under this Agreement by Altera to Use
+the Licensed Software by a single User in accordance with the terms
+and conditions of this Agreement or an Authorized Distributor's
+license agreement. A Seat is either a Floating Node Seat or a Fixed
+with Companion License, which is enabled via a License Key.
+
+"Specification" means technical data in human or machine readable
+form furnished by Altera which: (i) provides operating instructions
+for using the Licensed Software, or (ii) explains the capabilities and
+functions of such items, and any full or partial copies of any such
+technical data.
+
+"Support" means any support or maintenance services provided to
+Licensee by Altera, an Authorized Distributor, and/or authorized
+Altera representatives in responding to email, telephone, or other
+inquiries from You for maintenance, technical, or other support
+requests in connection with the Licensed Software or the Licensed
+Products.
+
+"Third Party Licenses" is a separate file, header, or release notes
+that contains additional terms, conditions or restrictions imposed by
+Third Party Licensors. Such Third Party Licenses will be identified
+in a Third Party Licenses Document describing each Third Party License
+associated with every Altera product. A hyperlink to an Altera
+database containing the text of all Third Party Licenses may be
+accessed by clicking on the applicable line in the Third Party
+Licenses Document.
+
+"Third Party Licensors" means and includes any third party that
+licenses or provides Third Party Materials to Altera.
+
+"Third Party Materials" are materials or components included in the
+download or the DVD, as applicable, that include but are not limited
+to software, code portions or files owned by Third Party Licensors,
+and are provided subject to Third Party Licenses.
+
+"Unlicensed Software" means any Altera computer programs or code in
+any format for which Licensee does not hold an active License Key
+issued by Altera, including but not limited to any non-subscribed or
+disabled features.
+
+"Use" means downloading, installing, using and copying all or any
+portion of the Licensed Software into the Designated Equipment for
+processing the instructions contained in the Licensed Software, and/or
+loading data into or displaying, viewing or extracting output results
+from, or otherwise operating, any portion of the Licensed Software.
+
+"User" or "You" means an individual identified by Licensee as a person
+authorized to Use the Licensed Software on behalf of and for the
+benefit of Licensee. If Licensee is an individual who obtained a Seat
+for his/her individual use, Licensee and User are and will be one and
+the same.
+
+2. Grant of License, Restrictions and Limitations.
+
+ 2.1. Altera License. Subject to and conditioned upon
+Licensee's compliance with the terms and conditions of this Agreement,
+including payment of the applicable license fee (unless You are using
+the Licensed Software through the OpenCore Plus Evaluation Feature)
+Altera hereby grants to Licensee a personal, worldwide, non-exclusive,
+non-transferable, perpetual (but subject to termination as otherwise
+described in this Agreement), royalty-free license with no right to
+sublicense under Altera's copyright and trade secret rights embodied
+in and to the Licensed Software to Use the Licensed Software during
+the License Period solely to:
+
+ (a) design with, parameterize, compile, route, and
+generate programming files and netlists with the Licensed Software,
+solely for implementation in Altera Devices, provided You have: (i)
+obtained from Altera a Fixed with Companion License or Checkout
+License; or (ii) if You have purchased a Floating License, multiple
+users on networked workstations up to the number of Concurrent Users
+for which You have obtained licenses from Altera;
+
+ (b) program Altera Devices with the Licensed Software;
+
+ (c) exercise the rights granted in Sections (a) and (c) of
+this Section 2.1 through Authorized Contractors;
+
+ (d) install the Licensed Software on one (1) or more
+computers, as specified the Fixed with Companion License, Floating
+License, or Checkout License (as applicable) You have obtained from
+Altera. In accordance with the provisions of this Section 2.1 ;
+
+ (e) Except as otherwise provided in Section 10.2 below,
+You may manufacture or have manufactured, market, offer for sale,
+sell, or otherwise distribute or have distributed Your products
+containing one or more Licensed Software; and
+
+ (f) Subject to Altera's prior written approval, upon the
+negotiation of a mutually acceptable agreement and your payment to
+Altera of license fees and royalties, You may incorporate the Licensed
+Software within the approved ASIC for a specific project.
+
+ 2.2 Use Restrictions. No right is granted under this
+Agreement to use the Licensed Software or any machine-executable,
+binary form of a core used to design, develop, or program a non-Altera
+Devices. However, You may port ASIC designs to Altera Devices for the
+sole purposes of prototyping and verification. Altera specifically
+disclaims any liability for results obtained when using the Licensed
+Software to program non-Altera Devices. Additionally, Licensee may
+not: (i) modify or synthesize any simulation model output files
+generated from or resulting from the Licensed Software, (ii) use, and
+shall prevent any third parties or Authorized Contractors from using,
+the Licensed Software to program programmable logic devices, field
+programmable gate arrays ("FPGAs"), application specific integrated
+circuits, application specific standard products, or any other
+integrated circuit products designed or manufactured by any company or
+entity other than Altera; (iii) except as otherwise permitted under
+this Agreement, You may not sublicense or transfer the Licensed
+Software and any rights granted under this Agreement. If Licensee
+transfers possession or control of the Licensed Software (including
+any modifications or portions thereof) or any rights granted under
+this Agreement to a third party, this license shall automatically
+terminate without notice; (iv) Licensee may not decompile,
+disassemble, reverse engineer, or otherwise attempt to access or
+derive the source code of the Licensed Software, or any algorithms,
+concepts, techniques, methods or processes embodied therein, or reduce
+the source code of the Licensed Software to a human readable form
+("Reverse Engineer") except as otherwise permitted in this Agreement,
+or as permitted by applicable law. In such case, Licensee may Reverse
+Engineer, but only after giving written notice to Altera, and only to
+the extent permitted by the Agreement or applicable law; and (v) You
+or Licensee may not publish or disclose the results of any
+benchmarking or testing of the Licensed Software or portions thereof,
+or use such results for Licensee's own competing software development
+activities, without the prior written permission of Altera.
+
+ 2.3. OpenCore Plus Evaluation License. Notwithstanding
+anything to the contrary in Section 2.1 above, if You are using the
+Licensed Software through the OpenCore Plus Evaluation Feature, Your
+license is more limited than the license granted by Altera in Section
+2.1 above. Altera grants to You a temporary, limited, nonexclusive,
+nontransferable, single Concurrent User right and license to: (a)
+evaluate the logic designs of Altera Devices by performing the
+following functions: design entry, timing, place and route,
+compilation and verification of logic designs for Altera Devices; and
+(b) evaluate the hardware in Altera Devices by programming the
+MegaCore Function into such Altera Devices, but only for so long as
+the Altera Device is continuously connected via a programming cable to
+a host development computer that is running the Altera development
+tool programmer software. Otherwise, the Licensed Software will
+operate for a predetermined amount of time, after which the Licensed
+Software is automatically disabled and will be inoperable. Certain
+features and functions of the Licensed Software may be disabled by
+Altera during the OpenCore Plus evaluation. In no event will Altera
+be held liable for any damages or losses to You, Licensee or any
+third-party resulting from the automatic disabling of any MegaCore
+functions obtained through Altera's Opencore Plus evaluation license.
+
+ 2.4. Reservation of Rights. Except for the licenses expressly
+granted to You or Licensee in this Section 2, no other licenses are
+granted to Licensee or You by implication, estoppel, or otherwise, and
+all rights not expressly granted to Licensee or You in this Section 2
+are reserved by Altera.
+
+ 2.5. Delivery of Licensed Software. The Licensed Software will
+be delivered electronically, and will be accepted upon delivery. You
+may copy the Licensed Software solely for back-up or archival
+purposes, and may use the Licensed Software over a network.
+
+ 2.6. License Key. Altera will deliver the License Key to You
+after Altera's receipt of all information required to generate the
+License Key, including the product name and quantity of Seats licensed
+for the designated server or computer onto which You will install the
+License Key management software. In accordance with its distribution
+method, Altera may include with the Licensed Software additional
+Unlicensed Software to which the License Key will not permit access.
+Inclusion of such Unlicensed Software in no way implies a license from
+Altera to access or use such Unlicensed Software, and You agree not to
+access or use such Unlicensed Software, unless the License Key
+specifically authorizes such access and use.
+
+ 2.7. Intellectual Property Rights Notices. Any copies of the
+Licensed Software made by or for Licensee or You shall include all
+intellectual Property Rights notices. Licensee will not, and shall
+cause its Authorized Contractors and its customers and/or end users to
+not remove any Altera Intellectual Property Rights notices from the
+Licensed Software. Any copy of the Licensed Software or portions
+thereof, including but not limited to any modified versions,
+Derivative Works, any portion merged into a design, and/or any design
+or product that incorporates all or any portion of the Licensed
+Software, will continue to be subject to the terms and conditions of
+this Agreement.
+
+ 2.8. Feedback. If You provide Altera with any comments or
+suggestions with respect to the modification, correction, improvement,
+or enhancement of: (i) the Licensed Software or portions thereof; (ii)
+any Confidential Information disclosed by Altera to You; or (iii)
+Licensed Products that may embody such Confidential Information
+(collectively, the "Feedback") then You and Licensee agree to grant
+and hereby grant to Altera a nonexclusive, irrevocable, perpetual,
+worldwide, royalty-free, fully paid up right and license under any
+Intellectual Property Rights You may have in and to the Feedback,
+including but not limited to the following rights: (a) create
+Derivative Works of the Feedback; (b) modify, enhance, and customize
+the Feedback; (c) sublicense the Feedback to Altera licensees and
+customers; and (d) market, perform, copy, have copied, make, have
+made, Use, offer to sell, sell, and otherwise distribute Altera's and
+its sublicensees' products including or embodying Feedback in any
+manner and via any media Altera chooses.
+
+ 2.9. No Other Licenses or Grant of Intellectual Property Rights.
+Except as provided in this Agreement, neither party grants to the
+other party, either directly or indirectly, by implication, or by way
+of estoppel, any license or any other right under such party's
+Intellectual Property Rights. You and Licensee acknowledge and agree
+that: (i) this Agreement does not grant to Licensee any right to
+practice, or any other right at all with respect to, any patent of
+Altera or its licensors, and a separate license agreement from Altera
+or its licensors is needed to use or practice any patent of Altera or
+its licensors. Licensee, on behalf of its Users, affiliates and
+subsidiaries, agrees not to contend in any context that, as a result
+of this Agreement, either Altera or its licensors have any obligation
+to extend, or Licensee, its Users or any other party has obtained any
+right to, any license, whether express or implied, with respect to any
+patent of Altera or its licensors, for any purpose whatsoever.
+
+3. Ownership and Future Development.
+
+ 3.1. Ownership of Licensed Software. As between Licensee, You
+and Altera, You and Licensee acknowledge and agree that Altera and
+its licensors have and shall have exclusive ownership of all worldwide
+right, title and interest in and to the Licensed Software and all
+Intellectual Property Rights and industrial rights associated
+therewith, including but not limited to enhancements, corrections,
+improvements, modified versions, or Derivative Works of all the
+foregoing, in whole or in part, whether developed or co-developed by
+Altera, or developed or co-developed by Licensee pursuant to this
+Agreement. To assist Altera in perfecting its ownership rights in and
+to the intellectual property described in this Section 3.1, You and
+Licensee agree to assign and hereby assign to Altera all Intellectual
+Property Rights that You and Licensee may otherwise have acquired in
+and to the intellectual property described herein, and You and
+Licensee agree to assist and cooperate with Altera in all reasonable
+respects in: (a) any actions to establish, transfer, or maintain such
+ownership rights, including executing any documents associated
+therewith; and (b) actions of enforcement of such ownership rights.
+To the extent that any rights You and/or Licensee may have acquired
+cannot be assigned under applicable law (for example, moral rights),
+You and Licensee agree to waive and hereby waive any and all rights
+related to the Intellectual Property Right described in this Section
+3.1, including without limitation any and all rights of identification
+of authorship and any and all rights of approval, restrictions or
+limitation on use, or subsequent modification.
+
+ 3.2. Licensee recognizes and acknowledges that Altera is or
+may be independently developing for commercial use products that may
+be complementary to or competitive with Licensee's products and may in
+future independently develop products that may compete with Licensee's
+products. Nothing in this Agreement shall limit Altera's independent
+development and marketing or distribution of any products or systems,
+provided such independent development is accomplished without use of
+Licensee's confidential information. The existence of this Agreement
+shall not prevent Altera from undertaking discussions with third
+parties, including Licensee's competitors.
+
+4. Confidential Information. The Confidential Information
+constitutes trade secrets and confidential and proprietary information
+of Altera and its licensors, and You and Licensee agree not to access
+or Use the Licensed Software or portions thereof, directly or
+indirectly, except and to the extent expressly permitted under this
+Agreement or by applicable law. Altera and its licensors retain all
+rights in and to the Licensed Software, modifications, derivatives,
+updates, and upgrades, and all Intellectual Property Rights associated
+with any of the foregoing. No other rights or licenses are granted by
+implication, estoppel or otherwise, to You, Licensee, or any third
+party.
+
+ 4.1. With respect to Confidential Information, You and
+Licensee agree: (a) to use at least the same degree of care as
+Licensee uses with respect to its own Confidential Information of
+similar importance, but in no event less than reasonable care, to
+prevent any Confidential Information from being disclosed to any third
+party, except as otherwise permitted by this Agreement; (b) not to use
+or disclose Confidential Information for any purpose except to the
+extent necessary and for the purpose of programming Altera Devices
+with the Licensed Software (the "Intended Purpose"); and (c) to
+restrict the disclosure and possession of Confidential Information
+solely to those of Licensee's Users, employees and Authorized
+Contractors with a need to know/need to access for the Intended
+Purpose, who agree to be bound by written confidentiality agreements
+no less strict than those contained in this Agreement. Licensee
+agrees to be liable to Altera for any breaches by Licensee, its Users,
+employees and Authorized Contractors of the confidentiality
+obligations in this Section 4.1.
+
+ 4.2. You will have no obligations of confidentiality with
+respect to any Confidential Information to the extent that it is: (a)
+already in the public domain or falls into the public domain through
+no breach of this Agreement (or any other obligation to Altera) by
+You, Your employees and Authorized Contractors; (b) already rightfully
+known to You without any obligation of confidentiality; (c) is
+rightfully obtained by You from a third party; or (d) developed
+independently by You, Your employees or Authorized Contractors without
+breach of Your obligation of confidentiality under this Agreement.
+With respect to a disclosure required by order of a court or an
+authorized government agency, You may disclose Confidential
+Information, provided: (i) that You give prompt written notice of any
+such required disclosure to Altera; (ii) You disclose the Confidential
+Information only to the extent required by such court or governmental
+agency; and (iii) You provide reasonable assistance to Altera in its
+efforts to protect the confidentiality of the Confidential Information
+required to be disclosed.
+
+ 4.3. Notwithstanding anything in this Agreement to the
+contrary, Licensee agrees that Altera may disclose Licensee's identity
+by name and address, and identify the Licensed Software licensed to
+Licensee, to the extent required by its agreement with its licensors
+and Authorized Distributors.
+
+5. Limited Warranty and Disclaimer of Warranties.
+
+ 5.1. Limited Warranty. Unless You are using the Licensed
+Software through the OpenCore Plus Evaluation Feature (in which case
+the limited warranty described in this Section 5 will not apply, and
+the Licensed Software is provided to You on an "AS-IS", "with all
+faults", and on a "no warranty" basis) Altera warrants that, until
+the Maintenance Expiration Date (the "Warranty Period"), the Licensed
+Software will conform to the Specifications in all material respects
+if used in compliance with the terms and conditions of this Agreement.
+This warranty is personal to Licensee, and is not transferable to end-
+user customers or to any third party. If the Licensed Software does
+not materially conform to its Specifications, You agree to promptly
+notify Altera in writing of such alleged nonconformance, and provide
+sufficient details or evidence to allow Altera to reproduce the
+alleged defect or nonconformance. Altera shall have no obligation to
+remedy any nonconformance or defect it cannot replicate. During the
+Warranty Period, Altera may, at Altera's sole option: (i) replace any
+Licensed Software not meeting the foregoing warranty (either directly
+or through its Authorized Distributor) provided the Licensed Software
+is returned to Altera or the Authorized Distributor with adequate
+proof of purchase; or (ii) if Altera is unable to remedy the defect or
+nonconformance after reasonable commercial efforts, Altera may elect
+to refund to Licensee the license fee actually paid for the Licensed
+Software during the previous twelve (12) months. Any replacement
+Licensed Software will be warranted for the remainder of the original
+Warranty Period or thirty (30) days, whichever is longer. Your sole
+remedy, and Altera's sole obligation for a breach of the warranty in
+this Section 5.1 shall be replacement or the refund specified in
+subsections (i) and (ii) above. If Altera refunds the license fee in
+accordance with subsection (ii) above, Licensee's license and any
+rights under this Agreement will terminate immediately, and You agree
+to irrevocably destroy the nonconforming Licensed Software including
+any copies thereof and portions thereof incorporated into a design or
+product, and certify in writing to its destruction to Altera.
+
+ 5.2. The foregoing warranty in Section 5.1 extends only to
+the Licensed Software in the form delivered by Altera and its
+Authorized Distributors to Licensee, and not to any: (a)
+modifications not made by Altera or its Authorized Distributor; (b)
+misuse, abuse, or use of the Licensed Software outside its Intended
+Purpose; (c) failure to use compatible Altera Devices as set forth in
+the Specifications; or (d) Third Party Materials.
+
+ 5.3. Disclaimer of Warranties. THE FOREGOING WARRANTIES ARE
+IN LIEU OF ALL OTHER WARRANTIES, EXPRESS OR IMPLIED, WITH RESPECT TO
+THE LICENSED SOFTWARE OR SUPPORT SERVICES, INCLUDING BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, TITLE, NON-INFRINGEMENT, AND ANY IMPLIED
+WARRANTIES ARISING FROM STATUTE, COURSE OF DEALING, COURSE OF
+PERFORMANCE OR USAGE OF TRADE. ALTERA DOES NOT WARRANT THAT THE
+FUNCTIONS IN THE LICENSED SOFTWARE WILL MEET LICENSEE'S REQUIREMENTS
+OR THAT THE OPERATION OF THE LICENSED SOFTWARE WILL BE UNINTERRUPTED
+OR ERROR-FREE, AND DOES NOT MAKE ANY REPRESENTATIONS REGARDING THE USE
+OF THE LICENSED SOFTWARE FOR ACCURACY, RELIABILITY, OR OTHERWISE.
+ALTERA EXPRESSLY DISCLAIMS ALL WARRANTIES NOT EXPRESSLY STATED IN THIS
+AGREEMENT. EXCEPT AND TO THE EXTENT OTHERWISE PROVIDED UNDER THIS
+AGREEMENT, LICENSEE ASSUMES THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE LICENSED SOFTWARE AND ANY DESIGN OR PRODUCT IN
+WHICH THE LICENSED SOFTWARE MAY BE USED, INCLUDING, WITHOUT
+LIMITATION, ANY LICENSED PRODUCTS. No representation or other
+affirmation of fact, including but limited to statements regarding
+capacity, suitability for use or performance of the Licensed Software,
+whether made by Altera employees or otherwise, shall be deemed to be a
+warranty for any purpose or give rise to any liability of Altera
+whatsoever. Some jurisdictions do not allow the exclusion of implied
+warranties, so the above exclusions may not apply to You or Licensee,
+but shall be interpreted to apply to the maximum extent permissible
+under applicable law.
+
+6. Third Party Licensors. The Licensed Software may contain or
+include Third Party Materials licensed or provided to Altera by third
+parties (the "Third Party Licensors") which may be subject to
+additional terms and conditions or restrictions imposed by such Third
+Party Licensors in a separate license agreement (the "Third Party
+Licenses"). Such Third Party Licenses will be identified in a
+separate file, header, or release notes, and the Third Party Licenses
+document describing each such Third Party Licenses associated with
+every Altera product. A hyperlink to an Altera database containing
+the text of all Third Party Licenses may be accessed by clicking on
+the applicable line in the Third Party Licenses document. With
+respect to the Third Party Materials that are not governed by a
+separate Third Party License, the Third Party Licensors of such Third
+Party Materials are intended third party beneficiaries of the terms of
+this Agreement.
+
+7. Term and Termination.
+
+ 7.1. Term. This Agreement will commence when you download
+and install the Licensed Software, and will remain in effect unless
+terminated by either party, or terminated in accordance with its
+terms, whichever occurs first.
+
+ 7.2. Termination. If the Licensed Software is licensed for
+evaluation purposes as described in Section 2.3, then this Agreement
+and the rights granted hereunder will automatically terminate in
+accordance with Section 2.2 above, or upon notice by Altera.
+Additionally, Altera may terminate this Agreement in accordance with
+its terms. Licensee may terminate it at any time by uninstalling and
+irrevocably destroying the Licensed Software, including all
+modifications, copies, and all portions of the foregoing, and
+certifying to such destruction in a writing signed by an officer of
+Licensee. Altera may terminate the license immediately if You or
+Licensee fail to comply with any material term or condition of this
+Agreement, including but not limited to Licensee's breach of the
+license rights granted in this Agreement, breach of Licensee's or Your
+obligation of confidentiality, or if Licensee: (a) ceases to do
+business or terminates its business operations; or (b) becomes
+insolvent or seeks protection under any bankruptcy or liquidation or
+similar proceedings.
+
+ 7.3. Effect of Termination. Upon termination of this
+Agreement for any reason, the licenses and any rights granted under
+this Agreement shall terminate, and Licensee agrees to irrevocably
+destroy, and shall cause any Licensee employees and Authorized
+Contractors to irrevocably destroy, the Licensed Software and all
+portions thereof in Your and Licensee's possession or under Your or
+its control (including any portions thereof merged into a design or
+Licensed Product not already distributed), and certify the same to
+Altera in writing. You shall not continue to use the Licensed
+Software or any portion thereof in development after termination of
+the Agreement, but You may keep a single copy of the Licensed Software
+solely for archival purposes, or to provide support to end users or
+customers.
+
+8. Maintenance and Support.
+
+ 8.1. Unless Licensee has licensed the Licensed Software
+through the OpenCore Plus Evaluation Feature, Altera will provide
+support and maintenance for the Licensed Software until the date
+listed in the license file for a particular MegaCore Function "in the
+format YYYY.MM" (the "Maintenance Expiration Date"). After
+expiration of the Warranty Period, upon payment of the applicable
+support fee Altera or its Authorized Distributor, as the case may be,
+shall: (i) be obligated to provide Support for the Licensed Software
+(including bug fixes, error corrections and any other updates made
+generally available by Altera to licensees that purchase support and
+maintenance) for a period of 12 months from the date of the license
+purchase or renewal, or the date of the license activation, whichever
+is later; and (ii) use commercially reasonable efforts to provide to
+You fixes to defects in the Licensed Software that cause the Licensed
+Software not to conform in all material respects with the
+Specifications that are diagnosed as non-conformances, and are capable
+of replication by Altera; (iii) provide to You fixes and other updates
+to the Licensed Software that Altera, in its sole discretion, chooses
+to make generally available to its licensees without a separate
+charge; and (iv) respond by telephone or email to Your inquiries for
+support.
+
+ 8.2. Exclusions. Altera is not and shall not be obligated
+to provide any maintenance or support for Licensed Software obtained
+through the OpenCore Plus Evaluation Feature. Except as described in
+Section 8.1 above, Altera will not have any obligation to provide any
+maintenance, support, or training, or to provide any error
+corrections, updates, upgrades, new versions, other modifications, or
+enhancements to the Licensed Software, the Altera Devices, or any
+Licensed Products. Licensee will be responsible, at its own expense,
+for providing technical support and training to any Licensee customers
+and any other end users of the Licensed Software or Licensed Products,
+and Altera will have no obligation to support any of the foregoing.
+Licensee will be solely responsible for, and Altera shall have no
+obligation to honor, any warranties that Licensee may provide to
+Licensee customers or to any other end users of the Licensed Products.
+
+9. Indemnification.
+
+ 9.1. Subject to the provisions of this Agreement, and
+provided Licensee has not acquired the Licensed Software through the
+OpenCore Plus Evaluation License (in which case Altera is not
+obligated to provide any defense or indemnification), Altera will
+defend Licensee from and to the extent based on a claim by a third
+party that the Licensed Software, in the form delivered by Altera or
+its Authorized Distributor and used by Licensee and You in accordance
+with this Agreement, infringes a third party's United States or
+European Union copyright, trade secret or trademark, and will pay any
+damages finally awarded as a result of the claim or amount agreed to
+by Altera as part of a settlement, provided that: (i) Licensee
+notifies Altera promptly in writing of any such claim, and (ii)
+reasonably cooperates, at Altera's expense, in the defense or
+settlement of such claim. Altera shall have sole authority to control
+the defense and all related settlement negotiations, but Licensee
+shall have the right to be represented by its own attorney, at its
+sole expense. The foregoing indemnity does not extend to claims
+resulting from: (a) any modifications of the Licensed Software by a
+party other than Altera and its Authorized Distributors; (b) use of
+the Licensed Software outside the scope of the licenses granted under
+this Agreement; (c) the combination or use of the Licensed Software
+with other products, software components or systems, to the extent
+that the claim of infringement results from such combination or use;
+(d) the use of other than the most recent version of the Licensed
+Software, if the infringement claim would have been avoided by use of
+the most recent version of Licensed Software; (e) any requirements
+specified by Licensee; (f) any unauthorized use of the Licensed
+Software, to the extent Altera has indicated in the Specifications
+that third-party licenses may be required to use such Licensed
+Software; or (g) any third party products, software, components,
+systems, or materials.
+
+ 9.2. Remedies. If, in Altera's judgment, the Use and/or
+licensing of the Licensed Software is likely to be enjoined by a
+court, Altera shall, at its option and expense (but subject to the
+terms and conditions of this Agreement) either: (i) procure the right
+to allow Licensee the continued rights to use the Licensed Software;
+or (ii) replace or modify the Licensed Software so that it becomes
+non-infringing, provided that the replacement or modified version
+substantially meets the Specifications applicable to the original
+Licensed Software. If Altera is unable, after exercising reasonable
+commercial efforts, to obtain such license or provide such replacement
+or modification, Altera may in its sole discretion terminate this
+Agreement, in which case You and Licensee agree to irrevocably destroy
+the Licensed Software, including all copies and portions thereof in
+any form (including any portions thereof merged into a design or a
+product that has not been distributed), and certify the same in
+writing to Altera. Altera will refund the license fee paid during the
+previous one (1) calendar year for such Licensed Software. Upon
+performance by Altera of the remedies above, the liability of Altera
+for such alleged infringement shall terminate with respect to all
+damages arising from or relating to such alleged infringement after
+the date of Altera's performance. Sections 9.1 and 9.2 of the
+Agreement state Altera's entire liability, and Your and Licensee's
+sole and exclusive remedies, with regards to infringement claims.
+
+10. Limitation of Liability.
+
+ 10.1. OpenCore Plus Evaluation License Limitation of
+Liability. YOU UNDERSTAND AND AGREE THAT THE LICENSED SOFTWARE MAY BE
+FUNCTION-, TIME-, OR CLOCK CYCLE LIMITED, AND THEREFORE YOU AND
+LICENSEE ACKNOWLEDGE AND AGREE THAT IN NO EVENT WILL ALTERA BE HELD
+LIABLE FOR ANY DAMAGES, LOSSES, COSTS, LIABILITIES OR EXPENSES TO YOU
+OR TO ANY THIRD PARTY ARISING FROM OR RELATING TO THE AUTOMATIC
+DISABLING OF ANY LICENSED SOFTWARE FUNCTIONS OBTAINED THROUGH THE
+OPENCORE PLUS EVALUATION LICENSE.
+
+ 10.2. No Indirect Damages. TO THE MAXIMUM EXTENT PERMITTED BY
+APPLICABLE LAW, UNDER NO CIRCUMSTANCES WILL ALTERA, ITS LICENSORS OR
+AUTHORIZED DISTRIBUTORS BE LIABLE TO YOU, TO LICENSEE, OR TO ANY THIRD
+PARTY FOR ANY INDIRECT, CONSEQUENTIAL, INCIDENTAL, PUNITIVE, OR
+SPECIAL DAMAGES OF ANY KIND OR NATURE INCLUDING BUT NOT LIMITED TO
+LOSS OF PROFITS, LOSS OR INACCURACY OF DATA, LOSS OF USE, COSTS OF
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES IN CONNECTION WITH THE
+SUBJECT MATTER OF THIS AGREEMENT OR USE OF THE LICENSED SOFTWARE, IN
+WHOLE OR IN PART, UNDER ANY THEORY OF LIABILITY, EVEN IF SUCH LOSSES
+WERE REASONABLY FORESEEABLE OR ALTERA HAS BEEN ADVISED OF THE
+POSSIBILITY OF OCCURRENCE OF SUCH DAMAGES.
+
+ 10.3. Damages Cap. IN NO EVENT SHALL ALTERA'S TOTAL AGGREGATE
+LIABILITY UNDER THIS AGREEMENT EXCEED THE LICENSE FEE ACTUALLY PAID
+BY LICENSEE TO ALTERA FOR THE SPECIFIC LICENSE GIVING RISE TO THE
+CLAIM FOR THE PRECEDING ONE (1) YEAR PERIOD.
+
+ 10.4. Failure of Essential Purpose. WITHOUT LIMITING THE
+FOREGOING, IT IS EXPRESSLY UNDERSTOOD AND AGREED BY THE PARTIES HERETO
+THAT EACH AND EVERY PROVISION OF THIS AGREEMENT WHICH PROVIDES FOR A
+LIMITATION OF LIABILITY, DISCLAIMER OF WARRANTY OR EXCLUSION OF
+DAMAGES IS INTENDED BY THE PARTIES TO BE SEVERABLE AND INDEPENDENT OF
+ANY OTHER SUCH PROVISION. FURTHER, IN THE EVENT THAT ANY REMEDY
+HEREUNDER IS DETERMINED TO HAVE FAILED OF ITS ESSENTIAL PURPOSE, ALL
+LIMITATIONS OF LIABILITY AND EXCLUSIONS OF DAMAGES SHALL REMAIN IN
+EFFECT, TO THE MAXIMUM EFFECT PERMITTED BY APPLICABLE LAW.
+
+ 10.5. Hazardous Applications and Uses. THE LICENSED SOFTWARE
+IS NOT INTENDED OR DESIGNED TO BE FAIL-SAFE FOR USE IN ANY APPLICATION
+REQUIRING FAIL-SAFE PERFORMANCE, SUCH AS LIFE SUPPORT, SAFETY OR
+MEDICAL DEVICE SYSTEMS, NUCLEAR FACILITIES, OR ANY OTHER APPLICATIONS
+THAT COULD LEAD TO DEATH, PERSONAL INJURY, OR SEVERE PROPERTY OR
+ENVIRONMENTAL DAMAGE (COLLECTIVELY, "HAZARDOUS APPLICATIONS"). THE
+LICENSED SOFTWARE IS ALSO NOT DESIGNED OR INTENDED FOR USE WITH ANY
+APPLICATIONS THAT CONTROL VEHICLES OR AIRCRAFT. LICENSEE AGREES THAT
+PRIOR TO USING OR DISTRIBUTING ANY SYSTEMS DEVELOPED BY USE OF THE
+LICENSED SOFTWARE OR THAT INCORPORATE A PORTION OF THE LICENSED
+SOFTWARE, TO THOROUGHLY TEST SUCH SYSTEMS FOR SAFETY PURPOSES. TO THE
+MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, LICENSEE ASSUMES ALL RISK
+AND LIABILITY FOR ANY HAZARDOUS APPLICATIONS AND USES IN APPLICATONS
+THAT CONTROL VEHICLES OR AIRCRAFT.
+
+ 10.6 Altera is willing to enter into this Agreement only in
+consideration of and in reliance of the terms and conditions contained
+herein limiting Altera's exposure to liability. Such provisions
+constitute an essential part of the bargain underlying this Agreement
+and have been reflected in the consideration hereto. The parties
+understand and agree that the exclusion of warranties, limitation of
+liability, and the limitation of remedies allocate risks between the
+parties as authorized under applicable law.
+
+ 10.7. NOTWITHSTANDING THE FOREGOING, THE LIMITATIONS OF
+LIABILITY IN THIS SECTION 10 WILL NOT APPLY WITH RESPECT TO DEATH,
+SERIOUS BODILY INJURY, OR DAMAGE TO PERSONAL PROPERTY RESULTING FROM A
+PARTY'S GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT.
+
+11. General Terms and Conditions.
+
+ 11.1. General Terms. This Agreement is entered into for the
+benefit of Altera, its licensors, and Authorized Distributors, and all
+rights granted to Licensee, its Users, and Authorized Contractors, and
+obligations owed to Altera and the Authorized Distributors, shall be
+enforceable by Altera, its licensors and the Authorized Distributors.
+No modification of this Agreement will be binding unless in writing
+and signed by authorized representatives of each party. If any of
+the provisions of this Agreement are in violation of applicable law,
+void, or unenforceable, then such provisions shall be deemed to be
+deleted from the Agreement, but the remaining provisions shall remain
+in full force and effect. If You have any questions concerning this
+Agreement, including questions relating to software maintenance or
+warranty service, please contact Altera Corporation, 101 Innovation
+Drive, San Jose, CA 95134.
+
+ 11.2. By downloading, installing, copying or using the
+Licensed Software, or by paying a license or other applicable fee, You
+acknowledge that You have read this Agreement, understand it, and
+agree to be bound by its terms and conditions. You further agree
+that the Agreement is the complete and entire agreement between You
+and Altera with respect to the subject matter hereof. No statements,
+promises or representations have been made by one party to the other,
+or are relied upon by either party when entering into this Agreement.
+All prior and contemporaneous discussions and negotiations, whether
+verbal or written, are merged into and superseded by the Agreement.
+No entity or person not a party hereto shall have any interest under
+this Agreement, or be deemed to be a third party beneficiary thereof.
+
+ 11.3. Audit Rights. Licensee agrees to keep complete and
+accurate books and records which confirm its compliance with the terms
+and conditions of this Agreement. Altera shall have a right to audit
+Licensee's facilities and records, provided that such audit: (a) shall
+be conducted at reasonable times, upon reasonable prior written
+notice; (b) shall not unreasonably interfere with Licensee's normal
+business operations. This Section 11.3 shall survive for three (3)
+years after expiration or termination of this Agreement.
+
+ 11.4. No Assignment. The license and rights granted to
+Licensee hereunder are personal in nature. Licensee may not
+sublicense, delegate, assign, or otherwise transfer this Agreement or
+any of the rights or obligations contained therein. Any attempt to do
+so will be void and shall have no force and effect, and shall
+immediately terminate all licenses and rights granted under this
+Agreement. Without limiting the foregoing, in the event of a merger,
+reorganization, or change in control of fifty percent (50%) or more of
+Licensee's equity or voting interest ("Change of Control") no transfer
+or assignment (including but not limited to by operation of law) of
+this Agreement may be made without Altera's prior written consent,
+which may be withheld at Altera's sole discretion.
+
+ 11.5. Export Control. The Licensed Software, technical data,
+any products developed with or utilizing the Licensed Software,
+Confidential Information, or any modifications or portions thereto
+(collectively, the "Exported Software") is subject to U.S. and may be
+subject to non-U.S. export control laws and regulations. Licensee may
+not export, re-export, transfer or otherwise distribute the Exported
+Software, in violation of the export control laws and regulations of
+U.S. or non-U.S. laws and regulations, as may be amended from time to
+time. It is Licensee's responsibility, at its sole expense, to
+obtain all approvals, licenses and consents required from any
+government entity prior to any export or re-export of the Exported
+Software for any reason.
+
+ 11.6. Governing Law/Venue. This Agreement will be governed
+by the laws of the State of California, United States of America,
+without reference to its choice of laws provisions. Licensee agrees
+to submit to the exclusive jurisdiction of the state and federal
+courts in the County of Santa Clara, State of California for the
+resolution of any dispute or claim arising out of or relating to this
+Agreement. The prevailing party in any legal action, settlement or
+arbitration arising out of this Agreement shall be entitled to
+reimbursement for its expenses, including court costs and reasonable
+attorneys' fees, in addition to any other rights and remedies such
+party may have.
+
+ 11.7. U.S. Government Restricted Rights. Licensee
+acknowledges and agrees that all software and software-related items
+licensed by Altera pursuant to this Agreement are "Commercial Computer
+Software" or "Commercial Computer Software Documentation" as defined
+in FAR 12.212 for civilian agencies and DFARS 227-7202 for military
+agencies (as amended) and in the event Licensee is permitted under
+this Agreement to provide such items to the U.S. government, such
+items shall be provided under terms that are at least as restrictive
+as the provisions of this Agreement. The Contractor/manufacturer is
+Altera Corporation, 101 Innovation Drive, San Jose, CA 95134.
+
+ 11.8. Survival. If the Agreement terminates for any reason,
+all definitions in this Agreement and the rights, obligations, and
+restrictions under Sections 1 (Definitions); 2.3 (Reservation of
+Rights) 2.6 (Intellectual Property Rights Notices); 2.9 (No Other
+Licenses or Grant of Intellectual Property Rights); 3 (Ownership and
+Future Development); 4 (Confidential Information); 5.3 (Disclaimer of
+Warranties); 6 (Third Party Licensors); 7.3 (Effect of Termination); 9
+(Indemnification); 10 (Limitation of Liability); and 11 (General Terms
+and Conditions) shall survive termination of the Agreement.
+
+[END OF MEGACORE FUNCTION V. 15.1 LICENSE TERMS AND
+CONDITIONS]
+
+
+
+===================================================================
+
+THIRD-PARTY LICENSES
+
+NOTE: The following third-party licenses and notices represent each
+third-party contributor's use requirements for Your usage of any third-
+party software incorporated into or provided in conjunction with the
+Altera product(s) licensed under the Altera Software License Agreement
+("Agreement"). The provisions contained in each such license apply
+only to the respective Third-Party Components (as such term is defined
+in the Agreement) and not to any Altera products licensed to You.
+
+Quartus Prime THIRD-PARTY LICENSES
+------------------------------------------------------------------
+1. Liberation Fonts 2.00.1 (SIL Open Font License, Version 1.1)
+2. Alphanum 1.0 (libpng/zlib License)
+3. AngularJS 1.0.8 (MIT License)
+4. AngularJS 1.2.0 (MIT License)
+5. Apache Xerces C++ 2.6 (Apache v. 2.0 license)
+6. autopep8 0.9.7 (MIT License)
+7. Base64 decoder 1.0 (Zlib License)
+8. boost 1.53.0 (MIT-style License)
+9. Bootstrap components for AngularJS 0.10.0 (MIT License)
+10. Bootstrap components for AngularJS 0.6.0 (MIT License)
+11. Bottle 0.12.7 (MIT License)
+12. buddy 2.2 (BSD-style License)
+13. bwidget 1.4.1 (BSD-style License)
+14. Cajun 2.0.1 (3 Clause BSD License)
+15. CherryPy 3.5.0 (3 Clause BSD License)
+16. Cygwin 1.7.32 (GPL v. 3.0)
+17. D3.js: Data-Driven Documents 2.10.3 (3 Clause BSD Licens)
+18. D3.js: Data-Driven Documents 3.0.0 (3 Clause BSD Licens)
+19. Django 1.6 (3 Clause BSD License)
+20. Editline Library (libedit) 0:42:0 (NetBSD License)
+21. Eigen3 3.2.1 (Mozilla Public License Version 2.0)
+22. Flake8 2.1.0 (MIT License)
+23. GD 2.0.34 (BSD-style License)
+24. Google Mock and Google Test 1.7 (BSD 3 Clause License)
+25. gzip 1.3.12 (GPL v. 2.0 License)
+26. HTTP-Parser 2.1 (MIT License)
+27. IBM.ICU 4.4.2 (IBM ICU License and additional Third Party terms)
+28. ICU 3.4 (IBM License and additional third party terms)
+29. INCR TCL 4.0 (BSD-Style License)
+30. javasysmon 0.3.5 (BSD 2 Clause License)
+31. jdbc sqlite 20120209 (Apache v. 2.0 license)
+32. jpeg 6b (Indedendent JPEG Group License)
+33. jQuery 1.9.1 (MIT License)
+34. jQuery UI 1.10.2 (MIT License)
+35. jQuery UI Layout Plug-in 1.3.0.rc30.79 (MIT License, GPL v.3 License)
+36. JRE Java SE 6 (Oracle Binary Code License)
+37. LIBCURL 7.36.0 (MIT/X Derivative License)
+38. Libelf 0.8.10 (LGPL v. 2.1 License)
+39. Liberty Parser 2.6 (SYNOPSYS Open Source License Version 1.0)
+40. libpng 1.2.18 (Libpng License)
+41. lpsolve 5.5.0.10 (LGPL v 2.1 License)
+42. make 3.81 (GPL v. 2.0 License)
+43. McCabe 0.2.1 (MIT License)
+44. metis 4.0.1 (GPL v. 2.0 License)
+45. MINISAT 2 2.2.0 (MIT License)
+46. mongoose 3.8 (MIT License)
+47. Normalize.css 2.1.3 (MIT License)
+48. OpenSSL 1.0.1h (BSD-style License)
+49. OpenSSL 1.0.1m (BSD-style License)
+50. Peewee 2.1.6 (MIT License)
+51. pep8 1.4.6 (MIT License)
+52. Perl 5.8.8 (GPL v. 1.0 or the Artistic License)
+53. PicNet Table Filter (MIT License)
+54. Protobuf 2.5.0 (BSD 3 Clause License)
+55. psutil 1.2.1 (3 Clause BSD License)
+56. pyflakes 3.2.2 (MIT License)
+57. Python 3.3.0 (PSF License for Python 3.3.0)
+58. pyzeromq 14.0.0 (Modified BSD License)
+59. Requests 2.3.0 (Apache v. 2.0 license)
+60. setuptools 2.0 (PSF or ZPL License)
+61. superlu 2.2.0 (BSD 3 Clause License)
+62. systemc 2.1 (SystemC Open Source License v. 3.3)
+63. Tablelist 5.5 (MIT style license)
+64. TableSorter 2.7.3 (MIT License, GPL v. 3.0 Licenses)
+65. tbb 4.2.2 (GPL v.2.0 License)
+66. TCL-TK 8.6 (BSD-style License)
+67. tcldom 3.0 (BSD Style License)
+68. tcllib 1.11 (BSD 4 Clause License)
+69. tclsoap 1.6.7 (MIT License)
+70. tclxml 3.2 (BSD style License)
+71. TinyXml 2.6.2 (zlib License)
+72. tktable 2.10 (Tcl/Tk license)
+73. TLS 1.6 (BSD License)
+74. Tufao 0.8 (LGPL v. 2.1 License (library) (documentation and examples under MIT License))
+75. Twitter Bootstrap 2.3.1 (Apache v. 2.0 License)
+76. Twitter Bootstrap 2.3.2 (Apache v. 2.0 License)
+77. Twitter Bootstrap version 3.0.3 (Apache v. 2.0 License)
+78. Underscore.js 1.4.4 (MIT License)
+79. unzip 6.00 (BSD Style Info-Zip License)
+80. xmlgen 1.4 (Apache v. 2.0 license)
+81. ZeroMQ 4.0.3 (LGPL v. 3 License)
+82. ZLIB 1.2.3 (Zlib License)
+
+MegaCore (IP) THIRD-PARTY LICENSES
+------------------------------------------------------------------
+1. antlr 2.7.2 (BSD 4 Clause License)
+2. appframework 1.03 (LGPL v. 2.1 License)
+3. asm 3.1 (BSD 3 Clause License)
+4. avi2raw 1.1 (Mozilla Public License v. 1.1)
+5. beansbinding 1.2.1 (LGPL v. 2.1 License)
+6. JGoodies Binding 2.0.6 (BSD 3 Clause License)
+7. binutils 2.24 (GPL v. 2 License)
+8. boost 1.38.0 (MIT-style License)
+9. castor 1.0.3 (Apache v. 2.0 and Intalio BSD-style Licenses)
+10. castor 1.2 (Apache v. 2.0 and Intalio BSD-style Licenses)
+11. checker-framework 1.8.7 (GPL v. 2 License)
+12. checkstyle 4.2 (LGPL v. 2.1 License)
+13. cli 1.1 (Apache v. 2.0 License)
+14. cobertura 1.8 (GPL v. 2 License)
+15. commons-beanutils 1.6 (Apache v. 1.1 License)
+16. commons-collection 3 (Apache v. 2.0 License)
+17. commons-digester 1.5 (Apache v. 1.1 License)
+18. commons-lang 3.1 (Apache v. 2.0 License)
+19. commons-logging 1.1 (Apache v. 2.0 License)
+20. commons-logging 1.2 (Apache v. 2.0 License)
+21. commons-pool 1.2 (Apache v. 2.0 License)
+22. DockingFrames 1.1.2p12c (LGPL v. 2.1 License)
+23. eclipse-cpp-kepler-SR2 4.3.2 (Eclipse Public License v 1.0)
+24. expat 2.0.1 (MIT License)
+25. expat 2.1.0 (MIT License)
+26. explicitlayout 3.0 (LGPL v. 2.1 License)
+27. forms_rt 6.0 (Apache v. 2.0 License)
+28. gcc 4.9 (GNU Free Documentation v. 1.2 GPL License)
+29. gdb 7.7 (GPL v. 2 License)
+30. gmp 5.0.5 (LGPL v. 3 License)
+31. gnu 1.2.5 (GPL v. 2 License)
+32. guava-libraries 15.0 (Apache v. 2.0 License)
+33. hamcrest 1.3 (BSD 3 Clause License)
+34. jacl 1.3.2a (Jacl Software License)
+35. jacoco 0.6.3 (Eclipse Public License v 1.0)
+36. jaxb-ri 2.2.7 (CDDL v. 1.1; GPL v. 2 Classpath Exception)
+37. jaxb-xew-plugin 1.4 (LGPL v. 3 License)
+38. jaxb2-basics-annotate 1.0.1 (BSD 2 Clause License)
+39. jaxb2-basics-tools 0.9.0 (BSD 3 Clause License)
+40. jaxen 1.1.1 (BSD 3 Clause License)
+41. jaxen 1.1.6 (BSD 3 Clause License)
+42. jaxen 1.3 (BSD 4 Clause License)
+43. jcommon 1.0.16 (LGPL v. 3 License)
+44. JDOM 1 (BSD-style License)
+45. JFreeChart 1.0.13 (LGPL v. 3 License)
+46. JGraphX 2.2.0.2 (BSD 3 Clause License)
+47. jline 2.12 (BSD 3 Clause License)
+48. jsap 2.0a (LGPL v. 2.1 License)
+49. jsr173 1.0 (Apache v. 2.0 License)
+50. junit 3.8.1 (Common Public License v. 1.0)
+51. junit 4.0 (Common Public License v. 1.0)
+52. junit 4.1 (Common Public License v. 1.0)
+53. l2fprod 7.3 (Apache v. 2.0 License)
+54. libstdc v3 (GPL v. 3 License)
+55. looks 2.0.1 (BSD 2 Clause License)
+56. make 3.81 (GPL v. 2 License)
+57. miglayout15 3.0.3 (BSD 2 Clause License)
+58. mpc 1.0.1 (LGPL v. 3 License)
+59. mpfr 3.1.0 (LGPL v. 3 License)
+60. mpfr 3.1.1 (LGPL v. 3 License)
+61. mpir 2.2.1 (LGPL v. 3 License)
+62. mydoggy 1.4.2 (LGPL v. 3 License)
+63. netbeans-swing-outline 6.9 (LGPL v. 2.1, GPL v. 2.0, and CDDL v. 1 Licenses plus Classpath Exception)
+64. newlib 2.1.0 (Red Hat and BSD 3 Clause Licenses)
+65. OpenCL 1.1 (MIT License)
+66. powermock 1.5 (Apache v. 2.0 license)
+67. quickserver 1.4.7 (LGPL v.2.1 License)
+68. stlport 7.1 (Stlport License)
+69. swingworker 3 (MPL v. 1.1 and LGPL v. 2.1 Licenses)
+70. symphony 5.4.5 (Eclipse Public License v. 1.0)
+71. systemc 2.2.0 (SystemC Open Source License v. 3.3)
+72. velocity 1.4 (Apache v. 2.0 License)
+73. wraplf 0.2 (Apache v. 2.0 License)
+74. xalan 1.2.2 (Apache v. 2.0 License)
+75. xerces 2.3.0 (Apache v. 1.1 License)
+76. xmlbeans 2.2.0 (Apache v. 2.0 License)
diff --git a/mail-client/claws-mail/claws-mail-3.13.1.ebuild b/mail-client/claws-mail/claws-mail-3.13.1.ebuild
index e043cd7f3d9c..6299c55df0d4 100644
--- a/mail-client/claws-mail/claws-mail-3.13.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.13.1.ebuild
@@ -77,8 +77,7 @@ COMMONDEPEND=">=sys-devel/gettext-0.12.1
calendar? ( >=net-misc/curl-7.9.7 )
pdf? ( app-text/poppler[cairo] )
spam-report? ( >=net-misc/curl-7.9.7 )
- webkit? ( >=net-libs/webkit-gtk-1.0:2
- >=net-libs/libsoup-gnome-2.26:2.4 )
+ webkit? ( >=net-libs/webkit-gtk-1.0:2 )
"
DEPEND="${PLUGINBLOCK}
@@ -100,6 +99,9 @@ RDEPEND="${COMMONDEPEND}
x11-misc/shared-mime-info"
src_configure() {
+ # Don't use libsoup-gnome (bug #565924)
+ export HAVE_LIBSOUP_GNOME=no
+
local myeconfargs=(
$(use_enable debug crash-dialog)
$(use_enable valgrind valgrind)
diff --git a/mail-client/roundcube/roundcube-1.1.3.ebuild b/mail-client/roundcube/roundcube-1.1.3.ebuild
index e9402115bf44..c112276f1705 100644
--- a/mail-client/roundcube/roundcube-1.1.3.ebuild
+++ b/mail-client/roundcube/roundcube-1.1.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
# roundcube is GPL-licensed, the rest of the licenses here are
# for bundled PEAR components, googiespell and utf8.class.php
LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ~sparc x86"
IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-38.5.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-38.5.0.ebuild
index 6f75ee0990c3..a79316c8843f 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-38.5.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-38.5.0.ebuild
@@ -37,7 +37,7 @@ SRC_URI="${SRC_URI}
HOMEPAGE="http://www.mozilla.com/thunderbird"
RESTRICT="strip mirror"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="+crashreporter selinux"
diff --git a/mail-client/thunderbird/thunderbird-38.4.0.ebuild b/mail-client/thunderbird/thunderbird-38.4.0.ebuild
index 20bc030a1d2d..128b3cfa9b18 100644
--- a/mail-client/thunderbird/thunderbird-38.4.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.4.0.ebuild
@@ -37,7 +37,7 @@ inherit flag-o-matic toolchain-funcs mozconfig-v6.38 makeedit multilib autotools
DESCRIPTION="Thunderbird Mail Client"
HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
diff --git a/mail-client/thunderbird/thunderbird-38.5.0.ebuild b/mail-client/thunderbird/thunderbird-38.5.0.ebuild
index a3fbfeed22e5..b1ef18a42872 100644
--- a/mail-client/thunderbird/thunderbird-38.5.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.5.0.ebuild
@@ -37,7 +37,7 @@ inherit flag-o-matic toolchain-funcs mozconfig-v6.38 makeedit multilib autotools
DESCRIPTION="Thunderbird Mail Client"
HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
diff --git a/mail-filter/rmilter/Manifest b/mail-filter/rmilter/Manifest
new file mode 100644
index 000000000000..16b140793ff2
--- /dev/null
+++ b/mail-filter/rmilter/Manifest
@@ -0,0 +1 @@
+DIST rmilter-1.6.7.tar.gz 117993 SHA256 d8312be6ab79cf42fd28a85c4eda3868e20a4d182f06c1491ce8cdc8c2bed8df SHA512 015393e803603d2e6e95344c1b30f748e7d4460c4dc0cb2551639d25f9b4554963bc072c872608f94cd6e2110afd4623e9083eb82df8d23f47c36c84585052ca WHIRLPOOL e4913d46a57e370e57b64141a1f4247757f9a621db2f53a01f624ae3082bf693b87198c54a125eba7ce5853c452650b3e6621947d9ccf330c3f5df6ca6e677ec
diff --git a/mail-filter/rmilter/files/rmilter.initd b/mail-filter/rmilter/files/rmilter.initd
new file mode 100644
index 000000000000..0b40013d778e
--- /dev/null
+++ b/mail-filter/rmilter/files/rmilter.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+RUNDIR=/var/run/rmilter
+PIDFILE=$RUNDIR/rmilter.pid
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ mkdir -m0750 -p $RUNDIR
+ chown rmilter:rmilter $RUNDIR
+ chmod g+s $RUNDIR
+ rm -f $RUNDIR/$SVCNAME.sock
+ start-stop-daemon --start --quiet --pidfile $PIDFILE -u rmilter \
+ --exec /usr/sbin/rmilter -- -c /etc/rmilter/rmilter.conf
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE
+ eend $?
+}
diff --git a/mail-filter/rmilter/metadata.xml b/mail-filter/rmilter/metadata.xml
new file mode 100644
index 000000000000..56a1880364bf
--- /dev/null
+++ b/mail-filter/rmilter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>djc@gentoo.org</email>
+ <name>Dirkjan Ochtman</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/mail-filter/rmilter/rmilter-1.6.7.ebuild b/mail-filter/rmilter/rmilter-1.6.7.ebuild
new file mode 100644
index 000000000000..674c1f42aea9
--- /dev/null
+++ b/mail-filter/rmilter/rmilter-1.6.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils user
+
+DESCRIPTION="Another sendmail milter for different mail checks"
+SRC_URI="https://github.com/vstakhov/rmilter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/vstakhov/rmilter"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libpcre
+ mail-filter/libmilter
+ mail-filter/opendkim
+ mail-filter/libspf2"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ enewgroup rmilter
+ enewuser rmilter -1 -1 /var/run/rmilter rmilter
+}
+
+src_install() {
+ cmake-utils_src_install
+ newinitd "${FILESDIR}/rmilter.initd" rmilter
+ insinto /etc/rmilter
+ newins rmilter.conf.sample rmilter.conf.sample
+ newins rmilter-grey.conf rmilter-grey.conf
+}
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
new file mode 100644
index 000000000000..034db933768f
--- /dev/null
+++ b/mail-filter/rspamd/Manifest
@@ -0,0 +1 @@
+DIST rspamd-1.0.11.tar.xz 1176160 SHA256 b914c77c30dcab863f6c685b4a83a1662ee1b4503654fbf3ee3ae2fbca1ed928 SHA512 79464e8c29bdf5b081744b79fb8eee944bf647abf334cd77686a8fa4d0a3ab7ff4293fc464606d298fb57c8d7fe909e333ae7e58768330e4d65464bf42f76f15 WHIRLPOOL ca1f8338ef6f917622c8a93fa8bf230b2767d750e953d9f790649e660865caaa255c5a8eb35a14cb882acc193a237bf107d79c7c01f3d7ec6520301edc9f2629
diff --git a/mail-filter/rspamd/files/rspamd.init b/mail-filter/rspamd/files/rspamd.init
new file mode 100644
index 000000000000..8ba223193683
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd.init
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+# Copyright 2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+PIDFILE=/var/run/rspamd/rspamd.pid
+
+depend() {
+ need net
+}
+
+checkconfig() {
+ /usr/bin/rspamadm configtest -c /etc/rspamd/rspamd.sysvinit.conf > /dev/null \
+ || return 1
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --quiet --pidfile $PIDFILE -u rspamd -g rspamd \
+ --exec /usr/bin/rspamd
+ eend $?
+}
+
+stop() {
+ if [ "${RC_CMD}" = "restart" ] ; then
+ checkconfig || return 1
+ fi
+
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE \
+ --exec /usr/bin/rspamd
+ eend $?
+}
+
+reload() {
+ checkconfig || return 1
+ ebegin "Reloading ${SVCNAME}"
+ start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE \
+ --exec /usr/bin/rspamd
+ eend $?
+}
diff --git a/mail-filter/rspamd/files/rspamd.logrotate b/mail-filter/rspamd/files/rspamd.logrotate
new file mode 100644
index 000000000000..dca9cfadf662
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd.logrotate
@@ -0,0 +1,12 @@
+/var/log/rspamd/rspamd.log{
+ daily
+ rotate 4
+ delaycompress
+ compress
+ notifempty
+ missingok
+ postrotate
+ service rspamd reopenlog >/dev/null 2>&1 || true
+ endscript
+}
+
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
new file mode 100644
index 000000000000..56a1880364bf
--- /dev/null
+++ b/mail-filter/rspamd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>djc@gentoo.org</email>
+ <name>Dirkjan Ochtman</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/mail-filter/rspamd/rspamd-1.0.11.ebuild b/mail-filter/rspamd/rspamd-1.0.11.ebuild
new file mode 100644
index 000000000000..54376f0c483f
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.0.11.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils user
+
+DESCRIPTION="Rapid spam filtering system"
+SRC_URI="https://rspamd.com/downloads/${P}.tar.xz"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libpcre
+ mail-filter/libmilter
+ mail-filter/opendkim
+ mail-filter/libspf2
+ dev-lang/luajit:2
+ dev-libs/libevent
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/gmime
+ dev-libs/hiredis"
+RDEPEND="${DEPEND}"
+
+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
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ newinitd "${FILESDIR}/rspamd.init" rspamd
+
+ dodir /var/lib/rspamd
+ dodir /var/log/rspamd
+ dodir /var/run/rspamd
+ fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd /var/run/rspamd
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/rspamd.logrotate" rspamd
+}
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.8.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.8.0.ebuild
index dfda81c47895..f32ee9993c4e 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.8.0.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.8.0.ebuild
@@ -3,10 +3,9 @@
# $Id$
EAPI="5"
-
GCONF_DEBUG="no"
-inherit gnome2 versionator
+inherit flag-o-matic gnome2 versionator
MATE_BRANCH="$(get_version_component_range 1-2)"
@@ -42,4 +41,10 @@ DEPEND="${RDEPEND}
sys-devel/gettext:*
virtual/pkgconfig:*"
-DOCS="AUTHORS ChangeLog NEWS README"
+src_configure() {
+ # This is needed for this old version, current upstream versions
+ # finally append it themselves:
+ # https://github.com/mate-desktop/mate-system-monitor/commit/56594f6f10ba04aa51af976bc8339ea9ae54ea21
+ append-cxxflags -std=c++11
+ gnome2_src_configure
+}
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index ddca9dd71045..e47f9dfb38dc 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,2 +1,2 @@
-DIST cantarell-fonts-0.0.16.tar.xz 291968 SHA256 15bf87555321556750bc68ace360f3df420359a8ab257e15c44fb69710152f1c SHA512 12936e56d1dd3eac3db5a02b854769ba7c8bd06bf4942c505d81ea20529ee450e07f0f347e3861a49212ef7291452716537c05375f74877246f49d186ad681b0 WHIRLPOOL ca79340c66cf4e4ed52e57f599ffa579bd207414b7e51507d4fb9c59b333b88b7d6b60783aff829ddc00686d0851f27c65c96452486951a1a997d4ad43e6f759
DIST cantarell-fonts-0.0.18.1.tar.xz 289248 SHA256 9c5b1a2edee1d3acf30eaae3d559b2b2e1d835249cf2770f6f8bfc6af861e8f0 SHA512 eeabffc1f51f1c5423c7eba29b9dd47b4e7595146a1f380bd2742ee692a95fafb159e5f0d67c2b8864da23d277a782eeb65939a3fb82f70b09d0c89d38663f7d WHIRLPOOL 5a610d9be666fa7b4aac9edebdbe6bd71c1d948fbdb4556dff8f4635db8298d7bf11b6d0d02f4a5a112e1653c3d32d14ab5756a2614879c815dc8694f77ed3bd
+DIST cantarell-fonts-0.0.19.tar.xz 386692 SHA256 c7f975ef3d5cf0ed409636c59d069260783683c47ba1289ac3e66a98446e46ae SHA512 52042a48a7fe36b3281006a56c4f8ccc98032e85776867fde803b593baabfdf80ff04173d983227964c185caa0949b2947e2dbbd4d4cf36116b52ba95ef8b7c7 WHIRLPOOL bd1de994ffe83544513d580cf4300fcd66a4fca6e2e8489e5383beac68920c48d01df682ad3adc691ba0b515fc25d556dfa9e8ba786226f4b3db5288a188dbd9
diff --git a/media-fonts/cantarell/cantarell-0.0.16.ebuild b/media-fonts/cantarell/cantarell-0.0.19.ebuild
index ca4827303ec2..ef8eba89faf7 100644
--- a/media-fonts/cantarell/cantarell-0.0.16.ebuild
+++ b/media-fonts/cantarell/cantarell-0.0.19.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE=""
RDEPEND="media-libs/fontconfig"
diff --git a/media-fonts/symbola/symbola-8.00.ebuild b/media-fonts/symbola/symbola-8.00.ebuild
index 397a00d3f571..c123ef600c37 100644
--- a/media-fonts/symbola/symbola-8.00.ebuild
+++ b/media-fonts/symbola/symbola-8.00.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}.zip -> ${P}.zip"
LICENSE="Unicode_Fonts_for_Ancient_Scripts"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
IUSE="doc"
DEPEND="app-arch/unzip"
diff --git a/media-gfx/darktable/darktable-1.6.9.ebuild b/media-gfx/darktable/darktable-1.6.9.ebuild
index f0e7fe1a743c..a3c61f4e342a 100644
--- a/media-gfx/darktable/darktable-1.6.9.ebuild
+++ b/media-gfx/darktable/darktable-1.6.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/
LICENSE="GPL-3 CC-BY-3.0"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
LANGS=" ca cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
# TODO add lua once dev-lang/lua-5.2 is unmasked
IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 00128f98c675..bdcb5f6868b9 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -5,7 +5,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils gnome2 fdo-mime multilib python-single-r1 git-r3
+inherit virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1 git-r3
EGIT_REPO_URI="git://git.gnome.org/gimp"
@@ -18,7 +18,7 @@ SLOT="2"
KEYWORDS=""
LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome openexr postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev webkit wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse svg udev webkit wmf xpm"
for lang in ${LANGS}; do
IUSE+=" linguas_${lang}"
@@ -27,47 +27,46 @@ done
RDEPEND=">=dev-libs/glib-2.40.0:2
>=dev-libs/atk-2.2.0
>=x11-libs/gtk+-2.24.10:2
- >=x11-libs/gdk-pixbuf-2.24.1:2
+ dev-util/gtk-update-icon-cache
+ >=x11-libs/gdk-pixbuf-2.31:2
>=x11-libs/cairo-1.12.2
>=x11-libs/pango-1.29.4
xpm? ( x11-libs/libXpm )
>=media-libs/freetype-2.1.7
- >=media-libs/fontconfig-2.2.0
- >=media-libs/freetype-2.1.7:2
>=media-libs/harfbuzz-0.9.19
+ >=media-libs/gexiv2-0.6.1
+ >=media-libs/fontconfig-2.2.0
sys-libs/zlib
dev-libs/libxml2
dev-libs/libxslt
x11-themes/hicolor-icon-theme
- >=media-libs/babl-0.1.11
- media-libs/gegl:0.3
+ >=media-libs/babl-0.1.14
+ >=media-libs/gegl-0.3.4:0.3[cairo]
+ >=dev-libs/glib-2.43
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
aqua? ( x11-libs/gtk-mac-integration )
- curl? ( net-misc/curl )
- dbus? ( dev-libs/dbus-glib )
+ dev-util/gdbus-codegen
gnome? ( gnome-base/gvfs )
webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
- jpeg? ( virtual/jpeg:0 )
+ virtual/jpeg:0
jpeg2k? ( media-libs/jasper )
- >=media-libs/gexiv2-0.6.1
- lcms? ( >=media-libs/lcms-2.2:2 )
+ >=media-libs/lcms-2.2:2
mng? ( media-libs/libmng )
- pdf? ( >=app-text/poppler-0.12.4[cairo] )
- png? ( >=media-libs/libpng-1.2.37:0 )
+ openexr? ( >=media-libs/openexr-1.6.1 )
+ pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 )
+ >=media-libs/libpng-1.2.37:0
python? (
${PYTHON_DEPS}
>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
)
- tiff? ( >=media-libs/tiff-3.5.7:0 )
+ >=media-libs/tiff-3.5.7:0
svg? ( >=gnome-base/librsvg-2.36.0:2 )
wmf? ( >=media-libs/libwmf-0.2.8 )
x11-libs/libXcursor
sys-libs/zlib
+ app-arch/bzip2
>=app-arch/xz-utils-5.0.0
- openexr? ( >=media-libs/openexr-1.6.1 )
- >=app-text/poppler-data-0.4.7
- bzip2? ( app-arch/bzip2 )
postscript? ( app-text/ghostscript-gpl )
udev? ( virtual/libgudev:= )"
DEPEND="${RDEPEND}
@@ -92,18 +91,17 @@ pkg_setup() {
$(use_with aalib aa) \
$(use_with alsa) \
$(use_enable altivec) \
- $(use_with openexr) \
$(use_with webkit) \
$(use_with jpeg2k libjasper) \
$(use_with postscript gs) \
$(use_enable cpu_flags_x86_mmx mmx) \
$(use_with mng libmng) \
+ $(use_with openexr) \
$(use_with pdf poppler) \
$(use_enable python) \
$(use_enable smp mp) \
$(use_enable cpu_flags_x86_sse sse) \
$(use_with svg librsvg) \
- $(use_with tiff libtiff) \
$(use_with udev gudev) \
$(use_with wmf) \
--with-xmc \
@@ -134,6 +132,10 @@ src_prepare() {
gnome2_src_prepare
}
+src_configure() {
+ GEGL=/usr/bin/gegl-0.3 gnome2_src_configure
+}
+
_clean_up_locales() {
einfo "Cleaning up locales..."
for lang in ${LANGS}; do
@@ -145,6 +147,10 @@ _clean_up_locales() {
done
}
+src_test() {
+ Xemake check
+}
+
src_install() {
gnome2_src_install
@@ -158,6 +164,9 @@ src_install() {
prune_libtool_files --all
+ # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+ mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+
_clean_up_locales
}
diff --git a/media-libs/elementary/Manifest b/media-libs/elementary/Manifest
index d6eb64bb1536..ded23c4e0237 100644
--- a/media-libs/elementary/Manifest
+++ b/media-libs/elementary/Manifest
@@ -1,5 +1,3 @@
DIST elementary-1.12.2.tar.bz2 16726431 SHA256 c6aa5e83224400babdd2a6ed848eeb09aa9bed2e1f573619d4d8c0dbf29fcd12 SHA512 05c9fb012bd933fe52978d0bdec7d80be06a54531d6c026de0cd32c7ba218c2c9960ed6c5f5aa94360c88a4465dbd3b8df7d92e73bc6bb754493b44825858232 WHIRLPOOL 97666a5072e280a613f21b3c32566b6a47a0d5a46fbe4983ec3e40c35bba6bd1f5d8f4d09557023494a9eaa89dc14711b8cc007d81e4c19881601955c1acf3df
-DIST elementary-1.13.1.tar.xz 16120080 SHA256 11595b6c5f511150a26e970bf8e590f96a6ce9e33e5dd8419407013844b2b74f SHA512 b8d4e3ff2447a80a98119753012e6ef0666ca569e4d401e66477a51667b6e940eb9c02d87f37b289b257db2855fc35486f0229e8861e74b6c48366aac30caa9f WHIRLPOOL 5400f9a11f2997fde9ee7b170ccf6b8833ad0fdecf229fc2dcbb9eea731e40958922672b47fa539df533006b29f7a197473cb3b24b8bac51a4159fc9f249ec46
-DIST elementary-1.15.0.tar.xz 18430880 SHA256 2be3180acbb9fa2fc0e9351b5508318925eb38733a6d54e1b3fc75e58368f1b0 SHA512 5441ebc012cf76aad074d25394cbb855decabcefa5a8b5feb2909a4fbc470fad32b1660fbc0bd47f6c11267d11cb21fe9df283718d4ccf68ffe44319de229781 WHIRLPOOL 29aa20103a56bd527754f14841216f0c6198e2663836455cc8b6391a88ca558c632f15868b948059616e659fd7c43f797526a472cba26ba38bc5195f562fbb3c
-DIST elementary-1.15.1.tar.xz 18514596 SHA256 ab22a40a5108f7f988a34b0a791d202d2c6c538ea8508919c264bdbdce11ab04 SHA512 1622eb3e54f716b84642c9fe2164c882749fe402cf516e070a47c6d0cff898d043e231e3f557984e6d2fff90bf218249431b148d209bc1ed1aacb35211364ba6 WHIRLPOOL 4b224a54a11d5e8907b53f8d71ef541ff93fa92a1a7e24ec567312d6fb3c7c0c31358a1ace2b66c227447ffef3c94f7b373da78c694e09d9d3f67f888d641f96
DIST elementary-1.15.2.tar.xz 18514048 SHA256 523c3073210b611817d0f56aa8348962ec757282f9f7dfde93825afa164a0f3f SHA512 7ee796898aee7667e0ae6e8e7d1a604287fc9b009a7a3f4ab75c15b10160e0a38975dfbf6586c20ad2fdc8075dd867287d4d5617ad6b6be2e522c74beb03ce38 WHIRLPOOL 6d42e6063c8d697d237b003781f33e6b3bf562c2785458cd3cf1cf84319325ac1ff39704e33bae641610b1ff669b2fe115135a5f939eca0314a25ee7a6a6bf0a
+DIST elementary-1.16.1.tar.xz 18536148 SHA256 7e3863640a9c6dff91d62a06a3119c6c6682247e4669583033b80c7d608da860 SHA512 fa5dce7c40be55f57e145ee459df5452b946b3701fe61f2f160e90c65720bcb1c24730b6fec9892c51d29af3d2898f38c8cbce83225b00e2aec5a27cb3081a5f WHIRLPOOL 6d0f1d40e91de42eb42552fa6c39578d8577f47e0ee2028f32e4e625b25a32ee229f7129f5ec4b6d54787ff669f8f3b5b0ca26e6334475565440a36f982381cd
diff --git a/media-libs/elementary/elementary-1.13.1.ebuild b/media-libs/elementary/elementary-1.13.1.ebuild
deleted file mode 100644
index f0852690c0f2..000000000000
--- a/media-libs/elementary/elementary-1.13.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
- EGIT_SUB_PROJECT="core"
- EGIT_URI_APPEND="${PN}"
-else
- SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
- EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="Basic widget set, based on EFL for mobile touch-screen devices"
-HOMEPAGE="https://trac.enlightenment.org/e/wiki/Elementary"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug examples fbcon quicklaunch sdl wayland X static-libs"
-
-DEPEND=">=dev-libs/efl-${PV}[fbcon?,sdl?,png,wayland?,X?]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- E_ECONF=(
- $(use_enable debug)
- $(use_enable doc)
- --disable-ecore-cocoa
- --disable-ecore-psl1ght
- --disable-ecore-win32
- --disable-elocation
- --disable-emap
- --disable-eweather
- # broken: make[4]: *** No rule to make target 'prefs_example_01.epb', needed by 'all-am'. Stop
- #$(use_enable examples build-examples)
- $(use_enable examples install-examples)
- $(use_enable fbcon ecore-fb)
- $(use_enable sdl ecore-sdl)
- $(use_enable wayland ecore-wayland)
- $(use_enable X ecore-x)
- $(use_enable quicklaunch quick-launch)
- )
-
- enlightenment_src_configure
-}
diff --git a/media-libs/elementary/elementary-1.15.1.ebuild b/media-libs/elementary/elementary-1.15.1.ebuild
deleted file mode 100644
index 7cef5b066732..000000000000
--- a/media-libs/elementary/elementary-1.15.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
- EGIT_SUB_PROJECT="core"
- EGIT_URI_APPEND="${PN}"
-else
- SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
- EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="Basic widget set, based on EFL for mobile touch-screen devices"
-HOMEPAGE="https://trac.enlightenment.org/e/wiki/Elementary"
-
-LICENSE="LGPL-2.1"
-IUSE="debug examples fbcon quicklaunch sdl wayland X static-libs"
-
-DEPEND=">=dev-libs/efl-${PV}[fbcon?,sdl?,png,wayland?,X?]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- E_ECONF=(
- $(use_enable debug)
- $(use_enable doc)
- --disable-ecore-cocoa
- --disable-ecore-psl1ght
- --disable-ecore-win32
- --disable-elocation
- --disable-emap
- --disable-eweather
- # broken: make[4]: *** No rule to make target 'prefs_example_01.epb', needed by 'all-am'. Stop
- #$(use_enable examples build-examples)
- $(use_enable examples install-examples)
- $(use_enable fbcon ecore-fb)
- $(use_enable sdl ecore-sdl)
- $(use_enable wayland ecore-wayland)
- $(use_enable X ecore-x)
- $(use_enable quicklaunch quick-launch)
- )
-
- enlightenment_src_configure
-}
diff --git a/media-libs/elementary/elementary-1.15.2.ebuild b/media-libs/elementary/elementary-1.15.2.ebuild
index 7cef5b066732..05259657f4c7 100644
--- a/media-libs/elementary/elementary-1.15.2.ebuild
+++ b/media-libs/elementary/elementary-1.15.2.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
EGIT_URI_APPEND="${PN}"
else
SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
- EKEY_STATE="snap"
+ EKEY_STATE="release"
fi
inherit enlightenment
diff --git a/media-libs/elementary/elementary-1.15.0.ebuild b/media-libs/elementary/elementary-1.16.1.ebuild
index 7cef5b066732..7cef5b066732 100644
--- a/media-libs/elementary/elementary-1.15.0.ebuild
+++ b/media-libs/elementary/elementary-1.16.1.ebuild
diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest
index f78cfbefe7d8..91aafd99ad03 100644
--- a/media-libs/freeverb3/Manifest
+++ b/media-libs/freeverb3/Manifest
@@ -1,4 +1,3 @@
-DIST freeverb3-2.5.13.tar.gz 6143981 SHA256 9c29adc15a94e6140e52f0b1a5a60923a8e9a3beb21ada4182363c60b25126dd SHA512 9ebe020790fdc41fb1d766757b7ea8a2e93e6112e97ada620698fd36f8f471b6ea52e423371490a2b24328354e6b4d2f2f35f345a3bec68a4d55de929199dfb9 WHIRLPOOL 4bf2f6f634492a621eb541064bec6dc2c5afa8b303311c34402b46f5ca82ee7d6162430414f92e11042fbc77e990a25b150d67e6352207d29b1bca5163aeb5bb
DIST freeverb3-2.6.6.tar.gz 6208119 SHA256 55c0585c8d53df1bcc5dcb6ffd26fc123583a239c3f064229af71e5f8dca6816 SHA512 755c95ef184487af7e01ea32765b77eba6ffc9738aece3d64f9da019f720075fb7907341689a8adbe81d6fd265a82436da578df2d98ff2e82803a064df4c5dc1 WHIRLPOOL 77795333dc30f3aca514a3a16d8760373bf1ac34fdcc1f3feef3d3bd3071fedf1dcb73ca85b3bf27666c0fba176d86607d68d4c0d5d37a2cfa42a5417d282bb4
DIST freeverb3-3.1.1.tar.xz 6067288 SHA256 6327b6809f4c15dfc74331f0b88af8d92f593d1bf8eabee15ec2a98217aa8d93 SHA512 83feb43a6c178b82958089a3527788f1426bc76e5a86d353df5818a0ebeb1656742e225d4e3eb3187b768169af1a6f2716215408fdb30869452d10d64a967516 WHIRLPOOL e2ac3bec3f2ba90bfc8f25d9c09290dcdc5e43e4528182cbf112614f9d86e97f27beb13a4869cfe5ac10a29af47e4ed9ab64a064189d57ac1d4282a38442b935
DIST freeverb3-3.1.2_pre20151102.tar.gz 8416503 SHA256 759ba987a6d696a34ce9a5a69ba87687bf678a93de3f49af3ad19df638379ae0 SHA512 ccdcf8832155e479164bb6a4cb2f830db83bf55b8c797ba96686abe8392e7d88f55c6ab8bcb2db447ec3ab4f5cca05e09ec0753a61452c01a32ff9f4008b3536 WHIRLPOOL a61cc9d301ddbbede0b9100219d93523ff7cece133f4402b1d82c2c9008d9cd7b2f89a1b94f8f638a298efd5bdc12eed3296618bcd9ab2cee9332cec733c8ea4
diff --git a/media-libs/freeverb3/freeverb3-2.5.13-r2.ebuild b/media-libs/freeverb3/freeverb3-2.5.13-r2.ebuild
deleted file mode 100644
index 44cf4eeb06d6..000000000000
--- a/media-libs/freeverb3/freeverb3-2.5.13-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit eutils autotools versionator
-
-MY_PV=$(replace_version_separator 3 '')
-
-DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins"
-HOMEPAGE="http://freeverb3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="audacious jack plugdouble cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_3dnow forcefpu"
-
-RDEPEND=">=sci-libs/fftw-3.0.1
- audacious? ( <media-sound/audacious-2.5
- media-libs/libsndfile )
- jack? ( media-sound/jack-audio-connection-kit
- media-libs/libsndfile )"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-respect-disable-sse.patch
- eautoreconf
-
- epatch "${FILESDIR}"/${P}-fix-sse1v2-assembly.patch
-}
-
-src_configure() {
- econf \
- --enable-release \
- --disable-bmp \
- --disable-pluginit \
- $(use_enable audacious) \
- $(use_enable jack) \
- $(use_enable plugdouble) \
- $(use_enable cpu_flags_x86_3dnow 3dnow) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable cpu_flags_x86_sse2 sse2) \
- $(use_enable cpu_flags_x86_sse3 sse3) \
- $(use_enable cpu_flags_x86_sse4_1 sse4) \
- $(use_enable forcefpu) \
- || die "econf failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc ChangeLog README || die 'dodoc failed'
-
- insinto /usr/share/${PN}/samples/IR
- doins samples/IR/*.wav || die
-}
diff --git a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
index 6ccec8d41180..8fc2baa13ac7 100644
--- a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
+++ b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
_IUSE_INSTRUCTION_SETS="cpu_flags_x86_3dnow cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
IUSE="${_IUSE_INSTRUCTION_SETS} audacious forcefpu jack openmp plugdouble threads"
diff --git a/media-libs/gd/gd-2.1.1.ebuild b/media-libs/gd/gd-2.1.1.ebuild
index 5d9d2753c73d..c708dd5e5b5d 100644
--- a/media-libs/gd/gd-2.1.1.ebuild
+++ b/media-libs/gd/gd-2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/libgd/gd-libgd/downloads/lib${P}.tar.xz"
LICENSE="gd IJG HPND BSD"
SLOT="2/3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="fontconfig jpeg png static-libs truetype webp xpm zlib"
# fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/gnonlin/Manifest b/media-libs/gnonlin/Manifest
index be58dfbbd7bd..63f103f04687 100644
--- a/media-libs/gnonlin/Manifest
+++ b/media-libs/gnonlin/Manifest
@@ -1,4 +1,2 @@
DIST gnonlin-0.10.17.tar.bz2 468711 SHA256 e4a2dd8af1c0c97f2f63e918a25c26e871c896e88b7ee85948509f68f29e8935 SHA512 e7e7c7999a1886641cf327ad75ba63171c2f9e74fe7a18c4e7c0a5ca69ea3926d4de21f92b01c7896591d2fb48a5c040be2fe05d4d8d43237948c9fe8e4d0f74 WHIRLPOOL a959d5779a5c4f9ee5ca7e608ae3b15c0a89e5c6f3691666370db01e4992c9e8c225d1a9d2e6334b4f157ae365583bfab86cff97d731319f5952817f5a6623c3
-DIST gnonlin-0.10.9.tar.bz2 366567 SHA256 99633d7ddb2c261030eb82567ff7f39ca75c94110cbfc6fe384889b23f2d1dae SHA512 31763d460b249b6f7e3aacc51e84c57f7d8a866f564aa56be6ee410292024b9da4b9c3383b42149bc8776b0daafd431ad2a610cdcfa8f34d5e6969eef56860a3 WHIRLPOOL e2d2b40cf4a8629cdcb92e27112fc1d54d97085659387eeb8740bccc8ea27fb4ec3eb7b12f9e95e643acc28785f6c932047299bbd958e8da525a2d21ef00ff92
-DIST gnonlin-1.2.1.tar.xz 401620 SHA256 787006231184753f8330b4b6d63d37979d937355291c6da75080d83efe1aeb93 SHA512 7e2579b77f6901cd14a57c849a97cc0915a439c11ea1f8989f52f2087926df49577b84866d81161a70de637241de76846373f9af2436eaab73d4573cc3dad792 WHIRLPOOL 2f183214fdca82e6405dcef201a250e5ed651eaba602d792a557a40440ae02b56d5cc57911cd16d4ae996690288f0d8e6d0a0dca16e91f54dc7097720d3040a1
DIST gnonlin-1.4.0.tar.xz 404096 SHA256 2d667e1632816ea8a6ff7c8b75b29241b6542e1f6ab41d9d51661c287006667f SHA512 22734a8cbc648811467a3a161fdf86997fff682007b57849b253618663d30996a787734df8caff56f0b4b24e98f8cbd073d4c48557b8d09091ab27b72851b055 WHIRLPOOL 37988b6a83c9a7c3a565be412dd5d7b52fb62da51317a8dd135bafce299124cef230b4fcabd0f1f74e931cc72a11fef9c5177f2944082f8a518640a06f1e3123
diff --git a/media-libs/gnonlin/gnonlin-0.10.9.ebuild b/media-libs/gnonlin/gnonlin-0.10.9.ebuild
deleted file mode 100644
index fef4d1dfdd68..000000000000
--- a/media-libs/gnonlin/gnonlin-0.10.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="Gnonlin is a set of GStreamer elements to ease the creation of non-linear multimedia editors"
-HOMEPAGE="http://gnonlin.sourceforge.net"
-SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0.10"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/gstreamer-0.10.9:0.10
- >=media-libs/gst-plugins-base-0.10.9:0.10"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc AUTHORS ChangeLog NEWS README RELEASE
-}
diff --git a/media-libs/gnonlin/gnonlin-1.2.1.ebuild b/media-libs/gnonlin/gnonlin-1.2.1.ebuild
deleted file mode 100644
index 268b2176158d..000000000000
--- a/media-libs/gnonlin/gnonlin-1.2.1.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="5"
-inherit gst-plugins10
-
-DESCRIPTION="Gnonlin is a set of GStreamer elements to ease the creation of non-linear multimedia editors"
-HOMEPAGE="http://gnonlin.sourceforge.net"
-
-LICENSE="LGPL-2"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-libs/glib-2.34:2
- >=media-libs/gstreamer-1.2:1.0
- >=media-libs/gst-plugins-base-1.2:1.0
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=dev-util/gtk-doc-am-1.13
- test? (
- dev-libs/check
- >=media-libs/gst-plugins-good-1.2:1.0 )
-" # videomixer
-
-src_configure() {
- econf --disable-gtk-doc
-}
-
-src_compile() {
- default
-}
-
-src_install() {
- default
- prune_libtool_files --all
-}
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 78dbabe00287..4680ccd21b71 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,2 +1,3 @@
DIST grilo-0.2.12.tar.xz 617284 SHA256 55b4663550bc8185f8db232e96b9ba99fbfa9175e31e7321fa5ccaacf3617b85 SHA512 a8102dc66e30676a3fcf2be1c96b4c461b78095c03d7566216bb6c04f875b3be6a305d81464058a11f92dee00e68b2abdcb8d5c5f2a0d95732ac7dbb473820f4 WHIRLPOOL fece087c8003138e9b6a977cb3c9d60dd41364dd6b7cb2efe98efab863e38ea360daf44b90ec7a970810a8b4a980221ef73e8a4606dca8e26e52f36980ba9ffc
DIST grilo-0.2.14.tar.xz 622860 SHA256 79c82ea1747ae7430a648aa9660e44d88d48c968bcdaeb3b2c5cb97e1c921ccd SHA512 0c06396b6c0c97bb7602f372077126432a0bc8284c85f3e684d1d050ab7ace6f59764c79870ce26462f8e1facfbbfca5f950fa3e35999483548510c10a42e440 WHIRLPOOL 1aed02f103beaf7f0425969806ee0fb7c802e584ab8c46a335a3af9e7efe75126b1ca8c5841ac11ca99cfe6dea6391616a3373a4165a6d01c06cc3800904cdec
+DIST grilo-0.2.15.tar.xz 627196 SHA256 6f5d2583250a68e76d281edaa08adb880d5a78ed46f9ecd22ae4715f1dd66815 SHA512 ac0a76d9075e5383fe1a56277b23986a8ec8e86f01f3f782ac7dc79539904712c22295c679243604b619f24088a1210622e0699b5601678264bd7651012ded3e WHIRLPOOL 6ea64142e1a4923d0ea3554ec3591f2c3dd6d30fdeaccde9a2a8e48d3e62ff1cd38b23a9eb39aa4c79c3a93c800e7dbfb4ad3a278e92d5ac57cb2e374a18f793
diff --git a/media-libs/grilo/grilo-0.2.15.ebuild b/media-libs/grilo/grilo-0.2.15.ebuild
new file mode 100644
index 000000000000..e87bbcf01188
--- /dev/null
+++ b/media-libs/grilo/grilo-0.2.15.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.28"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 python-any-r1 vala
+
+DESCRIPTION="A framework for easy media discovery and browsing"
+HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.2/1" # subslot is libgrilo-0.2 soname suffix
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk examples +introspection +network playlist test vala"
+REQUIRED_USE="test? ( introspection )"
+
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ dev-libs/libxml2:2
+ net-libs/liboauth
+ gtk? ( >=x11-libs/gtk+-3:3 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9:= )
+ network? ( >=net-libs/libsoup-2.41.3:2.4 )
+ playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+ test? (
+ $(python_gen_any_dep '
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]')
+ media-plugins/grilo-plugins:0.2 )
+"
+# eautoreconf requires gnome-common
+
+python_check_deps() {
+ has_version "dev-python/pygobject:2[${PYTHON_USEDEP}]" && \
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Don't build examples
+ sed -e '/SUBDIRS/s/examples//' \
+ -i Makefile.am -i Makefile.in || die
+
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # --enable-debug only changes CFLAGS, useless for us
+ gnome2_src_configure \
+ --disable-static \
+ --disable-debug \
+ $(use_enable gtk test-ui) \
+ $(use_enable introspection) \
+ $(use_enable network grl-net) \
+ $(use_enable playlist grl-pls) \
+ $(use_enable test tests) \
+ $(use_enable vala)
+}
+
+src_install() {
+ gnome2_src_install
+ # Upstream made this conditional on gtk-doc build...
+ emake -C doc install DESTDIR="${ED}"
+
+ if use examples; then
+ # Install example code
+ insinto /usr/share/doc/${PF}/examples
+ doins "${S}"/examples/*.c
+ fi
+}
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 26c972d6cbb4..10d6bd6e6c64 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,6 +1,5 @@
DIST gst-plugins-bad-0.10.23-h264-patches.tar.xz 5284 SHA256 40890e4d7792d1b4e18c21204be57d71c34a9add20ef84f8de88c4037ba90858 SHA512 528ed30edb544dd970047fd4b0f05bf75f9f49f07a8118f805430c56c3ec75643013799491aeba70c62cb0343cd3e72758bf5c167d00e90a6a3f13857e4860e1 WHIRLPOOL f48af056d50df855e1281d3c1026c420f1158c3a007416f54bd690ce781089bacf71f0c6a90cece7bb64341c450fb9f6a6bab9a41cf9bd893c96440a0be1c33c
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.4-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.4-r1.ebuild
deleted file mode 100644
index d2e84b32cc9f..000000000000
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE="gst-plugins-bad"
-inherit eutils flag-o-matic gstreamer
-
-DESCRIPTION="Less plugins for GStreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="egl +introspection +orc vnc"
-
-# FIXME: we need to depend on mesa to avoid automagic on egl
-# dtmf plugin moved from bad to good in 1.2
-# X11 is automagic for now, upstream #709530
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-1.2:${SLOT}[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-1.2:${SLOT}[${MULTILIB_USEDEP}]
- egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
- orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-
- !<media-libs/gst-plugins-good-1.1:${SLOT}
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
-"
-
-src_configure() {
- strip-flags
- replace-flags "-O3" "-O2"
- filter-flags "-fprefetch-loop-arrays" # (Bug #22249)
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- gstreamer_multilib_src_configure \
- $(multilib_native_use_enable introspection) \
- $(use_enable orc) \
- $(use_enable vnc librfb) \
- --disable-examples \
- --disable-debug \
- --with-egl-window-system=$(usex egl x11 none)
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS ChangeLog NEWS README RELEASE"
- einstalldocs
- prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild
deleted file mode 100644
index 6781558ab7b7..000000000000
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GST_ORG_MODULE="gst-plugins-bad"
-
-inherit eutils flag-o-matic gstreamer virtualx
-
-DESCRIPTION="Less plugins for GStreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="X egl gles2 +introspection opengl +orc vnc wayland"
-REQUIRED_USE="
- egl? ( !gles2 )
- gles2? ( !egl !opengl )
- opengl? ( X )
- wayland? ( egl )
-"
-
-# dtmf plugin moved from bad to good in 1.2
-# X11 is automagic for now, upstream #709530
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-1.6:${SLOT}[${MULTILIB_USEDEP},introspection?]
- >=media-libs/gst-plugins-base-1.6:${SLOT}[${MULTILIB_USEDEP},introspection?]
- introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-
- egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
- gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
- opengl? (
- >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}]
- virtual/glu[${MULTILIB_USEDEP}] )
- X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
- wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-
- orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-
- !<media-libs/gst-plugins-good-1.1:${SLOT}
- x11-libs/libSM[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
-"
-
-src_prepare() {
- # FIXME: tests are slower than upstream expects
- sed -e 's:/\* tcase_set_timeout.*:tcase_set_timeout (tc_chain, 5 * 60);:' \
- -i tests/check/elements/audiomixer.c || die
-}
-
-multilib_src_configure() {
- gstreamer_multilib_src_configure \
- $(multilib_native_use_enable introspection) \
- $(use_enable egl) \
- $(use_enable gles2) \
- $(use_enable opengl) \
- $(use_enable opengl glx) \
- $(use_enable orc) \
- $(use_enable vnc librfb) \
- $(use_enable X x11) \
- $(use_enable wayland) \
- --disable-examples \
- --disable-debug \
- --disable-cocoa \
- --disable-wgl
-
- if multilib_is_native_abi; then
- local x
- for x in libs plugins; do
- ln -s "${S}"/docs/${x}/html docs/${x}/html || die
- done
- fi
-}
-
-multilib_src_test() {
- unset DISPLAY
- Xemake check
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS ChangeLog NEWS README RELEASE"
- einstalldocs
- prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.2.ebuild
index 547dd00abd3a..6d192fb57a4e 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.1.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://gstreamer.freedesktop.org/"
LICENSE="LGPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="X egl gles2 +introspection opengl +orc vnc wayland"
+IUSE="X egl gles2 gtk +introspection opengl +orc vnc wayland"
REQUIRED_USE="
egl? ( !gles2 )
gles2? ( !egl !opengl )
@@ -37,6 +37,7 @@ RDEPEND="
X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+ gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}] )
orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
!<media-libs/gst-plugins-good-1.1:${SLOT}
@@ -52,10 +53,17 @@ src_prepare() {
}
multilib_src_configure() {
+ local myconf=()
+ if use opengl || use gles2 ; then
+ # Actually enable the gl element, not just libs
+ myconf+=( --enable-gl )
+ fi
+
gstreamer_multilib_src_configure \
$(multilib_native_use_enable introspection) \
$(use_enable egl) \
$(use_enable gles2) \
+ $(use_enable gtk gtk3) \
$(use_enable opengl) \
$(use_enable opengl glx) \
$(use_enable orc) \
@@ -65,7 +73,8 @@ multilib_src_configure() {
--disable-examples \
--disable-debug \
--disable-cocoa \
- --disable-wgl
+ --disable-wgl \
+ ${myconf[$@]}
if multilib_is_native_abi; then
local x
@@ -77,7 +86,8 @@ multilib_src_configure() {
multilib_src_test() {
unset DISPLAY
- Xemake check
+ # FIXME: tests are slower than upstream expects
+ Xemake check -j1
}
multilib_src_install_all() {
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 9a7f0429cba0..12c9d58421c7 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
-DIST gst-plugins-base-1.2.4.tar.xz 2538012 SHA256 4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550 SHA512 8e7e7fd494ee2335e917dae3fef93a2103db37c8cc645ccf1f63b7e6676a6cc6fee78bb90e43f8ccacab367788a416600577cb3d9630e9d64258ecb3dbe63338 WHIRLPOOL 173b2c71b2be05db75ef0d7c344b64ec5d74ba291cc8058546a2963257a1af8e7699737214e11c2d811e6349a008386f822a82f5fe5f5491f5faca64e9d8f20d
DIST gst-plugins-base-1.4.5.tar.xz 2637680 SHA256 77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d SHA512 63d3c531de736ad8a64d6962c0af75857d3b016d7f8e85d1884e8de50e64576902bb1161161b74130ab5dfb1d453eb995e374d8a958eac6e44ae5272eeaaf8b6 WHIRLPOOL cf6ef1c9589ed7a39be74e7663b0821c81b1b4cffdd612ccd7fd5b7929508af21d68817530a4b0fb2517f3a7044ee068afba7602816fdd0ada31444f0bcf8383
-DIST gst-plugins-base-1.6.0.tar.xz 2833380 SHA256 314fd1b707f65caf8eb6164d9422fc51e2b220a890ccd2de6ec03a2883d77231 SHA512 fea97754117f7a923e6622211a218ab1d1d4cbb30f8025777462df5c622061710236477af42df6ea6b817e155d2165af353d6f44b5609b87187ab2fb63aaf406 WHIRLPOOL 97696f2d44bbfd08ccf004493948b890fb28527a6fac2c2a04fe06e395a36a66a945e2153659e9324c5e22adf8af27c8426632379e0f734dddfc7b6661c1d3fa
DIST gst-plugins-base-1.6.1.tar.xz 2833356 SHA256 9533dcfaa4ee32d435483d9fa88c06b1eba6e9bb234aacd7583f207199f44ba3 SHA512 2887c8acb235f46c7102a572465995bcd4a8dd48a98adccb868225eb87db19e19c36b7c65495b0e0644fdf41e53e8e421f21479b1e80b65a3433a47c7da0eb5f WHIRLPOOL 8939c489eedc2098e93d2340a6ba91d8457225e581331f44c41e27d3f6b1f6c3ffcc4cfeae4695d88314d003a928b575e220e13b227ca44ce3f34dd55abb1549
+DIST gst-plugins-base-1.6.2.tar.xz 2838544 SHA256 c75dd400e451526ed71e1c4955e33d470a2581f5e71ecf84920a41c0a5c75322 SHA512 44cbc0cc731222e22314e74f7a54642d39471c6c47914acc86af177c6a49b87891100bdd04ace77d6fed676fd07b66594da68a9aaf44c1948cab4574fe2c6e49 WHIRLPOOL 05811b3a05d876752356d2ab65982b3564e1582ae5871a2eaf44507b3d1dd82be49a38df83ca983c9113fdafcf65f41dd169313cbedf02bf3e5dfa7506a74174
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r1.ebuild
deleted file mode 100644
index b85e4c88a375..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE="gst-plugins-base"
-inherit eutils gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+introspection nls +orc"
-
-RDEPEND=">=media-libs/gstreamer-${PV}:0.10[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- app-text/iso-codes
- introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
- orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.3
-"
-RDEPEND="${RDEPEND}
- !<media-libs/gst-plugins-bad-0.10.10:0.10
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-medialibs-20140508-r5
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
- )
-"
-
-src_prepare() {
- # The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even
- # though they are not actually used. This needs to be fixed upstream by
- # replacing AC_PATH_XTRA with PKG_CONFIG calls.
- sed -i -e 's:X_PRE_LIBS -lSM -lICE:X_PRE_LIBS:' "${S}"/configure || die
-
- # Fix compilation with gcc-4.9, bug #529962
- epatch "${FILESDIR}"/${PN}-0.10.36-gcc-4.9.patch
-}
-
-multilib_src_configure() {
- gstreamer_multilib_src_configure \
- $(multilib_native_use_enable introspection) \
- $(use_enable nls) \
- $(use_enable orc) \
- --disable-examples \
- --disable-debug \
- --disable-static
-
- # bug #366931, flag-o-matic for the whole thing is overkill
- if [[ ${CHOST} == *86-*-darwin* ]] ; then
- sed -i \
- -e '/FLAGS = /s|-O[23]|-O1|g' \
- gst/audioconvert/Makefile \
- gst/volume/Makefile || die
- fi
-
- if multilib_is_native_abi; then
- local x
- for x in libs plugins; do
- ln -s "${S}"/docs/${x}/html docs/${x}/html || die
- done
- fi
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS NEWS README RELEASE"
- einstalldocs
- prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.2.4-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.2.4-r1.ebuild
deleted file mode 100644
index dece56ec52c2..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE="gst-plugins-base"
-inherit eutils gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X"
-REQUIRED_USE="
- ivorbis? ( ogg )
- theora? ( ogg )
- vorbis? ( ogg )
-"
-
-RDEPEND="
- app-text/iso-codes
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-1.2.3:1.0[introspection?,${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
- ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
- ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
- orc? ( >=dev-lang/orc-0.4.18[${MULTILIB_USEDEP}] )
- pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
- theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
- vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
- X? (
- >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
-"
-
-src_prepare() {
- # The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even
- # though they are not actually used. This needs to be fixed upstream by
- # replacing AC_PATH_XTRA with PKG_CONFIG calls, upstream bug #731047
- sed -i -e 's:X_PRE_LIBS -lSM -lICE:X_PRE_LIBS:' "${S}"/configure || die
-
- # Fix compilation with gcc-4.9, bug #529962
- epatch "${FILESDIR}"/${PN}-0.10.36-gcc-4.9.patch
-}
-
-multilib_src_configure() {
- gstreamer_multilib_src_configure \
- $(use_enable alsa) \
- $(multilib_native_use_enable introspection) \
- $(use_enable ivorbis) \
- $(use_enable ogg) \
- $(use_enable orc) \
- $(use_enable pango) \
- $(use_enable theora) \
- $(use_enable vorbis) \
- $(use_enable X x) \
- $(use_enable X xshm) \
- $(use_enable X xvideo) \
- --disable-debug \
- --disable-examples \
- --disable-freetypetest \
- --disable-static
- # cdparanoia and libvisual are split out, per leio's request
-
- # bug #366931, flag-o-matic for the whole thing is overkill
- if [[ ${CHOST} == *86-*-darwin* ]] ; then
- sed -i \
- -e '/FLAGS = /s|-O[23]|-O1|g' \
- gst/audioconvert/Makefile \
- gst/volume/Makefile || die
- fi
-
- if multilib_is_native_abi; then
- local x
- for x in libs plugins; do
- ln -s "${S}"/docs/${x}/html docs/${x}/html || die
- done
- fi
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS NEWS README RELEASE"
- einstalldocs
- prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.6.0.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.6.2.ebuild
index 09682ecb6a06..6f796d5e8208 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.6.0.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.6.2.ebuild
@@ -3,8 +3,8 @@
# $Id$
EAPI="5"
-
GST_ORG_MODULE="gst-plugins-base"
+
inherit gstreamer
DESCRIPTION="Basepack of plugins for gstreamer"
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index b1ad1c9cdc44..647171b65849 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,6 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.3.tar.xz 2878780 SHA256 bfb33536a515bdcc34482f64b8d9cc3e47c753878b254923b419bc2f7485e470 SHA512 74203578c92c6979b76e6070fd976989b7b81d3fec4317037d04391cab8142738d7b443915bced1c77e97137ebd47728ef570a55b758a946fb5bc06b7c67b407 WHIRLPOOL 0b5a66751d6e966f4df7455b9227a8da07716a9111cf74bab75e0f3c0efdc8e1e872bb5b220a5ae1edf870c00f5677451f61fb198c709e51bb3f055ebf27669d
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-0.10.31.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-0.10.31.ebuild
deleted file mode 100644
index c6551f6502bd..000000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-0.10.31.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# order is important, gst-plugins10 after gst-plugins-good
-inherit eutils flag-o-matic gst-plugins-good gst-plugins10
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
- >=dev-libs/glib-2.24:2
- >=media-libs/gstreamer-0.10.36:${SLOT}
- >=media-libs/gst-plugins-base-0.10.36:${SLOT}
- app-arch/bzip2
- sys-libs/zlib
- orc? ( >=dev-lang/orc-0.4.11 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
- !<media-libs/gst-plugins-bad-0.10.22:${SLOT}
-"
-# audioparsers and qtmux moves
-
-src_configure() {
- # gst doesnt handle optimisations well
- strip-flags
- replace-flags "-O3" "-O2"
- filter-flags "-fprefetch-loop-arrays" # see bug 22249
-
- # Always enable optional bz2 support for matroska
- # Always enable optional zlib support for qtdemux and matroska
- # Many media files require these to work, as some container headers are often
- # compressed, bug #291154
- gst-plugins10_src_configure \
- --enable-bz2 \
- --enable-zlib \
- --disable-examples \
- --with-default-audiosink=autoaudiosink \
- --with-default-visualizer=goom
-}
-
-src_compile() {
- default
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog NEWS README RELEASE"
- default
- prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.2.3.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.2.3.ebuild
deleted file mode 100644
index a09eb51fbdb0..000000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.2.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# order is important, gst-plugins10 after gst-plugins-good
-inherit eutils flag-o-matic gst-plugins-good gst-plugins10
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-# dtmf plugin moved from bad to good in 1.2
-RDEPEND="
- >=dev-libs/glib-2.32:2
- >=media-libs/gst-plugins-base-1.2.3:${SLOT}
- >=media-libs/gstreamer-1.2:${SLOT}
- app-arch/bzip2
- sys-libs/zlib
- orc? ( >=dev-lang/orc-0.4.17 )
-
- !<media-libs/gst-plugins-bad-1.1:${SLOT}
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
-"
-
-src_configure() {
- # gst doesnt handle optimisations well
- strip-flags
- replace-flags "-O3" "-O2"
- filter-flags "-fprefetch-loop-arrays" # see bug 22249
-
- # Always enable optional bz2 support for matroska
- # Always enable optional zlib support for qtdemux and matroska
- # Many media files require these to work, as some container headers are often
- # compressed, bug #291154
- gst-plugins10_src_configure \
- --enable-bz2 \
- --enable-zlib \
- --disable-examples \
- --with-default-audiosink=autoaudiosink \
- --with-default-visualizer=goom
-}
-
-src_compile() {
- default
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog NEWS README RELEASE"
- default
- prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.2.4-r1.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.2.4-r1.ebuild
deleted file mode 100644
index 43391d3542bf..000000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE="gst-plugins-good"
-inherit eutils flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-# dtmf plugin moved from bad to good in 1.2
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-1.2.3:${SLOT}[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-1.2.4:${SLOT}[${MULTILIB_USEDEP}]
- >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-
- !<media-libs/gst-plugins-bad-1.1:${SLOT}
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
-"
-
-src_configure() {
- # gst doesnt handle optimisations well
- strip-flags
- replace-flags "-O3" "-O2"
- filter-flags "-fprefetch-loop-arrays" # see bug 22249
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- # Always enable optional bz2 support for matroska
- # Always enable optional zlib support for qtdemux and matroska
- # Many media files require these to work, as some container headers are often
- # compressed, bug #291154
- gstreamer_multilib_src_configure \
- --enable-bz2 \
- --enable-zlib \
- --disable-examples \
- --with-default-audiosink=autoaudiosink \
- --with-default-visualizer=goom
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS ChangeLog NEWS README RELEASE"
- einstalldocs
- prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.6.0.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.6.2.ebuild
index 5551d51ee911..019abe41499f 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.6.0.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.6.2.ebuild
@@ -3,8 +3,8 @@
# $Id$
EAPI="5"
-
GST_ORG_MODULE="gst-plugins-good"
+
inherit eutils flag-o-matic gstreamer
DESCRIPTION="Basepack of plugins for GStreamer"
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index fe6a50e8439d..dd31d2e8c60f 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
-DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
-DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
+DIST gst-plugins-ugly-1.6.2.tar.xz 859400 SHA256 e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845 SHA512 b8354bce9b0d8f46d16e18c766e8f432d029cfd13cb0141d54aaef73906072a2ccd72ecfc0a566da9c909f7d9b2a8bfa3e2d45a7c5a22a43fb8f811f75f2f173 WHIRLPOOL 75ad5ee7fdae1e2a899873d70e737f15c996a73f5beb93be740c436a855640b60f600cc68bf341be769f42dd4c077f3f04036212feed598a4405cc3ac3140fdb
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.2.4-r1.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.2.4-r1.ebuild
deleted file mode 100644
index 8380dc99f2ce..000000000000
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.2.4-r1.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="5"
-
-GST_ORG_MODULE="gst-plugins-ugly"
-inherit eutils flag-o-matic gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-1.2.4:${SLOT}[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-1.2:${SLOT}[${MULTILIB_USEDEP}]
- orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
-"
-
-src_configure() {
- # gst doesnt handle optimisations well
- strip-flags
- replace-flags "-O3" "-O2"
- filter-flags "-fprefetch-loop-arrays" # see bug 22249
-
- multilib-minimal_src_configure
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS ChangeLog NEWS README RELEASE"
- einstalldocs
- prune_libtool_files --modules
-}
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.0.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.2.ebuild
index 69bb42e0936e..186d14d6f079 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.0.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.2.ebuild
@@ -5,7 +5,7 @@
EAPI="5"
GST_ORG_MODULE="gst-plugins-ugly"
-inherit eutils flag-o-matic gstreamer
+inherit eutils gstreamer
DESCRIPTION="Basepack of plugins for gstreamer"
HOMEPAGE="http://gstreamer.freedesktop.org/"
@@ -16,8 +16,8 @@ IUSE="+orc"
RDEPEND="
>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-1.6:${SLOT}[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-1.6:${SLOT}[${MULTILIB_USEDEP}]
+ >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index a6bfbca1e916..6b4e8b886d7d 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1,2 +1,3 @@
DIST gst-rtsp-0.10.8.tar.bz2 567670 SHA256 9915887cf8515bda87462c69738646afb715b597613edc7340477ccab63a6617 SHA512 c5020cffa9334b7d9c6b9dbe6f32bd4580eeee1c67689269d232e954ef9d96d8b988e3fb19da89701eae26419df0bf6de5796f7780cfbedda4c07154b1c1ebd7 WHIRLPOOL 6bd260edaef5ab003ef7176d84c46d5a94d365af51226108af9ab845d6e5910d90c721d5fd87e7fe93b141a82e5114b4c674a1d2500ef57302bf845c87f5463c
DIST gst-rtsp-server-1.4.5.tar.xz 530724 SHA256 3089254bd31b7c1f1cf2c034a3b3551f92878f9e3cab65cef3a901a04c0f1d37 SHA512 0f7bbad94416de73abffd76f88fa051b6db4e5250486669b29b101d06a3629ccef886f2048d51d1e3b78c22393eaa86a1f44c696b25ffabc19a1c37c3e442a35 WHIRLPOOL 0a82942e3172a5d6f7699e73c41ab6cfd5c85c52153058fc38673dd347df5f67fa26229273cf29a6ef841c85ddf3ae3f37c0d5db073978c7f9d5546db9b7ce39
+DIST gst-rtsp-server-1.6.2.tar.xz 560824 SHA256 0f51f9879556c0950203c766b09a1b62f1f25b17f9a7d516e01b13ecf93c8858 SHA512 853a26cde765f029c1d357092684a2c0b187c213e0877567b17f45727e179e110fd55484134bfee0dfd32b5af8fa8443c5cafac0aa6d445166fe3d12aa331354 WHIRLPOOL fba57cdb95926312f2e9d3db495ecffdd46962c758aafb606d18c900007561e8da7233da2939100ba7fd03d4d4c4605c72511a2cc26408e09aefd83f2d59e6ae
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.6.2.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.6.2.ebuild
new file mode 100644
index 000000000000..71a6596d6952
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.6.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils gstreamer
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="http://people.freedesktop.org/~wtay/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +introspection static-libs test"
+
+# FIXME: check should depend on USE=test but check is losy
+# configure says good and bad are required by macros forces them to be optional
+# they are only used in unittests anyway.
+RDEPEND="
+ >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+ >=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+"
+DEPEND="${RDEPEND}
+ >=dev-libs/check-0.9.2
+ >=dev-util/gtk-doc-am-1.12
+ virtual/pkgconfig
+ test? (
+ >=media-libs/gst-plugins-bad-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ )
+"
+
+# Due to gstreamer src_configure
+QA_CONFIGURE_OPTIONS="--enable-nls"
+
+multilib_src_configure() {
+ # debug: only adds -g to CFLAGS
+ # docbook: nothing behind that switch
+ # libcgroup is automagic and only used in examples
+ gstreamer_multilib_src_configure \
+ --disable-examples \
+ --disable-docbook \
+ --disable-gtk-doc \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable static-libs static) \
+ $(use_enable test tests) \
+ LIBCGROUP_LIBS= \
+ LIBCGROUP_FLAGS=
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi ; then
+ ln -s "${S}"/docs/libs/${d}/html docs/libs/${d}/html || die
+ fi
+}
+
+multilib_src_install() {
+ emake install DESTDIR="${D}"
+ # Handle broken upstream modifications to defaults of gtk-doc
+ emake install -C docs/libs DESTDIR="${D}"
+ prune_libtool_files
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use examples ; then
+ insinto /usr/share/doc/${PF}/examples
+ doins "${S}"/examples/*.c
+ fi
+}
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 62a6cc17dfae..fa7130c42dd9 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,4 +1,3 @@
-DIST gstreamer-editing-services-1.2.1.tar.xz 900316 SHA256 fe768b21af5c644093a06a0e573b6e2fa9b467bec18de408c7ff7171c4fb40b0 SHA512 245d3f8934e36f5c58112a820375c90f775af928f5a32e5f6c5793a6ad0709b1d29f4e60e572778d1b3fca308d5eb7c55f89a04b38de67a0ba254f85d43d42fa WHIRLPOOL d354c6cfb1c8226b6a5f3b7d175187dfa1a099dbe5d292f1d6b691e51638f72534ac1b412e7851b5c05073e731ecefd0dfbc7ee1106459906498d8d6b61b7080
DIST gstreamer-editing-services-1.4.0.tar.xz 915420 SHA256 cc20b90fb7bcec257b2afda7474664d493b1acece66da675d7df584588808bb3 SHA512 4a3e39089810aa15f2e2e802b1f2a0fcf6f3508a86a5aa8323078334a3f3b427a53e0d3bbb62d42140dc43cbcd9d4985faf0b28edefbcb9814fa76cbb638119b WHIRLPOOL 913149756f5a3dc19e2549014b66484e6390c33d7bfd204899d5d3e9d1f86fe73570ed04548d8ad6700cf9b917344917ae647b0b1d8fb06655dc446e42653e56
-DIST gstreamer-editing-services-1.6.0.tar.xz 1013632 SHA256 4a780cc27029d25271cf4f8bc17531aa9a1d435e4f807202fd3790f53b964dbe SHA512 25435a9db98ed9d973a2414047f466b0fb865b869b29a7792c690e11e872933018d7fe8f998a4ddd1b452b21aa4021187f76ab8124366cde9a016292ad27646e WHIRLPOOL 67c88e89e9dd8aa26eac649bb8b4ea09048bcd538149b0c1380220094fe39e2be5966c19c69329a7582f2409aa66272f0ee2c0724d5fc5a468a4f2bcfb4319fd
DIST gstreamer-editing-services-1.6.1.tar.xz 1004808 SHA256 f5f7e97db04faeaf6ec941652e75221e244b88e570720e031965d81b759e7bd2 SHA512 d40494a76b411303679b68d69946ff10710f3328b3165175db494b905082598a2df75d89dc3ca21da5cf228c8b53efe9fc498012da937b84710a5177782b0342 WHIRLPOOL 3ccc0aa4c1b4a07baefde351f10f1422148ea4b1029561269e432890793c57e3fcf9b572d07f8b8df5ad77ca93a7f405a1ab4ade883d27009e043ad2cfdcb0f8
+DIST gstreamer-editing-services-1.6.2.tar.xz 1007064 SHA256 d12a174bac7af71f22f9d270aca7bd7abd6478d86247240e5d1e358c645d40c4 SHA512 6191b7527adfa7952af71072948440ce74eff82eee0600412a516ffd6a597cd37f6a0c5bbdf12ee0872059715a6b1c3246101d5e20e497ba751bfe1a1d6e0957 WHIRLPOOL f35f6882221ca5298f2ce37326bc4731781285386db332c8b857f0e6ed8f889ef75210bb6a587dee0cb3d1e9500381df4a4df1232763dc92842f27bf8aaec255
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.2.1.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.2.1.ebuild
deleted file mode 100644
index 07fee3dcbdbb..000000000000
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.2.1.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
-
-DESCRIPTION="SDK for making video editors and more"
-HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
-SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~amd64"
-IUSE="+introspection"
-
-# FIXME: There is something odd with pygobject check for >=4.22,
-# check with upstream
-COMMON_DEPEND="
- >=dev-libs/glib-2.34:2
- dev-libs/libxml2:2
- >=media-libs/gstreamer-1.2:1.0[introspection?]
- >=media-libs/gst-plugins-base-1.2:1.0[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-"
-RDEPEND="${COMMON_DEPEND}
- media-libs/gnonlin:1.0
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-doc-am-1.3
- virtual/pkgconfig
-"
-
-src_prepare() {
- # FIXME: disable failing check
- sed -e 's|\(tcase_add_test (.* test_project_load_xges);\)|/*\1*/|' \
- -i "${S}"/tests/check/ges/project.c || die
-}
-
-src_configure() {
- # gtk is only used for examples
- # GST_INSPECT true due bug #508096
- econf \
- GST_INSPECT=$(type -P true) \
- $(use_enable introspection) \
- --disable-examples \
- --disable-gtk-doc \
- --without-gtk \
- --with-package-name="GStreamer editing services ebuild for Gentoo" \
- --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services"
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.0.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild
index ac63af2c125e..3ffda41adfa6 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.0.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild
@@ -21,8 +21,8 @@ IUSE="+introspection"
COMMON_DEPEND="
>=dev-libs/glib-2.34:2
dev-libs/libxml2:2
- >=media-libs/gstreamer-1.6:1.0[introspection?]
- >=media-libs/gst-plugins-base-1.6:1.0[introspection?]
+ >=media-libs/gstreamer-${PV}:1.0[introspection?]
+ >=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
"
RDEPEND="${COMMON_DEPEND}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 904c607738fc..0797f94dccc4 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,5 +1,4 @@
DIST gstreamer-0.10.36.tar.xz 3025876 SHA256 9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da SHA512 7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8 WHIRLPOOL 03b841624552be860d4bf824bde9d6d5d6afc629048244b02037c96370c88191f34a6d09f02af61f295a9d6f84952efec2c5d4b0a28e8e70cd17966ed1b01d93
-DIST gstreamer-1.2.4.tar.xz 3225208 SHA256 1e7ca67a7870a82c9ed51d51d0008cdbc550c41d64cc3ff3f9a1c2fc311b4929 SHA512 e1feaae567e5dba23270b87bc031b9ba061f664b83a3f18064b8abf802ce3ae6855c97df7a9cb8d861c3c6668e671144da859ae9cda663e88720602198f6f8fc WHIRLPOOL 8c8325ee24d2fe6bb218e6d2cc8e3a2870ac47fb2134914205490decf6593c54ca59f92c95a3da0c7f4eb656191ae9b70a40ae02df87ba64a9c39e9e82fd36c0
DIST gstreamer-1.4.5.tar.xz 3324052 SHA256 40801aa7f979024526258a0e94707ba42b8ab6f7d2206e56adbc4433155cb0ae SHA512 ed7b371f99b7da4ec462e34cd8e02062a0faaad7498a87cfc1ef39f8740db9bca0cc5bfe17ae5ff24abe0bd4a6771e732da193c01ca0e2d835b6c5d9f0d41403 WHIRLPOOL 3065b43a84d8d1d09ec9fb9bda5afc91550cd9f55e2db486c6aceec8fa41dd5ae7d3809c6b6249e86e658c94ffed6ec5a4a7a3cd25b2ab17c24c5a3488355bee
-DIST gstreamer-1.6.0.tar.xz 3549712 SHA256 52ef885647afef11c8b7645a9afefe04aa09e8971c4b932e7717872ab8a30fcc SHA512 8e8b5b0ef4e2c74c1f518c11de19c66cd28faac8036321a5de364b774c7d519b6772c41896d61a67a1df76b256183b42b8496175ae03105bd7f506aa748efe5f WHIRLPOOL 2f8b3c4e6ec81d86bba2dd65db87a11ecd0393da78c863f42fed5282f69fa17fef61a0a913c1d125103f02475d428f918a71ac8f3b0ae5bcf41d1b56d50310bf
DIST gstreamer-1.6.1.tar.xz 3552476 SHA256 973a3f213c8d41d6dd0e4e7e38fd6cccacd5ae1ac09e1179a8d5d869ef0a5c9c SHA512 30b776a7ed9e9129e98e937da3c662eab5735e13caf9bb44a290b164d462bd6ba6101650971047e8ba595cc11c99507517df3593456507b37c6c9038fbd6fd1e WHIRLPOOL cadc669d22ae3aea5a590ba057f26b5e304c9f52b9d612bce1b6081bdb98cfaba83bdd48d2893a3d37caa152f2c79d1edff6f70ae6026def8ec2d6dfde2d6d3e
+DIST gstreamer-1.6.2.tar.xz 3557808 SHA256 5896716bd8e089dba452932a2eff2bb6f6c9d58ff64a96635d157f1ffaf8feb2 SHA512 c6032e8d11870668a716b546d1d1b9908e670767c41390285d4f1a89b93ec44262d901e2ba5ed251e9cbf316b41ff46d1f71d5208997f0b0b717de55df0080f9 WHIRLPOOL dd768878e175bba3318d5550556eb8b588ea3ff95db018547e3fc676d98f1b7b67b4a7d05f5c03c01ef24766daf348d27b8e6808607db5e6ccee4c334294d370
diff --git a/media-libs/gstreamer/gstreamer-1.2.4-r2.ebuild b/media-libs/gstreamer/gstreamer-1.2.4-r2.ebuild
deleted file mode 100644
index db3da4359408..000000000000
--- a/media-libs/gstreamer/gstreamer-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib multilib-minimal pax-utils
-
-DESCRIPTION="Streaming media framework"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+introspection nls +orc test"
-
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- >=dev-util/gtk-doc-am-1.12
- sys-devel/bison
- sys-devel/flex
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- nls? ( sys-devel/gettext )
-"
-# gtk-doc-am to install API docs
-
-src_configure() {
- if [[ ${CHOST} == *-interix* ]] ; then
- export ac_cv_lib_dl_dladdr=no
- export ac_cv_func_poll=no
- fi
- if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
- # GCC groks this, but then refers to an implementation (___multi3,
- # ___udivti3) that don't exist (at least I can't find it), so force
- # this one to be off, such that we use 2x64bit emulation code.
- export gst_cv_uint128_t=no
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- # Set 'libexecdir' to ABI-specific location for the library spawns
- # helpers from there.
- # Disable static archives, dependency tracking and examples
- # to speed up build time
- # Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
- ECONF_SOURCE=${S} \
- econf \
- --libexecdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-debug \
- --disable-examples \
- --disable-static \
- --disable-valgrind \
- --enable-check \
- $(multilib_native_use_enable introspection) \
- $(use_enable nls) \
- $(use_enable test tests) \
- --with-package-name="GStreamer ebuild for Gentoo" \
- --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
-
- if multilib_is_native_abi; then
- local x
- for x in gst libs plugins; do
- ln -s "${S}"/docs/${x}/html docs/${x}/html || die
- done
- fi
-}
-
-multilib_src_install() {
- # can't do "default", we want to install docs in multilib_src_install_all
- emake DESTDIR="${D}" install
-
- # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
- use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
-}
-
-multilib_src_install_all() {
- DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
- einstalldocs
- prune_libtool_files --modules
-
- # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
- use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
-}
diff --git a/media-libs/gstreamer/gstreamer-1.6.0.ebuild b/media-libs/gstreamer/gstreamer-1.6.2.ebuild
index 3b7dce9213c5..bb61db6f642f 100644
--- a/media-libs/gstreamer/gstreamer-1.6.0.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.6.2.ebuild
@@ -18,7 +18,7 @@ IUSE="+caps +introspection nls +orc test"
RDEPEND="
>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
caps? ( sys-libs/libcap )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
"
DEPEND="${RDEPEND}
app-arch/xz-utils
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 95c4c1b744c8..8d23d58ac89d 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,2 +1,3 @@
DIST harfbuzz-0.9.41.tar.bz2 1188176 SHA256 d81aa53d0c02b437beeaac159d7fc16394d676bbce0860fb6f6a10b587dc057c SHA512 821b2fbd0d668c90e9e0040f60b7cfd8d35954d218045cebfb5e9c6ba29aba4230d0cd8e951697c26afcc4da447177fe967fa323449499fa710b52dd7e1a7011 WHIRLPOOL 84ba899d8fbc27b19d255d3c40e2d1f92c8c0dcc0a764b5c83c8c470af4902891f954d11aa64b6eb69aac0e8cf55c36ee9babff0a9260fc9f6286ce48330accb
DIST harfbuzz-1.0.6.tar.bz2 1240522 SHA256 f616a7fbdc78a627043f9029000bf08c0c71df59cde4143fc92a014f6a993b26 SHA512 20ee169389a784e4ad4e2ff006a59a36879dba0a37a999ff51c2b4d76da9496a1a747d5176e9611998187452e6d18f880295bdfb9f45338acddf772fc3f16021 WHIRLPOOL 63eab91311674417b66fa92e0b92a5482321dfa8dc48edcc3ae1ed459483222ab08229438356245cc183234a65388fbb6bdb73222359dea0ec2a35a1bf141c78
+DIST harfbuzz-1.1.2.tar.bz2 1233019 SHA256 4a2c5790bd3db7c3ca8c02e4858f2fd592df7932c1d2fa9f6b99acbce0f8461f SHA512 ac2866a3267d7a55311abbdb8f8c38511799c471fb750f203494749ad26edd91ad36c995ee1ce756fa1fcc1625633435cd616e90b794d70f4bb8d213c6d693f9 WHIRLPOOL ef744ddccf30a387823021606304c9f888b99686b397270c2e742191e4c4a885e5872e3c4e8370d0079175a1a026d4c4b21bacf9adf27ccc2837c73294fee121
diff --git a/media-libs/harfbuzz/harfbuzz-1.1.2.ebuild b/media-libs/harfbuzz/harfbuzz-1.1.2.ebuild
new file mode 100644
index 000000000000..cdfd7a5ea536
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.1.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils libtool multilib-minimal python-any-r1
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+
+IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+ cairo? ( x11-libs/cairo:= )
+ fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+ icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+ truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+ test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+ >=dev-libs/gobject-introspection-common-1.34
+ dev-util/ragel
+"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+ # on Darwin/Solaris we need to link with g++, like automake defaults
+ # to, but overridden by upstream because on Linux this is not
+ # necessary, bug #449126
+ sed -i \
+ -e 's/\<LINK\>/CXXLINK/' \
+ src/Makefile.am || die
+ sed -i \
+ -e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+ src/Makefile.in || die
+ sed -i \
+ -e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+ test/api/Makefile.in || die
+ fi
+
+ [[ ${PV} == 9999 ]] && eautoreconf
+ elibtoolize # for Solaris
+
+ # failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+ sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" \
+ # harfbuzz-gobject only used for instrospection, bug #535852
+ econf \
+ --without-coretext \
+ --without-uniscribe \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_with cairo) \
+ $(use_with fontconfig) \
+ $(use_with glib) \
+ $(use_with introspection gobject) \
+ $(use_with graphite graphite2) \
+ $(use_with icu) \
+ $(multilib_native_use_enable introspection) \
+ $(use_with truetype freetype)
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/html docs/html || die
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --modules
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 7b0789786d53..cdfd7a5ea536 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -19,15 +19,17 @@ LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
[[ ${PV} == 9999 ]] || \
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype"
+
+IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
REQUIRED_USE="introspection? ( glib )"
RDEPEND="
cairo? ( x11-libs/cairo:= )
+ fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.34 )
+ introspection? ( >=dev-libs/gobject-introspection-1.34:= )
truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}
@@ -77,6 +79,7 @@ multilib_src_configure() {
--without-uniscribe \
$(use_enable static-libs static) \
$(multilib_native_use_with cairo) \
+ $(use_with fontconfig) \
$(use_with glib) \
$(use_with introspection gobject) \
$(use_with graphite graphite2) \
@@ -85,7 +88,7 @@ multilib_src_configure() {
$(use_with truetype freetype)
if multilib_is_native_abi; then
- ln -s "${S}"/docs/reference/html docs/reference/html || die
+ ln -s "${S}"/docs/html docs/html || die
fi
}
diff --git a/media-libs/imlib2/files/imlib2-1.4.7-headers.patch b/media-libs/imlib2/files/imlib2-1.4.7-headers.patch
new file mode 100644
index 000000000000..d2fba06c3ba2
--- /dev/null
+++ b/media-libs/imlib2/files/imlib2-1.4.7-headers.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/563732
+
+From 521573be219f27c7bfebb57d5b0b994fdb316721 Mon Sep 17 00:00:00 2001
+From: Chloe Kudryavtsev <chloe.kudryavtsev@gmail.com>
+Date: Sat, 24 Oct 2015 23:38:53 -0400
+Subject: [PATCH] add time.h include to common.h for time_t
+
+---
+ src/lib/common.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/common.h b/src/lib/common.h
+index 798965f..9053826 100644
+--- a/src/lib/common.h
++++ b/src/lib/common.h
+@@ -9,6 +9,7 @@
+ #include <config.h>
+ #include <string.h>
+ #include <math.h>
++#include <time.h>
+ #ifdef WITH_DMALLOC
+ #include <dmalloc.h>
+ #endif
+--
+2.6.2
+
diff --git a/media-libs/imlib2/imlib2-1.4.7.ebuild b/media-libs/imlib2/imlib2-1.4.7.ebuild
index 4af11591bead..f2b3f29ecf3e 100644
--- a/media-libs/imlib2/imlib2-1.4.7.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.7.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != "9999" ]] ; then
EKEY_STATE="snap"
fi
-inherit enlightenment toolchain-funcs multilib-minimal
+inherit enlightenment toolchain-funcs multilib-minimal eutils
DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
HOMEPAGE="https://www.enlightenment.org/"
@@ -37,6 +37,11 @@ DEPEND="${RDEPEND}
>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
)"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-headers.patch #563732
+ enlightenment_src_prepare
+}
+
multilib_src_configure() {
# imlib2 has diff configure options for x86/amd64 mmx
if [[ $(tc-arch) == amd64 ]]; then
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild
index d473c175f8b9..f93f7dae7a9d 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="BSD IJG"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="java static-libs"
ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libpng/libpng-1.6.19.ebuild b/media-libs/libpng/libpng-1.6.19.ebuild
index 53d160545e43..8818a93e8c5d 100644
--- a/media-libs/libpng/libpng-1.6.19.ebuild
+++ b/media-libs/libpng/libpng-1.6.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="libpng"
SLOT="0/16"
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng neon static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild b/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
index fa648bcd6ba4..fd10c264be1c 100644
--- a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ppc64 x86"
IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
REQUIRED_USE="
diff --git a/media-libs/libsndfile/libsndfile-1.0.26.ebuild b/media-libs/libsndfile/libsndfile-1.0.26.ebuild
index 54187aef4801..2de06c225c73 100644
--- a/media-libs/libsndfile/libsndfile-1.0.26.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.26.ebuild
@@ -21,7 +21,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="alsa minimal sqlite static-libs test"
RDEPEND="
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
index 3acc5bf57cb4..a6cf2a0f5f20 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+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 ~x64-solaris"
IUSE="X debug doc expat xml"
RDEPEND="
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index ad606fcdf820..1b79e8668389 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,4 +1,3 @@
-DIST audacious-plugins-2.4.4.tgz 3425914 SHA256 24948ae2161ddde580bcad27dbc11faed0cacd142252749e64da5f8f5e8084e4 SHA512 075af56ff2be5262b892cca40a0270a14e20c8b2627296ee5d546f1a3817657e8a46c3c6388ea920efede9a9a727391e31f09a7c781ff651726929b4e6f58ec6 WHIRLPOOL c357c222784b5a178cd8c5e83a8d1b90cbba453613507c11cc1bba34bbcf3aef7c3d6fd1540ffaa92c90699d20203a7acf3241cbbde83525fad011889addaa54
DIST audacious-plugins-2.5.4.tar.gz 3500309 SHA256 149fd27f476670d8ab3b8e9beaad9ab9de5955c8cbec70bf27e26446168148d8 SHA512 43eedbb4d599cc0437f5870cf0501222e107667a76873aa26786086b0ca29a5fb074f7715e7aeff504560e033dd482b98d9d771964d981afcd3b29a46f410bcc WHIRLPOOL e131fb818e90eaa7e98b06b903d6192d4b0fcac4f6af771ea75ce4323033d56ced9fd1b05f7534e390162378c7de8dd384ac9946e0df3cb99cf8cd00d170252c
DIST audacious-plugins-3.1.1.tar.bz2 2167856 SHA256 dd85e982a49a2794041a391aba3d12a12505338b2c9623b60f16842ae89215ad SHA512 f6c89a38385d9fed72e18e54cac5a4a5a126802b5dc0e71a868b92aec2d37b484b9c95e983aade2bdf3d8cf38af8f79aa2f67bc75ef292a3c8448f6029ea91fb WHIRLPOOL 79067763e94cd14191c6636e45ce2ca5778b5e28a6683d4fa69ffbe9c084e5830a3a56c9afeaf7f29b2df70db8582d7ab3fe9bcead8bbf0b910cd431dff35e53
DIST audacious-plugins-3.1.tar.bz2 2156993 SHA256 2d1e9b229b83e4ab2a2065e7116d0d36e774d73146d2cb63162ca880770d7ca8 SHA512 b8aa443d407dab8c5f55c9593e0306d2b2498018dd7787ab32275490d9b2cd76ee0e8c906a98fdf2ae70040f73399718c1eff9a6f8447b7327938a35b5de42d5 WHIRLPOOL 1a3c2efd8e2518011eceffd4104fbd2dcc9c9ac3038493a8a1d6e4ec8d7376311423319f8648f524be13b0332ed305a91c5810243e69ca7a3f816f65cead2911
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.4.4-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.4.4-r1.ebuild
deleted file mode 100644
index 6506bf19d507..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-2.4.4-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils flag-o-matic
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa aqua bs2b cdda cue ffmpeg flac fluidsynth gnome ipv6 jack
-lame libnotify libsamplerate lirc midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile cpu_flags_x86_sse2 vorbis wavpack"
-
-RDEPEND="app-arch/unzip
- >=dev-libs/dbus-glib-0.60
- dev-libs/libxml2:2
- ~media-sound/audacious-2.4.4
- >=net-libs/neon-0.26.4
- >=x11-libs/gtk+-2.14:2
- aac? ( >=media-libs/faad2-2.7 )
- adplug? ( >=dev-cpp/libbinio-1.4 )
- alsa? ( >=media-libs/alsa-lib-1.0.16 )
- bs2b? ( media-libs/libbs2b )
- cdda? ( >=media-libs/libcddb-1.2.1
- >=dev-libs/libcdio-0.79-r1 )
- cue? ( media-libs/libcue )
- ffmpeg? ( virtual/ffmpeg )
- flac? ( >=media-libs/libvorbis-1.0
- >=media-libs/flac-1.2.1-r1 )
- fluidsynth? ( media-sound/fluidsynth )
- jack? ( >=media-libs/bio2jack-0.4
- media-sound/jack-audio-connection-kit )
- lame? ( media-sound/lame )
- libnotify? ( x11-libs/libnotify )
- libsamplerate? ( media-libs/libsamplerate )
- lirc? ( app-misc/lirc )
- mms? ( >=media-libs/libmms-0.3 )
- mp3? ( >=media-sound/mpg123-1.12.1 )
- mtp? ( media-libs/libmtp )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
- scrobbler? ( net-misc/curl )
- sdl? ( >=media-libs/libsdl-1.2.5 )
- sid? ( >=media-libs/libsidplay-2.1.1-r2 )
- sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
- vorbis? ( >=media-libs/libvorbis-1.2.0
- >=media-libs/libogg-1.1.3 )
- wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
- nls? ( dev-util/intltool )
- virtual/pkgconfig"
-
-mp3_warning() {
- if ! use mp3 ; then
- ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.x-fix-skins-build-glib-2.32.patch
-}
-
-src_configure() {
- mp3_warning
-
- econf \
- --enable-chardet \
- --enable-dbus \
- --enable-modplug \
- --enable-neon \
- --disable-projectm \
- --disable-projectm-1.0 \
- $(use_enable adplug) \
- $(use_enable aac) \
- $(use_enable alsa) \
- $(use_enable alsa bluetooth) \
- $(use_enable alsa amidiplug-alsa) \
- $(use_enable aqua coreaudio) \
- $(use_enable aqua dockalbumart) \
- $(use_enable bs2b) \
- $(use_enable cdda cdaudio) \
- $(use_enable cue) \
- $(use_enable ffmpeg ffaudio) \
- $(use_enable flac flacng) \
- $(use_enable fluidsynth amidiplug-flsyn) \
- $(use_enable flac filewriter_flac) \
- $(use_enable ipv6) \
- $(use_enable jack) \
- $(use_enable gnome gnomeshortcuts) \
- $(use_enable lame filewriter_mp3) \
- $(use_enable libnotify notify) \
- $(use_enable libsamplerate resample) \
- $(use_enable lirc) \
- $(use_enable mms) \
- $(use_enable mp3) \
- $(use_enable midi amidiplug) \
- $(use_enable mtp mtp_up) \
- $(use_enable nls) \
- $(use_enable oss) \
- $(use_enable pulseaudio pulse) \
- $(use_enable scrobbler) \
- $(use_enable sdl paranormal) \
- $(use_enable sid) \
- $(use_enable sndfile) \
- $(use_enable cpu_flags_x86_sse2 sse2) \
- $(use_enable vorbis) \
- $(use_enable vorbis filewriter_vorbis) \
- $(use_enable wavpack)
-}
-
-src_compile() {
- emake || die "make failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS
-}
diff --git a/media-plugins/emotion_generic_players/Manifest b/media-plugins/emotion_generic_players/Manifest
index 314fe20070af..1c2c4562f1be 100644
--- a/media-plugins/emotion_generic_players/Manifest
+++ b/media-plugins/emotion_generic_players/Manifest
@@ -1 +1,2 @@
DIST emotion_generic_players-1.15.0.tar.xz 100080 SHA256 9f6d5e9041ac7c014d663dac56d1b39ac42a45abe954d09d0edbf6e759e55f5f SHA512 e0dbebadf9fa3b8b6af4f6828e13a7445731508f219258d2c12c6c0a27e140571dc7abf657fe34fba4295a4c5f6a370950e29c9b3c5dad38ab746e20ccaa4ea3 WHIRLPOOL 1ad44ce27f975244420a4ccd376240d125a93f6894e785faf2ad6f620e35975dbba2d481273c81347dd5e1816c579c47a99d2291e5448964e949be9650bd077b
+DIST emotion_generic_players-1.16.0.tar.xz 100072 SHA256 d5cbfdb31678cd9f6cf70077afe03f07f9076cef7a9faa424da437c38cf06a98 SHA512 5c1d2d074549cec12746670c06ded87378870569ebaba7ccecaec66442a0760a8a08951f2b3e608449e2faae5a756d5148d51aa8fcd162cdb44566f1beb0f7d1 WHIRLPOOL 28bbcc17491b1bd201add975384fa03279bd196495ed59cbb7ebd441475ebbf49c17b5128cf836462b1d1f405a4aa769becde1c5c74d21f8c40fe69cb30dc427
diff --git a/media-plugins/emotion_generic_players/emotion_generic_players-1.16.0.ebuild b/media-plugins/emotion_generic_players/emotion_generic_players-1.16.0.ebuild
new file mode 100644
index 000000000000..f0a638866b7a
--- /dev/null
+++ b/media-plugins/emotion_generic_players/emotion_generic_players-1.16.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P=${PN}-${PV/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+ EGIT_SUB_PROJECT="core"
+ EGIT_URI_APPEND="${PN}"
+else
+ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
+ EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Provides external applications as generic loaders for Evas"
+HOMEPAGE="https://www.enlightenment.org/"
+
+LICENSE="GPL-2"
+# The -arch need to keyword vlc first.
+KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 ~mips ~ppc ~ppc64 ~sh -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris"
+
+RDEPEND=">=dev-libs/efl-${PV}
+ media-video/vlc"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index 936b5b1352d8..ff16dc0f6a81 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,3 +1,4 @@
DIST grilo-plugins-0.2.12.tar.xz 721592 SHA256 15bed8a633c81b251920ab677d455433e641388f605277ca88e549cc89012b48 SHA512 37865fea88b2927482490481f07d830e6cbd89c886e20b2986931215099bc9b6b46600ac45e0c72c6ff2d8f9e273ca5cd4ad42195436b540118c483d1cb5bd8e WHIRLPOOL 27006aa66002770c55be9c8f9d4302f1b60524096a11ad27731a3fcb57e4e4a55a0be6809808d14c441e4bdc005753fd55657fb9df83c149a420eacc29276c91
DIST grilo-plugins-0.2.14.tar.xz 1036824 SHA256 d0f18116675058c7e8c178b1fe26d6d73998a0452f85a73b1696df740c83d3ab SHA512 d4caddb5a710f19365d1d9e890b1d525b96e78cf2228a886f1b2c66e60601c2bef61791007d0d9cc8d3b306aac3065c0ff618ef522c7971885c95ca2e365c69b WHIRLPOOL 40899069c626a4183a9cf2afe94f8290dd39bd0bed8475b5d0732d3aa2521eb6fb6f275fba38d47b0614a9e16501f63ee0c5180dd88082ceb14bff0867f7cfe5
DIST grilo-plugins-0.2.16.tar.xz 1027924 SHA256 80b4571f9db6df0d5f0873d30f2ee475204f5831d2974b89c58423d6ffac5203 SHA512 5f06c15a8cdaecca06d87f2c079d5b9b21de8aca2f0c78432225edda0dcf114403e42245cd3c300b63303b7f03defe53b3067fa24d17896a04bd4dfa9cce0000 WHIRLPOOL 10377791776b006def732c22f3f956b51d7d427f13368bd738a03c3e4ce058ec562a2d0f3f99159a7264fa51b93bfbd99196ceba7d4268758360f4573adde06a
+DIST grilo-plugins-0.2.17.tar.xz 1036308 SHA256 337669098cddf64a84fa9398aa1d7f994fea84bc5f7f1b348e1288f135713781 SHA512 f556ae6e72c82ce74cc8902f7b4ae27f51060c3b06230989b36ce4498f93894c723809c1f08fc8edfabd892fc303eb0523f21ea72649f644c7eb421b62773140 WHIRLPOOL f882ba3ef6ee4b7a1c115992dedd03778155d1ef4fa26077b7f482f5ab7bd5087e6d8485912bbd2563af3b0ef3e387169c1217b8f0427637aa1a9aa88e94df7c
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild
new file mode 100644
index 000000000000..8fa3fd2dd98e
--- /dev/null
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="A framework for easy media discovery and browsing"
+HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="daap +dvd flickr freebox gnome-online-accounts lua subtitles thetvdb tracker upnp-av +vimeo +youtube"
+
+# Bump gom requirement to avoid segfaults
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ >=media-libs/grilo-0.2.12:${SLOT}[network,playlist]
+ media-libs/libmediaart:2.0
+ >=dev-libs/gom-0.3.1
+
+ dev-libs/gmime:2.6
+ dev-libs/json-glib
+ dev-libs/libxml2:2
+ dev-db/sqlite:3
+
+ daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 )
+ dvd? ( >=dev-libs/totem-pl-parser-3.4.1 )
+ flickr? ( net-libs/liboauth )
+ freebox? ( net-dns/avahi )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91 )
+ lua? (
+ >=dev-lang/lua-5.3
+ app-arch/libarchive
+ dev-libs/libxml2:2
+ >=dev-libs/totem-pl-parser-3.4.1 )
+ subtitles? ( net-libs/libsoup:2.4 )
+ thetvdb? (
+ app-arch/libarchive
+ dev-libs/libxml2 )
+ tracker? ( >=app-misc/tracker-0.10.5:= )
+ youtube? (
+ >=dev-libs/libgdata-0.9.1:=
+ >=dev-libs/totem-pl-parser-3.4.1 )
+ upnp-av? (
+ net-libs/libsoup:2.4
+ net-libs/dleyna-connector-dbus )
+ vimeo? (
+ >=dev-libs/totem-pl-parser-3.4.1 )
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.5
+ app-text/yelp-tools
+ >=dev-util/intltool-0.40.0
+ virtual/pkgconfig
+"
+
+# FIXME: some unittests required python-dbusmock
+src_configure() {
+ # --enable-debug only changes CFLAGS, useless for us
+ # Plugins
+ # shoutcast seems to be broken
+ gnome2_src_configure \
+ --disable-static \
+ --disable-debug \
+ --disable-uninstalled \
+ --enable-bookmarks \
+ --enable-filesystem \
+ --enable-gravatar \
+ --enable-jamendo \
+ --enable-localmetadata \
+ --enable-magnatune \
+ --enable-metadata-store \
+ --enable-podcasts \
+ --enable-raitv \
+ --disable-shoutcast \
+ --enable-tmdb \
+ $(use_enable daap dmap) \
+ $(use_enable dvd optical-media) \
+ $(use_enable flickr) \
+ $(use_enable freebox) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable lua lua-factory) \
+ $(use_enable subtitles opensubtitles) \
+ $(use_enable thetvdb) \
+ $(use_enable tracker) \
+ $(use_enable upnp-av dleyna) \
+ $(use_enable vimeo) \
+ $(use_enable youtube)
+}
diff --git a/media-plugins/gst-plugins-a52dec/Manifest b/media-plugins/gst-plugins-a52dec/Manifest
index fe6a50e8439d..dd31d2e8c60f 100644
--- a/media-plugins/gst-plugins-a52dec/Manifest
+++ b/media-plugins/gst-plugins-a52dec/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
-DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
-DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
+DIST gst-plugins-ugly-1.6.2.tar.xz 859400 SHA256 e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845 SHA512 b8354bce9b0d8f46d16e18c766e8f432d029cfd13cb0141d54aaef73906072a2ccd72ecfc0a566da9c909f7d9b2a8bfa3e2d45a7c5a22a43fb8f811f75f2f173 WHIRLPOOL 75ad5ee7fdae1e2a899873d70e737f15c996a73f5beb93be740c436a855640b60f600cc68bf341be769f42dd4c077f3f04036212feed598a4405cc3ac3140fdb
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.2.4-r1.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.2.4-r1.ebuild
deleted file mode 100644
index 9397fa8779a6..000000000000
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.2.4-r1.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="5"
-
-GST_ORG_MODULE=gst-plugins-ugly
-inherit gstreamer
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
- >=media-libs/a52dec-0.7.4-r6[${MULTILIB_USEDEP}]
- orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.0.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.2.ebuild
index 08fa4b1aedfe..08fa4b1aedfe 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-amr/Manifest b/media-plugins/gst-plugins-amr/Manifest
index 89a1ef60a17b..dd31d2e8c60f 100644
--- a/media-plugins/gst-plugins-amr/Manifest
+++ b/media-plugins/gst-plugins-amr/Manifest
@@ -1,6 +1,4 @@
DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
-DIST gst-plugins-ugly-1.2.3.tar.xz 843156 SHA256 537b0a7607eee499026388bb705b5b68985a3fd59fe22ee09accaf8cdf57eb3b SHA512 fdfd22360cf1cb6ba203fb8a5a2a98658c898a41c630e4b466a4a34749b537ea387eee1069adb73bbbacd2da89632c56cd2cf8c371c315b75b11a49f5b9c4beb WHIRLPOOL 0a24e29f2e06d714059c2a83662fbd011808ba2a1996453c4aa44624efeef2a00fd6a4c578332548fc22494c9c1be93497a133f7ce87ab6325198e3465cc9f42
-DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
-DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
+DIST gst-plugins-ugly-1.6.2.tar.xz 859400 SHA256 e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845 SHA512 b8354bce9b0d8f46d16e18c766e8f432d029cfd13cb0141d54aaef73906072a2ccd72ecfc0a566da9c909f7d9b2a8bfa3e2d45a7c5a22a43fb8f811f75f2f173 WHIRLPOOL 75ad5ee7fdae1e2a899873d70e737f15c996a73f5beb93be740c436a855640b60f600cc68bf341be769f42dd4c077f3f04036212feed598a4405cc3ac3140fdb
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-0.10.19.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-0.10.19.ebuild
deleted file mode 100644
index a3e0bf6d28f7..000000000000
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-0.10.19.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils gst-plugins-ugly
-
-DESCRIPTION="GStreamer plugin for AMRNB/AMRWB codec"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/opencore-amr"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="amrnb amrwb"
-GST_PLUGINS_BUILD_DIR="amrnb amrwbdec"
-
-src_prepare() {
- # Fix build with current opencore-amr
- epatch "${FILESDIR}"/${P}-headers-location.patch
-}
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.2.3.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.2.3.ebuild
deleted file mode 100644
index a38a72e52501..000000000000
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.2.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-ugly
-
-DESCRIPTION="GStreamer plugin for AMRNB/AMRWB codec"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/opencore-amr"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="amrnb amrwb"
-GST_PLUGINS_BUILD_DIR="amrnb amrwbdec"
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.2.4-r1.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.2.4-r1.ebuild
deleted file mode 100644
index f1ca5422a1f3..000000000000
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-ugly
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for AMRNB/AMRWB codec"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="amrnb amrwb"
-GST_PLUGINS_BUILD_DIR="amrnb amrwbdec"
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.2.4.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.2.4.ebuild
deleted file mode 100644
index f18cdc0ee205..000000000000
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.2.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-ugly
-
-DESCRIPTION="GStreamer plugin for AMRNB/AMRWB codec"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/opencore-amr"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="amrnb amrwb"
-GST_PLUGINS_BUILD_DIR="amrnb amrwbdec"
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.0.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.2.ebuild
index 6a944bbf1e61..6a944bbf1e61 100644
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-annodex/gst-plugins-annodex-0.10.31.ebuild b/media-plugins/gst-plugins-annodex/gst-plugins-annodex-0.10.31.ebuild
deleted file mode 100644
index 87636947fcff..000000000000
--- a/media-plugins/gst-plugins-annodex/gst-plugins-annodex-0.10.31.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-good
-
-DESCRIPTION="GStreamer plugin for annodex stream manipulation"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.4.9"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index 9bbaeb1b7033..2db7502c1069 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -3,3 +3,4 @@ DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.2.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.2.ebuild
new file mode 100644
index 000000000000..285087c2d037
--- /dev/null
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for ASS/SSA rendering with effects support"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libass-0.10.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdio/Manifest b/media-plugins/gst-plugins-cdio/Manifest
index fe6a50e8439d..dd31d2e8c60f 100644
--- a/media-plugins/gst-plugins-cdio/Manifest
+++ b/media-plugins/gst-plugins-cdio/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
-DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
-DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
+DIST gst-plugins-ugly-1.6.2.tar.xz 859400 SHA256 e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845 SHA512 b8354bce9b0d8f46d16e18c766e8f432d029cfd13cb0141d54aaef73906072a2ccd72ecfc0a566da9c909f7d9b2a8bfa3e2d45a7c5a22a43fb8f811f75f2f173 WHIRLPOOL 75ad5ee7fdae1e2a899873d70e737f15c996a73f5beb93be740c436a855640b60f600cc68bf341be769f42dd4c077f3f04036212feed598a4405cc3ac3140fdb
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.2.4-r1.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.2.4-r1.ebuild
deleted file mode 100644
index b8d669f78018..000000000000
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-ugly
-inherit gstreamer
-
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.0.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.2.ebuild
index bec73c95e324..bec73c95e324 100644
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index 9a7f0429cba0..12c9d58421c7 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
-DIST gst-plugins-base-1.2.4.tar.xz 2538012 SHA256 4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550 SHA512 8e7e7fd494ee2335e917dae3fef93a2103db37c8cc645ccf1f63b7e6676a6cc6fee78bb90e43f8ccacab367788a416600577cb3d9630e9d64258ecb3dbe63338 WHIRLPOOL 173b2c71b2be05db75ef0d7c344b64ec5d74ba291cc8058546a2963257a1af8e7699737214e11c2d811e6349a008386f822a82f5fe5f5491f5faca64e9d8f20d
DIST gst-plugins-base-1.4.5.tar.xz 2637680 SHA256 77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d SHA512 63d3c531de736ad8a64d6962c0af75857d3b016d7f8e85d1884e8de50e64576902bb1161161b74130ab5dfb1d453eb995e374d8a958eac6e44ae5272eeaaf8b6 WHIRLPOOL cf6ef1c9589ed7a39be74e7663b0821c81b1b4cffdd612ccd7fd5b7929508af21d68817530a4b0fb2517f3a7044ee068afba7602816fdd0ada31444f0bcf8383
-DIST gst-plugins-base-1.6.0.tar.xz 2833380 SHA256 314fd1b707f65caf8eb6164d9422fc51e2b220a890ccd2de6ec03a2883d77231 SHA512 fea97754117f7a923e6622211a218ab1d1d4cbb30f8025777462df5c622061710236477af42df6ea6b817e155d2165af353d6f44b5609b87187ab2fb63aaf406 WHIRLPOOL 97696f2d44bbfd08ccf004493948b890fb28527a6fac2c2a04fe06e395a36a66a945e2153659e9324c5e22adf8af27c8426632379e0f734dddfc7b6661c1d3fa
DIST gst-plugins-base-1.6.1.tar.xz 2833356 SHA256 9533dcfaa4ee32d435483d9fa88c06b1eba6e9bb234aacd7583f207199f44ba3 SHA512 2887c8acb235f46c7102a572465995bcd4a8dd48a98adccb868225eb87db19e19c36b7c65495b0e0644fdf41e53e8e421f21479b1e80b65a3433a47c7da0eb5f WHIRLPOOL 8939c489eedc2098e93d2340a6ba91d8457225e581331f44c41e27d3f6b1f6c3ffcc4cfeae4695d88314d003a928b575e220e13b227ca44ce3f34dd55abb1549
+DIST gst-plugins-base-1.6.2.tar.xz 2838544 SHA256 c75dd400e451526ed71e1c4955e33d470a2581f5e71ecf84920a41c0a5c75322 SHA512 44cbc0cc731222e22314e74f7a54642d39471c6c47914acc86af177c6a49b87891100bdd04ace77d6fed676fd07b66594da68a9aaf44c1948cab4574fe2c6e49 WHIRLPOOL 05811b3a05d876752356d2ab65982b3564e1582ae5871a2eaf44507b3d1dd82be49a38df83ca983c9113fdafcf65f41dd169313cbedf02bf3e5dfa7506a74174
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.2.4-r1.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.2.4-r1.ebuild
deleted file mode 100644
index 475c05e93ee2..000000000000
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-base
-inherit gstreamer
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- gstreamer_system_link gst-libs/gst/audio:gstreamer-audio
-}
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.0.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.2.ebuild
index 5832bc2ad012..a3ecc2f52e97 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.2.ebuild
@@ -3,8 +3,8 @@
# $Id$
EAPI="5"
-
GST_ORG_MODULE=gst-plugins-base
+
inherit gstreamer
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/media-plugins/gst-plugins-dash/Manifest b/media-plugins/gst-plugins-dash/Manifest
index 9319ef3770bc..e88a0c52f0e6 100644
--- a/media-plugins/gst-plugins-dash/Manifest
+++ b/media-plugins/gst-plugins-dash/Manifest
@@ -1,4 +1,3 @@
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.2.4-r1.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.2.4-r1.ebuild
deleted file mode 100644
index fed62c0a7895..000000000000
--- a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPTION="MPEG-DASH plugin"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-# FIXME: gsturidownloader does not have a .pc
-#src_prepare() {
-# gstreamer_system_link \
-# gst-libs/gst/uridownloader:gsturidownloader
-#}
-
-multilib_src_compile() {
- emake -C gst-libs/gst/uridownloader
-
- gstreamer_multilib_src_compile
-}
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.0.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.2.ebuild
index 7bbdb2186061..7bbdb2186061 100644
--- a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-dtls/Manifest b/media-plugins/gst-plugins-dtls/Manifest
index d30d1812de41..c412ecb90009 100644
--- a/media-plugins/gst-plugins-dtls/Manifest
+++ b/media-plugins/gst-plugins-dtls/Manifest
@@ -1 +1,2 @@
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.4.5.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.2.ebuild
index 09c6040374f3..0e4a8dec21f6 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.4.5.ebuild
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.2.ebuild
@@ -7,8 +7,11 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+DESCRIPTION="DTLS plugin for GStreamer."
+KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
+RDEPEND="
+ >=dev-libs/openssl-1.0.1:0[${MULTILIB_USEDEP}]
+"
DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dts/Manifest b/media-plugins/gst-plugins-dts/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-dts/Manifest
+++ b/media-plugins/gst-plugins-dts/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.2.4-r1.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.2.4-r1.ebuild
deleted file mode 100644
index 7ed8548f45b5..000000000000
--- a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
-IUSE="+orc"
-
-RDEPEND="
- >=media-libs/libdca-0.0.5-r3[${MULTILIB_USEDEP}]
- orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.0.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.2.ebuild
index fdc401c0dfa1..fdc401c0dfa1 100644
--- a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-dv/Manifest b/media-plugins/gst-plugins-dv/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-dv/Manifest
+++ b/media-plugins/gst-plugins-dv/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.2.4-r1.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.2.4-r1.ebuild
deleted file mode 100644
index a2482f3b26d2..000000000000
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.2.4-r1.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="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin to demux and decode DV"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="libdv"
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.0.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.2.ebuild
index 1a532d025913..1a532d025913 100644
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.2.4-r1.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.2.4-r1.ebuild
deleted file mode 100644
index c7c5f441105a..000000000000
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPION="GStreamer plugin to allow capture from dvb devices"
-KEYWORDS="alpha amd64 arm ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/os-headers"
-
-multilib_src_compile() {
- # Prepare generated headers
- emake -C gst-libs/gst/mpegts
-
- gstreamer_multilib_src_compile
-}
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.0.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.2.ebuild
index 227f18446321..227f18446321 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-dvdread/Manifest b/media-plugins/gst-plugins-dvdread/Manifest
index fe6a50e8439d..dd31d2e8c60f 100644
--- a/media-plugins/gst-plugins-dvdread/Manifest
+++ b/media-plugins/gst-plugins-dvdread/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
-DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
-DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
+DIST gst-plugins-ugly-1.6.2.tar.xz 859400 SHA256 e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845 SHA512 b8354bce9b0d8f46d16e18c766e8f432d029cfd13cb0141d54aaef73906072a2ccd72ecfc0a566da9c909f7d9b2a8bfa3e2d45a7c5a22a43fb8f811f75f2f173 WHIRLPOOL 75ad5ee7fdae1e2a899873d70e737f15c996a73f5beb93be740c436a855640b60f600cc68bf341be769f42dd4c077f3f04036212feed598a4405cc3ac3140fdb
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.2.4-r1.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.2.4-r1.ebuild
deleted file mode 100644
index 39a30dd58b25..000000000000
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-ugly
-inherit gstreamer
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.0.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.2.ebuild
index a5f5bbf682f8..a5f5bbf682f8 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-faac/Manifest
+++ b/media-plugins/gst-plugins-faac/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.2.4-r1.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.2.4-r1.ebuild
deleted file mode 100644
index e9fbde2d4d3e..000000000000
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.0.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.2.ebuild
index 1e7ec41a0a85..1e7ec41a0a85 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-0.10.23-r1.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-0.10.23-r1.ebuild
deleted file mode 100644
index c31cc8b244c1..000000000000
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-0.10.23-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.2.4-r1.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.2.4-r1.ebuild
deleted file mode 100644
index c31cc8b244c1..000000000000
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.0.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.2.ebuild
index c6d0af713c11..c6d0af713c11 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild
deleted file mode 100644
index c9f5a74eea90..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib-minimal
-
-MY_PN="gst-ffmpeg"
-MY_P=${MY_PN}-${PV}
-
-# Create a major/minor combo for SLOT
-PVP=(${PV//[-\._]/ })
-SLOT=${PVP[0]}.${PVP[1]}
-
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
-#SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}.tar.xz
- https://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}-libav-9-patches.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=media-libs/gstreamer-0.10.36-r2:0.10[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
- >=virtual/ffmpeg-9-r1[${MULTILIB_USEDEP}]
- || (
- >=media-video/ffmpeg-1.2.6-r1:0[${MULTILIB_USEDEP}]
- >=media-libs/libpostproc-10.20140517-r1[${MULTILIB_USEDEP}]
- )
- orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-RDEPEND="${RDEPEND}
- abi_x86_32? (
- !app-emulation/emul-linux-x86-gstplugins[-abi_x86_32(-)]
- )"
-
-src_prepare() {
- sed -e 's/sleep 15//' -i configure.ac configure || die
-
- # libav-9 support backported from gst-plugins-libav-1.1.0
- epatch ../${MY_P}-libav-9-patches/*.patch
-
- # compat bits for older ffmpeg/libav releases
- epatch "${FILESDIR}/${PV}-channel_layout.patch" \
- "${FILESDIR}/${PV}-iscodec.patch" \
- "${FILESDIR}/${PV}-coma.patch" \
- "${FILESDIR}/${PV}-gstffmpegpipe_redef.patch"
-
- # compatibility with recent releases
- if has_version '>=media-video/ffmpeg-1.1' || has_version '>=media-video/libav-9' ; then
- epatch "${FILESDIR}/${PV}-planaraudio.patch"
- sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
- -e 's/ CodecID/ AVCodecID/g' \
- ext/ffmpeg/*.{c,h}
- epatch "${FILESDIR}/${PV}-ffmpeg2.patch"
- fi
-}
-
-multilib_src_configure() {
- # always use system ffmpeg if possible
- ECONF_SOURCE=${S} \
- econf \
- --with-system-ffmpeg \
- $(use_enable orc)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --modules
-}
-
-pkg_postinst() {
- if has_version "media-video/ffmpeg"; then
- elog "Please note that upstream uses media-video/libav"
- elog "rather than media-video/ffmpeg. If you encounter any"
- elog "issues try to move from ffmpeg to libav."
- fi
-}
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild
deleted file mode 100644
index b8e233af5d0a..000000000000
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib-minimal
-
-MY_PN="gst-ffmpeg"
-MY_P=${MY_PN}-${PV}
-
-# Create a major/minor combo for SLOT
-PVP=(${PV//[-\._]/ })
-SLOT=${PVP[0]}.${PVP[1]}
-
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
-#SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}.tar.xz
- https://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}-libav-9-patches.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="libav +orc"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="
- >=media-libs/gstreamer-0.10.36-r2:0.10[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
-
- !libav? ( >=media-video/ffmpeg-1.2.6-r1:0=[${MULTILIB_USEDEP}] )
- libav? (
- >=media-video/libav-9.12:0=[${MULTILIB_USEDEP}]
- <media-video/libav-10:0=[${MULTILIB_USEDEP}]
- >=media-libs/libpostproc-10.20140517-r1:0=[${MULTILIB_USEDEP}] )
- orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
- abi_x86_32? ( !app-emulation/emul-linux-x86-gstplugins[-abi_x86_32(-)] )
-"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
- sed -e 's/sleep 15//' -i configure.ac configure || die
-
- # libav-9 support backported from gst-plugins-libav-1.1.0
- epatch ../${MY_P}-libav-9-patches/*.patch
-
- # compat bits for older ffmpeg/libav releases
- epatch "${FILESDIR}/${PV}-channel_layout.patch" \
- "${FILESDIR}/${PV}-iscodec.patch" \
- "${FILESDIR}/${PV}-coma.patch" \
- "${FILESDIR}/${PV}-gstffmpegpipe_redef.patch"
-
- # compatibility with recent releases
- if has_version '>=media-video/ffmpeg-1.1' || has_version '>=media-video/libav-9' ; then
- epatch "${FILESDIR}/${PV}-planaraudio.patch"
- sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
- -e 's/ CodecID/ AVCodecID/g' \
- ext/ffmpeg/*.{c,h}
- epatch "${FILESDIR}/${PV}-ffmpeg2.patch"
- fi
-}
-
-multilib_src_configure() {
- # always use system ffmpeg if possible
- ECONF_SOURCE=${S} \
- econf \
- --with-system-ffmpeg \
- $(use_enable orc)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-0.10.31.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-0.10.31.ebuild
deleted file mode 100644
index 745b8df5c1bf..000000000000
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-0.10.31.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-good
-
-DESCRIPTION="GStreamer encoder/decoder/tagger for FLAC"
-KEYWORDS="sh"
-IUSE=""
-
-RDEPEND=">=media-libs/flac-1.1.4"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.2.4-r1.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.2.4-r1.ebuild
deleted file mode 100644
index c82ad3f2a5b6..000000000000
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE="gst-plugins-good"
-inherit gstreamer
-
-DESCRIPTION="GStreamer encoder/decoder/tagger for FLAC"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.0.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.2.ebuild
index b1b66f21b7cb..b1b66f21b7cb 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31.ebuild b/media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31.ebuild
deleted file mode 100644
index 5f81ad568c05..000000000000
--- a/media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gnome2-utils gst-plugins-good gst-plugins10
-
-DESCRIPTION="GStreamer plugin for wrapping GConf audio/video settings"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=gnome-base/gconf-2"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="gconf gconftool"
-
-src_configure() {
- gst-plugins10_src_configure --disable-schemas-install
-}
-
-src_compile() {
- gst-plugins10_src_compile
- cd "${S}"/gconf
- default
-}
-
-src_install() {
- gst-plugins10_src_install
- cd "${S}"/gconf
- default
-}
-
-pkg_preinst() {
- gnome2_gconf_savelist
-}
-
-pkg_postinst() {
- gnome2_gconf_install
-}
diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.2.4-r1.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.2.4-r1.ebuild
deleted file mode 100644
index fe65194a2eb3..000000000000
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPION="GdkPixbuf-based image decoder, overlay and sink"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="gdk_pixbuf"
-GST_PLUGINS_BUILD_DIR="gdk_pixbuf"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.0.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.2.ebuild
index 1f90bf3fe56e..1f90bf3fe56e 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-gio/gst-plugins-gio-0.10.36.ebuild b/media-plugins/gst-plugins-gio/gst-plugins-gio-0.10.36.ebuild
deleted file mode 100644
index c4ce3aa9a63a..000000000000
--- a/media-plugins/gst-plugins-gio/gst-plugins-gio-0.10.36.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-base
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.24:2"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.36.ebuild b/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.36.ebuild
deleted file mode 100644
index f42f9b90ee2a..000000000000
--- a/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.36.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-base gst-plugins10
-
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=gnome-base/gnome-vfs-2:2"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="gnome_vfs"
-
-src_prepare() {
- gst-plugins10_system_link \
- gst-libs/gst/tag:gstreamer-tag
-}
diff --git a/media-plugins/gst-plugins-gsm/gst-plugins-gsm-0.10.23.ebuild b/media-plugins/gst-plugins-gsm/gst-plugins-gsm-0.10.23.ebuild
deleted file mode 100644
index 4fcb5c4abed3..000000000000
--- a/media-plugins/gst-plugins-gsm/gst-plugins-gsm-0.10.23.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-bad
-
-DESCRIPTION="GStreamer plugin for GSM audio decoding/encoding"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-sound/gsm"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-hls/Manifest b/media-plugins/gst-plugins-hls/Manifest
index 9319ef3770bc..e88a0c52f0e6 100644
--- a/media-plugins/gst-plugins-hls/Manifest
+++ b/media-plugins/gst-plugins-hls/Manifest
@@ -1,4 +1,3 @@
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.2.4-r1.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.2.4-r1.ebuild
deleted file mode 100644
index 9bbabf70596e..000000000000
--- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPTION="HTTP live streaming plugin"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-# FIXME: gsturidownloader does not have a .pc
-#src_prepare() {
-# gst-plugins10_system_link \
-# gst-libs/gst/uridownloader:gsturidownloader
-#}
-
-multilib_src_compile() {
- emake -C gst-libs/gst/uridownloader
-
- gstreamer_multilib_src_compile
-}
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.0.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.2.ebuild
index 45fa0f57e06d..45fa0f57e06d 100644
--- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-ivorbis/gst-plugins-ivorbis-0.10.36.ebuild b/media-plugins/gst-plugins-ivorbis/gst-plugins-ivorbis-0.10.36.ebuild
deleted file mode 100644
index 102dc0c6caf9..000000000000
--- a/media-plugins/gst-plugins-ivorbis/gst-plugins-ivorbis-0.10.36.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-base gst-plugins10
-
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-fbsd ~x64-macos"
-IUSE=""
-
-RDEPEND="media-libs/tremor"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD_DIR="vorbis"
-
-src_prepare() {
- epatch "${FILESDIR}"/0.10.36-header-shuffle.patch
-
- gst-plugins10_system_link \
- gst-libs/gst/audio:gstreamer-audio \
- gst-libs/gst/tag:gstreamer-tag
-}
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.2.4-r1.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.2.4-r1.ebuild
deleted file mode 100644
index 0f9db7f90032..000000000000
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPION="GStreamer source/sink to transfer audio data with JACK ports"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.0.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.2.ebuild
index c683268718f5..c683268718f5 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.2.4-r1.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.2.4-r1.ebuild
deleted file mode 100644
index cb4ed8948e8c..000000000000
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPTION="GStreamer encoder/decoder for JPEG format"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.0.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.2.ebuild
index 6f76f5ca2f08..6f76f5ca2f08 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-0.10.23.ebuild b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-0.10.23.ebuild
deleted file mode 100644
index e73f2447f565..000000000000
--- a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-0.10.23.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-bad
-
-KEYWORDS="alpha amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/ladspa-sdk-1.12-r2"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- gst-plugins10_find_plugin_dir
- # signalprocessor has no .pc
- sed -e "s:\$(top_builddir)/gst-libs/gst/signalprocessor/.*\.la:-lgstsignalprocessor-${SLOT}:" \
- -i Makefile.am Makefile.in || die
-}
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index fe6a50e8439d..a00e709e2169 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -3,3 +3,4 @@ DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c
DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
+DIST gst-plugins-ugly-1.6.2.tar.xz 859400 SHA256 e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845 SHA512 b8354bce9b0d8f46d16e18c766e8f432d029cfd13cb0141d54aaef73906072a2ccd72ecfc0a566da9c909f7d9b2a8bfa3e2d45a7c5a22a43fb8f811f75f2f173 WHIRLPOOL 75ad5ee7fdae1e2a899873d70e737f15c996a73f5beb93be740c436a855640b60f600cc68bf341be769f42dd4c077f3f04036212feed598a4405cc3ac3140fdb
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.2.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.2.ebuild
new file mode 100644
index 000000000000..ea1442d8b665
--- /dev/null
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-ugly
+
+inherit gstreamer
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 3139a53e2781..c4e47af8aebd 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,3 +1,3 @@
DIST gst-libav-1.4.5.tar.xz 5220508 SHA256 605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc SHA512 a2f9250a51440358d205ef160119498d52cf4944fe810e736e4561f2cdbb8dabad6220d6e4da507f013c42bea69ce72acc373982642278de0a03605bbcd4f75f WHIRLPOOL 075ad91101def8ee8958eaf3051390a76efa3860a4d6796b7f5f86f9b175ca493aa3094e59b24b19c59025337683178f43346e887d7b5efe46b0f9aeadcd28d2
-DIST gst-libav-1.6.0.tar.xz 7687504 SHA256 6cca6cf73182a882768ef0c860af88c2fd2c77e2c81ce464a998ab4e6baa604c SHA512 5a8290f87bb2c75a8f1d33f242844dfbaf09be511b7966841b766ffa28029ffe8e44b01847014876e5fda4de69db017edbbacc08734545b40674cbe29de570e9 WHIRLPOOL a85128532443bef7ce61c69ea2c37584e9ea7fba0e5e67bbb19d0f9b0b79174c9306ee4bb13ebcf0a44d07add09d054f6558632c6b31dbecb992a46c40dc6345
DIST gst-libav-1.6.1.tar.xz 7688468 SHA256 24d5e8e8b8c825af1a19aa80a27aba268ec383c8133fd4ef66e0e572ff6137a9 SHA512 9a484517bc1a2d1b1174b279848c5ab3eb4a07f3f14684bc309a0b0c90a8dc9bd34bb8e0e0e3536992c69a75a0feec7d04cc057d631cd686dcca26d791de9825 WHIRLPOOL 453532bd5088f7d61b4ece8812913bf668c66aba22b8f2ad9884221231dc7153a9d89dad6acd8682c0badf74f839c96640fd9b6bb96a8ccc0acc5d2c31277806
+DIST gst-libav-1.6.2.tar.xz 7711908 SHA256 2597acc00171006d49f0d300440a87df51b113d557466e532153abc740db3469 SHA512 d324612eb21ed23702ffee1cdf6b7674cf7add5003fde310a64eab7793001a26d31640b5e72d86b98d2df0b9ac143dc0efcb5dd2c52dfbc9b8ad8be5f651541e WHIRLPOOL cea5ceff7d7d3618c63ec60ebd9dbfa96e9a832274809a7999f3c68312e619666208e7a9e3283763fcae822ffe9965451883e23052536893c20088c876e17212
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild
index a6883afe5751..5a57ff49e3d7 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
LICENSE="GPL-2"
SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="ia64 ppc"
IUSE="libav +orc"
RDEPEND="
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.0.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.2.ebuild
index cb8d237fe6f5..e33b09da00d8 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.2.ebuild
@@ -3,7 +3,8 @@
# $Id$
EAPI="5"
-inherit eutils flag-o-matic multilib-minimal
+
+inherit eutils multilib-minimal
MY_PN="gst-libav"
DESCRIPTION="FFmpeg based gstreamer plugin"
@@ -19,8 +20,8 @@ IUSE="libav +orc"
RDEPEND="
app-arch/bzip2
app-arch/xz-utils
- >=media-libs/gstreamer-1.4.0:1.0[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-1.4.0:1.0[${MULTILIB_USEDEP}]
+ >=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
!libav? ( >=media-video/ffmpeg-2.2:0=[${MULTILIB_USEDEP}] )
libav? ( >=media-video/libav-10:0=[${MULTILIB_USEDEP}] )
orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
diff --git a/media-plugins/gst-plugins-libde265/Manifest b/media-plugins/gst-plugins-libde265/Manifest
index d30d1812de41..c412ecb90009 100644
--- a/media-plugins/gst-plugins-libde265/Manifest
+++ b/media-plugins/gst-plugins-libde265/Manifest
@@ -1 +1,2 @@
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.2.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.2.ebuild
new file mode 100644
index 000000000000..21028d6fb1f5
--- /dev/null
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="H.265 decoder plugin for GStreamer."
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=media-libs/libde265-0.9[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libmms/Manifest b/media-plugins/gst-plugins-libmms/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-libmms/Manifest
+++ b/media-plugins/gst-plugins-libmms/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.2.4-r1.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.2.4-r1.ebuild
deleted file mode 100644
index cf42bf6d2a5c..000000000000
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.0.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.2.ebuild
index 3dcf3fab8580..3dcf3fab8580 100644
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-libnice/Manifest b/media-plugins/gst-plugins-libnice/Manifest
index 69a37fcf0629..78a774bce7c6 100644
--- a/media-plugins/gst-plugins-libnice/Manifest
+++ b/media-plugins/gst-plugins-libnice/Manifest
@@ -1,3 +1 @@
-DIST libnice-0.1.10.tar.gz 903083 SHA256 1dbfb663b730889ae8cab13a2913fe557d581f70b513c918bbbd0b7d3eefebc9 SHA512 2eb6cdd89380c29a23a844d17022b338522ae6a438e9ac018385acb51c2904eccdb0cbfe97a37775182962c003bf6077bee1dde48c7a29963a57564d8c206532 WHIRLPOOL 8450973c2b175a5c3edd99064ee1418f4de2148a02c1501c0fd33cfc6344fa0e187287912f2b447f9fd4be6f1e852ec77e425d7b8d25cee94acb1989933dfb35
DIST libnice-0.1.13.tar.gz 912374 SHA256 61112d9f3be933a827c8365f20551563953af6718057928f51f487bfe88419e1 SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1 WHIRLPOOL 93bd35742cc3ef3cf768613d7757552d7fae98e906cad334b499e3a69577480a840e4e9bdb16c047099a62d47a60e8eee006107b1717937312ada087098f9dad
-DIST libnice-0.1.8.tar.gz 881186 SHA256 9da7f09909902d535389d929c3e4d69129528fb18438a6c8565ec812d9904ddf SHA512 d573810d34a7ca9a5deddc11efa16e66615375fff50f91b406d8e6aa05486253335c35dfd0061ee68ee1c3ccbf9ea6c27225ad452540777c2e0ca0f7fe79d496 WHIRLPOOL c07d1d9d303e95af8d4d7f4fccd53a5fb07cbfbcb72f4364b6d3fb9be451e97f9ad5cb38f71a8c1a16e69302a6427261c3a1b5628423314ddfe126313b49d799
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.10-r100.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.10-r100.ebuild
deleted file mode 100644
index 27eef50a79aa..000000000000
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.10-r100.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 eutils multilib-minimal toolchain-funcs
-
-DESCRIPTION="GStreamer plugin for ICE (RFC 5245) support"
-HOMEPAGE="http://nice.freedesktop.org/wiki/"
-MY_P=libnice-${PV}
-SRC_URI="http://nice.freedesktop.org/releases/${MY_P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
- ~net-libs/libnice-${PV}[${MULTILIB_USEDEP}]
- media-libs/gstreamer:${SLOT}[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed -e 's:$(top_builddir)/nice/libnice.la:$(NICE_LIBS):' \
- -i gst/Makefile.{am,in} || die "sed failed"
-}
-
-multilib_src_configure() {
- # gupnp is not used in the gst plugin
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --disable-static-plugins \
- --without-gstreamer-0.10 \
- --with-gstreamer \
- --disable-introspection \
- --disable-gupnp
-}
-
-multilib_src_compile() {
- emake -C gst \
- NICE_LIBS="$($(tc-getPKG_CONFIG) --libs-only-l nice)"
-}
-
-multilib_src_test() {
- :
-}
-
-multilib_src_install() {
- emake -C gst DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.10.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.10.ebuild
deleted file mode 100644
index a7bad8cf5f54..000000000000
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.10.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 eutils multilib-minimal toolchain-funcs
-
-DESCRIPTION="GStreamer plugin for ICE (RFC 5245) support"
-HOMEPAGE="http://nice.freedesktop.org/wiki/"
-MY_P=libnice-${PV}
-SRC_URI="http://nice.freedesktop.org/releases/${MY_P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
-SLOT="0.10"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
- ~net-libs/libnice-${PV}[${MULTILIB_USEDEP}]
- media-libs/gstreamer:${SLOT}[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed -e 's:$(top_builddir)/nice/libnice.la:$(NICE_LIBS):' \
- -i gst/Makefile.{am,in} || die "sed failed"
-}
-
-multilib_src_configure() {
- # gupnp is not used in the gst plugin
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --disable-static-plugins \
- --with-gstreamer-0.10 \
- --without-gstreamer \
- --disable-introspection \
- --disable-gupnp
-}
-
-multilib_src_compile() {
- emake -C gst \
- NICE_LIBS="$($(tc-getPKG_CONFIG) --libs-only-l nice)"
-}
-
-multilib_src_test() {
- :
-}
-
-multilib_src_install() {
- emake -C gst DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.8-r100.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.8-r100.ebuild
deleted file mode 100644
index d2ddfe9c9071..000000000000
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.8-r100.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal toolchain-funcs
-
-DESCRIPTION="GStreamer plugin for ICE (RFC 5245) support"
-HOMEPAGE="http://nice.freedesktop.org/wiki/"
-MY_P=libnice-${PV}
-SRC_URI="http://nice.freedesktop.org/releases/${MY_P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
- ~net-libs/libnice-${PV}[${MULTILIB_USEDEP}]
- media-libs/gstreamer:${SLOT}[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed -e 's:$(top_builddir)/nice/libnice.la:$(NICE_LIBS):' \
- -i gst/Makefile.{am,in} || die "sed failed"
-}
-
-multilib_src_configure() {
- # gupnp is not used in the gst plugin
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --without-gstreamer-0.10 \
- --with-gstreamer \
- --disable-introspection \
- --disable-gupnp
-}
-
-multilib_src_compile() {
- emake -C gst \
- NICE_LIBS="$($(tc-getPKG_CONFIG) --libs-only-l nice)"
-}
-
-multilib_src_test() {
- :
-}
-
-multilib_src_install() {
- emake -C gst DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.8.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.8.ebuild
deleted file mode 100644
index eef1572d8d66..000000000000
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal toolchain-funcs
-
-DESCRIPTION="GStreamer plugin for ICE (RFC 5245) support"
-HOMEPAGE="http://nice.freedesktop.org/wiki/"
-MY_P=libnice-${PV}
-SRC_URI="http://nice.freedesktop.org/releases/${MY_P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
-SLOT="0.10"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
- ~net-libs/libnice-${PV}[${MULTILIB_USEDEP}]
- media-libs/gstreamer:${SLOT}[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed -e 's:$(top_builddir)/nice/libnice.la:$(NICE_LIBS):' \
- -i gst/Makefile.{am,in} || die "sed failed"
-}
-
-multilib_src_configure() {
- # gupnp is not used in the gst plugin
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --with-gstreamer-0.10 \
- --without-gstreamer \
- --disable-introspection \
- --disable-gupnp
-}
-
-multilib_src_compile() {
- emake -C gst \
- NICE_LIBS="$($(tc-getPKG_CONFIG) --libs-only-l nice)"
-}
-
-multilib_src_test() {
- :
-}
-
-multilib_src_install() {
- emake -C gst DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.2.4-r1.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.2.4-r1.ebuild
deleted file mode 100644
index e92ba2a520d3..000000000000
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPTION="GStreamer encoder/decoder for PNG images"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.0.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.2.ebuild
index e6549813842d..e6549813842d 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index 9a7f0429cba0..12c9d58421c7 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
-DIST gst-plugins-base-1.2.4.tar.xz 2538012 SHA256 4d6273dc3f5a94bcc53ccfe0711cfddd49e31371d1136bf62fa1ecc604fc6550 SHA512 8e7e7fd494ee2335e917dae3fef93a2103db37c8cc645ccf1f63b7e6676a6cc6fee78bb90e43f8ccacab367788a416600577cb3d9630e9d64258ecb3dbe63338 WHIRLPOOL 173b2c71b2be05db75ef0d7c344b64ec5d74ba291cc8058546a2963257a1af8e7699737214e11c2d811e6349a008386f822a82f5fe5f5491f5faca64e9d8f20d
DIST gst-plugins-base-1.4.5.tar.xz 2637680 SHA256 77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d SHA512 63d3c531de736ad8a64d6962c0af75857d3b016d7f8e85d1884e8de50e64576902bb1161161b74130ab5dfb1d453eb995e374d8a958eac6e44ae5272eeaaf8b6 WHIRLPOOL cf6ef1c9589ed7a39be74e7663b0821c81b1b4cffdd612ccd7fd5b7929508af21d68817530a4b0fb2517f3a7044ee068afba7602816fdd0ada31444f0bcf8383
-DIST gst-plugins-base-1.6.0.tar.xz 2833380 SHA256 314fd1b707f65caf8eb6164d9422fc51e2b220a890ccd2de6ec03a2883d77231 SHA512 fea97754117f7a923e6622211a218ab1d1d4cbb30f8025777462df5c622061710236477af42df6ea6b817e155d2165af353d6f44b5609b87187ab2fb63aaf406 WHIRLPOOL 97696f2d44bbfd08ccf004493948b890fb28527a6fac2c2a04fe06e395a36a66a945e2153659e9324c5e22adf8af27c8426632379e0f734dddfc7b6661c1d3fa
DIST gst-plugins-base-1.6.1.tar.xz 2833356 SHA256 9533dcfaa4ee32d435483d9fa88c06b1eba6e9bb234aacd7583f207199f44ba3 SHA512 2887c8acb235f46c7102a572465995bcd4a8dd48a98adccb868225eb87db19e19c36b7c65495b0e0644fdf41e53e8e421f21479b1e80b65a3433a47c7da0eb5f WHIRLPOOL 8939c489eedc2098e93d2340a6ba91d8457225e581331f44c41e27d3f6b1f6c3ffcc4cfeae4695d88314d003a928b575e220e13b227ca44ce3f34dd55abb1549
+DIST gst-plugins-base-1.6.2.tar.xz 2838544 SHA256 c75dd400e451526ed71e1c4955e33d470a2581f5e71ecf84920a41c0a5c75322 SHA512 44cbc0cc731222e22314e74f7a54642d39471c6c47914acc86af177c6a49b87891100bdd04ace77d6fed676fd07b66594da68a9aaf44c1948cab4574fe2c6e49 WHIRLPOOL 05811b3a05d876752356d2ab65982b3564e1582ae5871a2eaf44507b3d1dd82be49a38df83ca983c9113fdafcf65f41dd169313cbedf02bf3e5dfa7506a74174
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.2.4-r1.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.2.4-r1.ebuild
deleted file mode 100644
index 26af9f85871c..000000000000
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-base
-inherit gstreamer
-
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}]
- >=media-plugins/libvisual-plugins-0.4.0-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- gstreamer_system_link \
- gst-libs/gst/audio:gstreamer-audio \
- gst-libs/gst/video:gstreamer-video
-}
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.0.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.2.ebuild
index 8eca90c395cc..444d77807853 100644
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.2.ebuild
@@ -3,8 +3,8 @@
# $Id$
EAPI="5"
-
GST_ORG_MODULE=gst-plugins-base
+
inherit gstreamer
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
diff --git a/media-plugins/gst-plugins-mad/Manifest b/media-plugins/gst-plugins-mad/Manifest
index fe6a50e8439d..dd31d2e8c60f 100644
--- a/media-plugins/gst-plugins-mad/Manifest
+++ b/media-plugins/gst-plugins-mad/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
-DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
-DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
+DIST gst-plugins-ugly-1.6.2.tar.xz 859400 SHA256 e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845 SHA512 b8354bce9b0d8f46d16e18c766e8f432d029cfd13cb0141d54aaef73906072a2ccd72ecfc0a566da9c909f7d9b2a8bfa3e2d45a7c5a22a43fb8f811f75f2f173 WHIRLPOOL 75ad5ee7fdae1e2a899873d70e737f15c996a73f5beb93be740c436a855640b60f600cc68bf341be769f42dd4c077f3f04036212feed598a4405cc3ac3140fdb
diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.2.4-r1.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.2.4-r1.ebuild
deleted file mode 100644
index 00083033dbc2..000000000000
--- a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-ugly
-inherit gstreamer
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.0.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.2.ebuild
index 5506eba09628..5506eba09628 100644
--- a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r9.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r9.ebuild
deleted file mode 100644
index 43a51361a2ce..000000000000
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-0.10-r9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit multilib-build
-
-DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="metapackage"
-SLOT="0.10"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 mpeg musepack ogg opus oss pulseaudio taglib theora v4l vcd vorbis vpx wavpack X x264 xv xvid"
-REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
-
-RDEPEND=">=media-libs/gstreamer-0.10.36-r2:0.10[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-0.10.36:0.10[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-good-0.10.31:0.10[${MULTILIB_USEDEP}]
- a52? ( >=media-plugins/gst-plugins-a52dec-0.10.19:0.10[${MULTILIB_USEDEP}] )
- aac? ( >=media-plugins/gst-plugins-faad-0.10.23:0.10[${MULTILIB_USEDEP}] )
- alsa? ( >=media-plugins/gst-plugins-alsa-0.10.36:0.10[${MULTILIB_USEDEP}] )
- cdda? ( || (
- >=media-plugins/gst-plugins-cdparanoia-0.10.36:0.10[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-cdio-0.10.19:0.10[${MULTILIB_USEDEP}] ) )
- dts? ( >=media-plugins/gst-plugins-dts-0.10.23:0.10[${MULTILIB_USEDEP}] )
- dv? ( >=media-plugins/gst-plugins-dv-0.10.31:0.10[${MULTILIB_USEDEP}] )
- dvb? (
- >=media-plugins/gst-plugins-dvb-0.10.23:0.10[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-bad-0.10.23-r1:0.10[${MULTILIB_USEDEP}] )
- dvd? (
- >=media-libs/gst-plugins-ugly-0.10.19:0.10[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-a52dec-0.10.19:0.10[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-dvdread-0.10.19:0.10[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-mpeg2dec-0.10.19:0.10[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-resindvd-0.10.23:0.10[${MULTILIB_USEDEP}] )
- ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10.13_p201211:0.10[${MULTILIB_USEDEP}] )
- flac? ( >=media-plugins/gst-plugins-flac-0.10.31:0.10[${MULTILIB_USEDEP}] )
- http? ( >=media-plugins/gst-plugins-soup-0.10.31:0.10[${MULTILIB_USEDEP}] )
- jack? ( >=media-plugins/gst-plugins-jack-0.10.31:0.10[${MULTILIB_USEDEP}] )
- lame? ( >=media-plugins/gst-plugins-lame-0.10.19:0.10[${MULTILIB_USEDEP}] )
- libass? ( >=media-plugins/gst-plugins-assrender-0.10.23:0.10[${MULTILIB_USEDEP}] )
- libvisual? ( >=media-plugins/gst-plugins-libvisual-0.10.36:0.10[${MULTILIB_USEDEP}] )
- mms? ( >=media-plugins/gst-plugins-libmms-0.10.23:0.10[${MULTILIB_USEDEP}] )
- mp3? (
- >=media-libs/gst-plugins-ugly-0.10.19:0.10[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-mad-0.10.19:0.10[${MULTILIB_USEDEP}] )
- mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10.19:0.10[${MULTILIB_USEDEP}] )
- musepack? ( >=media-plugins/gst-plugins-musepack-0.10.23:0.10[${MULTILIB_USEDEP}] )
- ogg? ( >=media-plugins/gst-plugins-ogg-0.10.36:0.10[${MULTILIB_USEDEP}] )
- opus? ( >=media-plugins/gst-plugins-opus-0.10.23:0.10[${MULTILIB_USEDEP}] )
- oss? ( >=media-plugins/gst-plugins-oss-0.10.31:0.10[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-plugins/gst-plugins-pulse-0.10.31:0.10[${MULTILIB_USEDEP}] )
- theora? ( >=media-plugins/gst-plugins-theora-0.10.36-r1:0.10[${MULTILIB_USEDEP}] )
- taglib? ( >=media-plugins/gst-plugins-taglib-0.10.31:0.10[${MULTILIB_USEDEP}] )
- v4l? ( >=media-plugins/gst-plugins-v4l2-0.10.31:0.10[${MULTILIB_USEDEP}] )
- vcd? (
- >=media-plugins/gst-plugins-mplex-0.10.23:0.10[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-mpeg2dec-0.10.19:0.10[${MULTILIB_USEDEP}] )
- vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10.36:0.10[${MULTILIB_USEDEP}] )
- vpx? ( >=media-plugins/gst-plugins-vp8-0.10.23-r1:0.10[${MULTILIB_USEDEP}] )
- wavpack? ( >=media-plugins/gst-plugins-wavpack-0.10.31:0.10[${MULTILIB_USEDEP}] )
- X? ( >=media-plugins/gst-plugins-x-0.10.36:0.10[${MULTILIB_USEDEP}] )
- x264? ( >=media-plugins/gst-plugins-x264-0.10.19:0.10[${MULTILIB_USEDEP}] )
- xv? ( >=media-plugins/gst-plugins-xvideo-0.10.36:0.10[${MULTILIB_USEDEP}] )
- xvid? ( >=media-plugins/gst-plugins-xvid-0.10.23:0.10[${MULTILIB_USEDEP}] )"
-
-# Usage note:
-# The idea is that apps depend on this for optional gstreamer plugins. Then,
-# when USE flags change, no app gets rebuilt, and all apps that can make use of
-# the new plugin automatically do.
-
-# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.0-r3.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.0-r3.ebuild
deleted file mode 100644
index a006f6c01f3f..000000000000
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.0-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit multilib-build
-
-DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="metapackage"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
-REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
-
-RDEPEND="
- >=media-libs/gstreamer-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-1.2.3:1.0[alsa?,ogg?,theora?,vorbis?,X?,${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-good-1.2.3:1.0[${MULTILIB_USEDEP}]
- a52? ( >=media-plugins/gst-plugins-a52dec-1.2.3:1.0[${MULTILIB_USEDEP}] )
- aac? ( >=media-plugins/gst-plugins-faad-1.2.3:1.0[${MULTILIB_USEDEP}] )
- cdda? ( || (
- >=media-plugins/gst-plugins-cdparanoia-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-cdio-1.2.3:1.0[${MULTILIB_USEDEP}] ) )
- dts? ( >=media-plugins/gst-plugins-dts-1.2.3:1.0[${MULTILIB_USEDEP}] )
- dv? ( >=media-plugins/gst-plugins-dv-1.2.3:1.0[${MULTILIB_USEDEP}] )
- dvb? (
- >=media-plugins/gst-plugins-dvb-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-bad-1.2.3:1.0[${MULTILIB_USEDEP}] )
- dvd? (
- >=media-libs/gst-plugins-ugly-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-a52dec-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-dvdread-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-mpeg2dec-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-resindvd-1.2.3:1.0[${MULTILIB_USEDEP}] )
- ffmpeg? ( >=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0[${MULTILIB_USEDEP}] )
- flac? ( >=media-plugins/gst-plugins-flac-1.2.3:1.0[${MULTILIB_USEDEP}] )
- http? ( >=media-plugins/gst-plugins-soup-1.2.3:1.0[${MULTILIB_USEDEP}] )
- jack? ( >=media-plugins/gst-plugins-jack-1.2.3:1.0[${MULTILIB_USEDEP}] )
- lame? ( >=media-plugins/gst-plugins-lame-1.2.3:1.0[${MULTILIB_USEDEP}] )
- libass? ( >=media-plugins/gst-plugins-assrender-1.2.3:1.0[${MULTILIB_USEDEP}] )
- libvisual? ( >=media-plugins/gst-plugins-libvisual-1.2.3:1.0[${MULTILIB_USEDEP}] )
- mms? ( >=media-plugins/gst-plugins-libmms-1.2.3:1.0[${MULTILIB_USEDEP}] )
- modplug? ( >=media-plugins/gst-plugins-modplug-1.2.4-r1:1.0[${MULTILIB_USEDEP}] )
- mp3? (
- >=media-libs/gst-plugins-ugly-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-mad-1.2.3:1.0[${MULTILIB_USEDEP}] )
- mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.2.3:1.0[${MULTILIB_USEDEP}] )
- opus? ( >=media-plugins/gst-plugins-opus-1.2.3:1.0[${MULTILIB_USEDEP}] )
- oss? ( >=media-plugins/gst-plugins-oss-1.2.3:1.0[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.2.3:1.0[${MULTILIB_USEDEP}] )
- taglib? ( >=media-plugins/gst-plugins-taglib-1.2.3:1.0[${MULTILIB_USEDEP}] )
- v4l? ( >=media-plugins/gst-plugins-v4l2-1.2.3:1.0[${MULTILIB_USEDEP}] )
- vaapi? ( >=media-plugins/gst-plugins-vaapi-0.5.8-r1:1.0[${MULTILIB_USEDEP}] )
- vcd? (
- >=media-plugins/gst-plugins-mplex-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-mpeg2dec-1.2.3:1.0[${MULTILIB_USEDEP}] )
- vpx? ( >=media-plugins/gst-plugins-vpx-1.2.3:1.0[${MULTILIB_USEDEP}] )
- wavpack? ( >=media-plugins/gst-plugins-wavpack-1.2.3:1.0[${MULTILIB_USEDEP}] )
- x264? ( >=media-plugins/gst-plugins-x264-1.2.3:1.0[${MULTILIB_USEDEP}] )
-"
-
-# Usage note:
-# The idea is that apps depend on this for optional gstreamer plugins. Then,
-# when USE flags change, no app gets rebuilt, and all apps that can make use of
-# the new plugin automatically do.
-
-# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.ebuild
deleted file mode 100644
index a739ca93262d..000000000000
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit multilib-build
-
-DESCRIPTION="Meta ebuild to pull in gst plugins for apps"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="metapackage"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
-REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
-
-RDEPEND="
- >=media-libs/gstreamer-1.6:1.0[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-1.6:1.0[alsa?,ogg?,theora?,vorbis?,X?,${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-good-1.6:1.0[${MULTILIB_USEDEP}]
- a52? ( >=media-plugins/gst-plugins-a52dec-1.6:1.0[${MULTILIB_USEDEP}] )
- aac? ( >=media-plugins/gst-plugins-faad-1.6:1.0[${MULTILIB_USEDEP}] )
- cdda? ( || (
- >=media-plugins/gst-plugins-cdparanoia-1.6:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-cdio-1.6:1.0[${MULTILIB_USEDEP}] ) )
- dts? ( >=media-plugins/gst-plugins-dts-1.6:1.0[${MULTILIB_USEDEP}] )
- dv? ( >=media-plugins/gst-plugins-dv-1.6:1.0[${MULTILIB_USEDEP}] )
- dvb? (
- >=media-plugins/gst-plugins-dvb-1.6:1.0[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-bad-1.6:1.0[${MULTILIB_USEDEP}] )
- dvd? (
- >=media-libs/gst-plugins-ugly-1.6:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-a52dec-1.6:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-dvdread-1.6:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-mpeg2dec-1.6:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-resindvd-1.6:1.0[${MULTILIB_USEDEP}] )
- ffmpeg? ( >=media-plugins/gst-plugins-libav-1.4.5:1.0[${MULTILIB_USEDEP}] )
- flac? ( >=media-plugins/gst-plugins-flac-1.6:1.0[${MULTILIB_USEDEP}] )
- http? ( >=media-plugins/gst-plugins-soup-1.6:1.0[${MULTILIB_USEDEP}] )
- jack? ( >=media-plugins/gst-plugins-jack-1.6:1.0[${MULTILIB_USEDEP}] )
- lame? ( >=media-plugins/gst-plugins-lame-1.6:1.0[${MULTILIB_USEDEP}] )
- libass? ( >=media-plugins/gst-plugins-assrender-1.6:1.0[${MULTILIB_USEDEP}] )
- libvisual? ( >=media-plugins/gst-plugins-libvisual-1.6:1.0[${MULTILIB_USEDEP}] )
- mms? ( >=media-plugins/gst-plugins-libmms-1.6:1.0[${MULTILIB_USEDEP}] )
- modplug? ( >=media-plugins/gst-plugins-modplug-1.6:1.0[${MULTILIB_USEDEP}] )
- mp3? (
- >=media-libs/gst-plugins-ugly-1.6:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-mad-1.6:1.0[${MULTILIB_USEDEP}] )
- mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.6:1.0[${MULTILIB_USEDEP}] )
- opus? ( >=media-plugins/gst-plugins-opus-1.6:1.0[${MULTILIB_USEDEP}] )
- oss? ( >=media-plugins/gst-plugins-oss-1.6:1.0[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.6:1.0[${MULTILIB_USEDEP}] )
- taglib? ( >=media-plugins/gst-plugins-taglib-1.6:1.0[${MULTILIB_USEDEP}] )
- v4l? ( >=media-plugins/gst-plugins-v4l2-1.6:1.0[${MULTILIB_USEDEP}] )
- vaapi? ( >=media-plugins/gst-plugins-vaapi-0.6:1.0[${MULTILIB_USEDEP}] )
- vcd? (
- >=media-plugins/gst-plugins-mplex-1.6:1.0[${MULTILIB_USEDEP}]
- >=media-plugins/gst-plugins-mpeg2dec-1.6:1.0[${MULTILIB_USEDEP}] )
- vpx? ( >=media-plugins/gst-plugins-vpx-1.6:1.0[${MULTILIB_USEDEP}] )
- wavpack? ( >=media-plugins/gst-plugins-wavpack-1.6:1.0[${MULTILIB_USEDEP}] )
- x264? ( >=media-plugins/gst-plugins-x264-1.6:1.0[${MULTILIB_USEDEP}] )
-"
-
-# Usage note:
-# The idea is that apps depend on this for optional gstreamer plugins. Then,
-# when USE flags change, no app gets rebuilt, and all apps that can make use of
-# the new plugin automatically do.
-
-# When adding deps here, make sure the keywords on the gst-plugin are valid.
diff --git a/media-plugins/gst-plugins-mimic/Manifest b/media-plugins/gst-plugins-mimic/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-mimic/Manifest
+++ b/media-plugins/gst-plugins-mimic/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.2.4-r1.ebuild b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.2.4-r1.ebuild
deleted file mode 100644
index 93b9808f1ebd..000000000000
--- a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for the MIMIC codec"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libmimic-1.0.4-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.0.ebuild b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.2.ebuild
index bc8ad062e69b..bc8ad062e69b 100644
--- a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-modplug/Manifest
+++ b/media-plugins/gst-plugins-modplug/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.0.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.2.ebuild
index b8abc134e585..b8abc134e585 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-mpeg2dec/Manifest b/media-plugins/gst-plugins-mpeg2dec/Manifest
index fe6a50e8439d..dd31d2e8c60f 100644
--- a/media-plugins/gst-plugins-mpeg2dec/Manifest
+++ b/media-plugins/gst-plugins-mpeg2dec/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
-DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
-DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
+DIST gst-plugins-ugly-1.6.2.tar.xz 859400 SHA256 e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845 SHA512 b8354bce9b0d8f46d16e18c766e8f432d029cfd13cb0141d54aaef73906072a2ccd72ecfc0a566da9c909f7d9b2a8bfa3e2d45a7c5a22a43fb8f811f75f2f173 WHIRLPOOL 75ad5ee7fdae1e2a899873d70e737f15c996a73f5beb93be740c436a855640b60f600cc68bf341be769f42dd4c077f3f04036212feed598a4405cc3ac3140fdb
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.2.4-r1.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.2.4-r1.ebuild
deleted file mode 100644
index db00ed8bb466..000000000000
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-ugly
-inherit gstreamer
-
-DESCRIPTION="Libmpeg2 based decoder plug-in for gstreamer"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.0.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.2.ebuild
index 880137c223a1..880137c223a1 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-mpeg2enc/Manifest b/media-plugins/gst-plugins-mpeg2enc/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-mpeg2enc/Manifest
+++ b/media-plugins/gst-plugins-mpeg2enc/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.2.4-r1.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.2.4-r1.ebuild
deleted file mode 100644
index a2f99d8b2379..000000000000
--- a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.0.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.2.ebuild
index d713d50ebb72..d713d50ebb72 100644
--- a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-mplex/Manifest b/media-plugins/gst-plugins-mplex/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-mplex/Manifest
+++ b/media-plugins/gst-plugins-mplex/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.2.4-r1.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.2.4-r1.ebuild
deleted file mode 100644
index da528d892afb..000000000000
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for MPEG/DVD/SVCD/VCD video/audio multiplexing"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.0.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.2.ebuild
index fce45c672458..fce45c672458 100644
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-musepack/gst-plugins-musepack-0.10.23.ebuild b/media-plugins/gst-plugins-musepack/gst-plugins-musepack-0.10.23.ebuild
deleted file mode 100644
index 8beb43657ba2..000000000000
--- a/media-plugins/gst-plugins-musepack/gst-plugins-musepack-0.10.23.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-bad
-
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=media-sound/musepack-tools-444"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-neon/Manifest b/media-plugins/gst-plugins-neon/Manifest
index 3099758dda05..71652b073293 100644
--- a/media-plugins/gst-plugins-neon/Manifest
+++ b/media-plugins/gst-plugins-neon/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.3.tar.xz 3281880 SHA256 595d7911a9e6207dea37200587724bdbf841b81a5eb0730118be36976684278c SHA512 6b2715ab455acbc215b88fdbdfd1ebdd5ebd89b1dbcd15b289df416f4b09e53e2bef51bc69c26c830d5743161738675ae89db4ff11b72d29797a2d084ebc142f WHIRLPOOL 93245288a7f5e4686cff87188ccf3bd2bfa5fccc2155ceefb1114a52eef607460449b7e8ac1cdc6351b488b0272f8ca506c558766930f3165c9cc42d4609b7ab
DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-0.10.23.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-0.10.23.ebuild
deleted file mode 100644
index 9227fafef1af..000000000000
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-0.10.23.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-bad
-
-KEYWORDS="alpha amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/neon-0.27"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # Allow building with neon-0.30 and avoid eautoreconf
- # https://bugzilla.gnome.org/show_bug.cgi?id=705812
- sed -e 's#neon <= 0.29.99#neon <= 0.30.99#' -i configure{.ac,} || die
-}
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.2.3.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.2.3.ebuild
deleted file mode 100644
index 2675e89f9f0d..000000000000
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.2.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-bad
-
-KEYWORDS="alpha amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/neon-0.27"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.2.4.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.2.4.ebuild
deleted file mode 100644
index 7a45f325662e..000000000000
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.2.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-bad
-
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=net-libs/neon-0.27"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.0.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.2.ebuild
index c0ef6a2afd3a..c0ef6a2afd3a 100644
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-ofa/Manifest b/media-plugins/gst-plugins-ofa/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-ofa/Manifest
+++ b/media-plugins/gst-plugins-ofa/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.2.4-r1.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.2.4-r1.ebuild
deleted file mode 100644
index 69d681841e38..000000000000
--- a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.0.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.2.ebuild
index d936b4e7ea6f..d936b4e7ea6f 100644
--- a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-ogg/gst-plugins-ogg-0.10.36.ebuild b/media-plugins/gst-plugins-ogg/gst-plugins-ogg-0.10.36.ebuild
deleted file mode 100644
index 1cdfc5053e86..000000000000
--- a/media-plugins/gst-plugins-ogg/gst-plugins-ogg-0.10.36.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-base gst-plugins10
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
-IUSE=""
-
-RDEPEND=">=media-libs/libogg-1"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- gst-plugins10_system_link \
- gst-libs/gst/riff:gstreamer-riff \
- gst-libs/gst/tag:gstreamer-tag
-}
diff --git a/media-plugins/gst-plugins-openh264/Manifest b/media-plugins/gst-plugins-openh264/Manifest
index d30d1812de41..c412ecb90009 100644
--- a/media-plugins/gst-plugins-openh264/Manifest
+++ b/media-plugins/gst-plugins-openh264/Manifest
@@ -1 +1,2 @@
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.2.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.2.ebuild
new file mode 100644
index 000000000000..ee937d586400
--- /dev/null
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=media-libs/openh264-1.3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.2.4-r1.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.2.4-r1.ebuild
deleted file mode 100644
index b2dbf687c3bb..000000000000
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.2.4-r1.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="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for Opus audio codec support"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE=""
-
-COMMON_DEPEND=">=media-libs/opus-1.0.2-r2:=[${MULTILIB_USEDEP}]"
-RDEPEND="${COMMON_DEPEND}
- media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP},ogg]"
-DEPEND="${COMMON_DEPEND}"
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.0.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.2.ebuild
index 64581ee6589a..64581ee6589a 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-0.10.31.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-0.10.31.ebuild
deleted file mode 100644
index 413356ec8444..000000000000
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-0.10.31.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-good
-
-DESCRIPTION="GStreamer plugin for OSS (Open Sound System) support"
-KEYWORDS="sh"
-IUSE=""
-
-DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.2.4-r1.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.2.4-r1.ebuild
deleted file mode 100644
index cd898bfc677d..000000000000
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for OSS (Open Sound System) support"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.0.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.2.ebuild
index c7a9cca41fd0..c7a9cca41fd0 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-pango/gst-plugins-pango-0.10.36.ebuild b/media-plugins/gst-plugins-pango/gst-plugins-pango-0.10.36.ebuild
deleted file mode 100644
index f77e83061913..000000000000
--- a/media-plugins/gst-plugins-pango/gst-plugins-pango-0.10.36.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 gst-plugins-base gst-plugins10
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/pango-1.16"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- gst-plugins10_system_link gst-libs/gst/video:gstreamer-video
-}
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.2.4-r1.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.2.4-r1.ebuild
deleted file mode 100644
index 156ed83123a8..000000000000
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for the PulseAudio sound server"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
-IUSE=""
-
-RDEPEND=">=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.0.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.2.ebuild
index 35abd1df50fe..35abd1df50fe 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-raw1394/Manifest b/media-plugins/gst-plugins-raw1394/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-raw1394/Manifest
+++ b/media-plugins/gst-plugins-raw1394/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.2.4-r1.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.2.4-r1.ebuild
deleted file mode 100644
index 21bf9282e88a..000000000000
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin to capture firewire video"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
- >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
- >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
- >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="dv1394"
-GST_PLUGINS_BUILD_DIR="raw1394"
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.0.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.2.ebuild
index 8d528218d8c3..8d528218d8c3 100644
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-resindvd/Manifest
+++ b/media-plugins/gst-plugins-resindvd/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.2.4-r1.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.2.4-r1.ebuild
deleted file mode 100644
index 96cc171845e8..000000000000
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.2.4-r1.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="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND="
- >=media-libs/libdvdnav-4.2.0-r1[${MULTILIB_USEDEP}]
- >=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.0.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.2.ebuild
index 8e8bd2a8a4f1..8e8bd2a8a4f1 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-rtmp/Manifest b/media-plugins/gst-plugins-rtmp/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-rtmp/Manifest
+++ b/media-plugins/gst-plugins-rtmp/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.2.4-r1.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.2.4-r1.ebuild
deleted file mode 100644
index dd748c488214..000000000000
--- a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for supporting RTMP sources"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.0.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.2.ebuild
index d303c16504b9..d303c16504b9 100644
--- a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-schroedinger/Manifest b/media-plugins/gst-plugins-schroedinger/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-schroedinger/Manifest
+++ b/media-plugins/gst-plugins-schroedinger/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.2.4-r1.ebuild b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.2.4-r1.ebuild
deleted file mode 100644
index 3a0ca6a4964d..000000000000
--- a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.2.4-r1.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="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="schro"
-GST_PLUGINS_BUILD_DIR="schroedinger"
diff --git a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.0.ebuild b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.2.ebuild
index 9165f4a763e7..9165f4a763e7 100644
--- a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-shout2/Manifest b/media-plugins/gst-plugins-shout2/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-shout2/Manifest
+++ b/media-plugins/gst-plugins-shout2/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-0.10.31.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-0.10.31.ebuild
deleted file mode 100644
index e297b4dd5615..000000000000
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-0.10.31.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-good
-
-DESCRIPTION="GStreamer plugin to send data to an icecast server"
-KEYWORDS="sh"
-IUSE=""
-
-RDEPEND=">=media-libs/libshout-2"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.2.4-r1.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.2.4-r1.ebuild
deleted file mode 100644
index ece19bc08ea1..000000000000
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin to send data to an icecast server"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.0.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.2.ebuild
index 88927971e67b..88927971e67b 100644
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-sidplay/Manifest b/media-plugins/gst-plugins-sidplay/Manifest
index fe6a50e8439d..dd31d2e8c60f 100644
--- a/media-plugins/gst-plugins-sidplay/Manifest
+++ b/media-plugins/gst-plugins-sidplay/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
-DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
-DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
+DIST gst-plugins-ugly-1.6.2.tar.xz 859400 SHA256 e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845 SHA512 b8354bce9b0d8f46d16e18c766e8f432d029cfd13cb0141d54aaef73906072a2ccd72ecfc0a566da9c909f7d9b2a8bfa3e2d45a7c5a22a43fb8f811f75f2f173 WHIRLPOOL 75ad5ee7fdae1e2a899873d70e737f15c996a73f5beb93be740c436a855640b60f600cc68bf341be769f42dd4c077f3f04036212feed598a4405cc3ac3140fdb
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.2.4-r1.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.2.4-r1.ebuild
deleted file mode 100644
index 89f46a3f2f6d..000000000000
--- a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-ugly
-inherit gstreamer
-
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.0.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.2.ebuild
index a4dd29441a63..a4dd29441a63 100644
--- a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-smoothstreaming/Manifest b/media-plugins/gst-plugins-smoothstreaming/Manifest
index 9319ef3770bc..e88a0c52f0e6 100644
--- a/media-plugins/gst-plugins-smoothstreaming/Manifest
+++ b/media-plugins/gst-plugins-smoothstreaming/Manifest
@@ -1,4 +1,3 @@
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.2.4-r1.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.2.4-r1.ebuild
deleted file mode 100644
index 2320bdbdeb63..000000000000
--- a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPTION="Smooth Streaming plugin"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-# FIXME: gsturidownloader does not have a .pc
-src_prepare() {
- gstreamer_system_link \
- gst-libs/gst/codecparsers:gstreamer-codecparsers
- #gst-libs/gst/uridownloader:gsturidownloader
-}
-
-multilib_src_compile() {
- emake -C gst-libs/gst/uridownloader
- gstreamer_multilib_src_compile
-}
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.0.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.2.ebuild
index 30167d6140fc..30167d6140fc 100644
--- a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-soundtouch/Manifest b/media-plugins/gst-plugins-soundtouch/Manifest
index 9bbaeb1b7033..c629065c288c 100644
--- a/media-plugins/gst-plugins-soundtouch/Manifest
+++ b/media-plugins/gst-plugins-soundtouch/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.2.4-r1.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.2.4-r1.ebuild
deleted file mode 100644
index 9cdff9b963d3..000000000000
--- a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPTION="GStreamer elements for beats-per-minute detection and pitch controlling"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.0.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.2.ebuild
index 180630d34da1..180630d34da1 100644
--- a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index be646d129f93..647171b65849 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -1,3 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.2.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.2.ebuild
new file mode 100644
index 000000000000..e555cee34472
--- /dev/null
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer
+
+DESCRIPTION="GStreamer plugin for HTTP client source/sink"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+IUSE=""
+
+# Depend on >=net-libs/libsoup-2.47.0 once it is stable (see LIBSOUP_DOES_NOT_STEAL_OUR_CONTEXT in ext/soup)
+RDEPEND=">=net-libs/libsoup-2.44.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-speex/Manifest b/media-plugins/gst-plugins-speex/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-speex/Manifest
+++ b/media-plugins/gst-plugins-speex/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.2.4-r1.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.2.4-r1.ebuild
deleted file mode 100644
index 5f6ce9f39523..000000000000
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin to allow encoding and decoding of speex"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.0.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.2.ebuild
index a8108a39e102..a8108a39e102 100644
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-taglib/Manifest b/media-plugins/gst-plugins-taglib/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-taglib/Manifest
+++ b/media-plugins/gst-plugins-taglib/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.2.4-r1.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.2.4-r1.ebuild
deleted file mode 100644
index ba874e6fa4f0..000000000000
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPTION="GStreamer taglib based tag handler"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.0.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.2.ebuild
index 224155f71918..224155f71918 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-theora/gst-plugins-theora-0.10.36.ebuild b/media-plugins/gst-plugins-theora/gst-plugins-theora-0.10.36.ebuild
deleted file mode 100644
index db456bc3884c..000000000000
--- a/media-plugins/gst-plugins-theora/gst-plugins-theora-0.10.36.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit gst-plugins-base gst-plugins10
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libtheora-1.1[encode]
- media-libs/libogg"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- gst-plugins10_system_link \
- gst-libs/gst/tag:gstreamer-tag \
- gst-libs/gst/video:gstreamer-video
-}
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index fe6a50e8439d..dd31d2e8c60f 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
-DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
-DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
+DIST gst-plugins-ugly-1.6.2.tar.xz 859400 SHA256 e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845 SHA512 b8354bce9b0d8f46d16e18c766e8f432d029cfd13cb0141d54aaef73906072a2ccd72ecfc0a566da9c909f7d9b2a8bfa3e2d45a7c5a22a43fb8f811f75f2f173 WHIRLPOOL 75ad5ee7fdae1e2a899873d70e737f15c996a73f5beb93be740c436a855640b60f600cc68bf341be769f42dd4c077f3f04036212feed598a4405cc3ac3140fdb
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.2.4-r1.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.2.4-r1.ebuild
deleted file mode 100644
index 3e412e437c92..000000000000
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-ugly
-inherit gstreamer
-
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.0.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.2.ebuild
index 6a2fd35ef2c5..6a2fd35ef2c5 100644
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.2.4-r1.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.2.4-r1.ebuild
deleted file mode 100644
index 9f18d045fafb..000000000000
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPION="plugin to allow capture from video4linux2 devices"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="udev"
-
-RDEPEND="
- >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-1.2.3:1.0[X,${MULTILIB_USEDEP}]
- udev? ( >=virtual/libgudev-208:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- virtual/os-headers"
-
-GST_PLUGINS_BUILD="gst_v4l2"
-
-multilib_src_configure() {
- gstreamer_multilib_src_configure \
- --with-libv4l2 \
- $(use_with udev gudev)
-}
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.0.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.2.ebuild
index 3a4fbdfd8544..3a4fbdfd8544 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index a6a0720d19cb..fd0de24966c8 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,3 +1 @@
-DIST gstreamer-vaapi-0.5.10.tar.bz2 1333822 SHA256 0dd236c7bf225322b8934fdba99a7a9e4542566a2acbe7564cdc3ec2c8b73c9d SHA512 bb0c2c29100f2edfdbf76d2de2a554b988779a9fc462788b537f08f6e62f0fdfaa7f12e4e4d49f1abf887533dcbd79bf0c734895bc73f5bc4b0bc3ba0ac07120 WHIRLPOOL 27350341e2899bd50aa8795bde505f4da78f23b9d1615e1a8706516ed482f7f2bae0db8f121b16a6163327cd2323f755b39b6605f16ea725dfabc766ee5ec74e
-DIST gstreamer-vaapi-0.6.0.tar.bz2 1406631 SHA256 f6a4c657606849fb09ee2db778c80278cfa4546e9103862f273c910e208872b8 SHA512 f280655b712ebc14438074a1a659a49417457f34a903c9220a2b7594ef8c6836319f0f22a9bdff5a3899771eb53df1c75de5c3f625094caa0a00964f55025515 WHIRLPOOL a4b75203d8fa53dbd177a7fd08ceb480f10f819985c992d9d384bfeaeb099c8ecbb02d2ac7560f527acd329ac588859e36ab5077067584aea6f951e75b0b905a
DIST gstreamer-vaapi-0.6.1.tar.bz2 1403160 SHA256 36fc8afeb7ec679ea8df34671a34dba57dcc0b66255fb0991acb485e3efd67b3 SHA512 94dab46414da2b43b9f0fc119c8d901848ad637b1161644888072a733423c60c2b858a37467fc26a4341133c88940304fc70fd328dde9ac0bfba129722771ea8 WHIRLPOOL 49efe4f708810bc786c78f0950ed8249bcbb44113f8a3ce3518ef26eb5168397053314030d324b45346cf50c539d92c0aca5993e949b572a74772da025c4a7af
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.10.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.10.ebuild
deleted file mode 100644
index 7aa258edaee8..000000000000
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.5.10.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils multilib-minimal
-
-MY_PN="gstreamer-vaapi"
-DESCRIPTION="Hardware accelerated video decoding through VA-API plugin"
-HOMEPAGE="https://github.com/01org/gstreamer-vaapi"
-SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="~amd64"
-IUSE="+X opengl wayland"
-
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- media-libs/libvpx[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-bad-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
- >=x11-libs/libva-1.4.0[X?,opengl?,wayland?,${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- >=virtual/libudev-208:=[${MULTILIB_USEDEP}]
- wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --enable-builtin-libvpx=no \
- --disable-static \
- --enable-drm \
- $(use_enable opengl glx) \
- $(use_enable wayland) \
- $(use_enable X x11)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.0.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.0.ebuild
deleted file mode 100644
index 57e6ca6da4dd..000000000000
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils multilib-minimal
-
-MY_PN="gstreamer-vaapi"
-DESCRIPTION="Hardware accelerated video decoding through VA-API plugin"
-HOMEPAGE="https://github.com/01org/gstreamer-vaapi"
-SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+drm opengl wayland +X"
-REQUIRED_USE="|| ( drm opengl wayland X )"
-
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-bad-1.2.3:1.0[${MULTILIB_USEDEP}]
- >=x11-libs/libva-1.4.0[drm?,X?,opengl?,wayland?,${MULTILIB_USEDEP}]
- drm? (
- >=virtual/libudev-208:=[${MULTILIB_USEDEP}]
- >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] )
- opengl? (
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --enable-builtin-libvpx=no \
- --disable-static \
- --enable-egl \
- $(use_enable drm) \
- $(use_enable opengl glx) \
- $(use_enable wayland) \
- $(use_enable X x11)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-voaacenc/Manifest b/media-plugins/gst-plugins-voaacenc/Manifest
index 9319ef3770bc..e88a0c52f0e6 100644
--- a/media-plugins/gst-plugins-voaacenc/Manifest
+++ b/media-plugins/gst-plugins-voaacenc/Manifest
@@ -1,4 +1,3 @@
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.2.4-r1.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.2.4-r1.ebuild
deleted file mode 100644
index 671724336682..000000000000
--- a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for encoding AAC"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.0.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.2.ebuild
index 2450d237c63d..2450d237c63d 100644
--- a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-voamrwbenc/Manifest b/media-plugins/gst-plugins-voamrwbenc/Manifest
index 9319ef3770bc..e88a0c52f0e6 100644
--- a/media-plugins/gst-plugins-voamrwbenc/Manifest
+++ b/media-plugins/gst-plugins-voamrwbenc/Manifest
@@ -1,4 +1,3 @@
-DIST gst-plugins-bad-1.2.4.tar.xz 3272824 SHA256 984c133ec9d5d705e313d9e2bbd1472b93c6567460602a9a316578925ffe2eca SHA512 4344dedb899cdc0e3bf36a3b5dd36c6091e2e2f2a7440e3831cebbd9b4463f89cc4bc2d589b0c2c806bcaeb1864a49b3c9e0e3bedc051f1f46e09a8f131f0aa9 WHIRLPOOL 98bce50e7018d7c8d442bf8c7f26f14bd719a8af5af0fde39841c4282a9e4edfeefe06ab10797826cf9b876e173dafcf2e2df86408c373e6c4d8902072cf393c
DIST gst-plugins-bad-1.4.5.tar.xz 3824936 SHA256 152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c SHA512 65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a WHIRLPOOL f5ade3f101ca82b52e7145e5ac16f5c1ab5d042415ee7753586dc6ad0942467c4c5b5b4aa6b0bc44e1ebd9c40de1964df265aa41599cb692fd32aab2b6a7acf7
-DIST gst-plugins-bad-1.6.0.tar.xz 4209172 SHA256 d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49 SHA512 1b646b9dbbb18bd37a9141ba5983f3d8448d60af80144759120f580c2f65e97f78b148e7b7494c46163942274444f4191bed1be43539551c4278c9056230efe2 WHIRLPOOL 8ef0303f15153cb460009bf962e9d0c70d0f73ce4dda0f7d6579509df26104e3c16a1a6710bae16d13c4d3dd9f5d4c1846caa9164fef5fd49c21657269a6b0c9
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.2.4-r1.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.2.4-r1.ebuild
deleted file mode 100644
index c1e1e86b1e24..000000000000
--- a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit gstreamer
-
-DESCRIPTION="GStreamer plugin for encoding AMR-WB"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.0.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.2.ebuild
index 253ae06cd914..253ae06cd914 100644
--- a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild b/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild
deleted file mode 100644
index 79d23d144e53..000000000000
--- a/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-base gst-plugins10 libtool
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
-IUSE=""
-
-RDEPEND=">=media-libs/libvorbis-1
- >=media-libs/libogg-1"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- gst-plugins10_system_link \
- gst-libs/gst/tag:gstreamer-tag \
- gst-libs/gst/audio:gstreamer-audio
-
- elibtoolize # for Darwin bundles
-}
diff --git a/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r2.ebuild b/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r2.ebuild
deleted file mode 100644
index dc95c6fdc47e..000000000000
--- a/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-bad
-inherit eutils gstreamer
-
-DESCRIPTION="GStreamer decoder for vpx video format"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # Fix zero-bitrate vp8 encoding with libvpx-1.1, bug #435282
- epatch "${FILESDIR}/${PN}-0.10.23-libvpx-1.1.patch"
-
- local pdir=$(gstreamer_get_plugin_dir)
- # gstbasevideo has no .pc
- sed -e "s:\$(top_builddir)/gst-libs/gst/video/.*\.la:-lgstbasevideo-${SLOT}:" \
- -i "${pdir}"/Makefile.{am,in} || die
-}
diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index a75e47775b6e..8a1bb3c1fcad 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -1,4 +1,3 @@
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.2.4-r1.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.2.4-r1.ebuild
deleted file mode 100644
index 96de192dd46a..000000000000
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPTION="GStreamer decoder for vpx video format"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-# VP9 is under experimental, do not enable it now
-RDEPEND=">=media-libs/libvpx-1.3.0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.0.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.2.ebuild
index c68d89cf500c..c68d89cf500c 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-wavpack/Manifest b/media-plugins/gst-plugins-wavpack/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-wavpack/Manifest
+++ b/media-plugins/gst-plugins-wavpack/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.2.4-r1.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.2.4-r1.ebuild
deleted file mode 100644
index c3ffdf155ecb..000000000000
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-DESCRIPTION="GStreamer encoder/decoder for wavpack audio format"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.0.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.2.ebuild
index 8faf418f1a2a..8faf418f1a2a 100644
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild
deleted file mode 100644
index 07e31232b40a..000000000000
--- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-base gst-plugins10
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/xextproto"
-
-# xshm is a compile time option of ximage, which is in libXext
-GST_PLUGINS_BUILD="x xshm"
-GST_PLUGINS_BUILD_DIR="ximage"
-
-src_prepare() {
- # The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even
- # though they are not actually used. This needs to be fixed upstream by
- # replacing AC_PATH_XTRA with PKG_CONFIG calls.
- sed -i -e 's:X_PRE_LIBS -lSM -lICE:X_PRE_LIBS:' "${S}"/configure
-
- gst-plugins10_system_link \
- gst-libs/gst/video:gstreamer-video \
- gst-libs/gst/interfaces:gstreamer-interfaces
-}
diff --git a/media-plugins/gst-plugins-x264/Manifest b/media-plugins/gst-plugins-x264/Manifest
index fe6a50e8439d..dd31d2e8c60f 100644
--- a/media-plugins/gst-plugins-x264/Manifest
+++ b/media-plugins/gst-plugins-x264/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-ugly-0.10.19.tar.xz 882452 SHA256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda WHIRLPOOL f72f224c5f486982370e9d264ad7c658324783b42e995eef759faf270a18d8f12261d90ac6e70af38579921b0970f7aba50c6d091edcd6dc3dda272bcbef755f
-DIST gst-plugins-ugly-1.2.4.tar.xz 844968 SHA256 4ef6f76a47d57b8385d457c7b620b4c28fc041ab1d7c2e3e2f5f05b12b988ea8 SHA512 91a9d950e73a8d6c8bb4c559ba8f4a4dffc163be714d93c0d0d6421f2c9932a4b1af665f76417e79b50b31c83d8a766df9cf6c337b8371371708efc8683e24e1 WHIRLPOOL c1c3885cf2e041c4427f30ca13cda2948b8a35273d3e6417bfe83566f03230208ce1e019e655ae2c98725e94cce6c7fb37b450307312f682bdbd7c948190e7c0
DIST gst-plugins-ugly-1.4.5.tar.xz 846828 SHA256 5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067 SHA512 9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0 WHIRLPOOL b212a4dcba654dac7866ad75551b26818349780b0d7905e63c45b75e21ffbb86ae0f4e9e79ef8bfb317149c2d4f01cbda2c6e2cf2cbcf58991bc09ba9aa85f4e
-DIST gst-plugins-ugly-1.6.0.tar.xz 859996 SHA256 91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06 SHA512 72fadf593d3307b04757763ea7cec00c8c4f1d1aa7ab68a0876e7888f63b995b81b2d5efe6ac45a4dd068c0cfa9ea23b7a6b4435666bcd36b42e174b068874f0 WHIRLPOOL 3ad574a2d74591de9ecb0167bdea29478f48b7fe2cf4a1fec83ece5d0189d66826f1793e84215d7f412245b5b290310c500fea6a67cfcde94358da3884edeb57
DIST gst-plugins-ugly-1.6.1.tar.xz 859200 SHA256 0cc3f90e4322efe1f774272e8fe5c185be37cf7999cd5ca7e0e0607e03d56a57 SHA512 f62eb68779b6bbcc555f43c7c9f4a034f0fabe9244161d9c5ffd410c64a56c915637f5d4ec974810acd67fc744b9a143ba46b6ace96daa2ab56703b1e954c2a0 WHIRLPOOL 8bf8d4295054b8346c08794bddf081da668cd6d9e0e3320381fd2f3a52eb8ffbfa12e0a847137a7cde94de51ebf3bcecee17a098581d63ce444d52a42af76264
+DIST gst-plugins-ugly-1.6.2.tar.xz 859400 SHA256 e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845 SHA512 b8354bce9b0d8f46d16e18c766e8f432d029cfd13cb0141d54aaef73906072a2ccd72ecfc0a566da9c909f7d9b2a8bfa3e2d45a7c5a22a43fb8f811f75f2f173 WHIRLPOOL 75ad5ee7fdae1e2a899873d70e737f15c996a73f5beb93be740c436a855640b60f600cc68bf341be769f42dd4c077f3f04036212feed598a4405cc3ac3140fdb
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.2.4-r1.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.2.4-r1.ebuild
deleted file mode 100644
index 1401e177aec0..000000000000
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-ugly
-inherit gstreamer
-
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE=""
-
-# 20111220 ensures us X264_BUILD >= 120
-RDEPEND=">=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.0.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.2.ebuild
index faa54312800a..faa54312800a 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-x265/Manifest b/media-plugins/gst-plugins-x265/Manifest
index d30d1812de41..c412ecb90009 100644
--- a/media-plugins/gst-plugins-x265/Manifest
+++ b/media-plugins/gst-plugins-x265/Manifest
@@ -1 +1,2 @@
DIST gst-plugins-bad-1.6.1.tar.xz 4215876 SHA256 e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466 SHA512 336a449a23cc11c31fc744828746946de1107e31bd60bf1ba7e3b74d906bda691e917093d04a03249aabcdfc5af0a26ea2a04e343b2b744b1d404b0a5071bdd6 WHIRLPOOL 5cfaeef59b43c9c4fb70acb01f6cd31861e95904a618b02bcfa37afc81919239e1727f9e7da2bf2ee415c0525f3b7955289adbbf9099c9696f83128f7ffdf844
+DIST gst-plugins-bad-1.6.2.tar.xz 4187644 SHA256 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe SHA512 f2d14d32047440a64daf341f9538fcb37c8b808d5ba19e8e9d4b7f9439b77f81cfc791e72193cb69f280a038162921bc9670cc340905850bec656ed4fe488fb5 WHIRLPOOL 7ae8e20c706f3526a5cdd5b4d086dfcf86af4f93e6ba0d60f655c211ca41b80c841004d0fc2134ad3f77c3600913dff0d94610dc5751acbbc4b9305c5600e8dc
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.2.4-r1.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.2.ebuild
index 805f0ad3a71d..5b08bc47faf4 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.2.4-r1.ebuild
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.2.ebuild
@@ -3,12 +3,15 @@
# $Id$
EAPI="5"
-
GST_ORG_MODULE=gst-plugins-bad
+
inherit gstreamer
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 x86"
+DESCRIPTION="H.265 encoder plugin for GStreamer."
+KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
+RDEPEND="
+ media-libs/x265[${MULTILIB_USEDEP}]
+"
DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest
index 9de6a2187cfb..647171b65849 100644
--- a/media-plugins/gst-plugins-ximagesrc/Manifest
+++ b/media-plugins/gst-plugins-ximagesrc/Manifest
@@ -1,5 +1,4 @@
DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
-DIST gst-plugins-good-1.2.4.tar.xz 2882188 SHA256 c9c90368393c2e5e78387e95c02ce7b19f48e793bba6d8547f2c4b51c6f420d3 SHA512 2c057062e10b5ff4cc63d54ffd2a8fb013f264584a175fdadc2fa0b02a7bc390bde0747e7888c6bed45713ce62cd0b6da7d255c99ce5171e9e5c41d6aac90086 WHIRLPOOL 43b4fefa94cfe85e3082fcaaa70fc159381a3d43c43bc15e8bc92b9fe0412bfdba56107c1b2334c632fecdf9b78c8334d962a49efb29a4e82a487a9121bbea33
DIST gst-plugins-good-1.4.5.tar.xz 3031588 SHA256 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 SHA512 0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0 WHIRLPOOL a56ca2c2f2b73f299cb3c3605eb70ddbd97d9513d26ee11d91608c08589149df97f23490a6513d991c6b552a7b8a71f75463fd6dbf7579943ac859254eb0af3c
-DIST gst-plugins-good-1.6.0.tar.xz 3176568 SHA256 a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa SHA512 100b1f47d1c575e1f21fa4796153464cb65b75dd930be707a75c602dd90745a7b0742f64bba2f8210a7f3561774e4f9f81ce04f42a31e0e1def18292ca9d6706 WHIRLPOOL b1ce02c26b80dee2835fa06ac4ce1c506055a149906931eba8a228017217fef3f450c6a59aa05e9c1dc3287382ac4a67118921ed0f08e31da1d565b86fe0f7c9
DIST gst-plugins-good-1.6.1.tar.xz 3188188 SHA256 86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935 SHA512 6b326d908a6df3af059ee23ff41b10a07ad21a1c88f542eff5223a6e8acc75ae97ddead6adcf455cafc9e93f27f7829f6b7476d1a5d3f1ff123f477f00b4f41f WHIRLPOOL 78bf3a445ec03fde8f6bd8d0c3f774d4b41deedff1d4d45b650d45f25c648ad17d3ab9256a049416594e0d5f2b1e0904e7118af6d1805fb2072d1b461cac0ced
+DIST gst-plugins-good-1.6.2.tar.xz 3176060 SHA256 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 SHA512 b63391448cada4a1db6fb2c27f6e913edb339e7ac5bc47cab3ef09ef85c79a7aa01accfc2d9bfe74188b7a744d82988e39f97958e1ad8808765a451b721d6d23 WHIRLPOOL 9f286e09e85969989de561c2939262f77c1ca3ccc2d381ff79cc3b4385b549e49a7fc5adeff51b253c1285658a4e6840aca85c6c4cc803807b22efc14a3fb09a
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.2.4-r1.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.2.4-r1.ebuild
deleted file mode 100644
index 7766699b935b..000000000000
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GST_ORG_MODULE=gst-plugins-good
-inherit gstreamer
-
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
- >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-"
-
-# xshm is a compile time option of ximage
-GST_PLUGINS_BUILD="x xshm"
-GST_PLUGINS_BUILD_DIR="ximage"
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.0.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.2.ebuild
index 9f6fce49b11a..9f6fce49b11a 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.0.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.2.ebuild
diff --git a/media-plugins/gst-plugins-xvid/gst-plugins-xvid-0.10.23.ebuild b/media-plugins/gst-plugins-xvid/gst-plugins-xvid-0.10.23.ebuild
deleted file mode 100644
index 0b57150395ca..000000000000
--- a/media-plugins/gst-plugins-xvid/gst-plugins-xvid-0.10.23.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-bad
-
-DESCRIPTION="GStreamer plugin for XviD (MPEG-4) video encoding/decoding support"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/xvid"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36.ebuild b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36.ebuild
deleted file mode 100644
index f2f568c1a7db..000000000000
--- a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gst-plugins-base gst-plugins10
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libXv
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-proto/videoproto
- x11-proto/xproto
- x11-proto/xextproto"
-
-# xshm is a compile time option of xvideo
-# x is needed to build any X plugins, but we build/install only xv anyway
-GST_PLUGINS_BUILD="x xvideo xshm"
-GST_PLUGINS_BUILD_DIR="xvimage"
-
-src_prepare() {
- # The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even
- # though they are not actually used. This needs to be fixed upstream by
- # replacing AC_PATH_XTRA with PKG_CONFIG calls.
- sed -i -e 's:X_PRE_LIBS -lSM -lICE:X_PRE_LIBS:' "${S}"/configure
-
- gst-plugins10_system_link \
- gst-libs/gst/video:gstreamer-video \
- gst-libs/gst/interfaces:gstreamer-interfaces
-}
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 115ea18a08eb..435ec6455a34 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -5,3 +5,4 @@ DIST live.2015.08.07.tar.gz 616595 SHA256 1a27410aea9723e9e0c60850c57b52a08eed32
DIST live.2015.10.12.tar.gz 627366 SHA256 4402a2a803ee31ab1a0a79c85ddee107c8c458295388ea091d9da80689e61c17 SHA512 a282b1f7d8170e8edf13b4d4e632fe26ad74e1efc28a9c4b568c2da28aa72d3a0a7029b3e045f744ba217320fd67182658581d96018969b81bdeffe78c1a89f5 WHIRLPOOL 17cfe5784cfe1227dd12e05112273bdcebea9078d2d699a37be6d172db085efd27860831f46b33f9a65b539b068f438edf0f5b5b2f81a5d3087fe8c17dbe8c52
DIST live.2015.10.29.tar.gz 627327 SHA256 05bb03b58c9a758a735a2c5bb0b993c5e157d7a60b08df49cc29619d02fbc962 SHA512 03d10881e62b12676898e5cd889169d1d7de3640024198f8908c820375233535b9706bd309abbf26f7ad6e957338bf7371b1443f65b2d245d1b06345b5922e75 WHIRLPOOL 14998fe3da4854ab26063a88486e6e81e020c097f59c9a32e17e18184f085c92d8a85e52dbbca0a7fbf1643e657f54c0691e6ca6398ec33ba0e0a6337e733245
DIST live.2015.11.09.tar.gz 617651 SHA256 33dc683aae4cab9dd7cb05ff25ad35ddbd5ff6769f588a910644dced90e64ce8 SHA512 4c96f81a4c9379f7d1e2d63fa8db75bad6fba914862f538a4cb283ce7d7594f450682276ac684aa74b612d646eb05c0729eae48e00709f71215acb706c8a653f WHIRLPOOL c973a49fd0e5ed195dc4747e796a06b25d401792db3f469c8e8393b0407f3cefc3fdcaea2392bc59a7dd8762c99377adb8022f5fa1fd128cd8b62c86f03d2c1b
+DIST live.2015.12.22.tar.gz 5644431 SHA256 d0a8a0d13b79a8e34057d4c5c0a65572c2eba4948fcf5548d9d53ce994e14b91 SHA512 e5cec29b769e8c10dcc932c1ed96f88d216a3643b2301d36d8df58b8db9bf823247876f2b4cbccac0fcb61ae098eebff3df3b767b1710e5b8b279ffc3bec4eb1 WHIRLPOOL 46b7f3f5885115d5b7c4b024cd7ce95b1c47a8f7055c2640357f5beb6f1c0d0270a34a176b1ff8e7942394ede41ef2fc486238b1355860b7ee0a5ff3cf481df1
diff --git a/media-plugins/live/live-2015.12.22.ebuild b/media-plugins/live/live-2015.12.22.ebuild
new file mode 100644
index 000000000000..a787b3130fd0
--- /dev/null
+++ b/media-plugins/live/live-2015.12.22.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
+HOMEPAGE="http://www.live555.com/"
+SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
+ mirror://gentoo/${P/-/.}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="examples static-libs"
+DOCS=( "live-shared/README" )
+
+# Alexis Ballier <aballier@gentoo.org>
+# Be careful, bump this everytime you bump the package and the ABI has changed.
+# If you don't know, ask someone.
+LIVE_ABI_VERSION=7
+SLOT="0/${LIVE_ABI_VERSION}"
+
+src_unpack() {
+ unpack ${A}
+ mkdir -p "${S}"
+ mv "${WORKDIR}/live" "${S}/" || die
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-recursive2.patch"
+
+ if use static-libs ; then
+ cp -pPR live live-shared
+ mv live live-static
+ else
+ mv live live-shared
+ fi
+
+ use static-libs && cp "${FILESDIR}/config.gentoo" live-static
+ cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+
+ case ${CHOST} in
+ *-solaris*)
+ use static-libs && { sed -i \
+ -e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+ -e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+ live-static/config.gentoo \
+ || die ; }
+ sed -i \
+ -e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+ -e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+ live-shared/config.gentoo-so-r1 \
+ || die
+ ;;
+ *-darwin*)
+ use static-libs && { sed -i \
+ -e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+ -e '/^LINK /s/$/ /' \
+ -e '/^LIBRARY_LINK /s/$/ /' \
+ -e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
+ live-static/config.gentoo \
+ || die static ; }
+ sed -i \
+ -e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+ -e '/^LINK /s/$/ /' \
+ -e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
+ -e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
+ -e '/^LIB_SUFFIX /s/so/dylib/' \
+ live-shared/config.gentoo-so-r1 \
+ || die shared
+ ;;
+ esac
+ multilib_copy_sources
+}
+
+src_configure() { :; }
+
+multilib_src_compile() {
+ tc-export CC CXX LD
+
+ if use static-libs ; then
+ cd "${BUILD_DIR}/live-static"
+
+ einfo "Beginning static library build"
+ ./genMakefiles gentoo
+ emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+ fi
+
+ cd "${BUILD_DIR}/live-shared"
+ einfo "Beginning shared library build"
+ ./genMakefiles gentoo-so-r1
+ local suffix=$(get_libname ${LIVE_ABI_VERSION})
+ emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
+
+ for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
+ pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
+ ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
+ popd > /dev/null
+ done
+
+ if multilib_is_native_abi; then
+ einfo "Beginning programs build"
+ for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
+ cd "${BUILD_DIR}/live-shared/${i}"
+ emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
+ done
+ fi
+}
+
+multilib_src_install() {
+ for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
+ use static-libs && dolib.a live-static/${library}/lib${library}.a
+ dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
+ dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
+
+ insinto /usr/include/${library}
+ doins live-shared/${library}/include/*h
+ done
+
+ if multilib_is_native_abi; then
+ # Should we really install these?
+ use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
+ xargs -0 dobin
+
+ dobin live-shared/mediaServer/live555MediaServer
+ dobin live-shared/proxyServer/live555ProxyServer
+ fi
+}
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index 8380728bf9a0..4b36654dd941 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1,6 +1,6 @@
DIST qmmp-plugin-pack-0.8.3.tar.bz2 163989 SHA256 7b45464429a44f0de9f611ec4c2d396752c3be19e3b8076f8909cb18930589f0 SHA512 ffa41eae98f6e283f5f4699e533ba85c1cb89d9e39a2d45ac76ccb38ad444ea379e51753ac4d78027b0ba35adecde47c1b64e65bbfdb61a5226b2eab6290613c WHIRLPOOL 62d4d433b028b8003b13e41eb36c8518495b7d27adbf0adc6d60d61543292961d745623166a007f57d468c153a07aa6e13c6dca83892f81ae8db4f301e9c82fc
-DIST qmmp-plugin-pack-0.8.4.tar.bz2 164215 SHA256 f6ef6ec2fdcd8809fa826f75b1d723fa0c83bd6d13a4ffa9af7db82a167f265a SHA512 862d46cf2506932a0c35ebb30b46705a99f9d65a0332209467e30fdcb564ea483003de07f153939ded944ff3aa33221d0af1660a65bb9017a5638d46f8f675a5 WHIRLPOOL bbc9358a0cfb5759a56cf4c6c9939556530d8987f6c3613ab21e8c46467fa9ca96f56cc8ad25f64175245dbb716ac45b49c59fde8edbde449f70d958831d27f5
DIST qmmp-plugin-pack-0.8.6.tar.bz2 164732 SHA256 f79ab2d4a3bd9cb603773f0310d54b50390788bee31c5e4af4ac801b3cac9665 SHA512 0aa9daabb012ddfcb4de3f98e1804807349a311f70548491b5a4502403787fed5903a934db4da767409940329d8abe3c20ab15ef9eaa33d21f246d2d673cdd05 WHIRLPOOL a12cb56433612c2ef0c7ad5d86d0cd399b70505f9e3b539185a123af9c6fbeb478ed70b1c205bc06a309d60749a4383f2494d2f5e94255c7ac1d8b6ce8d2329d
-DIST qmmp-plugin-pack-0.9.0.tar.bz2 76277 SHA256 78a26c0696b0560b9b8fe25201873199b03f0b2e76e488acf043be7ac45a6d88 SHA512 bbea46e5482cc68cc98e44116b0bccf804015147213989ad5fe20f257747d7782359b8ba3c5d3dcde57efd39844c589261992e71e239eec4d8686b50f014183e WHIRLPOOL 4d630ea4a8fe40884957580cfd80452b9e5c2c59beff8ac6abfa4712c2b2a6ff7f20dbb516a0f86627295bfea776a7912b2870a7a722a62d69c3a90d2670dff8
DIST qmmp-plugin-pack-0.9.2.tar.bz2 76314 SHA256 730c4ac568a86969234e1faf2f18a7593a7d89c8c56fb58ab317aa7f3edb6317 SHA512 cc740cc28b55abe2d410c75433e49041a7602d80e932f97f22926bbff63b391e46f9772f8d7cd2fb5e7b109a73ef674894e151007ce99b1e26ef3234aaa22d42 WHIRLPOOL 6e5c213e54003e47c1b8226050f1d0c2628d159649fb9de3b8e3abe5b11e1cdef12f7dd4749c96454347c29715e941b32dbcee414c10ef01a116958aabfbf364
+DIST qmmp-plugin-pack-0.9.3.tar.bz2 76668 SHA256 4c65cf6b917574858248b81f7c357b128af21908e7a437f1e1cb89f1501020ec SHA512 b4be0f74ebee7306d9a6f51f462f201896f0287cd9bcf3db4cd12d4cd41313795c3a8e904f9173ce49159188f341eb81b37f3bab316ca824afb9877c1bb40a26 WHIRLPOOL 63fb1332e76a6d487c5208309c4cc04137818309865431eb6ca67b17fb17533e25f3db5cf09b0bae040338855838bd7844d2cca6db674b59c136a5454c7db267
DIST qmmp-plugin-pack-1.0.1.tar.bz2 76528 SHA256 ca26d3ceade68d3a9795e688a8ac32efcd56bf2426469c75085643919bd47084 SHA512 9b7bb22a2655c49be232374637de125cbe9aee50d03f33e2d4b2af37dcc7a8362a21112d3bd111e054c5ea2145e030e40aaa1819e0e714e59df9bfa57efab051 WHIRLPOOL 5c0e0d38aca62d1a9d1ad04fb60a7a43bcede558ee0a7f23f22a5db9615310f484270c772d29628d3195b88bb4f6d3ef6194c7e93f4f6eab08f9f2ebdd12ac6a
+DIST qmmp-plugin-pack-1.0.2.tar.bz2 76533 SHA256 a3a309342fd5077c80bcba214a3d5df6f96135e9fae37d5d122e608557080767 SHA512 268e7cdb5e88f7f15f407df4b2d353c20d8477acc67607485500e0f3eee6bff259a2aac180d3e591dfd15750e495c5f1e0f645704fbe59fa398bfdd7d3f38f5f WHIRLPOOL 296de7571d6d61ec0ca58c4d970455aec092f5b0a9a50f8d960422649a8d7ecb6bc46b48b600f9a1a953aec64b165640b2cea91fee2b5ba11332c35385bd472d
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.8.4.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.9.3.ebuild
index 35c11242d1fb..35c11242d1fb 100644
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.8.4.ebuild
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.9.3.ebuild
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.9.0.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.0.2.ebuild
index 35c11242d1fb..c89e74ef5765 100644
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.9.0.ebuild
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.0.2.ebuild
@@ -19,7 +19,12 @@ IUSE=""
RDEPEND="media-libs/taglib
media-sound/mpg123
- media-sound/qmmp
- dev-qt/qtgui:4"
+ >=media-sound/qmmp-1.0.0
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5"
DEPEND="${RDEPEND}
- dev-lang/yasm"
+ dev-lang/yasm
+ dev-qt/linguist-tools:5"
+
+#PATCHES=( )
diff --git a/media-radio/cwdaemon/Manifest b/media-radio/cwdaemon/Manifest
index 377666760ffb..b42e625eb0a4 100644
--- a/media-radio/cwdaemon/Manifest
+++ b/media-radio/cwdaemon/Manifest
@@ -1 +1,2 @@
DIST cwdaemon-0.10.1.tar.gz 314733 SHA256 5c914140aba395b5d52ba5d822bec9c22e05e93e38af9cfd212242adcaf6abcc SHA512 be15de3326de005c208bdcea412333ff3756e89f08cf5239d87bcd3bc20e9c98f74b028ab65438f04938b9840e354d5fc7c6056405a52aa434e134b5763fe1b8 WHIRLPOOL bfb0cdb4fbaa8ca4af2ca684278926aa058b1b16b9a27d33986bdb4fc39ff22c0a446a415e5d617f74e6aeafe90165173ba5112c61680373a926ab35a7f3602b
+DIST cwdaemon-0.10.2.tar.gz 290487 SHA256 811b9ccf28b9729a9e35ba234977bfa512ec39d7369823f0d29a5ecdc3b47983 SHA512 65ae1552d0a875b71354083401abed2271ff40b7f8ab6c8f2cbb4a36bb2648a6094efc9ac5cfc9228633ff48b839205e4f95f46d10244a43089c4c1f94ca94a7 WHIRLPOOL 60087da04f8d44e0434118297a08d696dc24774d4e32f8fbc828329188e1f35261f25c2073795de6c83e68eac8f579f3c90840a29f79ae9a2d81740b507c0a9d
diff --git a/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild b/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild
new file mode 100644
index 000000000000..bb0475bff629
--- /dev/null
+++ b/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A morse daemon for the parallel or serial port"
+HOMEPAGE="http://cwdaemon.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=media-radio/unixcw-3.3.1"
+DEPEND="$RDEPEND
+ virtual/pkgconfig"
diff --git a/media-radio/grig/Manifest b/media-radio/grig/Manifest
index 6a7c79bf65f9..3d5092d66aee 100644
--- a/media-radio/grig/Manifest
+++ b/media-radio/grig/Manifest
@@ -1 +1,2 @@
DIST grig-0.8.0.tar.gz 514072 SHA256 d621a3400b7720d6671d18bff2e7627cc1442d58df161cc8789851300495d3f3 SHA512 204256a382dd2faf5c380d036d5c75748a24d683e1f3625cc75d5f41a3e73a57c5720cc6db3ad8968c741835516a241680af4e83c32dc0e0951731548fb82357 WHIRLPOOL 2cf6c9f51febdbcb1e3f7caffdb76084a8198c067bead507e9ff9fc61ebacaa787e07b96b702e941725c1e3dcbbc95e4d7acbc0953acc577697b053f8949e506
+DIST grig-0.8.1.tar.gz 621728 SHA256 be8687418fb23efa0468674c3fdd15340fed06eef09be9de21106cc17e033c25 SHA512 84eda8db5d18324f26f0775483c8272296aad05dd75f0572c01a3c7af6dbd14bff7b98cc6a61fe3c43d25193866be4b3dafdc4e68dfc37217e88b53ca53266f9 WHIRLPOOL 21b70d145a7c7b0901cc74748f4ec24ba719a398a3c59e78eb231d0b886e62222477be9e612d21eec411426ba8f520b900ad03ef5c65ff81dcf3f6dd45e05068
diff --git a/media-radio/grig/grig-0.8.1.ebuild b/media-radio/grig/grig-0.8.1.ebuild
new file mode 100644
index 000000000000..f2c3326c633d
--- /dev/null
+++ b/media-radio/grig/grig-0.8.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A tool for controlling amateur radios"
+HOMEPAGE="http://groundstation.sourceforge.net/grig/"
+SRC_URI="mirror://sourceforge/groundstation/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ media-libs/hamlib"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf --enable-hardware
+}
+
+src_install() {
+ default
+ make_desktop_entry ${PN} "GRig" "/usr/share/pixmaps/grig/grig-logo.png" "HamRadio"
+ rm -rf "${D}/usr/share/grig" || die "cleanup docs failed"
+}
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 3854aeb78343..16c289edbe03 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,3 +1 @@
-DIST xlog-2.0.11.tar.gz 11395343 SHA256 a2381b6bbbf446d9bb95644d8394c5fe5fa43bbafe0c87ef65a0f6fbdafcb744 SHA512 15e91cc51af162d4def7e9ce29a3bde7af076ba875e939d3e908ac0fb39b8e0c30a1fdad6ec58d19a70947629684209038ddf83cf8316331f059fa3a3db5cc34 WHIRLPOOL e7dcaf548acf36e39400b3d039348a86cb30189cbc551158902728698b23a5db988c9fcf54ad847a2291e3062ec9cd963bd4281032653bf7f59f6494a2441579
-DIST xlog-2.0.12.tar.gz 11396005 SHA256 c5666c53e67b92b49bedb5ee1a629cf62d384033af6a912dff7726995775abd4 SHA512 34f590915b11e0aa24a23210f90f0bc7fb62874b46ab226e254e766b14965add58752a131c1a4b792e2447670059f92ef5d160fba8382fe757e31e8478902550 WHIRLPOOL e9b2561d23e9902de2753c4fd07eca98fa42bfe0d62ce1f7113f9056b5df801247be0b95665d1d85d8c3f7d05e606fc949df69bc72bfb8cfba43066d4de96c46
DIST xlog-2.0.13.tar.gz 11427287 SHA256 d53d8538b9fc61e761d1bd84ad0c866cc9a50540b663521ebad49df479d798ab SHA512 304efc65c35890f2d988680de2a5f21d2e728882175f9a3abf72a749d9172833ac7b18cbd65d9e9c2c143ee27bea0476b12ff5eb760d8dcbb64800944ac89003 WHIRLPOOL 7e77e2db8cd8f373fe5f93f81d80b29fdfc4870eab24557a8aa1c940d67df80fc4751d409a2751a795c42a14edb0da30a39dc88af7771cc223f0bb408c15ef23
diff --git a/media-radio/xlog/xlog-2.0.11.ebuild b/media-radio/xlog/xlog-2.0.11.ebuild
deleted file mode 100644
index 80e4cc0bcf61..000000000000
--- a/media-radio/xlog/xlog-2.0.11.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools eutils fdo-mime toolchain-funcs
-MY_P=${P/_}
-
-DESCRIPTION="An amateur radio logging program"
-HOMEPAGE="http://www.nongnu.org/xlog"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/hamlib
- dev-libs/glib:2
- x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.0.7-desktop.patch"
-
- # Let portage handle updating mime/desktop databases,
- epatch "${FILESDIR}/${PN}-1.9-desktop-update.patch"
- # Drop -Werror
- sed -i -e "s:-Werror::" configure.in || die
- eautoreconf
-}
-
-src_configure() {
- # mime-update causes file collisions if enabled
- econf --disable-mime-update --disable-desktop-update \
- --docdir=/usr/share/doc/${PF}
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}
- dodoc AUTHORS data/doc/THANKS NEWS README
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
diff --git a/media-radio/xlog/xlog-2.0.12.ebuild b/media-radio/xlog/xlog-2.0.12.ebuild
deleted file mode 100644
index 80e4cc0bcf61..000000000000
--- a/media-radio/xlog/xlog-2.0.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools eutils fdo-mime toolchain-funcs
-MY_P=${P/_}
-
-DESCRIPTION="An amateur radio logging program"
-HOMEPAGE="http://www.nongnu.org/xlog"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/hamlib
- dev-libs/glib:2
- x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.0.7-desktop.patch"
-
- # Let portage handle updating mime/desktop databases,
- epatch "${FILESDIR}/${PN}-1.9-desktop-update.patch"
- # Drop -Werror
- sed -i -e "s:-Werror::" configure.in || die
- eautoreconf
-}
-
-src_configure() {
- # mime-update causes file collisions if enabled
- econf --disable-mime-update --disable-desktop-update \
- --docdir=/usr/share/doc/${PF}
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}
- dodoc AUTHORS data/doc/THANKS NEWS README
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
diff --git a/media-radio/xlog/xlog-2.0.13.ebuild b/media-radio/xlog/xlog-2.0.13.ebuild
index b779b23c42ad..383c4074d716 100644
--- a/media-radio/xlog/xlog-2.0.13.ebuild
+++ b/media-radio/xlog/xlog-2.0.13.ebuild
@@ -32,6 +32,8 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-2.0.13-desktop-update.patch"
# Drop -Werror
sed -i -e "s:-Werror::" configure.ac || die
+ # fix underlinking
+ sed -i -e "s:HAMLIB_LIBS@:HAMLIB_LIBS@ -lm:g" src/Makefile.am || die
eautoreconf
}
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index c1d978bce1b1..eb3d021acb31 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -1,2 +1,3 @@
DIST apulse-0.1.4.tar.gz 99976 SHA256 717bc537c389af546b4db2ed7622a8896f7f0f306612c9eb6c693a70c104c86f SHA512 500abca0f6b4df35acb417744a5967e58ceff8cc2a0d640db03847d79b077295abe8888ee5d0008383349bd964345a340334f39e1f55286713db94a86c6596dc WHIRLPOOL 7fe604ed3128cb24d375f4f84ee77317fd499202d8bf46f9c68735501b35a55050852d08260b2c4ad0419ac32a3d330946c65aa402b9b66dbf6d25c3a92966bb
DIST apulse-0.1.6.tar.gz 101938 SHA256 f9ffbf7aff96680beff3243758e5c1e0d4ac9043d4bd6cbfb219890b4b91c9f3 SHA512 0bcc3966a1455bac64e7b9731a988c5d10d893544354453b70f36121e92854a632f33a2ec84fa2ee4d2010221f82fb83cea872d66c4b053b0cd9014215014dc2 WHIRLPOOL 114d7e5d2f344ee4bdb96df01db8f10b10798ef2b332542f45e0e2957462c8255963a7d00628c01fcf58c19703c207aa967fdb258efcd28922ef05687517a8d3
+DIST apulse-0.1.7.tar.gz 103311 SHA256 fc0e4853684ca5145950690405b0d4f89bf3a5aef7a86addec451561fb5f3e1b SHA512 05b73b6151ba76c1a0a05e065cc41ddf2239135920d94ba6e8b3c0228faa3d49ad8f008a4bcad37500c5e545c03f9f88327504a06e99718abab491b3e35925dc WHIRLPOOL e96e48bfa3cdaf983e5d46ea3431ccf8818ce5a8cb78b5f7df8d559227ab4f4c8e9bc828d5f255f0fb2a8c7c9cc01ba07041cc0150a9577a9359c41ee4607089
diff --git a/media-sound/apulse/apulse-0.1.7.ebuild b/media-sound/apulse/apulse-0.1.7.ebuild
new file mode 100644
index 000000000000..dde232ef3894
--- /dev/null
+++ b/media-sound/apulse/apulse-0.1.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib cmake-multilib
+
+DESCRIPTION="PulseAudio emulation for ALSA"
+HOMEPAGE="https://github.com/i-rinat/apulse"
+SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
+ media-libs/alsa-lib[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}
+ !!media-plugins/alsa-plugins[pulseaudio]"
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )
+
+src_prepare() {
+ # Ensure all relevant libdirs are added, to support all ABIs
+ DIRS=
+ _add_dir() { DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; }
+ multilib_foreach_abi _add_dir
+ sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > "${T}"/apulse
+}
+
+multilib_src_configure() {
+ local mycmakeargs="-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse"
+ cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+ cmake-utils_src_install
+ einstalldocs
+ dobin "${T}"/apulse
+}
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index c9c1708e0294..c4c0df23d07d 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,4 +1,3 @@
-DIST audacious-2.4.4.tgz 1344519 SHA256 76f84038a0360da80aeaddd1ec23e5a55fee5a120abffce97c4609958cdb30e8 SHA512 39b2f243863ac6dcd81dceaec7d0f3f1078ebf92336616c6d60016e1c9a79a90db7f3161cccfa13b2498a8efeeab3e3528b508ce9366653f96a6e2c9ae8148e3 WHIRLPOOL 57c246647aaca7b6f01047805dd1c4db9ed381460cc81a799d38cc4c9a06a86e01485ec0bddc8a0ddadc5d8685638aee1cad002405770235f6a64c8216054444
DIST audacious-2.5.4.tar.gz 1221134 SHA256 47bc36010e84c2c9638537a42a8451743d55a699bf85c614f3b913596f6e2fcd SHA512 4c6cdcd19e2de468c60c3a65fd75320f47febf3890011a6d7ebf5886ea34179bfb98bbbedd822ceeb278a466a63ba47d0243c90dd8cc04bb814ac50d60b54a1d WHIRLPOOL 99fb1f1541647ee378ab771975691b40230d3a3f7051cc714e9a0276101f3eda92e00c2071b89e62c1211481c41a0a9722a9ca494e50c93a88d4d69a334aa14a
DIST audacious-3.1.1.tar.bz2 766551 SHA256 50e229579a0ee06e88d2b123c8db6b373db73e87898e8b4843a1bd02e3cab8ac SHA512 507381330ffb20898ece803a5782047ef316925e749940cffff590129f4b5eef895c4062b20e59cc7663e51e45c5668565bff009e71d31a5ee03f4d0e720ee79 WHIRLPOOL c5d4695308b6a219de77aa0803d0975454814156ee9c1cac142781f092d66b48121d67f2834b3949efaef1e8f75ebe42cbf1b0559864e8ba6c06c2a1c83eef1c
DIST audacious-3.1.tar.bz2 793321 SHA256 306db180cd269b072cfb23551b4139cd2af28d8afb6699836ad82aa3bcec3a46 SHA512 c80c44dc94bf25bbf0dbcb0a2de2c8a0e2cbdb7261792f7b12b96f7aaec049b227cd67704228ad6dcd33b955d0b4ce3393511eca036cbaf996f753e85c9f7141 WHIRLPOOL 195061cc46ac5b9d6e79fafc4736d756501955b144bf2e53c439c6175632507c57962e0a29adbd030168e6d08498f2aedaa520213fbe14dfd819e27e0951825d
diff --git a/media-sound/audacious/audacious-2.4.4.ebuild b/media-sound/audacious/audacious-2.4.4.ebuild
deleted file mode 100644
index 4320150dc819..000000000000
--- a/media-sound/audacious/audacious-2.4.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz
- mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="altivec chardet nls session cpu_flags_x86_sse2"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
- >=dev-libs/glib-2.16
- >=dev-libs/libmcs-0.7.1-r2
- >=dev-libs/libmowgli-0.7.0:0
- dev-libs/libxml2
- >=x11-libs/cairo-1.2.6
- >=x11-libs/gtk+-2.14:2
- >=x11-libs/pango-1.8.0
- session? ( x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-2.4.4"
-
-src_compile() {
- # D-Bus is a mandatory dependency, remote control,
- # session management and some plugins depend on this.
- # Building without D-Bus is *unsupported* and a USE-flag
- # will not be added due to the bug reports that will result.
- # Bugs #197894, #199069, #207330, #208606
- econf \
- --enable-dbus \
- $(use_enable altivec) \
- $(use_enable chardet) \
- $(use_enable nls) \
- $(use_enable session sm) \
- $(use_enable cpu_flags_x86_sse2 sse2) \
- || die
-
- emake || die "make failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS NEWS README
-
- # Gentoo_ice skin installation; bug #109772
- insinto /usr/share/audacious/Skins/gentoo_ice
- doins "${WORKDIR}"/gentoo_ice/*
- docinto gentoo_ice
- dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/guimup/guimup-0.3.2.ebuild b/media-sound/guimup/guimup-0.3.2.ebuild
index 3d3cfabcd45e..149d3e7011d0 100644
--- a/media-sound/guimup/guimup-0.3.2.ebuild
+++ b/media-sound/guimup/guimup-0.3.2.ebuild
@@ -2,9 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
-
-inherit eutils
+EAPI=5
+inherit eutils flag-o-matic
MY_P=${P/-/_}
@@ -16,14 +15,19 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DOCS="ChangeLog README NEWS AUTHORS"
RDEPEND=">=dev-cpp/gtkmm-3.2.0:3.0
- dev-libs/libunique:3
- >=media-libs/libmpdclient-2.3
- >=net-libs/libsoup-2.36"
+ dev-libs/libunique:3
+ >=media-libs/libmpdclient-2.3
+ >=net-libs/libsoup-2.36
+"
DEPEND="${RDEPEND}
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ append-cxxflags -std=c++11
+}
src_install() {
default
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 6d53f56d05c4..cf2e79ac1ac1 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,3 +1,4 @@
DIST mumble-1.2.10.tar.gz 3195427 SHA256 c6367a63ef54aac8e6d556066297e536a8c288495d53490219a113e43aa85b04 SHA512 d4ff0572fd744cbf3473b25353b2ab8b2fc2d68921179c02f3047460d63c9e388d6d9e04fc4fb4b27eeaa63baf74d8bf3dc098cf24285619aef1b29f636b972e WHIRLPOOL 9aadb47756c7d1939c075079911a5851d619f973359e6346d209e5baaf7db9a80b2d622befd4e6ea10480875b1ea6479d9b4785111d9f88d9d009b17ecbc774a
DIST mumble-1.2.11.tar.gz 3196837 SHA256 e8ec96ec367151064352195d3f84aa9fe4e456e70c57037e0d0cb84155d603e6 SHA512 72500362dc137909465f8b932648cee6e9dd4d2c57e6f85a73de21cfe1e99ca8e290f899d50ae237729b24e86406ffedca8024977e94a30ffc863525c82c2995 WHIRLPOOL 7a32e57f8744c2e1b7dd8088334f062266af30f7cc2f64191f9e74e340b01e4b0253b6f23b8edf80dc20082ffd6d44f30e447a11a40d7c4710c208c649da4f3a
+DIST mumble-1.2.12.tar.gz 3197498 SHA256 5981ec2e8e62a0b47f1bfa9240721a885c9edb89e14cdf5db149e0ee723d5727 SHA512 fb800fc7b7eab57faefdd8fec1f6f28d7485a872faef8f7a8bfa27ff42d06813be8aca59d28bef2f857e467a5a7ba70e36b02b8391752ce15ee93f3d118501e0 WHIRLPOOL 46d1177e955e0e359422b94c656403e9788aa9188c8dc7e923fc9e0f5a6cbe9e7b393953c95fee67cdff7dd00a1fd6d4a9f803491c9deb8d3c370d6dfd7eeafa
DIST mumble-1.2.6.tar.gz 3201577 SHA256 876cdecfb89798ab45020cdae0d64bd0fa899a9a97c2c7f4a6e706d4165fb6ff SHA512 cf67d171bb76d30fd0b098552ac1707423cdeb7d04031fd5f6693cad4661f3a2d99b8e8d653686fab00f46e66257f8fb75c819b9ad1d4f514a0d0b04c36a446e WHIRLPOOL 37654990d66fb01fc7265c5757ad8b79e9a10325b669735f3010486b15896e3d191bb705664a1151c4b0eea1cb6c17daef86e45c38247a1463ad72c273019ee7
diff --git a/media-sound/mumble/mumble-1.2.12.ebuild b/media-sound/mumble/mumble-1.2.12.ebuild
new file mode 100644
index 000000000000..267536ce790d
--- /dev/null
+++ b/media-sound/mumble/mumble-1.2.12.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+QT_MINIMAL="4.6"
+
+inherit eutils multilib qt4-r2
+
+MY_P="${PN}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf"
+
+RDEPEND=">=dev-libs/boost-1.41.0
+ !libressl? ( >=dev-libs/openssl-1.0.0b:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/protobuf-2.2.0
+ >=media-libs/libsndfile-1.0.20[-minimal]
+ >=media-libs/opus-1.0.1
+ >=media-libs/speex-1.2_rc1
+ sys-apps/lsb-release
+ x11-libs/libX11
+ x11-libs/libXi
+ dev-qt/qtcore:4[ssl]
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ dev-qt/qtsql:4[sqlite]
+ dev-qt/qtsvg:4
+ dev-qt/qtxmlpatterns:4
+ x11-proto/inputproto
+ alsa? ( media-libs/alsa-lib )
+ dbus? ( dev-qt/qtdbus:4 )
+ g15? ( app-misc/g15daemon )
+ portaudio? ( media-libs/portaudio )
+ pulseaudio? ( media-sound/pulseaudio )
+ speech? ( app-accessibility/speech-dispatcher )
+ zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ local conf_add
+
+ if has_version '<=sys-devel/gcc-4.2'; then
+ conf_add="${conf_add} no-pch"
+ else
+ use pch || conf_add="${conf_add} no-pch"
+ fi
+
+ use alsa || conf_add="${conf_add} no-alsa"
+ use dbus || conf_add="${conf_add} no-dbus"
+ use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+ use g15 || conf_add="${conf_add} no-g15"
+ use oss || conf_add="${conf_add} no-oss"
+ use portaudio || conf_add="${conf_add} no-portaudio"
+ use pulseaudio || conf_add="${conf_add} no-pulseaudio"
+ use speech || conf_add="${conf_add} no-speechd"
+ use zeroconf || conf_add="${conf_add} no-bonjour"
+
+ eqmake4 "${S}/main.pro" -recursive \
+ CONFIG+="${conf_add} \
+ bundled-celt \
+ no-bundled-opus \
+ no-bundled-speex \
+ no-embed-qt-translations \
+ no-server \
+ no-update" \
+ DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+src_compile() {
+ # parallel make workaround, bug #445960
+ emake -j1
+}
+
+src_install() {
+ newdoc README.Linux README
+ dodoc CHANGES
+
+ local dir
+ if use debug; then
+ dir=debug
+ else
+ dir=release
+ fi
+
+ dobin "${dir}"/mumble
+ dobin scripts/mumble-overlay
+
+ insinto /usr/share/services
+ doins scripts/mumble.protocol
+
+ domenu scripts/mumble.desktop
+
+ insinto /usr/share/icons/hicolor/scalable/apps
+ doins icons/mumble.svg
+
+ doman man/mumble-overlay.1
+ doman man/mumble.1
+
+ insopts -o root -g root -m 0755
+ insinto "/usr/$(get_libdir)/mumble"
+ doins "${dir}"/libmumble.so.${PV}
+ dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
+ doins "${dir}"/libcelt0.so.0.{7,11}.0
+ doins "${dir}"/plugins/lib*.so*
+}
+
+pkg_postinst() {
+ echo
+ elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+ elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+ echo
+}
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 00cb6bea1bd2..0d797ee54b87 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -1,3 +1,4 @@
DIST mumble-1.2.10.tar.gz 3195427 SHA256 c6367a63ef54aac8e6d556066297e536a8c288495d53490219a113e43aa85b04 SHA512 d4ff0572fd744cbf3473b25353b2ab8b2fc2d68921179c02f3047460d63c9e388d6d9e04fc4fb4b27eeaa63baf74d8bf3dc098cf24285619aef1b29f636b972e WHIRLPOOL 9aadb47756c7d1939c075079911a5851d619f973359e6346d209e5baaf7db9a80b2d622befd4e6ea10480875b1ea6479d9b4785111d9f88d9d009b17ecbc774a
DIST mumble-1.2.11.tar.gz 3196837 SHA256 e8ec96ec367151064352195d3f84aa9fe4e456e70c57037e0d0cb84155d603e6 SHA512 72500362dc137909465f8b932648cee6e9dd4d2c57e6f85a73de21cfe1e99ca8e290f899d50ae237729b24e86406ffedca8024977e94a30ffc863525c82c2995 WHIRLPOOL 7a32e57f8744c2e1b7dd8088334f062266af30f7cc2f64191f9e74e340b01e4b0253b6f23b8edf80dc20082ffd6d44f30e447a11a40d7c4710c208c649da4f3a
+DIST mumble-1.2.12.tar.gz 3197498 SHA256 5981ec2e8e62a0b47f1bfa9240721a885c9edb89e14cdf5db149e0ee723d5727 SHA512 fb800fc7b7eab57faefdd8fec1f6f28d7485a872faef8f7a8bfa27ff42d06813be8aca59d28bef2f857e467a5a7ba70e36b02b8391752ce15ee93f3d118501e0 WHIRLPOOL 46d1177e955e0e359422b94c656403e9788aa9188c8dc7e923fc9e0f5a6cbe9e7b393953c95fee67cdff7dd00a1fd6d4a9f803491c9deb8d3c370d6dfd7eeafa
DIST mumble-1.2.5.tar.gz 3200216 SHA256 915156946f7662c2488e4c40c95cb95c4ff00532789515da7df775a36d544faf SHA512 bc1761f1e2fc833124ff2ff9af994be59dc9ef96a1ed49316d5383d9b5d91c37ddce87bf6afefc99315824a2a52c615162b2e6050c78f90beca591b58229e7b1 WHIRLPOOL 1f4b226c4036d35a73f65beb4ea66ec0c4363c6122320e8d70a52e0f40b0e2e550282206dcf158bf5a4bb1109202c38a9451374c1bbce96bc559c576a18346c3
diff --git a/media-sound/murmur/murmur-1.2.12.ebuild b/media-sound/murmur/murmur-1.2.12.ebuild
new file mode 100644
index 000000000000..d25d6cc7a400
--- /dev/null
+++ b/media-sound/murmur/murmur-1.2.12.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+QT_MINIMAL="4.6"
+
+inherit eutils qt4-r2 systemd user readme.gentoo
+
+MY_P="${PN/murmur/mumble}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="+dbus debug +ice pch zeroconf"
+
+RDEPEND=">=dev-libs/openssl-1.0.0b
+ >=dev-libs/protobuf-2.2.0
+ sys-apps/lsb-release
+ >=sys-libs/libcap-2.15
+ dev-qt/qtcore:4[ssl]
+ || ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
+ dev-qt/qtxmlpatterns:4
+ dbus? ( dev-qt/qtdbus:4 )
+ ice? ( dev-libs/Ice )
+ zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.41.0
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.4-ice-3.5.0-compat.patch
+ "${FILESDIR}"/${PN}-1.2.4-ice-3.5.1-compat.patch
+)
+
+DOC_CONTENTS="
+ Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
+ Please execute:\n
+ murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
+ chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
+ to set the build-in 'SuperUser' password before starting murmur.
+ Please restart dbus before starting murmur, or else dbus
+ registration will fail.
+"
+
+pkg_setup() {
+ enewgroup murmur
+ enewuser murmur -1 -1 /var/lib/murmur murmur
+}
+
+src_prepare() {
+ qt4-r2_src_prepare
+
+ sed \
+ -e 's:mumble-server:murmur:g' \
+ -e 's:/var/run:/run:g' \
+ -i "${S}"/scripts/murmur.{conf,ini.system} || die
+}
+
+src_configure() {
+ local conf_add
+
+ use dbus || conf_add="${conf_add} no-dbus"
+ use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+ use ice || conf_add="${conf_add} no-ice"
+ use pch || conf_add="${conf_add} no-pch"
+ use zeroconf || conf_add="${conf_add} no-bonjour"
+
+ eqmake4 main.pro -recursive \
+ CONFIG+="${conf_add} no-client"
+}
+
+src_compile() {
+ # parallel make workaround, upstream bug #3190498
+ emake -j1
+}
+
+src_install() {
+ dodoc README CHANGES
+
+ docinto scripts
+ dodoc scripts/*.php scripts/*.pl
+
+ local dir
+ if use debug; then
+ dir=debug
+ else
+ dir=release
+ fi
+
+ dobin "${dir}"/murmurd
+
+ insinto /etc/murmur/
+ newins scripts/murmur.ini.system murmur.ini
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}"/murmur.logrotate murmur
+
+ insinto /etc/dbus-1/system.d/
+ doins scripts/murmur.conf
+
+ insinto /usr/share/murmur/
+ doins src/murmur/Murmur.ice
+
+ newinitd "${FILESDIR}"/murmur.initd-r1 murmur
+ newconfd "${FILESDIR}"/murmur.confd murmur
+
+ if use dbus; then
+ systemd_newunit "${FILESDIR}"/murmurd-dbus.service "${PN}".service
+ systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+ else
+ systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service "${PN}".service
+ fi
+
+ keepdir /var/lib/murmur /var/log/murmur
+ fowners -R murmur /var/lib/murmur /var/log/murmur
+ fperms 750 /var/lib/murmur /var/log/murmur
+
+ doman man/murmurd.1
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/media-sound/pavucontrol/pavucontrol-3.0.ebuild b/media-sound/pavucontrol/pavucontrol-3.0.ebuild
index 9adc8b50f888..e14358825cce 100644
--- a/media-sound/pavucontrol/pavucontrol-3.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="nls"
RDEPEND="
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 6c9321714ef8..593a16fe27ff 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,4 +1,5 @@
DIST qmmp-0.9.2.tar.bz2 1112974 SHA256 90ac69a21779df5073efe71b25f28a7461d6a928deb1afbaa1ef8268f62ae9c5 SHA512 fc6cb0ec4bbf52e2ceb9e87a3585f25bd58b3a323ef07ddb9fd9f21a065ef0f5deb0b014f29b9648fe9e0a8b412f3b04643f8128638558089a25d867577690ad WHIRLPOOL 47a596b0f7d9e516737bfeb10a962f79edb74f61e2985b01f2cee80c8ff252a1709459f5712700784faef824e24ff3567d73f0d5759e2cd2c0c53c267cc6a026
DIST qmmp-0.9.3.tar.bz2 1113475 SHA256 5d8901d14066efaada789589aa64e28be0514c3226798d68a0b67750fea4c735 SHA512 8f023acd3906c382d9af78785944744449b3ff2155b8d697f2dc0074275d390a34eb1211b4f06f399fd391ed8891731e9db0f281c301037a561dd5021540f541 WHIRLPOOL 33eb797ddabb23f2033241df5b632c0f8c22773cc048d871a77b047784512fd5a34e8f831ebcad331f4c222f506ce5a5e1f49596ac74618398271b7b79c8833d
-DIST qmmp-1.0.1.tar.bz2 1094223 SHA256 010923f2fbba8b5a75c422eadf9b762b8b3eee10849e49272271262549457e66 SHA512 4162107d61b450f4d921b9f96fce72dc39f65a7daf3323433f9493e784cbad2c691a6720b571f950bf44e440f04622e35974544fc1ba35feba08b88a9faa512d WHIRLPOOL f388131704664a6943e7f0ae7f2ffaceb445f580fc1f6bc6a283a170c7642b5ab77ddf94a44b357c514aae17bbacb2678d2a07dc43d7bc8913c323199907624a
+DIST qmmp-0.9.5.tar.bz2 1121832 SHA256 628a017b2327437ff77ccf5b77b4756bd1e73186f030f4bb34b93c1135ea353e SHA512 21963852a10da4af88b7ab4050c86824e0f8d0f49ea5650f49b5794e6b34690b28724b292d8fb0828da44673201658d2441c8bd306bbdadf40cfa07076403d00 WHIRLPOOL 83dc441c089162dd9458b9dc5541ed47f76eafc7f3635d52a555c9624ef585e3570199cab30c81ab59fafd66c3048a3bb7f044a21061b2168e4f3d1a8e497c7b
DIST qmmp-1.0.2.tar.bz2 1095127 SHA256 5c3e72f0effa2f2a5c7b41507d751599bf01d80316da6eaef7f2f20b91be8221 SHA512 44a485ac670943a1bfc89cc9d7e483c64e42e78a5e405bce26a0665b68080f4fede8224c5527b1679e5316bf77bf4eb6636b97fb59207ad7a50f0f903a5d0a27 WHIRLPOOL addbe0978926c19c8699238e940bad786f990b2985b53f3e8ac70310a664894631e84fae0d0facf80458ce3d6285a0c8851826d639dafa4b78550759dc849d57
+DIST qmmp-1.0.4.tar.bz2 1102390 SHA256 9867fcb7ad7389f1c01d3bf31829fbe40a89eb8b05c104225257cea98c49ea85 SHA512 068e6de33af6675f326c90d3262bb350b0e513eb52f9ca1cdd680bf4562cc866516a34aa326ec3ad3a439c15727d902de7d80f7ba3d65e5a53f6b35be6dbadf2 WHIRLPOOL e2d7671fd27bd8adf447c972c467adc16adf5e91f71ad82e3d80fad15c7093a0c087bbf3644a6185f4b5dcbf296f928c94e1c5f089cd650eaf90f04258db1a23
diff --git a/media-sound/qmmp/qmmp-0.9.5.ebuild b/media-sound/qmmp/qmmp-0.9.5.ebuild
new file mode 100644
index 000000000000..5f82a4d0c164
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.9.5.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [ "$PV" != "9999" ]; then
+ SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~ppc ~x86"
+else
+ SRC_URI=""
+ ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+ dev-qt/qtgui:4
+ alsa? ( media-libs/alsa-lib )
+ bs2b? ( media-libs/libbs2b )
+ cdda? ( dev-libs/libcdio-paranoia )
+ cue? ( media-libs/libcue )
+ curl? ( net-misc/curl )
+ dbus? ( sys-apps/dbus )
+ aac? ( media-libs/faad2 )
+ enca? ( app-i18n/enca )
+ flac? ( media-libs/flac )
+ game? ( media-libs/game-music-emu )
+ ladspa? ( media-libs/ladspa-cmt )
+ libsamplerate? ( media-libs/libsamplerate )
+ mad? ( media-libs/libmad )
+ midi? ( media-sound/wildmidi )
+ mms? ( media-libs/libmms )
+ mplayer? ( media-video/mplayer )
+ mpris? ( dev-qt/qtdbus:4 )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ modplug? ( >=media-libs/libmodplug-0.8.4 )
+ vorbis? ( media-libs/libvorbis
+ media-libs/libogg )
+ jack? ( media-sound/jack-audio-connection-kit
+ media-libs/libsamplerate )
+ ffmpeg? ( virtual/ffmpeg )
+ opus? ( media-libs/opusfile )
+ projectm? ( media-libs/libprojectm
+ dev-qt/qtopengl:4 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+ wavpack? ( media-sound/wavpack )
+ scrobbler? ( net-misc/curl )
+ sndfile? ( media-libs/libsndfile )
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( dbus ) "
+
+src_prepare() {
+ if has_version dev-libs/libcdio-paranoia; then
+ sed -i \
+ -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+ src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use aac)
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use analyzer)
+ $(cmake-utils_use_use bs2b)
+ $(cmake-utils_use_use cdda CDA)
+ $(cmake-utils_use_use crossfade)
+ $(cmake-utils_use_use cover)
+ $(cmake-utils_use_use cue)
+ $(cmake-utils_use_use curl)
+ $(cmake-utils_use_use dbus)
+ $(cmake-utils_use_use enca)
+ $(cmake-utils_use_use ffmpeg)
+ -DUSE_FFMPEG_LEGACY=OFF
+ $(cmake-utils_use_use flac)
+ $(cmake-utils_use_use game GME)
+ -DUSE_HAL=OFF
+ $(cmake-utils_use_use jack)
+ $(cmake-utils_use_use kde KDENOTIFY)
+ $(cmake-utils_use_use ladspa)
+ $(cmake-utils_use_use lyrics)
+ $(cmake-utils_use_use mad)
+ $(cmake-utils_use_use midi MIDI_WILDMIDI)
+ $(cmake-utils_use_use mplayer)
+ $(cmake-utils_use_use mms)
+ $(cmake-utils_use_use modplug)
+ $(cmake-utils_use_use mpris)
+ $(cmake-utils_use_use musepack MPC)
+ $(cmake-utils_use_use notifier)
+ $(cmake-utils_use_use opus)
+ $(cmake-utils_use_use oss)
+ $(cmake-utils_use_use projectm)
+ $(cmake-utils_use_use pulseaudio PULSE)
+ $(cmake-utils_use_use qsui)
+ $(cmake-utils_use_use scrobbler)
+ $(cmake-utils_use_use sndfile)
+ $(cmake-utils_use_use stereo)
+ $(cmake-utils_use_use tray STATICON)
+ $(cmake-utils_use_use udisks UDISKS2)
+ -DUSE_UDISKS=OFF
+ $(cmake-utils_use_use libsamplerate SRC)
+ $(cmake-utils_use_use vorbis)
+ $(cmake-utils_use_use wavpack)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-1.0.1.ebuild b/media-sound/qmmp/qmmp-1.0.4.ebuild
index 4cba7f4c13a9..4cba7f4c13a9 100644
--- a/media-sound/qmmp/qmmp-1.0.1.ebuild
+++ b/media-sound/qmmp/qmmp-1.0.4.ebuild
diff --git a/media-tv/me-tv/me-tv-1.4.0.10.ebuild b/media-tv/me-tv/me-tv-1.4.0.10.ebuild
index ac124f15d78d..bb652aa8e0fe 100644
--- a/media-tv/me-tv/me-tv-1.4.0.10.ebuild
+++ b/media-tv/me-tv/me-tv-1.4.0.10.ebuild
@@ -2,9 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
-
-inherit eutils versionator autotools gnome2
+EAPI=5
+inherit eutils flag-o-matic versionator autotools gnome2
DESCRIPTION="Me TV is a GTK desktop application for watching digital television"
HOMEPAGE="http://me-tv.sourceforge.net/"
@@ -15,7 +14,9 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE="http"
-RDEPEND=">=dev-cpp/gconfmm-2.6
+
+RDEPEND="
+ >=dev-cpp/gconfmm-2.6
dev-cpp/gtkmm:2.4
dev-cpp/libxmlpp:2.6
dev-libs/libunique:1
@@ -25,12 +26,14 @@ RDEPEND=">=dev-cpp/gconfmm-2.6
>=media-video/vlc-1.1.8
media-libs/gstreamer:0.10
media-plugins/gst-plugins-xvideo:0.10
- media-libs/gst-plugins-base:0.10"
-
+ media-libs/gst-plugins-base:0.10
+"
DEPEND="${RDEPEND}
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
src_prepare() {
+ append-cxxflags -std=c++11
epatch "${FILESDIR}"/${P}-gcc47.patch
eautoreconf
}
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 661bb7467bc1..e696d2ddb43e 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,5 +1,2 @@
-DIST aegisub-2.1.9.tar.xz 1670496 SHA256 e0591c96183f7713bb14f9d357a2e12bdd3478e4d0a8fad77f14f87a4fc22db7 SHA512 bdb02e3d29db2b7ed165eaf1d541515c15f22199bb209d517089e2c35289b7fc22f6159589004c7f8667a57d26eb7ab6211f9d85ca4bbcd076c5856ac10a3d4f WHIRLPOOL 4ac402e067ff0d863042a8f314c1e55154bacfcc13103772e7c4036b7d927f687b2172003eb51e35469f7af2b640e20f224ff1fa5be83f729eacfaac89c73144
DIST aegisub-3.0.4.tar.xz 4155728 SHA256 7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a SHA512 2917195a61d16578a83ce0b69006dd0269c086c6eff2f622c47d9880697e4e531a7c0c0232c187f9023635c9d3857a1d6a0cee4f6251e49d22e2b625ac5dda7f WHIRLPOOL 60bd3e0374a60f6af62fe450488e8c68e18957283fff59d704f40e192da624bdf90d68c3cea41122e5b9ca440d218c3bd6d9d8091ed5226a2e9d1b9fdc2ce689
-DIST aegisub-3.1.2.tar.xz 4126244 SHA256 36ebfd05cc642b050da1e91ce2d2082b317a37bdfab109e191f861170d7cff86 SHA512 d15e16f9f98c01447b72cde1998c915a2bfc1aa918a4380b54303de8e88ef881f46c3896ab9dc5eddaf4f1376f0908abd8427dbf6af395e6e0b3969ddca402ab WHIRLPOOL fa7afa1a3e736a410d686bc14d173518267e4b1570a468d9871334f06af821040fe7f40d6ba3b1bece9350a70dd43613c4aedfe8480629a283c9a16a2f54ab6d
-DIST aegisub-3.1.3.tar.xz 4215196 SHA256 efea5bc2bc5e0651ada4f65cfdd8af1b422a15f87933710d11287bf51e2b5e58 SHA512 c406925623e7b8425df47d1cd31ef77d536861335d25c626ecb916ef091341a8156879430f094ffa1d27490a65f79e2edb84593609d589834f3411b2c2841297 WHIRLPOOL 12e40c2ce78e1659046d093d7d34b68b7ceda2744c36be0e15a71a379cc3ced4fb8cde2c364bbd3b7efa803f78229794d5d417c601ae140d79e0c0a9a2711fb0
DIST aegisub-3.2.2.tar.xz 5252052 SHA256 c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SHA512 54f825e52f238fef8d5cc31c37436e21355aee27883347f905271e5d2a8ff2a77e1b67d5aef38b0f8468bd0bad851fe944e02de27ec96310b902fbe5b1086722 WHIRLPOOL fe948edbb01f11385e14d1912b73942605df18325fcd95f4284a3c2edb73778d90d73038ac4a062e211fd56879590040e3c558fe1e361ec9fe2eee6a5c016448
diff --git a/media-video/aegisub/aegisub-2.1.9.ebuild b/media-video/aegisub/aegisub-2.1.9.ebuild
deleted file mode 100644
index 0f49837b22c2..000000000000
--- a/media-video/aegisub/aegisub-2.1.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-WX_GTK_VER="2.8"
-inherit autotools wxwidgets
-
-DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/"
-SRC_URI="https://rion-overlay.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug +ffmpeg lua nls openal oss portaudio pulseaudio spell"
-
-RDEPEND="
- x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
- virtual/opengl
- virtual/glu
- >=media-libs/libass-0.9.11[fontconfig]
- virtual/libiconv
- >=media-libs/fontconfig-2.4.2
- media-libs/freetype:2
-
- alsa? ( media-libs/alsa-lib )
- portaudio? ( =media-libs/portaudio-19* )
- pulseaudio? ( media-sound/pulseaudio )
- openal? ( media-libs/openal )
-
- lua? ( >=dev-lang/lua-5.1.1 )
-
- spell? ( >=app-text/hunspell-1.2 )
- ffmpeg? ( >=media-libs/ffmpegsource-2.17 )
-"
-DEPEND="${RDEPEND}
- dev-util/intltool
- virtual/pkgconfig
- media-gfx/imagemagick
-"
-
-src_prepare() {
- sh autogen.sh --skip-configure
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with alsa) \
- $(use_with oss) \
- $(use_with portaudio) \
- $(use_with pulseaudio) \
- $(use_with openal) \
- $(use_with lua) \
- $(use_with ffmpeg ffms) \
- $(use_with spell hunspell) \
- $(use_enable debug) \
- $(use_enable nls)
-}
diff --git a/media-video/aegisub/aegisub-3.1.2.ebuild b/media-video/aegisub/aegisub-3.1.2.ebuild
deleted file mode 100644
index 9152199e3bea..000000000000
--- a/media-video/aegisub/aegisub-3.1.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-WX_GTK_VER="3.0"
-PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW"
-inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils
-
-DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/"
-SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
-
-REQUIRED_USE="
- || ( alsa openal oss portaudio pulseaudio )
-"
-
-RDEPEND="
- >=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?]
- virtual/opengl
- virtual/glu
- >=media-libs/libass-0.10.0[fontconfig]
- virtual/libiconv
- >=dev-lang/lua-5.1.1
- >=dev-libs/boost-1.52.0:=[icu,nls,threads]
- >=dev-libs/icu-4.8.1.1:=
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2.3.5:2
-
- alsa? ( >=media-libs/alsa-lib-1.0.16 )
- portaudio? ( =media-libs/portaudio-19* )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.5 )
- openal? ( media-libs/openal )
-
- spell? ( >=app-text/hunspell-1.2.2 )
- ffmpeg? ( >=media-libs/ffmpegsource-2.17:= )
- fftw? ( >=sci-libs/fftw-3.3 )
-"
-DEPEND="${RDEPEND}
- oss? ( virtual/os-headers )
- >=sys-devel/gettext-0.18
- dev-util/intltool
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
- my_rm_loc() {
- sed -i -e "s:${1}\.po::" po/Makefile || die
- rm "po/${1}.po" || die
- }
-
- l10n_find_plocales_changes 'po' '' '.po'
- if [ -z "$(l10n_get_locales)" ]; then
- sed -e 's/^\s*po\s*$//' -i Makefile || die
- else
- l10n_for_each_disabled_locale_do my_rm_loc
- fi
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # testing openal does not work in sandbox, bug #508184
- use openal && export agi_cv_with_openal="yes"
- local myeconfargs=(
- $(use_with alsa)
- $(use_with oss)
- $(use_with portaudio)
- $(use_with pulseaudio libpulse)
- $(use_with openal)
- $(use_with ffmpeg ffms2)
- $(use_with fftw fftw3)
- $(use_with spell hunspell)
- $(use_enable debug)
- )
- autotools-utils_src_configure
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-video/aegisub/aegisub-3.1.3.ebuild b/media-video/aegisub/aegisub-3.1.3.ebuild
deleted file mode 100644
index 78f1562b10ec..000000000000
--- a/media-video/aegisub/aegisub-3.1.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-WX_GTK_VER="3.0"
-PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW"
-inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils
-
-DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/"
-SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
-
-REQUIRED_USE="
- || ( alsa openal oss portaudio pulseaudio )
-"
-
-RDEPEND="
- >=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?]
- virtual/opengl
- virtual/glu
- >=media-libs/libass-0.10.0[fontconfig]
- virtual/libiconv
- >=dev-libs/boost-1.53.0:=[icu,nls,threads]
- >=dev-libs/icu-4.8.1.1:=
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2.3.5:2
-
- alsa? ( >=media-libs/alsa-lib-1.0.16 )
- portaudio? ( =media-libs/portaudio-19* )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.5 )
- openal? ( media-libs/openal )
-
- spell? ( >=app-text/hunspell-1.2.2 )
- ffmpeg? ( >=media-libs/ffmpegsource-2.17:= )
- fftw? ( >=sci-libs/fftw-3.3 )
-"
-DEPEND="${RDEPEND}
- oss? ( virtual/os-headers )
- >=sys-devel/gettext-0.18
- dev-util/intltool
- virtual/pkgconfig
-"
-
-src_prepare() {
- my_rm_loc() {
- sed -i -e "s:${1}\.po::" po/Makefile || die
- rm "po/${1}.po" || die
- }
-
- l10n_find_plocales_changes 'po' '' '.po'
- if [ -z "$(l10n_get_locales)" ]; then
- sed -e 's/^\s*po\s*$//' -i Makefile || die
- else
- l10n_for_each_disabled_locale_do my_rm_loc
- fi
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # testing openal does not work in sandbox, bug #508184
- use openal && export agi_cv_with_openal="yes"
- local myeconfargs=(
- $(use_with alsa)
- $(use_with oss)
- $(use_with portaudio)
- $(use_with pulseaudio libpulse)
- $(use_with openal)
- $(use_with ffmpeg ffms2)
- $(use_with fftw fftw3)
- $(use_with spell hunspell)
- $(use_enable debug)
- )
- autotools-utils_src_configure
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-video/aegisub/aegisub-3.2.2.ebuild b/media-video/aegisub/aegisub-3.2.2.ebuild
index 7472992e502f..afdf4afbc5c8 100644
--- a/media-video/aegisub/aegisub-3.2.2.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
# configure.ac specifies minimal versions for some of the dependencies below.
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index f7d68891b3c4..4474823fc383 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -61,7 +61,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.2.2-fix-lua-regexp.patch"
"${FILESDIR}/${P}-unbundle-luajit.patch"
"${FILESDIR}/${P}-add-missing-pthread-flags.patch"
- "${FILESDIR}/${P}-respect-user-compiler-flags.patch"
+ "${FILESDIR}/${PN}-3.2.2-respect-user-compiler-flags.patch"
)
pkg_pretend() {
diff --git a/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
index c1aa14a3c83c..ed45de7a9bd3 100644
--- a/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
+++ b/media-video/aegisub/files/aegisub-3.2.2-add-missing-pthread-flags.patch
@@ -1,16 +1,40 @@
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index c93b9dc..8c5678a 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -99,7 +99,7 @@ LIBS_LIBPULSE = @LIBPULSE_LIBS@
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a
+ LIBS_OPENAL = @OPENAL_LIBS@
+ LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
+-LIBS_PTHREAD = @PTHREAD_LIBS@
++LIBS_PTHREAD = @PTHREAD_LIBS@ -lpthread
+
+ ifeq (yes, $(BUILD_DARWIN))
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
+diff --git a/libaegisub/Makefile b/libaegisub/Makefile
+index 64204ef..178044d 100644
+--- a/libaegisub/Makefile
++++ b/libaegisub/Makefile
+@@ -41,7 +41,8 @@ aegisub_OBJ += $(d)common/dispatch.o
+ endif
+
+ aegisub_PCH := $(d)lagi_pre.h
+-aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
++aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC \
++ $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
+
+ $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
+ $(d)common/parser.o_FLAGS := -ftemplate-depth=256
diff --git a/tools/Makefile b/tools/Makefile
-index 81bcef3..f9a6cd3 100644
+index 81bcef3..d9f64b8 100644
--- a/tools/Makefile
+++ b/tools/Makefile
-@@ -7,8 +7,9 @@ PROGRAM += $(d)osx-bundle-restart-helper
+@@ -7,7 +7,7 @@ PROGRAM += $(d)osx-bundle-restart-helper
endif
repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
-repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU)
--repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
+repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
-+repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \
-+ $(CFLAGS_ICU) $(CFLAGS_PTHREAD)
+ repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
PROGRAM += $(d)repack-thes-dict
-
diff --git a/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
index caecf82a7ff6..3cb268615b3b 100644
--- a/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
+++ b/media-video/aegisub/files/aegisub-3.2.2-respect-user-compiler-flags.patch
@@ -28,3 +28,23 @@ index be657b0..fca48e0 100644
])
])
+diff --git a/src/Makefile b/src/Makefile
+index 60d7101..1f7b2bc 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -182,14 +182,13 @@ endif
+ #####################
+ # SOURCE-LEVEL CFLAGS
+ #####################
+-$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized
+ $(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
+ $(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2)
+ $(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE)
+ $(d)charset_detect.o_FLAGS := -D_X86_
+ $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
+ $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS)
+-$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
++$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS)
+ $(d)text_file_reader.o_FLAGS := -D_X86_
+ $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2)
+ $(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include
diff --git a/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch
index de0907229dba..ff033cb969e7 100644
--- a/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch
+++ b/media-video/aegisub/files/aegisub-3.2.2-unbundle-luajit.patch
@@ -28,6 +28,22 @@ index c93b9dc..ae018c3 100644
FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
#####################
+diff --git a/automation/Makefile b/automation/Makefile
+index 45a5ce2..db51a61 100644
+--- a/automation/Makefile
++++ b/automation/Makefile
+@@ -12,9 +12,9 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_
+ $(DESTDIR)$(P_DATA)/automation/%: $(d)%
+ $(MKDIR_INSTALL)
+
+-aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
++aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a
+ aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
+-aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU)
++aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA)
+
+ PROGRAM += $(d)aegisub-lua
+
diff --git a/configure.ac b/configure.ac
index be657b0..de586d5 100644
--- a/configure.ac
@@ -62,7 +78,7 @@ index 61c8ba1..050472d 100644
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
diff --git a/src/Makefile b/src/Makefile
-index 60d7101..757bdc6 100644
+index 60d7101..1d4779c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui
@@ -70,8 +86,8 @@ index 60d7101..757bdc6 100644
src_CXXFLAGS := $(CXXFLAGS_WX)
src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU)
-+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) \
-+ $(LIBS_LUA)
++ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \
++ $(LIBS_ICU) $(LIBS_LUA)
src_PCH := $(d)agi_pre.h
src_INSTALLNAME := $(AEGISUB_COMMAND)
diff --git a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
index 1d709fe18fdd..363136134e84 100644
--- a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
+++ b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
@@ -1,14 +1,27 @@
-diff --git a/tools/Makefile b/tools/Makefile
-index d9f64b8..f9a6cd3 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -8,7 +8,8 @@ endif
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index d1e1da4..699ac77 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -99,7 +99,7 @@ LIBS_LIBPULSE = @LIBPULSE_LIBS@
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a
+ LIBS_OPENAL = @OPENAL_LIBS@
+ LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
+-LIBS_PTHREAD = @PTHREAD_LIBS@
++LIBS_PTHREAD = @PTHREAD_LIBS@ -lpthread
- repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
- repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
--repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
-+repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \
-+ $(CFLAGS_ICU) $(CFLAGS_PTHREAD)
+ ifeq (yes, $(BUILD_DARWIN))
+ LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
+diff --git a/libaegisub/Makefile b/libaegisub/Makefile
+index 4efb685..f53c372 100644
+--- a/libaegisub/Makefile
++++ b/libaegisub/Makefile
+@@ -44,7 +44,8 @@ aegisub_OBJ += $(d)common/dispatch.o
+ endif
- PROGRAM += $(d)repack-thes-dict
+ aegisub_PCH := $(d)lagi_pre.h
+-aegisub_CPPFLAGS := -I$(d)include -I$(TOP) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
++aegisub_CPPFLAGS := -I$(d)include -I$(TOP) \
++ $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
+ $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
+ $(d)common/parser.o_FLAGS := -ftemplate-depth=256
diff --git a/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch
deleted file mode 100644
index ae1f5c1c1ea7..000000000000
--- a/media-video/aegisub/files/aegisub-9999-respect-user-compiler-flags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d0b5152..2609161 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -136,20 +136,17 @@ AS_IF([test x$build_darwin != xyes], [
- AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]]))
-
- AS_IF([test x$enable_compiler_flags != xno], [
-- CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-- CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-+ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
-+ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter"
-+ AC_C_FLAG([-std=gnu99])
- AC_CXX_FLAG([-std=c++11])
-- AC_CXX_FLAG([-Wno-c++11-narrowing])
- AC_C_FLAG([-Wno-unused-local-typedefs])
- AC_CXX_FLAG([-Wno-unused-local-typedefs])
-
- # -O* messes with debugging.
- AS_IF([test x$enable_debug = xyes], [
-- CFLAGS="$CFLAGS -O0"
-- CXXFLAGS="$CXXFLAGS -O0"
-- ], [
-- CFLAGS="$CFLAGS -O3"
-- CXXFLAGS="$CXXFLAGS -O3"
-+ CFLAGS="$CFLAGS -O0 -g"
-+ CXXFLAGS="$CXXFLAGS -O0 -g"
- ])
- ])
-
-diff --git a/src/Makefile b/src/Makefile
-index 08f9216..e2e5602 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -182,14 +182,13 @@ endif
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
--$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized
- $(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
- $(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2)
- $(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE)
- $(d)charset_detect.o_FLAGS := -D_X86_
- $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
- $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS)
--$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
-+$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS)
- $(d)text_file_reader.o_FLAGS := -D_X86_
- $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2)
- $(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include
diff --git a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
index 4eea654b2e06..cfae62ae7feb 100644
--- a/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
+++ b/media-video/aegisub/files/aegisub-9999-unbundle-luajit.patch
@@ -28,6 +28,22 @@ index d1e1da4..aa26b81 100644
FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
#####################
+diff --git a/automation/Makefile b/automation/Makefile
+index d5425b7..121aae7 100644
+--- a/automation/Makefile
++++ b/automation/Makefile
+@@ -12,9 +12,9 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_
+ $(DESTDIR)$(P_DATA)/automation/%: $(d)%
+ $(MKDIR_INSTALL)
+
+-aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
++aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a
+ aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
+-aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU)
++aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA)
+
+ PROGRAM += $(d)aegisub-lua
+
diff --git a/configure.ac b/configure.ac
index d0b5152..ecec4de 100644
--- a/configure.ac
@@ -62,7 +78,7 @@ index 61c8ba1..050472d 100644
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
diff --git a/src/Makefile b/src/Makefile
-index 08f9216..bb9233b 100644
+index 08f9216..53c60b6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui
@@ -70,8 +86,8 @@ index 08f9216..bb9233b 100644
src_CXXFLAGS := $(CXXFLAGS_WX)
src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU)
-+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) \
-+ $(LIBS_LUA)
++ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \
++ $(LIBS_ICU) $(LIBS_LUA)
src_PCH := $(d)agi_pre.h
src_INSTALLNAME := $(AEGISUB_COMMAND)
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 0db4f1fa72c9..1bd2c89bd572 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -208,7 +208,7 @@ RDEPEND="
>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
)
jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
- jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
diff --git a/media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch b/media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch
new file mode 100644
index 000000000000..a22136c9f5f8
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch
@@ -0,0 +1,14 @@
+Fix build with >=cmake-3.4
+
+Gentoo-bug: 568430
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,6 +59,7 @@
+ endif(NOT WIN32)
+
+
++include(CheckIncludeFiles)
+ check_include_files(stdint.h HAVE_STDINT_H)
+
+ configure_file (config-kmplayer.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmplayer.h )
diff --git a/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild b/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild
index 971fd3704453..84a1c41521fb 100644
--- a/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild
+++ b/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild
@@ -38,7 +38,10 @@ RDEPEND="${DEPEND}
media-video/mplayer
"
-PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-cmake34.patch"
+ "${FILESDIR}/${P}-kdelibs-4.14.11.patch"
+)
src_prepare() {
use npp && epatch "${FILESDIR}/${PN}-flash.patch"
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 79cf7504ac21..fd994cfb687e 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.9.7.tar.gz 5305589 SHA256 de6d0fd802c13fbaac4a3d0720e3de15f81b006fde0042a2df42d784b46b33ac SHA512 8d50673c5291381f5800c0e93341e6a01a4e40d9ac0b47ac1f48bbdfb883ed8e82e9fb9c50e48a667b45aa9903a88e4f680b7b7afe7d6913c5db0cc86030c133 WHIRLPOOL 346f4a64e4ec594deec592f9cf7b24d83357a1ec523eeeeed49e9370c68a82728f8431cbf5b54c0a3b9789b14ce18327ddd9194dd745a27c653db4938b70b1d6
-DIST makemkv-oss-1.9.7.tar.gz 4405814 SHA256 69fd254a2eb63e90f616051fde6cd7188c3ee454033bdf288c63843876a02e99 SHA512 842aecac301889116f24afa99f35bfe8acacc15a4544c6801742461c65f7f24e7bb2b75725cc22a64c2b6b3d6458eb991a6fa6b68ec61d2b559fd96a55472333 WHIRLPOOL 9856be4771628cee0ac2ceca8067926397f48d96ce5f3c250edaa7be4c3a149e8f00a1b9c51c9b1e905966ffbdae1c8544a07b38662767a6f1556f2c18fe1b74
+DIST makemkv-bin-1.9.8.tar.gz 5485398 SHA256 3c08a9881f5d45bc1117cad87948e25d718da497e656ae2360864a3cb526d201 SHA512 cc1621f950bd565ba9281aabe5b6294a9581c3d2644d8c19162f19594bb24c3a250fd42f29e5ebae5fd344b30431b34d47c1119ac5816954515536a3cfa9e7c3 WHIRLPOOL d32a72ceaaf685c9139067c5bf20ae61b55c14706c9585c1a89c8d92eba9bcf3d5c6ac701cf2c45f72cef2613a9e3f09720f6d47f9ebc2a669b4c89aca62701d
+DIST makemkv-oss-1.9.8.tar.gz 4419358 SHA256 15c6dde52430086ff9749750952ca0d2e0002017be2f8c30f9961ca4997ab065 SHA512 a797bba9774ab0fd2e36a2628e832acfa20cd1f00c82962662a01e8fcf97de80346a00d14aa977223ca1b53be1dc3c388ed5ec72178eceae255a6e852d69c5a8 WHIRLPOOL a7945d0067496fc976262029085f1304e182f37d0c315e911a54fad8ff1f39beaffe8fcbd05dd885e0149f72f766899d8171f602c24a6791244047cac57c3e3b
diff --git a/media-video/makemkv/files/makemkv-qt4.patch b/media-video/makemkv/files/makemkv-qt4.patch
new file mode 100644
index 000000000000..cbc2fa08f1ad
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-qt4.patch
@@ -0,0 +1,34 @@
+--- makemkv-oss-1.9.8/configure.orig 2015-12-20 16:22:19.000000000 +0000
++++ makemkv-oss-1.9.8/configure 2015-12-26 23:59:44.601387071 +0000
+@@ -5048,6 +5048,7 @@
+ if test "$enable_gui" != "no"; then
+
+
++: '
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt5" >&5
+ $as_echo_n "checking for qt5... " >&6; }
+@@ -5105,6 +5106,7 @@
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$qt5_PKG_ERRORS" >&5
++'
+
+
+
+@@ -5271,6 +5273,7 @@
+
+ fi
+
++: '
+ else
+ qt5_CFLAGS=$pkg_cv_qt5_CFLAGS
+ qt5_LIBS=$pkg_cv_qt5_LIBS
+@@ -5283,6 +5286,7 @@
+ QT_MOC="$qt5_host_bins/moc";
+
+ fi
++'
+
+ QT_INC=$QT_INC
+
diff --git a/media-video/makemkv/files/makemkv-qt5.patch b/media-video/makemkv/files/makemkv-qt5.patch
new file mode 100644
index 000000000000..58b5e4145a4b
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-qt5.patch
@@ -0,0 +1,28 @@
+--- makemkv-oss-1.9.8/configure.orig 2015-12-20 16:22:19.000000000 +0000
++++ makemkv-oss-1.9.8/configure 2015-12-27 00:05:18.659860655 +0000
+@@ -5108,6 +5108,7 @@
+
+
+
++: '
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt4" >&5
+ $as_echo_n "checking for qt4... " >&6; }
+@@ -5257,7 +5258,9 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+
++'
+ as_fn_error $? "Qt library (version 5 or 4) is required to build GUI" "$LINENO" 5
++: '
+
+ else
+ qt4_CFLAGS=$pkg_cv_qt4_CFLAGS
+@@ -5270,6 +5273,7 @@
+ QT_MOC=`$PKG_CONFIG --variable moc_location "QtCore" 2>/dev/null`;
+
+ fi
++'
+
+ else
+ qt5_CFLAGS=$pkg_cv_qt5_CFLAGS
diff --git a/media-video/makemkv/makemkv-1.9.7.ebuild b/media-video/makemkv/makemkv-1.9.8-r1.ebuild
index 74150adfc94b..252dc7308f67 100644
--- a/media-video/makemkv/makemkv-1.9.7.ebuild
+++ b/media-video/makemkv/makemkv-1.9.8-r1.ebuild
@@ -16,7 +16,8 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="libav multilib qt4"
+IUSE="libav multilib qt4 qt5"
+REQUIRED_USE="?? ( qt4 qt5 )"
QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
@@ -26,11 +27,16 @@ RDEPEND="
dev-libs/openssl:0
sys-libs/zlib
qt4? (
- virtual/opengl
dev-qt/qtcore:4
dev-qt/qtdbus:4
dev-qt/qtgui:4
)
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
!libav? ( >=media-video/ffmpeg-1.0.0:0= )
libav? ( >=media-video/libav-0.8.9:0= )
"
@@ -40,14 +46,25 @@ S=${WORKDIR}/makemkv-oss-${PV}
src_prepare() {
epatch "${FILESDIR}"/${PN}-{makefile,path}.patch
+
+ # Qt5 always trumps Qt4 if it is available. There are no configure
+ # options or variables to control this and there is no publicly
+ # available configure.ac either.
+ if use qt4; then
+ epatch "${FILESDIR}"/${PN}-qt4.patch
+ elif use qt5; then
+ epatch "${FILESDIR}"/${PN}-qt5.patch
+ fi
}
src_configure() {
+ # See bug #439380.
replace-flags -O* -Os
- local args=""
- use qt4 || args="--disable-gui"
- if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
- econf $args
+
+ if use qt4 || use qt5; then
+ econf --enable-gui
+ else
+ econf --disable-gui
fi
}
@@ -68,7 +85,7 @@ src_install() {
dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so.0.${PV}
into /opt
- if use qt4; then
+ if use qt4 || use qt5; then
dobin out/makemkv
local res
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index efbc55fe086d..93aba3fd045a 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,8 +1,2 @@
-DIST mkvtoolnix-6.6.0.tar.xz 5174424 SHA256 cb1f965617fe064cf78457d3fbd0685eb31ae5b7e205cf4c8e74b6f27f3399e3 SHA512 c86f10a0a919e6d28c2587b60663c38713cfa6ca0a5188524b81af2fd60e4ea626a01431d29c6ae5885eae05d71af93d857986c5008aec4963dacc3ead9dc26f WHIRLPOOL 55a15bb2fdb62af85e189c39b1a1391d33eb08b4ba116fc307965be6817a944b21d18c034b9a3da16a6e84e93544dbd59f3c7fe9406ab454e15cf8ee1eb815c3
-DIST mkvtoolnix-8.2.0.tar.xz 5856988 SHA256 eb6d3d7a0254bb4326dccc9983418801783198cdf4a259f31261dab4e843a5c4 SHA512 200fad08f6912081d7aabbae9330dc41b90af8d6fdce592090b9fedf2325a91f70d3a85ff40b03b57b0682a075050b6b73307872c1e716e8261849c3fb97968b WHIRLPOOL 1b25cd8913eb02018d62de369171ee1a48d31cbce6684c0c7febd2f88c3286bbf386c825ddeae54ef411dc14cc128c9e833408f9b0ac9cb1d5e525ba34aaa4ae
-DIST mkvtoolnix-8.3.0.tar.xz 5863384 SHA256 87bd82222995d35c310a426ed43e0b27cbfefa0caadcbcca8296787314affc37 SHA512 fb3ac11480c20ae360fef9081991876ef2d7a717f24ec631bb8482ee7d22f79164aafeaf561dee503f1c0a83fe3ed6db319b420c34d638450aada762e6eb00c0 WHIRLPOOL b3cd3f4785c891c75eac3754136aa0b709ff0e784eea6d0e915478eea6fbdbe7132c56a997a007ba6d690649b6caaae46a8b45ae055aab7ae557486d99aab417
-DIST mkvtoolnix-8.4.0.tar.xz 3234284 SHA256 f6a5506d14a0b16abb3765d6f78cded0267e01096926b30e8f72df9d30aaf878 SHA512 ab9ab49baf06a8ef713872a09c58fdb1560628dbe3b2b661d809972f56a36c751a390a78ae260624510963b92e177d090088030bb96f9ab9e96e1a372772d22f WHIRLPOOL 811a0466413bdba84959c5ae84d637aba4371018ee3deed70d65f24472c0bf6a714003574efb4e4dcdc3bfb1b3c48595a347ab0bcdd935a9b49e2f1ab4c36c58
-DIST mkvtoolnix-8.5.0.tar.xz 3280556 SHA256 ec3f4566dbc324c3bda7314c70d87046136664d72888945f9fdb8d129e1e05a3 SHA512 18f1bac6ba46d3ec3235d4b8ec8fc9bd0b5993344205172f254d3ca8aa7afdb399d81d9e7d8b24fe004661c83757e82b4874865acaa231e7721b1d8382adfdd3 WHIRLPOOL 453a55adf80fca61be3b102c39ccd48aa057983e8e3d4aea563ffe67ad86ded6889f0e1926e600556d43c4fccacdc79facd6438b8dccb9591a6e86de2919e8b1
-DIST mkvtoolnix-8.5.1.tar.xz 3288800 SHA256 db9ae151ef236afac190c0137d8d4df4e43c105dbd298e3913b5afae1fdd5b43 SHA512 cf2d254df0851f4450a59b187ec9c4d293c1128d062ab12d098bc77ea4c2213a2d5b78989ee170789aa2bac9c23a531ed7b87f6d7206f03ee73a0821c021fffa WHIRLPOOL 7a7858fd6f22c9bf812cb28528f7612a3fb7a7056889534e24a45fe1bc88e69c9c6220088cd45e66f2072150b876af7eeaa417b2f7f02dff19c1ea4d03853ba9
DIST mkvtoolnix-8.5.2.tar.xz 3304356 SHA256 efaae6d5e3d0963e2f53ae9c45f151be28561a6c6a28fad46e6220baf9862bbc SHA512 14a2d3d20499ccc2cfd0b1cfbbaa66def6ba512df0624f3e79d317670c4c17bf6552b9e62daed225b369fbab2fad3ce98877ccb7583096cd61da4c91ffed54ef WHIRLPOOL 536bbf36ac76e46d0205f5b2db58d986065ba38acd513129e0604154130cdf8861f3d8a52cb341980161b302f2853199c031b9908665ff13d2bb7db193a56a66
DIST mkvtoolnix-8.6.1.tar.xz 3242840 SHA256 815d8355b6a83af01c957543cee8716f1dad53e03b2ecf58b821099cd3c8fa77 SHA512 f3b14547da01a3a1268ec9b356e830391da7058741d7d8b67dcc9df5098ae9617fece67b82d6a73324f95c7060b182d94929c637baa6b9c806b2d472937151e1 WHIRLPOOL d8f4f9d3b2db77820bc018f41ac5a864057f18b22ed7711fc5c7bc3996b31041606a244b4f06b19abbaec6686990834c37ab27d5e58dd37b7c8313b24afdca51
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch
deleted file mode 100644
index 72b94b9688c8..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/ac/ax_boost_filesystem.m4 b/ac/ax_boost_filesystem.m4
-index 97c4ad0..87b94a8 100644
---- a/ac/ax_boost_filesystem.m4
-+++ b/ac/ax_boost_filesystem.m4
-@@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
- AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- if test "x$ax_boost_user_filesystem_lib" = "x"; then
-- for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_filesystem.*\)\.so.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.a.*$,\1,'`; do
-+ for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.\(dylib\|a\|so\).*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
- [link_filesystem="no"],[$BOOST_SYSTEM_LIB])
- done
- if test "x$link_filesystem" != "xyes"; then
-- for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
-+ for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.dll* $BOOSTLIBDIR/boost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.\(dll\|a\).*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-diff --git a/ac/ax_boost_regex.m4 b/ac/ax_boost_regex.m4
-index ffd537f..2cef64f 100644
---- a/ac/ax_boost_regex.m4
-+++ b/ac/ax_boost_regex.m4
-@@ -75,14 +75,14 @@ AC_DEFUN([AX_BOOST_REGEX],
- AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- if test "x$ax_boost_user_regex_lib" = "x"; then
-- for libextension in `ls $BOOSTLIBDIR/libboost_regex*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_regex.*\)\.so.*$,\1,' -e 's,^lib\(boost_regex.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_regex.*\)\.a.*$,\1,'`; do
-+ for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* $BOOSTLIBDIR/libboost_regex*.dylib* $BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.dylib.*;\1;' -e 's;^lib\(boost_regex.*\)\.a.*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
- [link_regex="no"])
- done
- if test "x$link_regex" != "xyes"; then
-- for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a*$;\1;'` ; do
-+ for libextension in `ls $BOOSTLIBDIR/boost_regex*.dll* $BOOSTLIBDIR/boost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a.*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-diff --git a/ac/ax_boost_system.m4 b/ac/ax_boost_system.m4
-index b0685b9..a71907b 100644
---- a/ac/ax_boost_system.m4
-+++ b/ac/ax_boost_system.m4
-@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
-
- LDFLAGS_SAVE=$LDFLAGS
- if test "x$ax_boost_user_system_lib" = "x"; then
-- for libextension in `ls $BOOSTLIBDIR/libboost_system*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_system.*\)\.so.*$,\1,' -e 's,^lib\(boost_system.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_system.*\)\.a.*$,\1,'`; do
-+ for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
- [link_system="no"])
- done
- if test "x$link_system" != "xyes"; then
-- for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
-+ for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch
deleted file mode 100644
index a3fcf21947e5..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mkvtoolnix-5.8.0/rake.d/target.rb
-+++ mkvtoolnix-5.8.0/rake.d/target.rb
-@@ -107,7 +107,6 @@
- when :mtxunittest then "tests/unit/libmtxunittest.a"
- when :avi then "lib/avilib-0.6.10/libavi.a"
- when :rmff then "lib/librmff/librmff.a"
-- when :pugixml then "lib/pugixml/src/libpugixml.a"
- when :mpegparser then "src/mpegparser/libmpegparser.a"
- when :ebml then c?("EBML_MATROSKA_INTERNAL") ? "lib/libebml/src/libebml.a" : nil
- when :matroska then c?("EBML_MATROSKA_INTERNAL") ? "lib/libmatroska/src/libmatroska.a" : nil
---- mkvtoolnix-5.8.0/Rakefile
-+++ mkvtoolnix-5.8.0/Rakefile
-@@ -55,8 +55,8 @@
- $applications = $programs.collect { |name| "src/#{$application_subdirs[name]}#{name}" + c(:EXEEXT) }
- $manpages = $programs.collect { |name| "doc/man/#{name}.1" }
-
-- $system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Ilib/pugixml/src -Isrc"
-- $system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Llib/pugixml/src -Lsrc/common"
-+ $system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Isrc"
-+ $system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common"
-
- $source_directories = %w{lib/avilib-0.6.10 lib/librmff src src/input src/output src/common src/common/chapters src/common/compression src/common/strings src/common/tags src/common/xml
- src/mmg src/mmg/header_editor src/mmg/options src/mmg/tabs src/extract src/propedit src/merge src/info src/mpegparser}
-@@ -605,7 +605,6 @@
-
- [ { :name => 'avi', :dir => 'lib/avilib-0.6.10' },
- { :name => 'rmff', :dir => 'lib/librmff' },
-- { :name => 'pugixml', :dir => 'lib/pugixml/src' },
- { :name => 'mpegparser', :dir => 'src/mpegparser' },
- { :name => 'mtxcommon', :dir => [ 'src/common' ] + %w{chapters compression strings tags xml }.collect { |e| "src/common/#{e}" } },
- { :name => 'mtxinput', :dir => 'src/input' },
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch b/media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch
deleted file mode 100644
index c99d06b52de5..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nuar mkvtoolnix-6.6.0/src/common/iso639.cpp mkvtoolnix-6.6.0-fix/src/common/iso639.cpp
---- mkvtoolnix-6.6.0/src/common/iso639.cpp 2013-12-01 16:51:35.000000000 +0000
-+++ mkvtoolnix-6.6.0-fix/src/common/iso639.cpp 2015-02-09 07:00:26.134735208 +0000
-@@ -13,6 +13,7 @@
-
- #include "common/common_pch.h"
-
-+#include <boost/version.hpp>
- #include <unordered_map>
-
- #include "common/iso639.h"
-@@ -590,20 +591,36 @@
- auto range = iso639_languages | badap::indexed(0);
- auto end = boost::end(range);
- for (auto lang = boost::begin(range); lang != end; lang++) {
-- auto names = split(lang->english_name, ";");
-+#if BOOST_VERSION < 105600
-+ auto const &english_name = lang->english_name;
-+ auto index = lang.index();
-+#else
-+ auto const &english_name = lang->value().english_name;
-+ auto index = lang->index();
-+#endif
-+
-+ auto names = split(english_name, ";");
- strip(names);
- if (brng::find(names, s) != names.end())
-- return lang.index();
-+ return index;
- }
-
- if (!allow_short_english_name)
- return -1;
-
- for (auto lang = boost::begin(range); lang != end; lang++) {
-- auto names = split(lang->english_name, ";");
-+#if BOOST_VERSION < 105600
-+ auto const &english_name = lang->english_name;
-+ auto index = lang.index();
-+#else
-+ auto const &english_name = lang->value().english_name;
-+ auto index = lang->index();
-+#endif
-+
-+ auto names = split(english_name, ";");
- strip(names);
- if (names.end() != brng::find_if(names, [&](std::string const &name) { return balg::istarts_with(name, s); }))
-- return lang.index();
-+ return index;
- }
-
- return -1;
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch b/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch
deleted file mode 100644
index 67ce30fdbbc6..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mkvtoolnix-gui/main_window/main_window.cpp
-+++ b/src/mkvtoolnix-gui/main_window/main_window.cpp
-@@ -118,7 +118,7 @@ MainWindow::setupMenu() {
- #if defined(HAVE_CURL_EASY_H)
- connect(ui->actionHelpCheckForUpdates, &QAction::triggered, this, &MainWindow::checkForUpdates);
- #else
-- ui->actionGUICheckForUpdates->setVisible(false);
-+ ui->actionHelpCheckForUpdates->setVisible(false);
- #endif // HAVE_CURL_EASY_H
- }
-
diff --git a/media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild
deleted file mode 100644
index d7c1bba42547..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch qt4 wxwidgets"
-
-RDEPEND="
- >=dev-libs/libebml-1.3.0:=
- >=media-libs/libmatroska-1.4.1:=
- >=dev-libs/boost-1.46.0:=
- dev-libs/pugixml
- media-libs/flac
- media-libs/libogg
- media-libs/libvorbis
- sys-apps/file
- >=sys-devel/gcc-4.6
- sys-libs/zlib
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- wxwidgets? ( x11-libs/wxGTK:2.8[X] )
-"
-DEPEND="${RDEPEND}
- dev-lang/ruby
- virtual/pkgconfig
-"
-
-pkg_pretend() {
- # https://bugs.gentoo.org/419257
- local ver=4.6
- local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
- if ! version_is_at_least ${ver} $(gcc-version); then
- eerror ${msg}
- die ${msg}
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-5.8.0-system-pugixml.patch \
- "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch \
- "${FILESDIR}"/${PN}-6.6.0-boost-1.56.patch
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use wxwidgets ; then
- WX_GTK_VER="2.8"
- need-wxwidgets unicode
- myconf="--with-wx-config=${WX_CONFIG}"
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt4 qt) \
- $(use_enable wxwidgets) \
- $(usex pch "" --disable-precompiled-headers) \
- ${myconf} \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
- --without-curl
-}
-
-src_compile() {
- ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
- DESTDIR="${D}" ./drake -j$(makeopts_jobs) install || die
-
- dodoc AUTHORS ChangeLog README TODO
- doman doc/man/*.1
-
- use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild
deleted file mode 100644
index f7fa4eb240fa..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-8.2.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl debug pch qt5 wxwidgets"
-
-ruby_atom() {
- local ruby_slot=${1/ruby/}
- ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
- echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# 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=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
- echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
- >=dev-libs/boost-1.46.0:=
- >=dev-libs/libebml-1.3.1:=
- dev-libs/pugixml
- media-libs/flac
- >=media-libs/libmatroska-1.4.2:=
- media-libs/libogg
- media-libs/libvorbis
- sys-apps/file
- >=sys-devel/gcc-4.6
- sys-libs/zlib
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- )
- wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}
- || ( ${RUBY_BDEPS} )
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-pkg_pretend() {
- # https://bugs.gentoo.org/419257
- local ver=4.6
- local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
- if ! version_is_at_least ${ver} $(gcc-version); then
- eerror ${msg}
- die ${msg}
- fi
-}
-
-src_prepare() {
- local ruby_impl
- for ruby_impl in "${RUBY_IMPLS[@]}"; do
- if has_version "$(ruby_atom ${ruby_impl})"; then
- export RUBY=${ruby_impl}
- break
- fi
- done
- [[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
- epatch "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
- epatch "${FILESDIR}"/${P}-fix-curl-support.patch #555340
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- --with-mkvtoolnix-gui
- )
- fi
-
- if use wxwidgets ; then
- need-wxwidgets unicode
- myconf+=( --with-wx-config=${WX_CONFIG} )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(use_enable wxwidgets) \
- $(use_with curl) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
- DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
- dodoc AUTHORS ChangeLog README.md TODO
- doman doc/man/*.1
-
- use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.3.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.3.0.ebuild
deleted file mode 100644
index bb94e9e1f803..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-8.3.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl debug pch qt5 wxwidgets"
-
-ruby_atom() {
- local ruby_slot=${1/ruby/}
- ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
- echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# 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=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
- echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
- >=dev-libs/boost-1.46.0:=
- >=dev-libs/libebml-1.3.1:=
- dev-libs/pugixml
- media-libs/flac
- >=media-libs/libmatroska-1.4.2:=
- media-libs/libogg
- media-libs/libvorbis
- sys-apps/file
- >=sys-devel/gcc-4.6
- sys-libs/zlib
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- )
- wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}
- || ( ${RUBY_BDEPS} )
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-pkg_pretend() {
- # https://bugs.gentoo.org/419257
- local ver=4.6
- local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
- if ! version_is_at_least ${ver} $(gcc-version); then
- eerror ${msg}
- die ${msg}
- fi
-}
-
-src_prepare() {
- local ruby_impl
- for ruby_impl in "${RUBY_IMPLS[@]}"; do
- if has_version "$(ruby_atom ${ruby_impl})"; then
- export RUBY=${ruby_impl}
- break
- fi
- done
- [[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- --with-mkvtoolnix-gui
- )
- fi
-
- if use wxwidgets ; then
- need-wxwidgets unicode
- myconf+=( --with-wx-config=${WX_CONFIG} )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(use_enable wxwidgets) \
- $(use_with curl) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
- DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
- dodoc AUTHORS ChangeLog README.md TODO
- doman doc/man/*.1
-
- use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild
deleted file mode 100644
index 9c244eb82a98..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-8.4.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl debug pch test qt5"
-
-ruby_atom() {
- local ruby_slot=${1/ruby/}
- ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
- echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# 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=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
- echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
- >=dev-libs/boost-1.46.0:=
- >=dev-libs/libebml-1.3.1:=
- dev-libs/pugixml
- media-libs/flac
- >=media-libs/libmatroska-1.4.2:=
- 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
- )
-"
-DEPEND="${RDEPEND}
- || ( ${RUBY_BDEPS} )
- sys-devel/gettext
- virtual/pkgconfig
- test? ( dev-cpp/gtest )
-"
-
-pkg_pretend() {
- # https://bugs.gentoo.org/419257
- local ver=4.6
- local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
- if ! version_is_at_least ${ver} $(gcc-version); then
- eerror ${msg}
- die ${msg}
- fi
-}
-
-src_prepare() {
- local ruby_impl
- for ruby_impl in "${RUBY_IMPLS[@]}"; do
- if has_version "$(ruby_atom ${ruby_impl})"; then
- export RUBY=${ruby_impl}
- break
- fi
- done
- [[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(use_with curl) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
- DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
- dodoc AUTHORS ChangeLog README.md
- doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild
deleted file mode 100644
index 9c244eb82a98..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-8.5.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl debug pch test qt5"
-
-ruby_atom() {
- local ruby_slot=${1/ruby/}
- ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
- echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# 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=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
- echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
- >=dev-libs/boost-1.46.0:=
- >=dev-libs/libebml-1.3.1:=
- dev-libs/pugixml
- media-libs/flac
- >=media-libs/libmatroska-1.4.2:=
- 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
- )
-"
-DEPEND="${RDEPEND}
- || ( ${RUBY_BDEPS} )
- sys-devel/gettext
- virtual/pkgconfig
- test? ( dev-cpp/gtest )
-"
-
-pkg_pretend() {
- # https://bugs.gentoo.org/419257
- local ver=4.6
- local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
- if ! version_is_at_least ${ver} $(gcc-version); then
- eerror ${msg}
- die ${msg}
- fi
-}
-
-src_prepare() {
- local ruby_impl
- for ruby_impl in "${RUBY_IMPLS[@]}"; do
- if has_version "$(ruby_atom ${ruby_impl})"; then
- export RUBY=${ruby_impl}
- break
- fi
- done
- [[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(use_with curl) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
- DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
- dodoc AUTHORS ChangeLog README.md
- doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild
deleted file mode 100644
index 4d202519138f..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-8.5.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="curl debug pch test qt5"
-
-ruby_atom() {
- local ruby_slot=${1/ruby/}
- ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
- echo "dev-lang/ruby:${ruby_slot}"
-}
-
-# 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=( ruby22 ruby21 ruby20 )
-RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
- echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
-
-RDEPEND="
- >=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
- )
-"
-DEPEND="${RDEPEND}
- || ( ${RUBY_BDEPS} )
- sys-devel/gettext
- virtual/pkgconfig
- test? ( dev-cpp/gtest )
-"
-
-pkg_pretend() {
- # https://bugs.gentoo.org/419257
- local ver=4.6
- local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
- if ! version_is_at_least ${ver} $(gcc-version); then
- eerror ${msg}
- die ${msg}
- fi
-}
-
-src_prepare() {
- local ruby_impl
- for ruby_impl in "${RUBY_IMPLS[@]}"; do
- if has_version "$(ruby_atom ${ruby_impl})"; then
- export RUBY=${ruby_impl}
- break
- fi
- done
- [[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(use_with curl) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
- "${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
- DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
-
- dodoc AUTHORS ChangeLog README.md
- doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-8.5.2.ebuild b/media-video/mkvtoolnix/mkvtoolnix-8.5.2.ebuild
index d3857534ec2b..b5464217fe3b 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-8.5.2.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-8.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="curl debug pch test qt5"
ruby_atom() {
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 89e69f2dc92d..d701d23d5394 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,5 +1,5 @@
DIST mpv-0.11.0.tar.gz 2689655 SHA256 a2157174e46db46dad5deb1fde94283e72ebe922fd15447cb16a2a243fae5bda SHA512 f85da000770dbca09be2a59c4eda7e6d7142ca17328844d2b08a173f64554159f50ba9b32661ba67924b789e886940cda1add993862f02f295e7753f50388bdb WHIRLPOOL 1184f09435d6f30119143ab98ddd4767e53c701bdc5b850eb62c19607652a7103699a6b54a0d165acb548f4cced4179af6f7decbf64c8289ff56736e26ed7924
+DIST mpv-0.14.0.tar.gz 2872619 SHA256 042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233 SHA512 523bffe87d6743ac67cab090bb5f43363352491f663debf150e204b942daaaa85176f228011e306d58fa4a05ee962d4bc56b6f77ea943e3efe757417ad52b952 WHIRLPOOL b27f8acb21870c4d98e2a39ce78cf0e8923bdac5056adafedd242b687c0532cc51e338b9d5c2046155972adb99fd8f12f7d9ec2e78bdf4ed8ae1a295faedc0e9
DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
-DIST mpv-0.9.2_p20150824.tar.xz 1867384 SHA256 67fa5ce11740b83ceef8bc435d5ef17803f1ec328dd2fee93b67e46ccc195209 SHA512 1ae0fd4faa180472c023c0ba77a28f2d1319f597763d5249259d55a04387b5f6384e2c5a8ff78bb514dfda86c30ceb474c35e54468a29ad3fc6327c4baaf75cc WHIRLPOOL cb61758234f9186880def4dcb7cb7e54d03abd6734484b5691926e2514cae1bebef6f9a53465e2aa2710e4ad5dbe1875369d483489a5cb853c3fa756ff7e968a
DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e
diff --git a/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch b/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch
new file mode 100644
index 000000000000..6e17314ab7cf
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch
@@ -0,0 +1,37 @@
+For a lengthy discussion see https://github.com/mpv-player/mpv/issues/2631
+
+Upstream commits:
+https://github.com/mpv-player/mpv/commit/1a6f3c56ea6e7bf9928fc99469f8f5da4578f035
+https://github.com/mpv-player/mpv/commit/946bd52a1d1eb561ff8bb516ef6efcd02ca3ea1e
+
+diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c
+index 00cd535..f607c23 100644
+--- a/video/out/opengl/common.c
++++ b/video/out/opengl/common.c
+@@ -606,7 +606,13 @@ int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt,
+ }
+
+ #if HAVE_C11_TLS
+-static _Thread_local MPGLContext *current_context;
++#define MP_TLS _Thread_local
++#elif defined(__GNU__)
++#define MP_TLS __thread
++#endif
++
++#ifdef MP_TLS
++static MP_TLS MPGLContext *current_context;
+
+ static void * GLAPIENTRY get_native_display(const char *name)
+ {
+diff --git a/wscript b/wscript
+index a5e6914..969d9cc 100644
+--- a/wscript
++++ b/wscript
+@@ -718,7 +718,6 @@ video_output_features = [
+ }, {
+ 'name': 'vaapi-egl',
+ 'desc': 'VAAPI EGL',
+- 'deps': [ 'c11-tls' ], # indirectly
+ 'deps_any': [ 'vaapi-x-egl', 'vaapi-wayland' ],
+ 'func': check_true,
+ }, {
diff --git a/media-video/mpv/files/mpv-0.3.11-libav-9.patch b/media-video/mpv/files/mpv-0.3.11-libav-9.patch
deleted file mode 100644
index 7ab6516ebf90..000000000000
--- a/media-video/mpv/files/mpv-0.3.11-libav-9.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/demux/demux.c b/demux/demux.c
-index 0649175..bd16a7a 100644
---- a/demux/demux.c
-+++ b/demux/demux.c
-@@ -43,6 +43,7 @@
- #include "audio/format.h"
-
- #include <libavcodec/avcodec.h>
-+#include <libavutil/mem.h>
-
- // Demuxer list
- extern const struct demuxer_desc demuxer_desc_edl; \ No newline at end of file
diff --git a/media-video/mpv/files/mpv-fix-include-in-tests.patch b/media-video/mpv/files/mpv-fix-include-in-tests.patch
new file mode 100644
index 000000000000..b02011910e5f
--- /dev/null
+++ b/media-video/mpv/files/mpv-fix-include-in-tests.patch
@@ -0,0 +1,17 @@
+commit 867334395765ae7d2765e0834f9fd3dd5de53cab
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date: Tue Dec 22 17:10:12 2015 +0300
+
+ tests: fix #include
+
+diff --git a/test/gl_video.c b/test/gl_video.c
+index 253ab35..97fee94 100644
+--- a/test/gl_video.c
++++ b/test/gl_video.c
+@@ -1,5 +1,5 @@
+ #include "test_helpers.h"
+-#include "video/out/gl_video.h"
++#include "video/out/opengl/video.h"
+
+ static void test_scale_ambient_lux_limits(void **state) {
+ float x;
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 1bead13bde4c..d4ea40d4d1d7 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -19,16 +19,18 @@
<herd>video</herd>
<herd>proxy-maintainers</herd>
<use>
+ <flag name="archive">Enable support for various archive formats via <pkg>app-arch/libarchive</pkg></flag>
<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
<flag name="cli">Build mpv CLI player</flag>
<flag name="cdio">Enable CDDA support via <pkg>dev-libs/libcdio-paranoia</pkg></flag>
<flag name="doc-pdf">Build documentation in pdf format</flag>
<flag name="drm">Enable Kernel Mode Setting / Direct Rendering Manager based video output</flag>
- <flag name="egl">Enable EGL backend for X11 OpenGL video output (experimental)</flag>
- <flag name="enca">Enable support for charset discovery and conversion using <pkg>app-i18n/enca</pkg></flag>
- <flag name="jpeg">Enable support for saving screenshots to JPEG format</flag>
- <flag name="libguess">Enable support for charset discovery and conversion using <pkg>app-i18n/libguess</pkg></flag>
+ <flag name="egl">Enable support for various EGL-based video outputs</flag>
+ <flag name="enca">Enable subtitles charset discovery via <pkg>app-i18n/enca</pkg></flag>
+ <flag name="gbm">Enable Graphics Buffer Manager based EGL video output</flag>
+ <flag name="jpeg">Enable support for saving screenshots in JPEG format</flag>
+ <flag name="libguess">Enable subtitles charset discovery via <pkg>app-i18n/libguess</pkg></flag>
<flag name="libmpv">Build mpv shared library</flag>
<flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag>
<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
@@ -36,7 +38,8 @@
<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
<flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag>
<flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs</flag>
- <flag name="vf-dlopen">Install additional video filters for using with -vf dlopen</flag>
+ <flag name="uchardet">Enable subtitles charset discovery via <pkg>dev-libs/uchardet</pkg></flag>
+ <flag name="vf-dlopen">Install additional video filters to be used with -vf dlopen</flag>
</use>
<upstream>
<remote-id type="github">mpv-player/mpv</remote-id>
diff --git a/media-video/mpv/mpv-0.9.2_p20150824.ebuild b/media-video/mpv/mpv-0.11.0-r1.ebuild
index 5307fa21a1db..dc450c204e48 100644
--- a/media-video/mpv/mpv-0.9.2_p20150824.ebuild
+++ b/media-video/mpv/mpv-0.11.0-r1.ebuild
@@ -3,94 +3,85 @@
# $Id$
EAPI=5
+
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_REQ_USE='threads(+)'
-inherit eutils python-any-r1 waf-utils pax-utils fdo-mime gnome2-utils
-WAF_V="1.8.4"
+WAF_PV='1.8.12'
+
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 waf-utils
DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="http://mpv.io/"
-SRC_URI="http://ftp.waf.io/pub/release/waf-${WAF_V}"
-DOCS=( README.md etc/example.conf etc/input.conf )
+HOMEPAGE="https://mpv.io/"
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+ DOCS=( RELEASE_NOTES )
+else
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
inherit git-r3
-else
- SRC_URI+=" http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
- #DOCS+=( RELEASE_NOTES )
fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md etc/example.conf etc/input.conf )
# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
LICENSE="GPL-2+ BSD ISC"
SLOT="0"
-IUSE="+alsa bluray bs2b cdio +cli doc-pdf drm dvb +dvd egl +enca encode +iconv
-jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit openal
-+opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l vaapi
-vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
+# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output
+IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd egl +enca encode +iconv
+ jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit openal
+ +opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux test
+ uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
REQUIRED_USE="
|| ( cli libmpv )
- egl? ( opengl X )
+ egl? ( || ( X wayland ) )
enca? ( iconv )
- lcms? ( opengl )
+ lcms? ( || ( opengl egl ) )
libguess? ( iconv )
luajit? ( lua )
- opengl? ( || ( wayland X ) )
+ opengl? ( X )
pvr? ( v4l )
+ uchardet? ( iconv )
+ v4l? ( || ( alsa oss ) )
vaapi? ( X )
vdpau? ( X )
- wayland? ( opengl )
+ wayland? ( egl )
xinerama? ( X )
xscreensaver? ( X )
xv? ( X )
"
-RDEPEND="
- libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
+COMMON_DEPEND="
!libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] )
+ libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
sys-libs/zlib
- X? (
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/libXrandr-1.2.0
- opengl? (
- virtual/opengl
- egl? ( media-libs/mesa[egl] )
- )
- lcms? ( >=media-libs/lcms-2.6:2 )
- vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
- vdpau? ( >=x11-libs/libvdpau-0.2 )
- xinerama? ( x11-libs/libXinerama )
- xscreensaver? ( x11-libs/libXScrnSaver )
- xv? ( x11-libs/libXv )
- )
alsa? ( >=media-libs/alsa-lib-1.0.18 )
+ archive? ( >=app-arch/libarchive-3.0.0:= )
bluray? ( >=media-libs/libbluray-0.3.0 )
- bs2b? ( media-libs/libbs2b )
- cdio? (
- dev-libs/libcdio
- dev-libs/libcdio-paranoia
- )
+ cdda? ( dev-libs/libcdio-paranoia )
drm? ( x11-libs/libdrm )
dvb? ( virtual/linuxtv-dvb-headers )
dvd? (
- >=media-libs/libdvdread-4.1.3
>=media-libs/libdvdnav-4.2.0
+ >=media-libs/libdvdread-4.1.0
+ )
+ egl? ( media-libs/mesa[egl,wayland(-)?] )
+ iconv? (
+ virtual/libiconv
+ enca? ( app-i18n/enca )
+ libguess? ( >=app-i18n/libguess-1.0 )
+ uchardet? ( dev-libs/uchardet )
)
- enca? ( app-i18n/enca )
- iconv? ( virtual/libiconv )
jack? ( media-sound/jack-audio-connection-kit )
jpeg? ( virtual/jpeg:0 )
- ladspa? ( media-libs/ladspa-sdk )
+ lcms? ( >=media-libs/lcms-2.6:2 )
libass? (
- >=media-libs/libass-0.12.1:=[enca?,fontconfig]
+ >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
virtual/ttf-fonts
)
libcaca? ( >=media-libs/libcaca-0.99_beta18 )
- libguess? ( >=app-i18n/libguess-1.0 )
lua? (
!luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
luajit? ( dev-lang/luajit:2 )
@@ -99,61 +90,73 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
rubberband? ( >=media-libs/rubberband-1.8.0 )
samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl2[threads] )
+ sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
v4l? ( media-libs/libv4l )
wayland? (
>=dev-libs/wayland-1.6.0
- media-libs/mesa[egl,wayland]
>=x11-libs/libxkbcommon-0.3.0
)
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/libXrandr-1.2.0
+ opengl? (
+ x11-libs/libXdamage
+ virtual/opengl
+ )
+ vaapi? ( >=x11-libs/libva-1.2.0[X] )
+ vdpau? ( >=x11-libs/libvdpau-0.2 )
+ xinerama? ( x11-libs/libXinerama )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ xv? ( x11-libs/libXv )
+ )
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
- virtual/pkgconfig
>=dev-lang/perl-5.8
dev-python/docutils
- doc-pdf? ( dev-python/rst2pdf )
- X? (
- x11-proto/videoproto
- xinerama? ( x11-proto/xineramaproto )
- xscreensaver? ( x11-proto/scrnsaverproto )
- )
+ virtual/pkgconfig
+ doc? ( dev-python/rst2pdf )
+ test? ( >=dev-util/cmocka-1.0.0 )
"
-RDEPEND+="
+RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-mplayer )
"
-pkg_setup() {
+pkg_pretend() {
if ! use libass; then
- ewarn "You have disabled the libass flag. No OSD or subtitles will be displayed."
+ ewarn "You have disabled the libass support."
+ ewarn "OSD and subtitles won't be available."
fi
if use openal; then
- ewarn "You have enabled the openal audio output which is a fallback"
- ewarn "and disabled by upstream."
+ ewarn "You have enabled the openal audio output. Be warned that"
+ ewarn "this output is considered experimental by upstream."
fi
if use sdl; then
- ewarn "You have enabled the sdl video and audio outputs which are fallbacks"
- ewarn "and disabled by upstream."
+ ewarn "You have enabled the sdl video and audio outputs. Note that"
+ ewarn "upstream provides these outputs for compatibility reasons only."
+ ewarn "You probably don't need them under the normal circumstances."
fi
if use libav; then
- einfo "You have enabled media-video/libav instead of media-video/ffmpeg."
- einfo "Upstream recommends media-video/ffmpeg, as some functionality is not"
- einfo "provided by media-video/libav."
+ elog "You have enabled media-video/libav instead of media-video/ffmpeg."
+ elog "Upstream recommends media-video/ffmpeg, as some functionality"
+ elog "is not provided by media-video/libav."
fi
- einfo "For additional format support you need to enable the support on your"
+ einfo "mpv optionally supports many different audio and video formats."
+ einfo "You will need to enable support for the desired formats in your"
einfo "libavcodec/libavformat provider:"
einfo " media-video/ffmpeg or media-video/libav"
-
- python-any-r1_pkg_setup
}
src_prepare() {
- cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die
- chmod 0755 "${S}"/waf || die
+ cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+ chmod +x "${S}"/waf || die
+
+ epatch "${FILESDIR}/${PN}-fix-include-in-tests.patch"
epatch_user
}
@@ -161,51 +164,59 @@ src_configure() {
local mywafargs=(
--confdir="${EPREFIX}"/etc/${PN}
--docdir="${EPREFIX}"/usr/share/doc/${PF}
+
$(usex cli '' '--disable-cplayer')
$(use_enable libmpv libmpv-shared)
+
--disable-libmpv-static
- --disable-build-date # keep build reproducible
- --disable-optimize # do not add '-O2' to CFLAGS
- --disable-debug-build # do not add '-g' to CFLAGS
- --disable-test # avoid dev-util/cmocka automagic
- $(use_enable doc-pdf pdf-build)
+ --disable-static-build
+ --disable-build-date # Create reproducible build
+ --disable-optimize # Do not add '-O2' to CFLAGS
+ --disable-debug-build # Do not add '-g' to CFLAGS
+
+ $(use_enable doc pdf-build)
$(use_enable vf-dlopen vf-dlopen-filters)
$(use_enable cli zsh-comp)
+ $(use_enable test)
- # optional features
$(use_enable iconv)
- $(use_enable libguess)
$(use_enable samba libsmbclient)
$(use_enable lua)
+ $(usex luajit '--lua=luajit' '')
$(use_enable libass)
$(use_enable libass libass-osd)
$(use_enable encode encoding)
$(use_enable bluray libbluray)
$(use_enable dvd dvdread)
$(use_enable dvd dvdnav)
- $(use_enable cdio cdda)
+ $(use_enable cdda)
$(use_enable enca)
- $(use_enable ladspa)
+ $(use_enable libguess)
+ $(use_enable uchardet)
$(use_enable rubberband)
- $(use_enable bs2b libbs2b)
$(use_enable lcms lcms2)
- --disable-vapoursynth # vapoursynth is not packaged
+ --disable-vapoursynth # Only available in overlays
--disable-vapoursynth-lazy
+ $(use_enable archive libarchive)
+
--enable-libavfilter
--enable-libavdevice
- $(usex luajit '--lua=luajit' '')
- # audio outputs
- $(use_enable sdl sdl2) # SDL output is fallback for platforms where nothing better is available
+ # Audio outputs
+ $(use_enable sdl sdl2) # Listed under audio, but also includes video
--disable-sdl1
$(use_enable oss oss-audio)
- --disable-rsound # media-sound/rsound is in pro-audio overlay only
+ --disable-rsound # Only available in overlays
$(use_enable pulseaudio pulse)
$(use_enable jack)
$(use_enable openal)
$(use_enable alsa)
+ --disable-coreaudio
+ --disable-dsound
+ --disable-wasapi
- # video outputs
+ # Video outputs
+ --disable-cocoa
$(use_enable wayland)
$(use_enable X x11)
$(use_enable xscreensaver xss)
@@ -213,10 +224,9 @@ src_configure() {
$(use_enable xv)
$(use_enable xinerama)
$(use_enable X xrandr)
- $(usex X "$(use_enable opengl gl-x11)" '--disable-gl-x11')
- $(use_enable egl egl-x11)
- $(usex wayland "$(use_enable opengl gl-wayland)" '--disable-gl-wayland')
- $(use_enable opengl gl)
+ $(use_enable opengl gl-x11)
+ $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+ $(use_enable wayland gl-wayland)
$(use_enable vdpau)
$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
$(use_enable vaapi)
@@ -227,13 +237,15 @@ src_configure() {
$(use_enable jpeg)
$(use_enable raspberry-pi rpi)
- # hwaccels
+ # HWaccels
$(use_enable vaapi vaapi-hwaccel)
+ # Automagic VDPAU HW acceleration. See Gentoo bug 558870.
- # tv features
+ # TV features
$(use_enable v4l tv)
$(use_enable v4l tv-v4l2)
$(use_enable v4l libv4l2)
+ $(use_enable v4l audio-input)
$(use_enable pvr)
$(use_enable dvb dvbin)
)
@@ -244,7 +256,7 @@ src_install() {
waf-utils_src_install
if use cli && use luajit; then
- pax-mark -m "${ED}"usr/bin/mpv
+ pax-mark -m "${ED}usr/bin/${PN}"
fi
}
@@ -261,3 +273,12 @@ pkg_postrm() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}
+
+src_test() {
+ cd "${S}"/build/test || die
+ for test in *; do
+ if [[ -x ${test} ]]; then
+ ./"${test}" || die "Test suite failed"
+ fi
+ done
+}
diff --git a/media-video/mpv/mpv-0.11.0.ebuild b/media-video/mpv/mpv-0.11.0.ebuild
deleted file mode 100644
index 9d0d09eee072..000000000000
--- a/media-video/mpv/mpv-0.11.0.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE='threads(+)'
-inherit eutils python-any-r1 waf-utils pax-utils fdo-mime gnome2-utils
-
-WAF_V="1.8.12"
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="http://mpv.io/"
-SRC_URI="http://ftp.waf.io/pub/release/waf-${WAF_V}"
-DOCS=( README.md etc/example.conf etc/input.conf )
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
- inherit git-r3
-else
- SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
- #DOCS+=( RELEASE_NOTES )
-fi
-
-# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
-LICENSE="GPL-2+ BSD ISC"
-SLOT="0"
-IUSE="+alsa bluray cdio +cli doc-pdf drm dvb +dvd egl +enca encode +iconv
-jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit openal
-+opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l vaapi
-vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
-
-REQUIRED_USE="
- || ( cli libmpv )
- egl? ( opengl X )
- enca? ( iconv )
- lcms? ( opengl )
- libguess? ( iconv )
- luajit? ( lua )
- opengl? ( || ( wayland X ) )
- pvr? ( v4l )
- vaapi? ( X )
- vdpau? ( X )
- wayland? ( opengl )
- xinerama? ( X )
- xscreensaver? ( X )
- xv? ( X )
-"
-
-RDEPEND="
- libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
- !libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] )
- sys-libs/zlib
- X? (
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/libXrandr-1.2.0
- opengl? (
- virtual/opengl
- egl? ( media-libs/mesa[egl] )
- )
- lcms? ( >=media-libs/lcms-2.6:2 )
- vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
- vdpau? ( >=x11-libs/libvdpau-0.2 )
- xinerama? ( x11-libs/libXinerama )
- xscreensaver? ( x11-libs/libXScrnSaver )
- xv? ( x11-libs/libXv )
- )
- alsa? ( >=media-libs/alsa-lib-1.0.18 )
- bluray? ( >=media-libs/libbluray-0.3.0 )
- cdio? (
- dev-libs/libcdio
- dev-libs/libcdio-paranoia
- )
- drm? ( x11-libs/libdrm )
- dvb? ( virtual/linuxtv-dvb-headers )
- dvd? (
- >=media-libs/libdvdread-4.1.3
- >=media-libs/libdvdnav-4.2.0
- )
- enca? ( app-i18n/enca )
- iconv? ( virtual/libiconv )
- jack? ( media-sound/jack-audio-connection-kit )
- jpeg? ( virtual/jpeg:0 )
- libass? (
- >=media-libs/libass-0.12.1:=[enca(-)?,fontconfig]
- virtual/ttf-fonts
- )
- libcaca? ( >=media-libs/libcaca-0.99_beta18 )
- libguess? ( >=app-i18n/libguess-1.0 )
- lua? (
- !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
- luajit? ( dev-lang/luajit:2 )
- )
- openal? ( >=media-libs/openal-1.13 )
- pulseaudio? ( media-sound/pulseaudio )
- rubberband? ( >=media-libs/rubberband-1.8.0 )
- samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl2[threads] )
- v4l? ( media-libs/libv4l )
- wayland? (
- >=dev-libs/wayland-1.6.0
- media-libs/mesa[egl,wayland]
- >=x11-libs/libxkbcommon-0.3.0
- )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- >=dev-lang/perl-5.8
- dev-python/docutils
- doc-pdf? ( dev-python/rst2pdf )
- X? (
- x11-proto/videoproto
- xinerama? ( x11-proto/xineramaproto )
- xscreensaver? ( x11-proto/scrnsaverproto )
- )
-"
-RDEPEND+="
- selinux? ( sec-policy/selinux-mplayer )
-"
-
-pkg_setup() {
- if ! use libass; then
- ewarn "You have disabled the libass flag. No OSD or subtitles will be displayed."
- fi
-
- if use openal; then
- ewarn "You have enabled the openal audio output which is a fallback"
- ewarn "and disabled by upstream."
- fi
-
- if use sdl; then
- ewarn "You have enabled the sdl video and audio outputs which are fallbacks"
- ewarn "and disabled by upstream."
- fi
-
- if use libav; then
- einfo "You have enabled media-video/libav instead of media-video/ffmpeg."
- einfo "Upstream recommends media-video/ffmpeg, as some functionality is not"
- einfo "provided by media-video/libav."
- fi
-
- einfo "For additional format support you need to enable the support on your"
- einfo "libavcodec/libavformat provider:"
- einfo " media-video/ffmpeg or media-video/libav"
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die
- chmod 0755 "${S}"/waf || die
- epatch_user
-}
-
-src_configure() {
- local mywafargs=(
- --confdir="${EPREFIX}"/etc/${PN}
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
- $(usex cli '' '--disable-cplayer')
- $(use_enable libmpv libmpv-shared)
- --disable-libmpv-static
- --disable-build-date # keep build reproducible
- --disable-optimize # do not add '-O2' to CFLAGS
- --disable-debug-build # do not add '-g' to CFLAGS
- --disable-test # avoid dev-util/cmocka automagic
- $(use_enable doc-pdf pdf-build)
- $(use_enable vf-dlopen vf-dlopen-filters)
- $(use_enable cli zsh-comp)
-
- # optional features
- $(use_enable iconv)
- $(use_enable libguess)
- $(use_enable samba libsmbclient)
- $(use_enable lua)
- $(use_enable libass)
- $(use_enable libass libass-osd)
- $(use_enable encode encoding)
- $(use_enable bluray libbluray)
- $(use_enable dvd dvdread)
- $(use_enable dvd dvdnav)
- $(use_enable cdio cdda)
- $(use_enable enca)
- $(use_enable rubberband)
- $(use_enable lcms lcms2)
- --disable-vapoursynth # vapoursynth is not packaged
- --disable-vapoursynth-lazy
- --enable-libavfilter
- --enable-libavdevice
- $(usex luajit '--lua=luajit' '')
-
- # audio outputs
- $(use_enable sdl sdl2) # SDL output is fallback for platforms where nothing better is available
- --disable-sdl1
- $(use_enable oss oss-audio)
- --disable-rsound # media-sound/rsound is in pro-audio overlay only
- $(use_enable pulseaudio pulse)
- $(use_enable jack)
- $(use_enable openal)
- $(use_enable alsa)
-
- # video outputs
- $(use_enable wayland)
- $(use_enable X x11)
- $(use_enable xscreensaver xss)
- $(use_enable X xext)
- $(use_enable xv)
- $(use_enable xinerama)
- $(use_enable X xrandr)
- $(usex X "$(use_enable opengl gl-x11)" '--disable-gl-x11')
- $(use_enable egl egl-x11)
- $(usex wayland "$(use_enable opengl gl-wayland)" '--disable-gl-wayland')
- $(use_enable opengl gl)
- $(use_enable vdpau)
- $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
- $(use_enable vaapi)
- $(use_enable vaapi vaapi-vpp)
- $(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
- $(use_enable libcaca caca)
- $(use_enable drm)
- $(use_enable jpeg)
- $(use_enable raspberry-pi rpi)
-
- # hwaccels
- $(use_enable vaapi vaapi-hwaccel)
-
- # tv features
- $(use_enable v4l tv)
- $(use_enable v4l tv-v4l2)
- $(use_enable v4l libv4l2)
- $(use_enable pvr)
- $(use_enable dvb dvbin)
- )
- waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
- waf-utils_src_install
-
- if use cli && use luajit; then
- pax-mark -m "${ED}"usr/bin/mpv
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-video/mpv/mpv-0.14.0.ebuild b/media-video/mpv/mpv-0.14.0.ebuild
new file mode 100644
index 000000000000..f6a048592df9
--- /dev/null
+++ b/media-video/mpv/mpv-0.14.0.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV='1.8.12'
+
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+ DOCS=( RELEASE_NOTES )
+else
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+ inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md etc/example.conf etc/input.conf )
+
+# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
+LICENSE="GPL-2+ BSD ISC"
+SLOT="0"
+# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output
+IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm
+ +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit
+ openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux
+ test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
+ xv"
+
+REQUIRED_USE="
+ || ( cli libmpv )
+ egl? ( || ( gbm X wayland ) )
+ enca? ( iconv )
+ gbm? ( drm egl )
+ lcms? ( || ( opengl egl ) )
+ libguess? ( iconv )
+ luajit? ( lua )
+ opengl? ( X )
+ uchardet? ( iconv )
+ v4l? ( || ( alsa oss ) )
+ vaapi? ( || ( X wayland ) )
+ vdpau? ( X )
+ wayland? ( egl )
+ xinerama? ( X )
+ xscreensaver? ( X )
+ xv? ( X )
+"
+
+COMMON_DEPEND="
+ !libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] )
+ libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
+ sys-libs/zlib
+ alsa? ( >=media-libs/alsa-lib-1.0.18 )
+ archive? ( >=app-arch/libarchive-3.0.0:= )
+ bluray? ( >=media-libs/libbluray-0.3.0 )
+ cdda? ( dev-libs/libcdio-paranoia )
+ drm? ( x11-libs/libdrm )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ dvd? (
+ >=media-libs/libdvdnav-4.2.0
+ >=media-libs/libdvdread-4.1.0
+ )
+ egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+ iconv? (
+ virtual/libiconv
+ enca? ( app-i18n/enca )
+ libguess? ( >=app-i18n/libguess-1.0 )
+ uchardet? ( dev-libs/uchardet )
+ )
+ jack? ( media-sound/jack-audio-connection-kit )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( >=media-libs/lcms-2.6:2 )
+ libass? (
+ >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+ virtual/ttf-fonts
+ )
+ libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+ lua? (
+ !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
+ luajit? ( dev-lang/luajit:2 )
+ )
+ openal? ( >=media-libs/openal-1.13 )
+ pulseaudio? ( media-sound/pulseaudio )
+ rubberband? ( >=media-libs/rubberband-1.8.0 )
+ samba? ( net-fs/samba )
+ sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
+ v4l? ( media-libs/libv4l )
+ vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] )
+ wayland? (
+ >=dev-libs/wayland-1.6.0
+ >=x11-libs/libxkbcommon-0.3.0
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/libXrandr-1.2.0
+ opengl? (
+ x11-libs/libXdamage
+ virtual/opengl
+ )
+ vdpau? ( >=x11-libs/libvdpau-0.2 )
+ xinerama? ( x11-libs/libXinerama )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ xv? ( x11-libs/libXv )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ >=dev-lang/perl-5.8
+ dev-python/docutils
+ virtual/pkgconfig
+ doc? ( dev-python/rst2pdf )
+ test? ( >=dev-util/cmocka-1.0.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ selinux? ( sec-policy/selinux-mplayer )
+"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
+ die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
+ fi
+
+ if ! use libass; then
+ ewarn "You have disabled the libass support."
+ ewarn "OSD and subtitles won't be available."
+ fi
+
+ if use openal; then
+ ewarn "You have enabled the openal audio output. Be warned that"
+ ewarn "this output is considered experimental by upstream."
+ fi
+
+ if use sdl; then
+ ewarn "You have enabled the sdl video and audio outputs. Note that"
+ ewarn "upstream provides these outputs for compatibility reasons only."
+ ewarn "You probably don't need them under the normal circumstances."
+ fi
+
+ if use libav; then
+ elog "You have enabled media-video/libav instead of media-video/ffmpeg."
+ elog "Upstream recommends media-video/ffmpeg, as some functionality"
+ elog "is not provided by media-video/libav."
+ fi
+
+ einfo "mpv optionally supports many different audio and video formats."
+ einfo "You will need to enable support for the desired formats in your"
+ einfo "libavcodec/libavformat provider:"
+ einfo " media-video/ffmpeg or media-video/libav"
+}
+
+src_prepare() {
+ cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+ chmod +x "${S}"/waf || die
+
+ epatch "${FILESDIR}/${PN}-fix-include-in-tests.patch"
+ epatch "${FILESDIR}/${P}-support-GNU-__thread.patch"
+ epatch_user
+}
+
+src_configure() {
+ local mywafargs=(
+ --confdir="${EPREFIX}"/etc/${PN}
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+ $(usex cli '' '--disable-cplayer')
+ $(use_enable libmpv libmpv-shared)
+
+ --disable-libmpv-static
+ --disable-static-build
+ --disable-build-date # Create reproducible build
+ --disable-optimize # Do not add '-O2' to CFLAGS
+ --disable-debug-build # Do not add '-g' to CFLAGS
+
+ $(use_enable doc pdf-build)
+ $(use_enable vf-dlopen vf-dlopen-filters)
+ $(use_enable cli zsh-comp)
+ $(use_enable test)
+
+ $(use_enable iconv)
+ $(use_enable samba libsmbclient)
+ $(use_enable lua)
+ $(usex luajit '--lua=luajit' '')
+ $(use_enable libass)
+ $(use_enable libass libass-osd)
+ $(use_enable encode encoding)
+ $(use_enable bluray libbluray)
+ $(use_enable dvd dvdread)
+ $(use_enable dvd dvdnav)
+ $(use_enable cdda)
+ $(use_enable enca)
+ $(use_enable libguess)
+ $(use_enable uchardet)
+ $(use_enable rubberband)
+ $(use_enable lcms lcms2)
+ --disable-vapoursynth # Only available in overlays
+ --disable-vapoursynth-lazy
+ $(use_enable archive libarchive)
+
+ --enable-libavfilter
+ --enable-libavdevice
+
+ # Audio outputs
+ $(use_enable sdl sdl2) # Listed under audio, but also includes video
+ --disable-sdl1
+ $(use_enable oss oss-audio)
+ --disable-rsound # Only available in overlays
+ $(use_enable pulseaudio pulse)
+ $(use_enable jack)
+ $(use_enable openal)
+ $(use_enable alsa)
+ --disable-coreaudio
+ --disable-dsound
+ --disable-wasapi
+
+ # Video outputs
+ --disable-cocoa
+ $(use_enable drm)
+ $(use_enable gbm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ $(use_enable xscreensaver xss)
+ $(use_enable X xext)
+ $(use_enable xv)
+ $(use_enable xinerama)
+ $(use_enable X xrandr)
+ $(use_enable opengl gl-x11)
+ $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+ $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+ $(use_enable wayland gl-wayland)
+ $(use_enable vdpau)
+ $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+ $(use_enable vaapi) # See below for vaapi-x-egl
+ $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+ $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+ $(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
+ $(use_enable libcaca caca)
+ $(use_enable jpeg)
+ $(use_enable raspberry-pi rpi)
+
+ # HWaccels
+ $(use_enable vaapi vaapi-hwaccel)
+ # Automagic VDPAU HW acceleration. See Gentoo bug 558870.
+
+ # TV features
+ $(use_enable v4l tv)
+ $(use_enable v4l tv-v4l2)
+ $(use_enable v4l libv4l2)
+ $(use_enable v4l audio-input)
+ $(use_enable dvb dvbin)
+ )
+
+ if use vaapi && use X && use egl; then
+ mywafargs+=(--enable-vaapi-x-egl)
+ else
+ mywafargs+=(--disable-vaapi-x-egl)
+ fi
+
+ waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+ waf-utils_src_install
+
+ if use cli && use luajit; then
+ pax-mark -m "${ED}usr/bin/${PN}"
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+src_test() {
+ cd "${S}"/build/test || die
+ for test in *; do
+ if [[ -x ${test} ]]; then
+ ./"${test}" || die "Test suite failed"
+ fi
+ done
+}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index f4f73a502bb7..fcb22d52bc21 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -3,92 +3,86 @@
# $Id$
EAPI=5
+
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_REQ_USE='threads(+)'
-inherit eutils python-any-r1 waf-utils pax-utils fdo-mime gnome2-utils
-WAF_V="1.8.12"
+WAF_PV='1.8.12'
+
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="http://mpv.io/"
-SRC_URI="http://ftp.waf.io/pub/release/waf-${WAF_V}"
-DOCS=( README.md etc/example.conf etc/input.conf )
+HOMEPAGE="https://mpv.io/"
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+ DOCS=( RELEASE_NOTES )
+else
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
inherit git-r3
-else
- SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
- DOCS+=( RELEASE_NOTES )
fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md etc/example.conf etc/input.conf )
# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
LICENSE="GPL-2+ BSD ISC"
SLOT="0"
-IUSE="+alsa bluray cdio +cli doc-pdf drm dvb +dvd egl +enca encode +iconv
-jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit openal
-+opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l vaapi
-vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
+# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output
+IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm
+ +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit
+ openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux
+ test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
+ xv"
REQUIRED_USE="
|| ( cli libmpv )
- egl? ( opengl X )
+ egl? ( || ( gbm X wayland ) )
enca? ( iconv )
- lcms? ( opengl )
+ gbm? ( drm egl )
+ lcms? ( || ( opengl egl ) )
libguess? ( iconv )
luajit? ( lua )
- opengl? ( || ( wayland X ) )
- pvr? ( v4l )
- vaapi? ( X )
+ opengl? ( X )
+ uchardet? ( iconv )
+ v4l? ( || ( alsa oss ) )
+ vaapi? ( || ( X wayland ) )
vdpau? ( X )
- wayland? ( opengl )
+ wayland? ( egl )
xinerama? ( X )
xscreensaver? ( X )
xv? ( X )
"
-RDEPEND="
- libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
+COMMON_DEPEND="
!libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] )
+ libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
sys-libs/zlib
- X? (
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/libXrandr-1.2.0
- opengl? (
- virtual/opengl
- egl? ( media-libs/mesa[egl] )
- )
- lcms? ( >=media-libs/lcms-2.6:2 )
- vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
- vdpau? ( >=x11-libs/libvdpau-0.2 )
- xinerama? ( x11-libs/libXinerama )
- xscreensaver? ( x11-libs/libXScrnSaver )
- xv? ( x11-libs/libXv )
- )
alsa? ( >=media-libs/alsa-lib-1.0.18 )
+ archive? ( >=app-arch/libarchive-3.0.0:= )
bluray? ( >=media-libs/libbluray-0.3.0 )
- cdio? (
- dev-libs/libcdio
- dev-libs/libcdio-paranoia
- )
+ cdda? ( dev-libs/libcdio-paranoia )
drm? ( x11-libs/libdrm )
dvb? ( virtual/linuxtv-dvb-headers )
dvd? (
- >=media-libs/libdvdread-4.1.3
>=media-libs/libdvdnav-4.2.0
+ >=media-libs/libdvdread-4.1.0
+ )
+ egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+ iconv? (
+ virtual/libiconv
+ enca? ( app-i18n/enca )
+ libguess? ( >=app-i18n/libguess-1.0 )
+ uchardet? ( dev-libs/uchardet )
)
- enca? ( app-i18n/enca )
- iconv? ( virtual/libiconv )
jack? ( media-sound/jack-audio-connection-kit )
jpeg? ( virtual/jpeg:0 )
+ lcms? ( >=media-libs/lcms-2.6:2 )
libass? (
- >=media-libs/libass-0.12.1:=[enca(-)?,fontconfig]
+ >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
virtual/ttf-fonts
)
libcaca? ( >=media-libs/libcaca-0.99_beta18 )
- libguess? ( >=app-i18n/libguess-1.0 )
lua? (
!luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
luajit? ( dev-lang/luajit:2 )
@@ -97,61 +91,75 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
rubberband? ( >=media-libs/rubberband-1.8.0 )
samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl2[threads] )
+ sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
v4l? ( media-libs/libv4l )
+ vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] )
wayland? (
>=dev-libs/wayland-1.6.0
- media-libs/mesa[egl,wayland]
>=x11-libs/libxkbcommon-0.3.0
)
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/libXrandr-1.2.0
+ opengl? (
+ x11-libs/libXdamage
+ virtual/opengl
+ )
+ vdpau? ( >=x11-libs/libvdpau-0.2 )
+ xinerama? ( x11-libs/libXinerama )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ xv? ( x11-libs/libXv )
+ )
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
- virtual/pkgconfig
>=dev-lang/perl-5.8
dev-python/docutils
- doc-pdf? ( dev-python/rst2pdf )
- X? (
- x11-proto/videoproto
- xinerama? ( x11-proto/xineramaproto )
- xscreensaver? ( x11-proto/scrnsaverproto )
- )
+ virtual/pkgconfig
+ doc? ( dev-python/rst2pdf )
+ test? ( >=dev-util/cmocka-1.0.0 )
"
-RDEPEND+="
+RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-mplayer )
"
-pkg_setup() {
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
+ die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
+ fi
+
if ! use libass; then
- ewarn "You have disabled the libass flag. No OSD or subtitles will be displayed."
+ ewarn "You have disabled the libass support."
+ ewarn "OSD and subtitles won't be available."
fi
if use openal; then
- ewarn "You have enabled the openal audio output which is a fallback"
- ewarn "and disabled by upstream."
+ ewarn "You have enabled the openal audio output. Be warned that"
+ ewarn "this output is considered experimental by upstream."
fi
if use sdl; then
- ewarn "You have enabled the sdl video and audio outputs which are fallbacks"
- ewarn "and disabled by upstream."
+ ewarn "You have enabled the sdl video and audio outputs. Note that"
+ ewarn "upstream provides these outputs for compatibility reasons only."
+ ewarn "You probably don't need them under the normal circumstances."
fi
if use libav; then
- einfo "You have enabled media-video/libav instead of media-video/ffmpeg."
- einfo "Upstream recommends media-video/ffmpeg, as some functionality is not"
- einfo "provided by media-video/libav."
+ elog "You have enabled media-video/libav instead of media-video/ffmpeg."
+ elog "Upstream recommends media-video/ffmpeg, as some functionality"
+ elog "is not provided by media-video/libav."
fi
- einfo "For additional format support you need to enable the support on your"
+ einfo "mpv optionally supports many different audio and video formats."
+ einfo "You will need to enable support for the desired formats in your"
einfo "libavcodec/libavformat provider:"
einfo " media-video/ffmpeg or media-video/libav"
-
- python-any-r1_pkg_setup
}
src_prepare() {
- cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die
- chmod 0755 "${S}"/waf || die
+ cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+ chmod +x "${S}"/waf || die
epatch_user
}
@@ -159,49 +167,61 @@ src_configure() {
local mywafargs=(
--confdir="${EPREFIX}"/etc/${PN}
--docdir="${EPREFIX}"/usr/share/doc/${PF}
+
$(usex cli '' '--disable-cplayer')
$(use_enable libmpv libmpv-shared)
+
--disable-libmpv-static
- --disable-build-date # keep build reproducible
- --disable-optimize # do not add '-O2' to CFLAGS
- --disable-debug-build # do not add '-g' to CFLAGS
- --disable-test # avoid dev-util/cmocka automagic
- $(use_enable doc-pdf pdf-build)
+ --disable-static-build
+ --disable-build-date # Create reproducible build
+ --disable-optimize # Do not add '-O2' to CFLAGS
+ --disable-debug-build # Do not add '-g' to CFLAGS
+
+ $(use_enable doc pdf-build)
$(use_enable vf-dlopen vf-dlopen-filters)
$(use_enable cli zsh-comp)
+ $(use_enable test)
- # optional features
$(use_enable iconv)
- $(use_enable libguess)
$(use_enable samba libsmbclient)
$(use_enable lua)
+ $(usex luajit '--lua=luajit' '')
$(use_enable libass)
$(use_enable libass libass-osd)
$(use_enable encode encoding)
$(use_enable bluray libbluray)
$(use_enable dvd dvdread)
$(use_enable dvd dvdnav)
- $(use_enable cdio cdda)
+ $(use_enable cdda)
$(use_enable enca)
+ $(use_enable libguess)
+ $(use_enable uchardet)
$(use_enable rubberband)
$(use_enable lcms lcms2)
- --disable-vapoursynth # vapoursynth is not packaged
+ --disable-vapoursynth # Only available in overlays
--disable-vapoursynth-lazy
+ $(use_enable archive libarchive)
+
--enable-libavfilter
--enable-libavdevice
- $(usex luajit '--lua=luajit' '')
- # audio outputs
- $(use_enable sdl sdl2) # SDL output is fallback for platforms where nothing better is available
+ # Audio outputs
+ $(use_enable sdl sdl2) # Listed under audio, but also includes video
--disable-sdl1
$(use_enable oss oss-audio)
- --disable-rsound # media-sound/rsound is in pro-audio overlay only
+ --disable-rsound # Only available in overlays
$(use_enable pulseaudio pulse)
$(use_enable jack)
$(use_enable openal)
$(use_enable alsa)
+ --disable-coreaudio
+ --disable-dsound
+ --disable-wasapi
- # video outputs
+ # Video outputs
+ --disable-cocoa
+ $(use_enable drm)
+ $(use_enable gbm)
$(use_enable wayland)
$(use_enable X x11)
$(use_enable xscreensaver xss)
@@ -209,29 +229,38 @@ src_configure() {
$(use_enable xv)
$(use_enable xinerama)
$(use_enable X xrandr)
- $(usex X "$(use_enable opengl gl-x11)" '--disable-gl-x11')
- $(use_enable egl egl-x11)
- $(usex wayland "$(use_enable opengl gl-wayland)" '--disable-gl-wayland')
- $(use_enable opengl gl)
+ $(use_enable opengl gl-x11)
+ $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+ $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+ $(use_enable wayland gl-wayland)
$(use_enable vdpau)
$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
- $(use_enable vaapi)
+ $(use_enable vaapi) # See below for vaapi-x-egl
+ $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+ $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
$(use_enable libcaca caca)
- $(use_enable drm)
$(use_enable jpeg)
$(use_enable raspberry-pi rpi)
- # hwaccels
+ # HWaccels
$(use_enable vaapi vaapi-hwaccel)
+ # Automagic VDPAU HW acceleration. See Gentoo bug 558870.
- # tv features
+ # TV features
$(use_enable v4l tv)
$(use_enable v4l tv-v4l2)
$(use_enable v4l libv4l2)
- $(use_enable pvr)
+ $(use_enable v4l audio-input)
$(use_enable dvb dvbin)
)
+
+ if use vaapi && use X && use egl; then
+ mywafargs+=(--enable-vaapi-x-egl)
+ else
+ mywafargs+=(--disable-vaapi-x-egl)
+ fi
+
waf-utils_src_configure "${mywafargs[@]}"
}
@@ -239,7 +268,7 @@ src_install() {
waf-utils_src_install
if use cli && use luajit; then
- pax-mark -m "${ED}"usr/bin/mpv
+ pax-mark -m "${ED}usr/bin/${PN}"
fi
}
@@ -256,3 +285,12 @@ pkg_postrm() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}
+
+src_test() {
+ cd "${S}"/build/test || die
+ for test in *; do
+ if [[ -x ${test} ]]; then
+ ./"${test}" || die "Test suite failed"
+ fi
+ done
+}
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index 7418515a01e7..029beb31a222 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,2 +1 @@
-DIST pitivi-0.94.tar.xz 3271200 SHA256 f52a0643bc5a9149069c01d0b5ef4149032473bb505e6d679dd3f3153506faec SHA512 fcf3ccb537980418af55ead196963b3503d407e23fcaf7409898c9c3e61077ae7491d91c82f6fa3eb63182a383035e1ec2ada4f046ec9b7cdf9f02829662c3c3 WHIRLPOOL c308595a582f304f8910fd04aadcfebe9743b560db48165247feb15065694441441564feb91e13a609f3d9344be05be369094b2e52638bd9a6525e95a1a00acd
DIST pitivi-0.95.tar.xz 3341488 SHA256 5f15220bcc3d02cef4edacaa19da284014caf725e41fc9cbec70469582e1d313 SHA512 e628302ecbb790e955459a4dc124e8580081f6eff8abde210a1b537ae18696c3861bd619efe1434e8e1cf1069adb72cbff0cf44c64706c4046d2cfb7f9aecdfa WHIRLPOOL df6e625dddcf113a8e84aabf5a7a40d90e6b38130e63201a1674f4a576a735696c6b9a9a35b2743cbe5bac8d444c04cd0ea9c5a43358718e1b32b6ebc97f435c
diff --git a/media-video/pitivi/files/pitivi-0.94-unittest.patch b/media-video/pitivi/files/pitivi-0.94-unittest.patch
deleted file mode 100644
index a117d108f48f..000000000000
--- a/media-video/pitivi/files/pitivi-0.94-unittest.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Allow fallback to a non GL sink for unittests.
-
---- a/pitivi/utils/pipeline.py 2015-05-25 13:58:33.980916075 +0200
-+++ b/pitivi/utils/pipeline.py 2015-05-25 13:57:52.277261138 +0200
-@@ -182,6 +182,9 @@
- # Create a cluttersink element used for display. Subclasses must connect
- # it to self._pipeline themselves
- self.video_sink = Gst.ElementFactory.make("glimagesink", None)
-+ if self.video_sink is None:
-+ self.video_sink = Gst.ElementFactory.make("xvimagesink", None)
-+
- if isinstance(pipeline, GES.Pipeline):
- self._pipeline.preview_set_video_sink(self.video_sink)
- else:
diff --git a/media-video/pitivi/pitivi-0.94.ebuild b/media-video/pitivi/pitivi-0.94.ebuild
deleted file mode 100644
index 157ec8bf5320..000000000000
--- a/media-video/pitivi/pitivi-0.94.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_3,3_4} )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils gnome2 python-single-r1 virtualx
-
-DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
-HOMEPAGE="http://www.pitivi.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="v4l test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Do not forget to check pitivi/check.py for dependencies
-# pycanberra, gnome-desktop, libav and libnotify are optional
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- >=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
- >=x11-libs/cairo-1.10
-"
-RDEPEND="${COMMON_DEPEND}
- dev-libs/glib:2
-
- >=dev-libs/gobject-introspection-1.34
- dev-python/dbus-python[${PYTHON_USEDEP}]
- >=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pycanberra[${PYTHON_USEDEP}]
- >=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
-
- gnome-base/librsvg:=
- gnome-base/gnome-desktop:3[introspection]
-
- >=media-libs/clutter-1.12:1.0[introspection]
- >=media-libs/clutter-gst-2:2.0[introspection]
- >=media-libs/clutter-gtk-1.4:1.0[introspection]
- >=media-libs/gnonlin-1.4:1.0
- >=media-libs/gstreamer-1.4:1.0[introspection]
- >=media-libs/gstreamer-editing-services-1.4:1.0[introspection]
- >=media-libs/gst-plugins-base-1.4:1.0
- >=media-libs/gst-plugins-good-1.4:1.0
- >=media-plugins/gst-plugins-libav-1.4:1.0
-
- x11-libs/libnotify[introspection]
- >=x11-libs/gtk+-3.10:3[introspection]
-
- v4l? ( >=media-plugins/gst-plugins-v4l2-1.4:1.0 )
-"
-DEPEND="${RDEPEND}
- app-text/yelp-tools
- dev-python/setuptools
- >=dev-util/intltool-0.35.5
- sys-devel/gettext
- virtual/pkgconfig
- test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
- # Allow using non-GL sink when it cannot be found
- epatch "${FILESDIR}"/${PN}-0.94-unittest.patch
-
- gnome2_src_prepare
-}
-src_configure() {
- gnome2_src_configure \
- ITSTOOL="$(type -P true)" \
- --disable-static
-}
-
-src_test() {
- # Force Xvfb to be used
- unset DISPLAY
- unset DBUS_SESSION_BUS_ADDRESS
- export PITIVI_TOP_LEVEL_DIR="${S}"
- Xemake check
-}
-
-src_install() {
- gnome2_src_install
- python_fix_shebang "${D}"
-}
diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest
index 75a4bb2b8e58..5b416263cdb4 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1 +1,2 @@
DIST subtitleeditor-0.41.1.tar.gz 1637940 SHA256 3183f2f9831359f2200194fcc2d360198094c494892ccacd08a28717bffac0d0 SHA512 6e87df6bf1b97fc085387f331fa415be48086b9dabf445e6050ff3ab3c812c8fff72e613959308f07c2e849bf95064c5d288f44dbc266997e7143bbb46615c9d WHIRLPOOL 111163dde1cf17df34e0dfb0aeeb874a98095d6d338ca22138ff13747697d78a2d1be127f344c36286b79f828918ab1c615bccc7e04cc8586b12efe407c76f52
+DIST subtitleeditor-0.52.1.tar.gz 1680875 SHA256 5b3e5fc1f12bcf0d4bcf5014249b6832181bd3b513ac04ee665ec979441412d5 SHA512 a9a7ee78abadf660fe645e36ed69b87131320e04373554adb48dc33df8f36605ed74da3822fe0281b2b75d6f82daddd062b2ae9a12aed44673195fba43adfd4f WHIRLPOOL def330a098b9227cf6db8a74c67d2cd7db724b65f586e22ebf1b08de6de6321849fdeecfe5fd6c0132a814d45d84087b406a05aec7463c04a4355530c3d09c44
diff --git a/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
new file mode 100644
index 000000000000..9cce5d2d98f2
--- /dev/null
+++ b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
@@ -0,0 +1,55 @@
+Fix build errors with gcc-4.9.3 -std=c++11 (after disabling -ansi)
+
+https://gna.org/bugs/?23714
+
+https://bugs.gentoo.org/show_bug.cgi?id=550764
+https://bugs.gentoo.org/show_bug.cgi?id=566328
+
+--- a/src/subtitleview.cc 2015-12-24 01:52:29.322622155 +0100
++++ b/src/subtitleview.cc 2015-12-24 01:52:44.210491213 +0100
+@@ -1363,7 +1363,7 @@
+ {
+ int num;
+ std::istringstream ss(event->string);
+- bool is_num = ss >> num != 0;
++ bool is_num = static_cast<bool>(ss >> num) != 0;
+ // Update only if it's different
+ if(is_num != get_enable_search())
+ set_enable_search(is_num);
+--- a/src/utility.h 2015-12-24 01:49:42.205104858 +0100
++++ b/src/utility.h 2015-12-24 01:50:23.387737071 +0100
+@@ -91,7 +91,7 @@
+ std::istringstream s(src);
+ // return s >> dest != 0;
+
+- bool state = s >> dest != 0;
++ bool state = static_cast<bool>(s >> dest) != 0;
+
+ if(!state)
+ se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", src.c_str());
+--- a/plugins/actions/dialoguize/dialoguize.cc 2015-12-24 01:06:24.125428454 +0100
++++ b/plugins/actions/dialoguize/dialoguize.cc 2015-12-24 01:06:42.630277006 +0100
+@@ -23,7 +23,7 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+-#include <auto_ptr.h>
++#include <memory>
+ #include "extension/action.h"
+ #include "i18n.h"
+ #include "debug.h"
+--- a/plugins/actions/documentmanagement/documentmanagement.old 2015-12-24 01:17:13.914730337 +0100
++++ b/plugins/actions/documentmanagement/documentmanagement.cc 2015-12-24 01:17:23.339640430 +0100
+@@ -178,9 +178,9 @@
+
+ ui_id = ui->new_merge_id();
+
+- #define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/"name, name, name);
+- #define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/"name, name, name);
+- #define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/"name, name, name);
++ #define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/" name, name, name);
++ #define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/" name, name, name);
++ #define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/" name, name, name);
+
+ ADD_UI("new-document");
+ ADD_OPEN_UI("open-document");
diff --git a/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild b/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
new file mode 100644
index 000000000000..fa99db5b69c6
--- /dev/null
+++ b/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2 versionator
+
+DESCRIPTION="GTK+3 subtitle editing tool"
+HOMEPAGE="http://home.gna.org/subtitleeditor/"
+SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls"
+# opengl would mix gtk+:2 and :3 which is not possible
+
+RDEPEND="
+ >=app-text/enchant-1.4
+ app-text/iso-codes
+ >=dev-cpp/cairomm-1.12
+ >=dev-cpp/glibmm-2.46:2
+ >=dev-cpp/gtkmm-3.18:3.0
+ >=dev-cpp/gstreamermm-1.0:1.0
+ >=dev-cpp/libxmlpp-2.40:2.6
+ dev-libs/glib:2
+ >=dev-libs/libsigc++-2.6:2
+ media-libs/gst-plugins-base:1.0[X,pango]
+ media-libs/gst-plugins-good:1.0
+ media-libs/gstreamer:1.0
+ media-plugins/gst-plugins-meta:1.0
+ x11-libs/gtk+:3
+ virtual/libintl
+"
+# opengl? (
+# >=dev-cpp/gtkglextmm-1.2.0-r2:1.0
+# virtual/opengl )
+# X needed for video output and pango needed for text overlay
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # ansi overrides -std, see src_configure
+ sed 's/\(CXXFLAGS\) -ansi/\1/' -i configure.ac configure || die
+
+ # fix build issues
+ epatch "${FILESDIR}"/${PN}-0.52.1-build-fix.patch
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Needed with newer gnome mm bindings
+ append-cxxflags -std=c++11
+
+ # Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
+ use debug && append-cxxflags -DDEBUG
+
+ gnome2_src_configure \
+ --disable-debug \
+ --disable-gl \
+ $(use_enable nls)
+# $(use_enable opengl gl)
+}
diff --git a/media-video/vlc/vlc-2.1.5-r1.ebuild b/media-video/vlc/vlc-2.1.5-r1.ebuild
index 84af4dfbc1ae..924d5a93d4e8 100644
--- a/media-video/vlc/vlc-2.1.5-r1.ebuild
+++ b/media-video/vlc/vlc-2.1.5-r1.ebuild
@@ -34,10 +34,8 @@ fi
LICENSE="LGPL-2.1 GPL-2"
SLOT="0/5-7" # vlc - vlccore
-if [ "${PV%9999}" = "${PV}" ] ; then
+if [[ ${PV} != *9999 ]] ; then
KEYWORDS="amd64 ~arm ppc ppc64 -sparc x86 ~x86-fbsd"
-else
- KEYWORDS=""
fi
IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild
index e003fc02236f..a6c7b2e15302 100644
--- a/media-video/vlc/vlc-2.1.9999.ebuild
+++ b/media-video/vlc/vlc-2.1.9999.ebuild
@@ -34,10 +34,8 @@ fi
LICENSE="LGPL-2.1 GPL-2"
SLOT="0/5-7" # vlc - vlccore
-if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~x86-fbsd"
-else
- KEYWORDS=""
+if [[ ${PV} != *9999 ]] ; then
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
fi
IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild
index 13087bf94c94..1a8b9d39cecb 100644
--- a/media-video/vlc/vlc-2.2.1-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.1-r1.ebuild
@@ -34,10 +34,8 @@ fi
LICENSE="LGPL-2.1 GPL-2"
SLOT="0/5-8" # vlc - vlccore
-if [ "${PV%9999}" = "${PV}" ] ; then
+if [[ ${PV} != *9999 ]] ; then
KEYWORDS="amd64 ~arm ppc ppc64 -sparc x86 ~x86-fbsd"
-else
- KEYWORDS="amd64 ppc ppc64 x86"
fi
IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index f264f1c33f61..bf7818afa1aa 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -34,10 +34,8 @@ fi
LICENSE="LGPL-2.1 GPL-2"
SLOT="0/5-8" # vlc - vlccore
-if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~x86-fbsd"
-else
- KEYWORDS=""
+if [[ ${PV} != *9999 ]] ; then
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
fi
IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 62de861ba38c..e4d7563742a6 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -34,10 +34,8 @@ fi
LICENSE="LGPL-2.1 GPL-2"
SLOT="0/5-8" # vlc - vlccore
-if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~x86-fbsd"
-else
- KEYWORDS=""
+if [[ ${PV} != *9999 ]] ; then
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
fi
IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..c1aeb36b8be8
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui lto minimal nano-syntax +plugins studio +vim-syntax"
+
+DEPEND="
+ dev-libs/openssl:0
+ >=dev-libs/boost-1.41
+ sys-devel/bison
+ >=sys-devel/flex-2.5.35
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+ ${DEPEND}
+ plugins? ( || (
+ net-analyzer/monitoring-plugins
+ net-analyzer/nagios-plugins
+ ) )
+ classicui? ( net-analyzer/icinga[web] )
+ studio? ( x11-libs/wxGTK:2.9 )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+ depend.apache_pkg_setup
+ enewgroup icinga
+ enewgroup icingacmd
+ enewgroup nagios # for plugins
+ enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+ sed -i 's/FLAGS\}\ \-g/FLAGS\}\ /g' CMakeLists.txt || die
+ local mycmakeargs=(
+ -DICINGA2_UNITY_BUILD=FALSE
+ -DCMAKE_VERBOSE_MAKEFILE=ON
+ -DCMAKE_BUILD_TYPE=None
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc
+ -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+ -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+ -DICINGA2_USER=icinga
+ -DICINGA2_GROUP=icingacmd
+ -DICINGA2_COMMAND_USER=icinga
+ -DICINGA2_COMMAND_GROUP=icingacmd
+ -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+ )
+ # default to off if minimal, allow the flags to be set otherwise
+ if use minimal; then
+ mycmakeargs+=(
+ -DICINGA2_WITH_MYSQL=OFF
+ -DICINGA2_WITH_PGSQL=OFF
+ )
+ else
+ mycmakeargs+=(
+ -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+ -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+ )
+ fi
+ # LTO
+ if use lto; then
+ mycmakeargs+=(
+ -DICINGA2_LTO_BUILD=ON
+ )
+ else
+ mycmakeargs+=(
+ -DICINGA2_LTO_BUILD=OFF
+ )
+ fi
+ # STUDIO
+ if use studio; then
+ mycmakeargs+=(
+ -DICINGA2_WITH_STUDIO=ON
+ )
+ else
+ mycmakeargs+=(
+ -DICINGA2_WITH_STUDIO=OFF
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+ cd "${BUILDDIR}" || die
+
+ emake DESTDIR="${D}" install
+
+ einstalldocs
+
+ newinitd "${FILESDIR}"/icinga2.initd icinga2
+ newconfd "${FILESDIR}"/icinga2.confd icinga2
+
+ if use mysql ; then
+ docinto schema
+ newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+ docinto schema/upgrade
+ dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+ elif use postgres ; then
+ docinto schema
+ newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+ docinto schema/upgrade
+ dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+ fi
+
+ keepdir /etc/icinga2
+ keepdir /var/lib/icinga2/api/zones
+ keepdir /var/lib/icinga2/api/repository
+ keepdir /var/lib/icinga2/api/log
+ keepdir /var/spool/icinga2/perfdata
+
+ rm -r "${D}/var/run" || die "failed to remove /var/run"
+ rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+ fowners icinga:icinga /etc/icinga2
+ fowners icinga:icinga /var/lib/icinga2
+ fowners icinga:icinga /var/spool/icinga2
+ fowners icinga:icinga /var/spool/icinga2/perfdata
+ fowners icinga:icingacmd /var/log/icinga2
+
+ fperms ug+rwX,o-rwx /etc/icinga2
+ fperms ug+rwX,o-rwx /var/lib/icinga2
+ fperms ug+rwX,o-rwx /var/spool/icinga2
+ fperms ug+rwX,o-rwx /var/log/icinga2
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles
+ doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+ doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+ fi
+
+ if use nano-syntax; then
+ insinto /usr/share/nano
+ doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+ fi
+}
+
+pkg_postinst() {
+ elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+ elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild
index 951133c19549..1fecb968696c 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${P/_/.}
# GPL-2 for the init scripts
LICENSE="HPND BSD GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="bzip2 doc elf ipv6 libressl mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql"
COMMON_DEPEND="
diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild
index 0022291860af..b5e98b2441f1 100644
--- a/net-analyzer/nmap/nmap-7.01.ebuild
+++ b/net-analyzer/nmap/nmap-7.01.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
@@ -96,6 +96,11 @@ src_prepare() {
-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
Makefile.in || die
+ sed -i \
+ -e '/rm -f $@/d' \
+ $(find . -name Makefile.in) \
+ || die
+
# Fix desktop files wrt bug #432714
sed -i \
-e '/^Encoding/d' \
@@ -126,6 +131,15 @@ src_configure() {
}
src_compile() {
+ local directory
+ for directory in . libnetutil nsock/src \
+ $(usex ncat ncat '') \
+ $(usex nmap-update nmap-update '') \
+ $(usex nping nping '')
+ do
+ emake -C "${directory}" makefile.dep
+ done
+
emake \
AR=$(tc-getAR) \
RANLIB=$(tc-getRANLIB)
diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
index cde758c7b875..31d09a0f92aa 100644
--- a/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -141,6 +141,10 @@ src_compile() {
use python && distutils-r1_src_compile
}
+src_test() {
+ default
+}
+
src_install() {
default
diff --git a/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch
new file mode 100644
index 000000000000..f3c2fd08da0f
--- /dev/null
+++ b/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch
@@ -0,0 +1,50 @@
+--- SSLConnectionManager.cpp.orig 2014-09-01 23:09:35.916376510 +0200
++++ SSLConnectionManager.cpp 2014-09-01 23:10:32.492515988 +0200
+@@ -95,13 +95,13 @@
+ } catch (SSLConnectionError &error) {
+ std::stringstream errorStream;
+ errorStream << "Got exception: " << error.what();
+- std::string error = errorStream.str();
+- Logger::logError(error);
++ std::string errorStr = errorStream.str();
++ Logger::logError(errorStr);
+ } catch (FirefoxUpdateException &error) {
+ std::stringstream errorStream;
+ errorStream << "Got exception: " << error.what();
+- std::string error = errorStream.str();
+- Logger::logError(error);
++ std::string errorStr = errorStream.str();
++ Logger::logError(errorStr);
+ }
+ }
+
+@@ -120,13 +120,13 @@
+ } catch (SSLConnectionError &error) {
+ std::stringstream errorStream;
+ errorStream << "Got exception: " << error.what();
+- std::string error = errorStream.str();
+- Logger::logError(error);
++ std::string errorStr = errorStream.str();
++ Logger::logError(errorStr);
+ } catch (FirefoxUpdateException &error) {
+ std::stringstream errorStream;
+ errorStream << "Got exception: " << error.what();
+- std::string error = errorStream.str();
+- Logger::logError(error);
++ std::string errorStr = errorStream.str();
++ Logger::logError(errorStr);
+ }
+ }
+
+@@ -151,9 +151,9 @@
+ } catch (SSLConnectionError &error) {
+ std::stringstream errorStream;
+ errorStream << "Got exception: " << error.what();
+- std::string error = errorStream.str();
++ std::string errorStr = errorStream.str();
+
+- Logger::logError(error);
++ Logger::logError(errorStr);
+ }
+ }
+ }
diff --git a/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild
index 90d7c8a83fa6..998780d7849d 100644
--- a/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild
+++ b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-PYTHON_DEPEND="2"
inherit autotools eutils
@@ -14,27 +13,31 @@ SRC_URI="http://thoughtcrime.org/software/sslsniff/${P}.tar.gz"
LICENSE="GPL-3" # plus OpenSSL exception
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
DEPEND="dev-libs/boost:=
- dev-libs/log4cpp
- dev-libs/openssl"
+ dev-libs/log4cpp:=
+ dev-libs/openssl:0"
RDEPEND="${DEPEND}"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.6-asneeded.patch
+DOCS=( AUTHORS README )
+
+# last two patches are taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652756
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.6-asneeded.patch
+ "${FILESDIR}"/${P}-error-redefinition.patch
+ "${FILESDIR}"/${P}-fix-compatibility-with-boost-1.47-and-higher.patch
+ "${FILESDIR}"/${P}-underlinking.patch
+)
- #stolen from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652756
- epatch \
- "${FILESDIR}"/${P}-fix-compatibility-with-boost-1.47-and-higher.patch \
- "${FILESDIR}"/${P}-underlinking.patch
+src_prepare() {
+ epatch ${PATCHES[@]}
+ epatch_user
eautoreconf
}
src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS README
+ default
insinto /usr/share/sslsniff
doins leafcert.pem IPSCACLASEA1.crt
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 77f17d08edeb..e35b5b90b2e4 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -1 +1,2 @@
DIST suricata-2.0.10.tar.gz 3090730 SHA256 c8d1d3b6ce3d2a56577fca224424071afd921739d3859efc8a62229556d4beef SHA512 fa3683a93d85b26166b0f67a85f1a498941aadf4372ef98bd7fe62fcdef150af46b65456e3a764e054c385abbf44138ae6f70882c68ba320508eade6e181f2c6 WHIRLPOOL b867003e76df2b0b1b56c89415ed96acbf9d8966739d77aa303055d29ae5cdad8ad0b58e969336f0c1fc2e5d9990941622c19c062828dae58bf062f5662225f3
+DIST suricata-2.0.11.tar.gz 3091124 SHA256 c607f1e18e5636830f42a83f7c67e1466f07db82853f3a9dba4ab8c6c3bc656e SHA512 659e893fef3cdcca8440f2af7596d5cc58b142d3350b9ea5ba57d855c6759a00adafeb15a1dfe91dd55eca1437487eb4e842b4e2913d12417f0b906ca3d54ec9 WHIRLPOOL 5cfa55abd90284a0a3441853af9db18075a23fa5661d89448b409b8fdd1031ad348d76d455b7dfe7b2688e69633f5bbb65dc060cc2426af017ab1bcb824c9ac5
diff --git a/net-analyzer/suricata/suricata-2.0.10.ebuild b/net-analyzer/suricata/suricata-2.0.10.ebuild
index 40b27405908a..3c69998a1b55 100644
--- a/net-analyzer/suricata/suricata-2.0.10.ebuild
+++ b/net-analyzer/suricata/suricata-2.0.10.ebuild
@@ -96,7 +96,8 @@ src_configure() {
myeconfargs+=( $(use_enable luajit) )
fi
- LIBS+="-lrt -lnuma"
+# this should be used when pf_ring use flag support will be added
+# LIBS+="-lrt -lnuma"
econf LIBS="${LIBS}" ${myeconfargs[@]}
}
diff --git a/net-analyzer/suricata/suricata-2.0.11.ebuild b/net-analyzer/suricata/suricata-2.0.11.ebuild
new file mode 100644
index 000000000000..3c69998a1b55
--- /dev/null
+++ b/net-analyzer/suricata/suricata-2.0.11.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils user
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="http://suricata-ids.org/"
+SRC_URI="http://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet control-socket cuda debug geoip hardened lua luajit nflog +nfqueue +rules test"
+
+DEPEND="
+ >=dev-libs/jansson-2.2
+ dev-libs/libpcre
+ dev-libs/libyaml
+ net-libs/libnet:*
+ net-libs/libnfnetlink
+ dev-libs/nspr
+ dev-libs/nss
+ net-libs/libpcap
+ sys-apps/file
+ cuda? ( dev-util/nvidia-cuda-toolkit )
+ geoip? ( dev-libs/geoip )
+ lua? ( dev-lang/lua:* )
+ luajit? ( dev-lang/luajit:* )
+ nflog? ( net-libs/libnetfilter_log )
+ nfqueue? ( net-libs/libnetfilter_queue )
+"
+# #446814
+# prelude? ( dev-libs/libprelude )
+# pfring? ( sys-process/numactl net-libs/pf_ring)
+# system-htp? ( >=net-analyzer/htp-0.5.5 )
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/fortify_source-numeric.patch"
+ epatch "${FILESDIR}/magic-location.patch"
+ epatch "${FILESDIR}/json.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ "--localstatedir=/var/" \
+ "--disable-detection" \
+ $(use_enable af-packet) \
+ $(use_enable nfqueue) \
+ $(use_enable test coccinelle) \
+ $(use_enable test unittests) \
+ $(use_enable control-socket unix-socket)
+ )
+
+ if use cuda ; then
+ myeconfargs+=( $(use_enable cuda) )
+ fi
+ if use debug ; then
+ myeconfargs+=( $(use_enable debug) )
+ fi
+ if use geoip ; then
+ myeconfargs+=( $(use_enable geoip) )
+ fi
+ if use hardened ; then
+ myeconfargs+=( $(use_enable hardened gccprotect) )
+ fi
+ if use nflog ; then
+ myeconfargs+=( $(use_enable nflog) )
+ fi
+ # not supported yet (no pfring in portage)
+# if use pfring ; then
+# myeconfargs+=( $(use_enable pfring) )
+# fi
+ # no libprelude in portage
+# if use prelude ; then
+# myeconfargs+=( $(use_enable prelude) )
+# fi
+ # htp not added into portage yet
+# if use system-htp ; then
+# myeconfargs+=( $(use_enable system-htp non-bundled-htp) )
+# fi
+ if use lua ; then
+ myeconfargs+=( $(use_enable lua) )
+ fi
+ if use luajit ; then
+ myeconfargs+=( $(use_enable luajit) )
+ fi
+
+# this should be used when pf_ring use flag support will be added
+# LIBS+="-lrt -lnuma"
+
+ econf LIBS="${LIBS}" ${myeconfargs[@]}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ insinto "/etc/${PN}"
+ doins {classification,reference,threshold}.config suricata.yaml
+
+ if use rules ; then
+ insinto "/etc/${PN}/rules"
+ doins rules/*.rules
+ fi
+
+ dodir "/var/lib/${PN}"
+ dodir "/var/log/${PN}"
+ fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+ fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+} \ No newline at end of file
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 63786c06d701..636568df8e39 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,4 +1,2 @@
-DIST vnstat-1.11.tar.gz 79075 SHA256 b71876d817bbb6a16d31b4236e22a2eb6c39666a7f7bfea581f5ff441cade026 SHA512 f16a0cc5065665c46de9781b6d92e96f0966520e5448fc529150ced886574fe07d0695df5051828b58183d06a707b7b2e94562b06db1898dacb858517a5485b1 WHIRLPOOL bc93704b8f9c39830f1ba8c2d39cc7ba7d0b317d35941547870bd5cf8c2f374050cdbae7c8ce444765cd5fb22c78d28e6099f32b06aee9d836451b399216e6ef
-DIST vnstat-1.12.tar.gz 98435 SHA256 af1050d9c1b22d4b9742fe0d1818de9eb1037b8e7f9ba67b962e108d8527be69 SHA512 0d6b5f362bbcbb4a104f82b8e350f5d8b071e974a3fdfb100333c3d8e5a096a71a97360543d2594fd3f2108df8bb03ffffc4c52d396f28723005a5d1bf605eb1 WHIRLPOOL 590197dc62b077268e0814d7ce15f5f519d53328a68e57743c1a3375082410239d75e28674094dbb7d14b27d17769f7de6d0eccd716a05d50d86f5d06274c9a0
DIST vnstat-1.13.tar.gz 101568 SHA256 6f4e2599ebb195b25f499d3e2e865aa14da336dfc9cc03a79181aa71f7ed99cd SHA512 b9620349247db292b13cd06db1921b4e5921a473957ac387f6adfc21acdc441910f73b97dfa5f024d7ba7a6521d1d9d97e2b25337673f423bcdbd064207f01a4 WHIRLPOOL 6b9aeb96790eeef2b287cdffeb4d41b2db22803e7218dafb27944bb14acf255bf590dcb82220c72f388c8cc387045b87335a2e4973a07c5ef1e1c98c710e068d
-DIST vnstat-1.14.tar.gz 103281 SHA256 f8462a47d85d0890493dc9eaeafbc725ae631aa5b103fb7f8af4ddb2314e8386 SHA512 a2aebcdd0c4aa4a821579b751af587af44a5c3f14864d3022a05f65c4df2b9ddece0ed414097346d95124a3ea5fb89ea26bf44c68d3c7ca7237573dd5f1e8239 WHIRLPOOL 1b8b6ac7eeaec936d7c8d17d6a384c13f8daa9ee8e451d94abffc1b373eb3b106ed2b4c95af9f833c4c6e732a4ebc0ccdb1544988da650012add99d7915fd068
+DIST vnstat-1.15.tar.gz 207712 SHA256 c3814b5baa8b627198a8debfe1dce4b4346a342523818cc8668a5497971dbc39 SHA512 e6cf714c2c95ae7f82ec7852d23067da28f4fab83cf33726e4268a31f982ddf13c3bc30f17251a80f7c65d25f394cd05379a30e677687ce70f8c7b229ac0cb4e WHIRLPOOL 7cb68f5c054c96697e415f4d3c23074f36ba1b8fdd012abf732cb6e50eff0a4a862267ac252aace1d5d7fea38cd5f525113a9cdb7e27d9cd58fce373a68896c6
diff --git a/net-analyzer/vnstat/vnstat-1.11-r2.ebuild b/net-analyzer/vnstat/vnstat-1.11-r2.ebuild
deleted file mode 100644
index 0b20d76df83d..000000000000
--- a/net-analyzer/vnstat/vnstat-1.11-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs user
-
-DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
-HOMEPAGE="http://humdi.net/vnstat/"
-SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="gd"
-
-DEPEND="
- gd? ( media-libs/gd[png] )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- enewgroup vnstat
- enewuser vnstat -1 -1 /dev/null vnstat
-}
-
-src_compile() {
- sed -i 's:vnstat[.]log:vnstatd.log:' cfg/vnstat.conf || die
- sed -i 's:vnstat[.]pid:vnstatd/vnstatd.pid:' cfg/vnstat.conf || die
-
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" $(usex gd all '')
-}
-
-src_install() {
- use gd && dobin src/vnstati
- dobin src/vnstat src/vnstatd
- exeinto /etc/cron.hourly
- newexe "${FILESDIR}"/vnstat.cron vnstat
-
- insinto /etc
- doins cfg/vnstat.conf
- fowners root:vnstat /etc/vnstat.conf
-
- newconfd "${FILESDIR}"/vnstatd.confd vnstatd
- newinitd "${FILESDIR}"/vnstatd.initd vnstatd
-
- keepdir /var/lib/vnstat
- fowners vnstat:vnstat /var/lib/vnstat
-
- use gd && doman man/vnstati.1
- doman man/vnstat.1 man/vnstatd.1
-
- newdoc examples/vnstat_ip-up ip-up.example
- newdoc examples/vnstat_ip-down ip-down.example
- newdoc INSTALL README.setup
- dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}
-
-pkg_postinst() {
- # Workaround feature/bug #141619
- chown -R vnstat:vnstat "${ROOT}"/var/lib/vnstat
- chown vnstat:vnstat "${ROOT}"/var/run/vnstatd
- ewarn "vnStat db files owning user and group has been changed to \"vnstat\"."
-
- elog
- elog "Repeat the following command for every interface you"
- elog "wish to monitor (replace eth0):"
- elog " vnstat -u -i eth0"
- elog "and set correct permissions after that, e.g."
- elog " chown -R vnstat:vnstat /var/lib/vnstat"
- elog
- elog "Note: if an interface transfers more than ~4GB in"
- elog "the time between cron runs, you may miss traffic"
- elog
- elog "To update the interfaces database automatically with cron, uncomment"
- elog "lines in /etc/cron.hourly/vnstat and set cron job to run it as"
- elog "frequently as required. Alternatively you can use vnstatd. Init script"
- elog "was installed into /etc/init.d/vnstatd for your convenience."
-}
diff --git a/net-analyzer/vnstat/vnstat-1.12.ebuild b/net-analyzer/vnstat/vnstat-1.12.ebuild
deleted file mode 100644
index a35b06920ea2..000000000000
--- a/net-analyzer/vnstat/vnstat-1.12.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs user
-
-DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
-HOMEPAGE="http://humdi.net/vnstat/"
-SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gd selinux"
-
-DEPEND="
- gd? ( media-libs/gd[png] )
-"
-RDEPEND="
- ${DEPEND}
- selinux? ( sec-policy/selinux-vnstatd )
-"
-
-pkg_setup() {
- enewgroup vnstat
- enewuser vnstat -1 -1 /dev/null vnstat
-}
-
-src_prepare() {
- tc-export CC
-}
-
-src_compile() {
- sed -i 's:vnstat[.]log:vnstatd.log:' cfg/vnstat.conf || die
- sed -i 's:vnstat[.]pid:vnstatd/vnstatd.pid:' cfg/vnstat.conf || die
-
- emake CFLAGS="${CFLAGS}" $(usex gd all '')
-}
-
-src_install() {
- use gd && dobin src/vnstati
- dobin src/vnstat src/vnstatd
-
- exeinto /etc/cron.hourly
- newexe "${FILESDIR}"/vnstat.cron vnstat
-
- insinto /etc
- doins cfg/vnstat.conf
- fowners root:vnstat /etc/vnstat.conf
-
- newconfd "${FILESDIR}"/vnstatd.confd vnstatd
- newinitd "${FILESDIR}"/vnstatd.initd vnstatd
-
- keepdir /var/lib/vnstat
- fowners vnstat:vnstat /var/lib/vnstat
-
- use gd && doman man/vnstati.1
- doman man/vnstat.1 man/vnstatd.1
-
- newdoc INSTALL README.setup
- dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}
-
-pkg_postinst() {
- # Workaround feature/bug #141619
- chown -R vnstat:vnstat "${ROOT}"/var/lib/vnstat
- chown vnstat:vnstat "${ROOT}"/var/run/vnstatd
- ewarn "vnStat db files owning user and group has been changed to \"vnstat\"."
-
- elog
- elog "Repeat the following command for every interface you"
- elog "wish to monitor (replace eth0):"
- elog " vnstat -u -i eth0"
- elog "and set correct permissions after that, e.g."
- elog " chown -R vnstat:vnstat /var/lib/vnstat"
- elog
- elog "Note: if an interface transfers more than ~4GB in"
- elog "the time between cron runs, you may miss traffic"
- elog
- elog "To update the interfaces database automatically with cron, uncomment"
- elog "lines in /etc/cron.hourly/vnstat and set cron job to run it as"
- elog "frequently as required. Alternatively you can use vnstatd. Init script"
- elog "was installed into /etc/init.d/vnstatd for your convenience."
-}
diff --git a/net-analyzer/vnstat/vnstat-1.14.ebuild b/net-analyzer/vnstat/vnstat-1.15.ebuild
index 53ea375992ae..140d8394138c 100644
--- a/net-analyzer/vnstat/vnstat-1.14.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.15.ebuild
@@ -45,12 +45,12 @@ src_prepare() {
}
src_compile() {
- emake CFLAGS="${CFLAGS}" $(usex gd all '')
+ emake ${PN} ${PN}d $(usex gd ${PN}i '')
}
src_install() {
- use gd && dobin src/vnstati
- dobin src/vnstat src/vnstatd
+ use gd && dobin vnstati
+ dobin vnstat vnstatd
exeinto /etc/cron.hourly
newexe "${FILESDIR}"/vnstat.cron vnstat
diff --git a/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch b/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch
new file mode 100644
index 000000000000..639e2993ff6d
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -549,6 +549,7 @@
+ wiretap/libwiretap.la \
+ wsutil/libwsutil.la \
+ @GLIB_LIBS@ \
++ @PCAP_LIBS@ \
+ @SOCKET_LIBS@
+
+ androiddump_CFLAGS = $(AM_CLEAN_CFLAGS)
diff --git a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch
new file mode 100644
index 000000000000..1f80be9f4fa9
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1101,6 +1101,7 @@
+ AC_SUBST(PIE_CFLAGS)
+ AC_SUBST(PIE_LDFLAGS)
+
++AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[
+ WS_CHECKED_CFLAGS_before_simd="$WS_CHECKED_CFLAGS"
+ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C)
+ if test "x$can_add_to_cflags" = "xyes"
+@@ -1132,6 +1133,9 @@
+ ac_sse4_2_flag=-xarch=sse4_2
+ fi
+ fi
++],[
++AC_MSG_RESULT(no)
++])
+
+ #
+ # All AC_WIRESHARK_COMPILER_FLAGS_CHECK are done, do not call it again!
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 2707e563ea6a..9b808bbd2895 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -26,6 +26,7 @@
</longdescription>
<use>
<flag name='adns'>Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
+<flag name='androiddump'>Install androiddump</flag>
<flag name='crypt'>Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
<flag name='doc-pdf'>Build documentation in pdf format (US and a4 paper sizes)</flag>
<flag name='gtk3'>Build the wireshark executable with a GTK+ UI version 3.</flag>
@@ -34,5 +35,6 @@
<flag name='qt4'>Build the wireshark executable with an experimental Qt UI instead of GTK+.</flag>
<flag name='sbc'>Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
<flag name='smi'>Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
+<flag name='tfshark'>Install tfshark</flag>
</use>
</pkgmetadata>
diff --git a/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild b/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..7d7f825b6ee3
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="http://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="
+ adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
+ +netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
+ cpu_flags_x86_sse4_2 ssl zlib
+"
+REQUIRED_USE="
+ ssl? ( crypt )
+ ?? ( qt4 qt5 )
+"
+
+S=${WORKDIR}/${P/_/}
+
+GTK_COMMON_DEPEND="
+ x11-libs/gdk-pixbuf
+ x11-libs/pango
+ x11-misc/xdg-utils
+"
+CDEPEND="
+ >=dev-libs/glib-2.14:2
+ netlink? ( dev-libs/libnl:3 )
+ adns? ( >=net-dns/c-ares-1.5 )
+ crypt? ( dev-libs/libgcrypt:0 )
+ caps? ( sys-libs/libcap )
+ geoip? ( dev-libs/geoip )
+ gtk3? (
+ ${GTK_COMMON_DEPEND}
+ x11-libs/gtk+:3
+ )
+ kerberos? ( virtual/krb5 )
+ lua? ( >=dev-lang/lua-5.1:* )
+ pcap? ( net-libs/libpcap )
+ portaudio? ( media-libs/portaudio )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4[accessibility]
+ x11-misc/xdg-utils
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ x11-misc/xdg-utils
+ )
+ sbc? ( media-libs/sbc )
+ smi? ( net-libs/libsmi )
+ ssl? ( net-libs/gnutls )
+ zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+ ${CDEPEND}
+ dev-lang/perl
+ !<virtual/perl-Pod-Simple-3.170
+ !<perl-core/Pod-Simple-3.170
+ doc? (
+ app-doc/doxygen
+ app-text/asciidoc
+ dev-libs/libxml2
+ dev-libs/libxslt
+ doc-pdf? ( dev-java/fop )
+ www-client/lynx
+ )
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+"
+RDEPEND="
+ ${CDEPEND}
+ gtk3? ( virtual/freedesktop-icon-theme )
+ qt4? ( virtual/freedesktop-icon-theme )
+ qt5? ( virtual/freedesktop-icon-theme )
+ selinux? ( sec-policy/selinux-wireshark )
+"
+
+pkg_setup() {
+ enewgroup wireshark
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
+ "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
+ "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
+ "${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
+ "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
+ "${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch
+
+ epatch_user
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+ # --with-ssl to ./configure. (Mimics code from acinclude.m4).
+ if use kerberos; then
+ case $(krb5-config --libs) in
+ *-lcrypto*)
+ ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+ ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+ ewarn "license and the GPL, so do your check before distributing such package."
+ myconf+=( "--with-ssl" )
+ ;;
+ esac
+ fi
+
+ # Enable wireshark binary with any supported GUI toolkit (bug #473188)
+ if use gtk3 || use qt4 || use qt5; then
+ myconf+=( "--enable-wireshark" )
+ else
+ myconf+=( "--disable-wireshark" )
+ fi
+
+ if ! use qt4 && ! use qt5; then
+ myconf+=( "--with-qt=no" )
+ fi
+
+ if use qt4; then
+ export QT_MIN_VERSION=4.6.0
+ fi
+
+ if use qt5; then
+ export QT_MIN_VERSION=5.3.0
+ append-cxxflags -fPIC -DPIC
+ fi
+
+ # Hack around inability to disable doxygen/fop doc generation
+ use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+ use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+ # dumpcap requires libcap
+ # --disable-profile-build bugs #215806, #292991, #479602
+ econf \
+ $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+ $(use_enable androiddump) \
+ $(use_enable ipv6) \
+ $(use_enable tfshark) \
+ $(use_with adns c-ares) \
+ $(use_with caps libcap) \
+ $(use_with crypt gcrypt) \
+ $(use_with geoip) \
+ $(use_with gtk3) \
+ $(use_with kerberos krb5) \
+ $(use_with lua) \
+ $(use_with pcap dumpcap-group wireshark) \
+ $(use_with pcap) \
+ $(use_with portaudio) \
+ $(usex qt4 --with-qt=4 '') \
+ $(usex qt5 --with-qt=5 '') \
+ $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
+ $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \
+ $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
+ $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+ $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+ $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+ $(use_with sbc) \
+ $(use_with smi libsmi) \
+ $(use_with ssl gnutls) \
+ $(use_with zlib) \
+ $(usex netlink --with-libnl=3 --without-libnl) \
+ $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+ --disable-profile-build \
+ --disable-usr-local \
+ --disable-warnings-as-errors \
+ --sysconfdir="${EPREFIX}"/etc/wireshark \
+ --without-adns \
+ ${myconf[@]}
+}
+
+src_compile() {
+ default
+ if use doc; then
+ use doc-pdf && addpredict "/root/.java"
+ emake -j1 -C docbook
+ fi
+}
+
+src_install() {
+ default
+
+ if use doc; then
+ dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+ if use doc-pdf; then
+ insinto /usr/share/doc/${PF}/pdf/
+ doins docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+ fi
+ fi
+
+ # FAQ is not required as is installed from help/faq.txt
+ dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+ doc/{randpkt.txt,README*}
+
+ # install headers
+ local wsheader
+ for wsheader in \
+ color.h \
+ config.h \
+ epan/*.h \
+ epan/crypt/*.h \
+ epan/dfilter/*.h \
+ epan/dissectors/*.h \
+ epan/ftypes/*.h \
+ epan/wmem/*.h \
+ register.h \
+ wiretap/*.h \
+ ws_symbol_export.h \
+ wsutil/*.h
+ do
+ insinto /usr/include/wireshark/$( dirname ${wsheader} )
+ doins ${wsheader}
+ done
+
+ #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+ insinto /usr/include/wiretap
+ doins wiretap/wtap.h
+
+ if use gtk3 || use qt4 || use qt5; then
+ local c d
+ for c in hi lo; do
+ for d in 16 32 48; do
+ insinto /usr/share/icons/${c}color/${d}x${d}/apps
+ newins image/${c}${d}-app-wireshark.png wireshark.png
+ done
+ done
+ for d in 16 24 32 48 64 128 256 ; do
+ insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+ newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+ done
+ fi
+
+ if use gtk3; then
+ domenu wireshark.desktop
+ fi
+
+ if use qt4 || use qt5; then
+ sed \
+ -e '/Exec=/s|wireshark|&-qt|g' \
+ -e 's|^Name.*=Wireshark|& (Qt)|g' \
+ wireshark.desktop > wireshark-qt.desktop \
+ || die
+ domenu wireshark-qt.desktop
+ fi
+
+ prune_libtool_files
+}
+
+pkg_postinst() {
+ # Add group for users allowed to sniff.
+ enewgroup wireshark
+
+ if use pcap; then
+ fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+ cap_dac_read_search,cap_net_raw,cap_net_admin \
+ "${EROOT}"/usr/bin/dumpcap
+ fi
+
+ ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+ ewarn "add yourself to the wireshark group. This security measure ensures"
+ ewarn "that only trusted users are allowed to sniff your traffic."
+}
diff --git a/net-analyzer/wireshark/wireshark-2.0.0.ebuild b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
index cf834817b59d..f0bae7c6b839 100644
--- a/net-analyzer/wireshark/wireshark-2.0.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="
adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
portaudio +qt4 qt5 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib
@@ -51,6 +51,7 @@ CDEPEND="
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
x11-misc/xdg-utils
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 4a25e68d4edc..786f1b1f1169 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -13,8 +13,9 @@ LICENSE="GPL-2"
SLOT="0/${PV}"
KEYWORDS=""
IUSE="
- adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
- portaudio +qt4 qt5 sbc selinux smi cpu_flags_x86_sse4_2 ssl zlib
+ adns androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk3
+ ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl
+ tfshark zlib
"
REQUIRED_USE="
ssl? ( crypt )
@@ -49,6 +50,7 @@ CDEPEND="
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
x11-misc/xdg-utils
@@ -97,9 +99,9 @@ src_prepare() {
epatch \
"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \
- "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
"${FILESDIR}"/${PN}-99999999-pkgconfig.patch \
- "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+ "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \
+ "${FILESDIR}"/${PN}-2.1.0-sse4_2.patch
epatch_user
@@ -151,7 +153,10 @@ src_configure() {
# dumpcap requires libcap
# --disable-profile-build bugs #215806, #292991, #479602
econf \
+ $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+ $(use_enable androiddump) \
$(use_enable ipv6) \
+ $(use_enable tfshark) \
$(use_with adns c-ares) \
$(use_with caps libcap) \
$(use_with crypt gcrypt) \
diff --git a/net-analyzer/zabbix/zabbix-2.2.11.ebuild b/net-analyzer/zabbix/zabbix-2.2.11.ebuild
index 33b121098d01..6f2350a22fe9 100644
--- a/net-analyzer/zabbix/zabbix-2.2.11.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.11.ebuild
@@ -323,7 +323,6 @@ src_install() {
if use frontend; then
webapp_src_preinst
cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
webapp_configfile \
"${MY_HTDOCSDIR}"/include/db.inc.php \
"${MY_HTDOCSDIR}"/include/config.inc.php
diff --git a/net-analyzer/zabbix/zabbix-2.2.5.ebuild b/net-analyzer/zabbix/zabbix-2.2.5.ebuild
index 603469cb297c..fb86e85ab3ae 100644
--- a/net-analyzer/zabbix/zabbix-2.2.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.5.ebuild
@@ -325,7 +325,6 @@ src_install() {
if use frontend; then
webapp_src_preinst
cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
webapp_configfile \
"${MY_HTDOCSDIR}"/include/db.inc.php \
"${MY_HTDOCSDIR}"/include/config.inc.php
diff --git a/net-analyzer/zabbix/zabbix-2.2.9.ebuild b/net-analyzer/zabbix/zabbix-2.2.9.ebuild
index 33b121098d01..6f2350a22fe9 100644
--- a/net-analyzer/zabbix/zabbix-2.2.9.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.9.ebuild
@@ -323,7 +323,6 @@ src_install() {
if use frontend; then
webapp_src_preinst
cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
webapp_configfile \
"${MY_HTDOCSDIR}"/include/db.inc.php \
"${MY_HTDOCSDIR}"/include/config.inc.php
diff --git a/net-analyzer/zabbix/zabbix-2.4.5.ebuild b/net-analyzer/zabbix/zabbix-2.4.5.ebuild
index 01aca05aa5e4..0c07f1692ad7 100644
--- a/net-analyzer/zabbix/zabbix-2.4.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.4.5.ebuild
@@ -323,7 +323,6 @@ src_install() {
if use frontend; then
webapp_src_preinst
cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
webapp_configfile \
"${MY_HTDOCSDIR}"/include/db.inc.php \
"${MY_HTDOCSDIR}"/include/config.inc.php
diff --git a/net-analyzer/zabbix/zabbix-2.4.7.ebuild b/net-analyzer/zabbix/zabbix-2.4.7.ebuild
index 01aca05aa5e4..0c07f1692ad7 100644
--- a/net-analyzer/zabbix/zabbix-2.4.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.4.7.ebuild
@@ -323,7 +323,6 @@ src_install() {
if use frontend; then
webapp_src_preinst
cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
webapp_configfile \
"${MY_HTDOCSDIR}"/include/db.inc.php \
"${MY_HTDOCSDIR}"/include/config.inc.php
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild
index 20067194b3fd..9bd948cb8895 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86"
IUSE="tk"
RDEPEND="
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index eba934378f3a..f7eba426fc62 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,4 +1,4 @@
DIST bind-9.10.1-P1.tar.gz 8356463 SHA256 974343108d32f253a130383d0ba51290fb7bf372092f1451f264a9e3ac09898d SHA512 5fedff46d9cb0ff2544624c6d998f4f4bcd82152730e8e936c2611847fe443018b5c5c1dfb1dc49888dde5e3e30c3814f08369525612f0770575d54a3133ed48 WHIRLPOOL 6f39ff0e15676ed68f6d48d2ec5894b00de5192edbbbff94444f62dcf83e62a1e72019d575da97b6e6cde91b8918da78721c48510dbaad88095d4f2b3af375eb
DIST bind-9.10.2-P2.tar.gz 8469608 SHA256 b1e6f0af88634aaf48fb9d06bbf82968264f49b8e2685f061dd3fd4c1ab76c5f SHA512 f59a4e7ef268cd95be9c31b8f908a77b261c76bfad0572608f503175e4e06e69c22ee88f4b6ae9578cd096aa069d9401f76084c7e07b3e98e9dbbb40d535695c WHIRLPOOL 10b035f790a43552b22eed13a98b8dcfdc0cc0614342ae221ce23ba655fb40a46e336cca8575460bf26a792303c6eba61e184ca5deb219372fdd09609b4c9798
DIST bind-9.10.2-P4.tar.gz 8471531 SHA256 c00b21ec1def212957f28efe9d10aac52d6ec515e84fbf2c42143f5d71429cb8 SHA512 71dd211167c46ada768389f818b114c9e101132544510df0fde7b83ccbe6ef4d7313a3a254f11efe1ccea43a35f74785de4757c9f6044320174f5a69d39cdd5c WHIRLPOOL 0e179fb597c906c05d820969b8a005511aac177c968ffb10d34c1eda132c6caf9aa6fe8348a16e6ce55317784e44645a5295ccdb2aa740ac5960d6bd85dca7db
-DIST bind-9.10.3.tar.gz 8552545 SHA256 9ac33bd8754ab4b6ee449b1b2aa88e09f51cda088486f4ab1585acd920b98ff0 SHA512 4dd6b298496cb451d8ccc0c1360f7bcfcd4f3180097c7fe4af33bffb8f8d38808e56bcc008d009deb5c8f1e612a2c6c00154b822df94a709195a3abf63e98f99 WHIRLPOOL 0562f3fb4fd0ca9b487f84a67321c1ccf4d05ca13272de740db9ccbda7bb50bea9d23f4d6732bf9b9dabbfaeef03e87b47a7eb7f36bf84c92aee2e87a76ea859
+DIST bind-9.10.3-P2.tar.gz 8523719 SHA256 4a6c1911ac0d4b6be635b63de3429b6c168ea244043f12bbc8a4eb3368fd6ecd SHA512 21905cdff464f9ff275b87744433970d4a80faa6d9245c66c092421a45e89e438bd78f3bfe0d795964312f072c936e44eb6867b72decbba86821619180ced210 WHIRLPOOL 7bc4038a746e5b5c4166fb0d7a57985be9defef4c4c494492312671b81853f506c3216fcd94df993f6f1088d4c36c838d40d85fedbe8eee1b4265c5e2caecaa6
diff --git a/net-dns/bind-tools/bind-tools-9.10.3.ebuild b/net-dns/bind-tools/bind-tools-9.10.3_p2.ebuild
index fb904017e488..59d4b9b5d0f1 100644
--- a/net-dns/bind-tools/bind-tools-9.10.3.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.10.3_p2.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-REQUIRED_USE="gost? ( ssl )"
+REQUIRED_USE="gost? ( !libressl ssl )"
DEPEND="
ssl? (
@@ -45,6 +45,7 @@ RESTRICT="test"
src_prepare() {
epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch #231247
epatch "${FILESDIR}"/${PN}-9.10.2-openssl.patch #417129
+ epatch "${FILESDIR}"/${P}-libressl.patch #563648
# Disable tests for now, bug 406399
sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
diff --git a/net-dns/bind-tools/files/bind-tools-9.10.3_p2-libressl.patch b/net-dns/bind-tools/files/bind-tools-9.10.3_p2-libressl.patch
new file mode 100644
index 000000000000..a38a70d05e4b
--- /dev/null
+++ b/net-dns/bind-tools/files/bind-tools-9.10.3_p2-libressl.patch
@@ -0,0 +1,110 @@
+Fix LibreSSL compatibility, patches from OpenBSD
+
+http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/isc-bind/patches/
+
+http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_dst_openssl_h?rev=1.1&content-type=text/plain
+http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_openssl_link_c?rev=1.1&content-type=text/plain
+http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_openssldh_link_c?rev=1.1&content-type=text/plain
+http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_openssldsa_link_c?rev=1.1&content-type=text/plain
+http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_opensslrsa_link_c?rev=1.1&content-type=text/plain
+
+--- lib/dns/dst_openssl.h.orig Wed Sep 16 14:00:47 2015
++++ lib/dns/dst_openssl.h Wed Sep 16 14:02:42 2015
+@@ -36,7 +36,7 @@
+ #define USE_ENGINE 1
+ #endif
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ /*
+ * These are new in OpenSSL 1.1.0. BN_GENCB _cb needs to be declared in
+ * the function like this before the BN_GENCB_new call:
+--- lib/dns/openssl_link.c.orig Wed Sep 16 14:01:23 2015
++++ lib/dns/openssl_link.c Wed Sep 16 14:01:46 2015
+@@ -88,7 +88,7 @@ entropy_getpseudo(unsigned char *buf, int num) {
+ return (result == ISC_R_SUCCESS ? 1 : -1);
+ }
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ static void
+ entropy_add(const void *buf, int num, double entropy) {
+ /*
+@@ -121,7 +121,7 @@ lock_callback(int mode, int type, const char *file, in
+ UNLOCK(&locks[type]);
+ }
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ static unsigned long
+ id_callback(void) {
+ return ((unsigned long)isc_thread_self());
+@@ -187,7 +187,7 @@ dst__openssl_init(const char *engine) {
+ if (result != ISC_R_SUCCESS)
+ goto cleanup_mutexalloc;
+ CRYPTO_set_locking_callback(lock_callback);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ CRYPTO_set_id_callback(id_callback);
+ #endif
+
+@@ -287,7 +287,7 @@ dst__openssl_destroy(void) {
+ CRYPTO_cleanup_all_ex_data();
+ #endif
+ ERR_clear_error();
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ ERR_remove_state(0);
+ #endif
+ ERR_free_strings();
+--- lib/dns/openssldh_link.c.orig Wed Sep 16 14:01:23 2015
++++ lib/dns/openssldh_link.c Wed Sep 16 14:02:06 2015
+@@ -173,7 +173,7 @@ openssldh_generate(dst_key_t *key, int generator, void
+ DH *dh = NULL;
+ #if OPENSSL_VERSION_NUMBER > 0x00908000L
+ BN_GENCB *cb;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ BN_GENCB _cb;
+ #endif
+ union {
+@@ -210,7 +210,7 @@ openssldh_generate(dst_key_t *key, int generator, void
+ if (dh == NULL)
+ return (dst__openssl_toresult(ISC_R_NOMEMORY));
+ cb = BN_GENCB_new();
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ if (cb == NULL) {
+ DH_free(dh);
+ return (dst__openssl_toresult(ISC_R_NOMEMORY));
+--- lib/dns/openssldsa_link.c.orig Wed Sep 16 14:01:23 2015
++++ lib/dns/openssldsa_link.c Wed Sep 16 14:02:22 2015
+@@ -359,7 +359,7 @@ openssldsa_generate(dst_key_t *key, int unused, void (
+ isc_result_t result;
+ #if OPENSSL_VERSION_NUMBER > 0x00908000L
+ BN_GENCB *cb;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ BN_GENCB _cb;
+ #endif
+ union {
+@@ -383,7 +383,7 @@ openssldsa_generate(dst_key_t *key, int unused, void (
+ if (dsa == NULL)
+ return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
+ cb = BN_GENCB_new();
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ if (cb == NULL) {
+ DSA_free(dsa);
+ return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
+--- lib/dns/opensslrsa_link.c.orig Wed Sep 16 14:01:23 2015
++++ lib/dns/opensslrsa_link.c Wed Sep 16 14:02:31 2015
+@@ -771,7 +771,7 @@ opensslrsa_generate(dst_key_t *key, int exp, void (*ca
+ } u;
+ RSA *rsa = RSA_new();
+ BIGNUM *e = BN_new();
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ BN_GENCB _cb;
+ #endif
+ BN_GENCB *cb = BN_GENCB_new();
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 92f5978f01e2..8ce5420311b4 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,3 +1,3 @@
DIST bind-9.10.2-P4.tar.gz 8471531 SHA256 c00b21ec1def212957f28efe9d10aac52d6ec515e84fbf2c42143f5d71429cb8 SHA512 71dd211167c46ada768389f818b114c9e101132544510df0fde7b83ccbe6ef4d7313a3a254f11efe1ccea43a35f74785de4757c9f6044320174f5a69d39cdd5c WHIRLPOOL 0e179fb597c906c05d820969b8a005511aac177c968ffb10d34c1eda132c6caf9aa6fe8348a16e6ce55317784e44645a5295ccdb2aa740ac5960d6bd85dca7db
-DIST bind-9.10.3.tar.gz 8552545 SHA256 9ac33bd8754ab4b6ee449b1b2aa88e09f51cda088486f4ab1585acd920b98ff0 SHA512 4dd6b298496cb451d8ccc0c1360f7bcfcd4f3180097c7fe4af33bffb8f8d38808e56bcc008d009deb5c8f1e612a2c6c00154b822df94a709195a3abf63e98f99 WHIRLPOOL 0562f3fb4fd0ca9b487f84a67321c1ccf4d05ca13272de740db9ccbda7bb50bea9d23f4d6732bf9b9dabbfaeef03e87b47a7eb7f36bf84c92aee2e87a76ea859
+DIST bind-9.10.3-P2.tar.gz 8523719 SHA256 4a6c1911ac0d4b6be635b63de3429b6c168ea244043f12bbc8a4eb3368fd6ecd SHA512 21905cdff464f9ff275b87744433970d4a80faa6d9245c66c092421a45e89e438bd78f3bfe0d795964312f072c936e44eb6867b72decbba86821619180ced210 WHIRLPOOL 7bc4038a746e5b5c4166fb0d7a57985be9defef4c4c494492312671b81853f506c3216fcd94df993f6f1088d4c36c838d40d85fedbe8eee1b4265c5e2caecaa6
DIST dyndns-samples.tbz2 22866 SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac WHIRLPOOL 08d4e6a817f1d02597631e18152dbd55ea1bc4c82174be150cc77efc9e1f0f03b6471d1cefbe4229cd3161de752ef232a43ca274a07b78e9c974ceb04cfe99a2
diff --git a/net-dns/bind/bind-9.10.3.ebuild b/net-dns/bind/bind-9.10.3_p2.ebuild
index f1956d5e6cbf..2c5d866f3b94 100644
--- a/net-dns/bind/bind-9.10.3.ebuild
+++ b/net-dns/bind/bind-9.10.3_p2.ebuild
@@ -41,7 +41,7 @@ LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="berkdb +caps dlz doc fetchlimit filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
-json ldap mysql nslint odbc postgres python rpz seccomp selinux sit ssl static-libs
+json ldap libressl mysql nslint odbc postgres python rpz seccomp selinux sit ssl static-libs
+threads urandom xml"
# sdb-ldap - patch broken
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
@@ -51,11 +51,15 @@ REQUIRED_USE="postgres? ( dlz )
mysql? ( dlz !threads )
odbc? ( dlz )
ldap? ( dlz )
- gost? ( ssl )
+ gost? ( !libressl ssl )
threads? ( caps )"
# sdb-ldap? ( dlz )
-DEPEND="ssl? ( dev-libs/openssl:0[-bindist] )
+DEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0[-bindist] )
+ libressl? ( dev-libs/libressl )
+ )
mysql? ( >=virtual/mysql-4.0 )
odbc? ( >=dev-db/unixODBC-2.2.6 )
ldap? ( net-nds/openldap )
@@ -87,6 +91,8 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}"/${P}-libressl.patch #563362
+
# Adjusting PATHs in manpages
for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
sed -i \
@@ -235,7 +241,7 @@ src_install() {
# ftp://ftp.rs.internic.net/domain/named.cache:
insinto /var/bind
- newins "${FILESDIR}"/named.cache-r1 named.cache
+ newins "${FILESDIR}"/named.cache-r2 named.cache
insinto /var/bind/pri
newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
diff --git a/net-dns/bind/files/bind-9.10.3_p2-libressl.patch b/net-dns/bind/files/bind-9.10.3_p2-libressl.patch
new file mode 100644
index 000000000000..a38a70d05e4b
--- /dev/null
+++ b/net-dns/bind/files/bind-9.10.3_p2-libressl.patch
@@ -0,0 +1,110 @@
+Fix LibreSSL compatibility, patches from OpenBSD
+
+http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/isc-bind/patches/
+
+http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_dst_openssl_h?rev=1.1&content-type=text/plain
+http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_openssl_link_c?rev=1.1&content-type=text/plain
+http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_openssldh_link_c?rev=1.1&content-type=text/plain
+http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_openssldsa_link_c?rev=1.1&content-type=text/plain
+http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_opensslrsa_link_c?rev=1.1&content-type=text/plain
+
+--- lib/dns/dst_openssl.h.orig Wed Sep 16 14:00:47 2015
++++ lib/dns/dst_openssl.h Wed Sep 16 14:02:42 2015
+@@ -36,7 +36,7 @@
+ #define USE_ENGINE 1
+ #endif
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ /*
+ * These are new in OpenSSL 1.1.0. BN_GENCB _cb needs to be declared in
+ * the function like this before the BN_GENCB_new call:
+--- lib/dns/openssl_link.c.orig Wed Sep 16 14:01:23 2015
++++ lib/dns/openssl_link.c Wed Sep 16 14:01:46 2015
+@@ -88,7 +88,7 @@ entropy_getpseudo(unsigned char *buf, int num) {
+ return (result == ISC_R_SUCCESS ? 1 : -1);
+ }
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ static void
+ entropy_add(const void *buf, int num, double entropy) {
+ /*
+@@ -121,7 +121,7 @@ lock_callback(int mode, int type, const char *file, in
+ UNLOCK(&locks[type]);
+ }
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ static unsigned long
+ id_callback(void) {
+ return ((unsigned long)isc_thread_self());
+@@ -187,7 +187,7 @@ dst__openssl_init(const char *engine) {
+ if (result != ISC_R_SUCCESS)
+ goto cleanup_mutexalloc;
+ CRYPTO_set_locking_callback(lock_callback);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ CRYPTO_set_id_callback(id_callback);
+ #endif
+
+@@ -287,7 +287,7 @@ dst__openssl_destroy(void) {
+ CRYPTO_cleanup_all_ex_data();
+ #endif
+ ERR_clear_error();
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ ERR_remove_state(0);
+ #endif
+ ERR_free_strings();
+--- lib/dns/openssldh_link.c.orig Wed Sep 16 14:01:23 2015
++++ lib/dns/openssldh_link.c Wed Sep 16 14:02:06 2015
+@@ -173,7 +173,7 @@ openssldh_generate(dst_key_t *key, int generator, void
+ DH *dh = NULL;
+ #if OPENSSL_VERSION_NUMBER > 0x00908000L
+ BN_GENCB *cb;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ BN_GENCB _cb;
+ #endif
+ union {
+@@ -210,7 +210,7 @@ openssldh_generate(dst_key_t *key, int generator, void
+ if (dh == NULL)
+ return (dst__openssl_toresult(ISC_R_NOMEMORY));
+ cb = BN_GENCB_new();
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ if (cb == NULL) {
+ DH_free(dh);
+ return (dst__openssl_toresult(ISC_R_NOMEMORY));
+--- lib/dns/openssldsa_link.c.orig Wed Sep 16 14:01:23 2015
++++ lib/dns/openssldsa_link.c Wed Sep 16 14:02:22 2015
+@@ -359,7 +359,7 @@ openssldsa_generate(dst_key_t *key, int unused, void (
+ isc_result_t result;
+ #if OPENSSL_VERSION_NUMBER > 0x00908000L
+ BN_GENCB *cb;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ BN_GENCB _cb;
+ #endif
+ union {
+@@ -383,7 +383,7 @@ openssldsa_generate(dst_key_t *key, int unused, void (
+ if (dsa == NULL)
+ return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
+ cb = BN_GENCB_new();
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ if (cb == NULL) {
+ DSA_free(dsa);
+ return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
+--- lib/dns/opensslrsa_link.c.orig Wed Sep 16 14:01:23 2015
++++ lib/dns/opensslrsa_link.c Wed Sep 16 14:02:31 2015
+@@ -771,7 +771,7 @@ opensslrsa_generate(dst_key_t *key, int exp, void (*ca
+ } u;
+ RSA *rsa = RSA_new();
+ BIGNUM *e = BN_new();
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ BN_GENCB _cb;
+ #endif
+ BN_GENCB *cb = BN_GENCB_new();
diff --git a/net-dns/bind/files/named.cache-r2 b/net-dns/bind/files/named.cache-r2
new file mode 100644
index 000000000000..71713d8c280f
--- /dev/null
+++ b/net-dns/bind/files/named.cache-r2
@@ -0,0 +1,90 @@
+; This file holds the information on root name servers needed to
+; initialize cache of Internet domain name servers
+; (e.g. reference this file in the "cache . <file>"
+; configuration file of BIND domain name servers).
+;
+; This file is made available by InterNIC
+; under anonymous FTP as
+; file /domain/named.cache
+; on server FTP.INTERNIC.NET
+; -OR- RS.INTERNIC.NET
+;
+; last update: December 01, 2015
+; related version of root zone: 2015120100
+;
+; formerly NS.INTERNIC.NET
+;
+. 3600000 NS A.ROOT-SERVERS.NET.
+A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4
+A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30
+;
+; FORMERLY NS1.ISI.EDU
+;
+. 3600000 NS B.ROOT-SERVERS.NET.
+B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201
+B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b
+;
+; FORMERLY C.PSI.NET
+;
+. 3600000 NS C.ROOT-SERVERS.NET.
+C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12
+C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c
+;
+; FORMERLY TERP.UMD.EDU
+;
+. 3600000 NS D.ROOT-SERVERS.NET.
+D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13
+D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d
+;
+; FORMERLY NS.NASA.GOV
+;
+. 3600000 NS E.ROOT-SERVERS.NET.
+E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10
+;
+; FORMERLY NS.ISC.ORG
+;
+. 3600000 NS F.ROOT-SERVERS.NET.
+F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241
+F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f
+;
+; FORMERLY NS.NIC.DDN.MIL
+;
+. 3600000 NS G.ROOT-SERVERS.NET.
+G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4
+;
+; FORMERLY AOS.ARL.ARMY.MIL
+;
+. 3600000 NS H.ROOT-SERVERS.NET.
+H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53
+H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53
+;
+; FORMERLY NIC.NORDU.NET
+;
+. 3600000 NS I.ROOT-SERVERS.NET.
+I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17
+I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53
+;
+; OPERATED BY VERISIGN, INC.
+;
+. 3600000 NS J.ROOT-SERVERS.NET.
+J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30
+J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30
+;
+; OPERATED BY RIPE NCC
+;
+. 3600000 NS K.ROOT-SERVERS.NET.
+K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129
+K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1
+;
+; OPERATED BY ICANN
+;
+. 3600000 NS L.ROOT-SERVERS.NET.
+L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42
+L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:3::42
+;
+; OPERATED BY WIDE
+;
+. 3600000 NS M.ROOT-SERVERS.NET.
+M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33
+M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35
+; End of file
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..5d52ce9ff792
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit systemd user
+
+DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
+HOMEPAGE="http://dnscrypt.org/"
+SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins systemd"
+
+CDEPEND="
+ dev-libs/libsodium
+ net-libs/ldns
+ systemd? ( sys-apps/systemd )"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README* TECHNOTES THANKS"
+
+pkg_setup() {
+ enewgroup dnscrypt
+ enewuser dnscrypt -1 -1 /var/empty dnscrypt
+}
+
+src_configure() {
+ econf \
+ $(use_enable plugins) \
+ $(use_with systemd)
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/${PN}.initd-1.6.0-r1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd-1.6.0-r1 ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+ elog "After starting the service you will need to update your"
+ elog "/etc/resolv.conf and replace your current set of resolvers"
+ elog "with:"
+ elog
+ elog "nameserver <DNSCRYPT_LOCALIP>"
+ elog
+ elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
+ elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
+ elog
+ elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
+}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-1.6.0-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-1.6.0-r1
new file mode 100644
index 000000000000..5b1b28dd5ab1
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-1.6.0-r1
@@ -0,0 +1,13 @@
+DNSCRYPT_LOCALIP=127.0.0.1
+DNSCRYPT_LOCALPORT=53
+DNSCRYPT_USER=dnscrypt
+DNSCRYPT_OPTIONS="--ephemeral-keys"
+# Pick exactly ONE of the following sets:
+# option 1) selection from CSV file, uses the first column as the key
+DNSCRYPT_RESOLVER_NAME=cisco # Cisco OpenDNS
+DNSCRYPT_RESOLVERS_LIST=/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv
+# option 2) manually specified parameters
+#DNSCRYPT_RESOLVERIP=203.0.133.53
+#DNSCRYPT_RESOLVERPORT=443
+#DNSCRYPT_PROVIDER_NAME=2.dnscrypt-cert.example.com
+#DNSCRYPT_PROVIDER_KEY=1234:5678:90AB:CDEF:DEAD:BEEF:CAFE:BEA7:1234:5678:90AB:CDEF:DEAD:BEEF:CAFE:BEA7
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.0-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.0-r1
new file mode 100644
index 000000000000..e79f8f98d747
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.0-r1
@@ -0,0 +1,60 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DNSCRYPT_LOGFILE=${DNSCRYPT_LOGFILE:-/var/log/dnscrypt-proxy.log}
+DNSCRYPT_RESOLVERS_LIST=${DNSCRYPT_RESOLVERS_LIST:-/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv}
+
+rundir=${rundir:-/var/run/dnscrypt-proxy}
+pidfile=${pidfile:-${rundir}/dnscrypt-proxy.pid}
+rundir=${rundir:-/var/run/dnscrypt-proxy}
+runas_user=${runas_user:-dnscrypt}
+runas_group=${runas_user:-dnscrypt}
+
+depend() {
+ use net
+ before dns
+ after logger
+}
+
+start() {
+ if [ ! -d "${rundir}" ]; then
+ mkdir "${rundir}"
+ if [ -n "${runas_user}" ]; then
+ touch "${DNSCRYPT_LOGFILE}"
+ chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
+ chown -R ${runas_user}:${runas_group} "${rundir}"
+ fi
+ fi
+
+ if [ -n "$DNSCRYPT_RESOLVER_NAME" -a -n "$DNSCRYPT_RESOLVERIP" ]; then
+ eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
+ return 1
+ elif [ -n "$DNSCRYPT_RESOLVER_NAME" ]; then
+ resolver_opts="--resolvers-list=${DNSCRYPT_RESOLVERS_LIST} --resolver-name=${DNSCRYPT_RESOLVER_NAME}"
+ elif [ -n "$DNSCRYPT_RESOLVERIP" ]; then
+ resolver_opts="--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} --provider-name=${DNSCRYPT_PROVIDER_NAME} --provider-key=${DNSCRYPT_PROVIDER_KEY}"
+ else
+ eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
+ return 1
+ fi
+
+ ebegin "Starting dnscrypt-proxy"
+ start-stop-daemon --start --quiet \
+ --exec /usr/sbin/dnscrypt-proxy \
+ -- \
+ ${DNSCRYPT_OPTIONS} \
+ --pidfile="${pidfile}" \
+ --logfile="${DNSCRYPT_LOGFILE}" \
+ --daemonize --user=${runas_user} \
+ --local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
+ $resolver_opts
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping dnscrypt-proxy"
+ start-stop-daemon --stop --quiet --exec /usr/sbin/dnscrypt-proxy
+ eend $?
+}
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 69bd5b575744..d7709562e818 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1 +1,2 @@
DIST fwknop-2.6.7.tar.gz 2849006 SHA256 e96c13f725a4c3829c842743b14aedf591d30570df5c06556862a900b64def86 SHA512 8a8c5e76740c495342fd914309de564576ce5c7fda90dc0f0322782ace5f28ccbb4bcef4c0a3353a564b13ef7298a5cd75dcd4d26986b2fb5ec000b641fbf848 WHIRLPOOL 6de45c31cc39b7b44d0531dc19bd2727bc721cf156a04d830c295573fe40d95296c1591e3bd5ae2b597bea9a6015744061351655f1cf04a5d6a5cae6678d1126
+DIST fwknop-2.6.8.tar.gz 2860231 SHA256 96e6ba8b7e29aaf65bd06eaa823896ab66169b2aaced8123375378ff4b76a2d6 SHA512 aed4081652a95f3276468d58476d093a6dd76abbe5b4047930fc32a0d46f3dc341a3b0d9b7c81dc6c466f468f06c94607f2dadc89867127d0b4878175e32b6d6 WHIRLPOOL d394b43c5eb96a4172ec005dc8ec13985e8b70bd342eabfdd95d0fd7a6425ddc294d24900f6b85b4ce7c595cf45622b28ee08583fb222c7d5d9f74f87a10c1cc
diff --git a/net-firewall/fwknop/fwknop-2.6.8.ebuild b/net-firewall/fwknop/fwknop-2.6.8.ebuild
new file mode 100644
index 000000000000..582a81b605dd
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.8.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DISABLE_AUTOFORMATTING=1
+
+DISTUTILS_OPTIONAL=1
+# Python extension supports only Python2
+# See https://github.com/mrash/fwknop/issues/167
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
+
+DESCRIPTION="Single Packet Authorization and Port Knocking application"
+HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop"
+SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="client extras firewalld gdbm gpg iptables python server udp-server"
+
+DEPEND="
+ client? ( net-misc/wget[ssl] )
+ firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] )
+ gdbm? ( sys-libs/gdbm )
+ gpg? (
+ app-crypt/gpgme
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ )
+ iptables? ( net-firewall/iptables )
+ python? ( ${PYTHON_DEPS} )
+ server? ( !udp-server? ( net-libs/libpcap ) )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ firewalld? ( server )
+ iptables? ( server )
+ server? ( ^^ ( firewalld iptables ) )
+ udp-server? ( server )
+"
+
+DOCS=( ChangeLog README.md )
+
+DOC_CONTENTS="
+Example configuration files were installed in /etc/fwknopd directory.
+Please edit them to fit your needs and then remove the .example suffix.
+
+fwknopd supports several backends: firewalld, iptables, ipfw, pf, ipf.
+You can set the desired backend via FIREWALL_EXE option in fwknopd.conf
+instead of the default one chosen at compile time.
+"
+
+pkg_pretend() {
+ if use server; then
+ if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then
+ ewarn "fwknopd uses the iptables 'comment' match to expire SPA rules,"
+ ewarn "which is a major security feature and is enabled by default."
+ ewarn "Please either enable NETFILTER_XT_MATCH_COMMENT support in your"
+ ewarn "kernel, or set the appropriate ENABLE_{FIREWD,IPT}_COMMENT_CHECK"
+ ewarn "to 'N' in your fwknopd.conf file."
+ fi
+ fi
+}
+
+src_prepare() {
+ # Install example configs with .example suffix
+ if use server; then
+ sed -i -e 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
+ fi
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --localstatedir=/run
+ --enable-digest-cache
+ $(use_enable client)
+ $(use_enable !gdbm file-cache)
+ $(use_enable server)
+ $(use_enable udp-server)
+ $(use_with gpg gpgme)
+ )
+ use firewalld && myeconfargs+=(--with-firewalld=/usr/sbin/firewalld)
+ use iptables && myeconfargs+=(--with-iptables=/sbin/iptables)
+
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+
+ if use python; then
+ cd "${S}"/python || die
+ distutils-r1_src_compile
+ fi
+}
+
+src_install() {
+ autotools-utils_src_install
+ prune_libtool_files --modules
+
+ if use server; then
+ newinitd "${FILESDIR}/fwknopd.init" fwknopd
+ newconfd "${FILESDIR}/fwknopd.confd" fwknopd
+ systemd_dounit extras/systemd/fwknopd.service
+ systemd_newtmpfilesd extras/systemd/fwknopd.tmpfiles.conf fwknopd.conf
+ readme.gentoo_create_doc
+ fi
+
+ use extras && dodoc "${S}/extras/apparmor/usr.sbin.fwknopd"
+
+ if use python; then
+ # Unset DOCS since distutils-r1.eclass interferes
+ local DOCS=()
+ cd "${S}"/python || die
+ distutils-r1_src_install
+ fi
+}
+
+pkg_postinst() {
+ use server && readme.gentoo_print_elog
+}
diff --git a/net-firewall/nftables/nftables-0.5-r1.ebuild b/net-firewall/nftables/nftables-0.5-r1.ebuild
deleted file mode 100644
index 8c706169a1ee..000000000000
--- a/net-firewall/nftables/nftables-0.5-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools linux-info eutils
-
-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 gmp +readline"
-
-RDEPEND=">=net-libs/libmnl-1.0.3
- >=net-libs/libnftnl-1.0.5
- gmp? ( dev-libs/gmp:0= )
- readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
- >=app-text/docbook2X-0.8.8-r4
- sys-devel/bison
- sys-devel/flex"
-
-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() {
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- econf \
- --sbindir="${EPREFIX}"/sbin \
- $(use_enable debug) \
- $(use_with readline cli) \
- $(use_with !gmp mini_gmp)
-}
-
-src_install() {
- default
-
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
- keepdir /var/lib/nftables
-}
diff --git a/net-firewall/nftables/nftables-0.5.ebuild b/net-firewall/nftables/nftables-0.5.ebuild
deleted file mode 100644
index fdefe0046b08..000000000000
--- a/net-firewall/nftables/nftables-0.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools linux-info eutils
-
-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 gmp +readline"
-
-RDEPEND=">=net-libs/libmnl-1.0.3
- >=net-libs/libnftnl-1.0.5
- gmp? ( dev-libs/gmp )
- readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
- >=app-text/docbook2X-0.8.8-r4
- sys-devel/bison
- sys-devel/flex"
-
-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() {
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- econf \
- --sbindir="${EPREFIX}"/sbin \
- $(use_enable debug) \
- $(use_with readline cli) \
- $(use_with !gmp mini_gmp)
-}
-
-src_install() {
- default
-
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.init ${PN}
- keepdir /var/lib/nftables
-}
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index ed51477a5ced..94cca56c1dc6 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,3 +1,4 @@
DIST psad-2.2.5.tar.bz2 1243987 SHA256 736d446266227cb65511d792c85224573c95ea4dc3bde3d5c65bc19084f57452 SHA512 195a06420cf821d182a5422705ba2d407fd35f23887430e61925cad0eada7d20e2416eaf6317857a5aec2f1264a280a7e0128cc301f17dcf20cf833a9f0efb6e WHIRLPOOL fac4797e0a399d4f5edf2179c21d37791d184ee1e334b9b8fb2707405afc10ca0c0d4ab43cd274f34cf8ba9453189066b1d46b955d0533fa357e376ef3817f1f
DIST psad-2.4.1.tar.bz2 1361593 SHA256 d86688ed7907724750b501087a92a3417cb5b2dc81e06230d0eb2cdcf676b03e SHA512 e146d9853e265f4bb25b79fff7a0ab6ba2759367890498ea25edaff771df1b30c3a284b18e6fe5ae3f4c91a79f6b8d255bf331921c36a24fb0f4f554fa3cb848 WHIRLPOOL 5ac2b96fd8ec4baa98a0b35465e5c8bbfb3dffd48f2a95e31ef80e176d80e7ed09a5bcf6d945e8bed3d69d9cb21b14857dc56fd24bc5ce01ef9540729fd585d4
DIST psad-2.4.2.tar.bz2 1396459 SHA256 0490688c2d09428ee3b0f20a8aebaceb5993484c5e30176f883bea37272c9715 SHA512 1a28bec3eafcbc9a480680598724b7c99c1aaad2560ec44d00b002208d737b771017c3bbeb73ece10199740d1c9094b11036f8d04cb5b8c6f3860f2e0c0221ab WHIRLPOOL 17401c1ad846759f181f2f5d0619412f198aff5dd54fa8841a02757322ada67a9f6ae651b3b1cdbc4dbfbe2ed0570e56a74bb235794b24b0a187583383a94b0b
+DIST psad-2.4.3.tar.bz2 1395260 SHA256 e482de4602ab72dba868dcdd1078ad3645d49ab02a9eb116dd117c1a5a20f8c5 SHA512 8a25ef377e3f4f406c2179a42217110a670f1c0eb8e7991e32a99fd695ca1866218274e9aaeb48552e1bd9bd91b5fbf34b226d767c28f1db27f15b08fba2b0e8 WHIRLPOOL a1c06df2cd67baa3e2b519094ffcccd027aab47352c00cd3147a8d3db2366ce8cbea42c37f5e8adcd9c2532af215bd87ed5d925e376cf8d965725e4f5cf4c7ea
diff --git a/net-firewall/psad/psad-2.4.3.ebuild b/net-firewall/psad/psad-2.4.3.ebuild
new file mode 100644
index 000000000000..dcf0bcd10907
--- /dev/null
+++ b/net-firewall/psad/psad-2.4.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+#PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit eutils perl-module toolchain-funcs
+
+DESCRIPTION="Port Scanning Attack Detection daemon"
+SRC_URI="http://www.cipherdyne.org/psad/download/${P}.tar.bz2"
+HOMEPAGE="http://www.cipherdyne.org/psad"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+RDEPEND="
+ dev-perl/Bit-Vector
+ dev-perl/Date-Calc
+ dev-perl/NetAddr-IP
+ dev-perl/Unix-Syslog
+ net-firewall/iptables
+ net-misc/whois
+ virtual/logger
+ virtual/mailx
+ virtual/perl-Storable
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.2.4-var-run.patch
+
+ sed -i \
+ -e 's|/usr/bin/gcc|$(CC)|g' \
+ -e 's|-O|$(CFLAGS) $(LDFLAGS)|g' \
+ Makefile || die
+ # Fix up default paths
+ sed -i \
+ -e "s:/usr/bin/whois_psad:/usr/bin/whois:g" \
+ psad.conf || die
+}
+
+src_configure() {
+ default
+
+ local deps_subdir
+ for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
+ cd "${S}"/deps/${deps_subdir} || die
+ SRC_PREP="no" perl-module_src_configure
+ done
+}
+
+src_compile() {
+ tc-export CC
+ default
+
+ local deps_subdir
+ for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
+ cd "${S}"/deps/${deps_subdir} || die
+ perl-module_src_compile
+ done
+}
+
+src_install() {
+ newbin pscan psad-pscan
+
+ insinto /usr
+ dosbin kmsgsd psad psadwatchd
+ newsbin fwcheck_psad.pl fwcheck_psad
+
+ insinto /etc/psad
+ doins \
+ *.conf auto_dl icmp{,6}_types ip_options psad_* pf.os posf \
+ protocols signatures
+
+ newinitd init-scripts/psad-init.gentoo psad
+
+ doman *.8
+
+ dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES FW_HELP README \
+ README.SYSLOG SCAN_LOG
+
+ insinto /etc/psad/snort_rules
+ doins deps/snort_rules/*
+
+ local deps_subdir
+ for deps_subdir in IPTables-Parse IPTables-ChainMgr; do
+ cd "${S}"/deps/${deps_subdir} || die
+ perl-module_src_install
+ done
+}
diff --git a/net-fs/cifs-utils/cifs-utils-6.4.ebuild b/net-fs/cifs-utils/cifs-utils-6.4.ebuild
index fba0a5e58d63..6ae8d3ec9336 100644
--- a/net-fs/cifs-utils/cifs-utils-6.4.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
IUSE="+acl +ads +caps +caps-ng creds"
DEPEND="!net-fs/mount-cifs
diff --git a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
index b57c95f3280e..4ec3651c420f 100644
--- a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
kerberos ldap libressl linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
diff --git a/net-im/ayttm/ayttm-0.6.3.ebuild b/net-im/ayttm/ayttm-0.6.3-r1.ebuild
index 079efe16e8ac..ce6f529a75bf 100644
--- a/net-im/ayttm/ayttm-0.6.3.ebuild
+++ b/net-im/ayttm/ayttm-0.6.3-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=5
inherit autotools eutils multilib
DESCRIPTION="A multi-protocol instant messaging client"
@@ -16,7 +16,7 @@ IUSE="crypt icq irc xmpp lj msn nls oscar smtp webcam xscreensaver yahoo"
CDEPEND="app-text/enchant
dev-libs/glib:2
- dev-libs/openssl
+ dev-libs/openssl:0
virtual/libiconv
x11-libs/gdk-pixbuf
x11-libs/gtk+:2
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 075fcdc881ef..59a12f72eb33 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1 +1,2 @@
DIST gajim-0.16.4.tar.bz2 4593307 SHA256 2116ad3a5635c54b575ff53eed72fe4651fc50582f5094bfc6113d1cf0d1ce7f SHA512 e8c046aa711207d71080c83d4827400392354eaadb4b431a474fcd94d56bb0fac9f163606a6f7e8abd68c7509158f8e8101b0cc2ecb439443e2966deb707bfdb WHIRLPOOL c6a496f9c02fabbaf76b52e930e5d79f6fad2557e8b458654c538c82041b8ba65bb6f8d75f18438fbabb8aa0e52493494a5847833cc49b70444720b15d6d86a5
+DIST gajim-0.16.5.tar.bz2 4562971 SHA256 a5c015b3b140ec5e47d3842cbe701c9948af5a0cce36314248f0793c2d66d091 SHA512 d69613f9e119f128adc9e81ace2475d3e3e41b47c153ea6ae5a9fcb5be390ec900893e1ab9ce694260898ebced00cd631a3ec4271ac27ed735d3f18dd1e1b6d4 WHIRLPOOL d1405dedd29e867d9a05ca1678f3568acfb53baf7047294af66561a5542f70a02d9b8f22e42abae670e17e6f00461b423e01748ee31b8ada7be7d352af4bb344
diff --git a/net-im/gajim/files/gajim-0.16.5-desktop.patch b/net-im/gajim/files/gajim-0.16.5-desktop.patch
new file mode 100644
index 000000000000..5dd087bf5802
--- /dev/null
+++ b/net-im/gajim/files/gajim-0.16.5-desktop.patch
@@ -0,0 +1,29 @@
+diff -r ecfc76d21658 data/gajim-remote.desktop.in.in
+--- a/data/gajim-remote.desktop.in.in Wed Dec 23 22:40:53 2015 +0100
++++ b/data/gajim-remote.desktop.in.in Mon Dec 28 17:38:15 2015 +0100
+@@ -1,11 +1,11 @@
+ [Desktop Entry]
+ Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly;
+ _Name=Gajim Remote
+-_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip
++_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip;
+ Version=1.0
+ Exec=gajim-remote handle_uri %u
+ TryExec=gajim-remote
+ StartupNotify=false
+ Terminal=false
+ Type=Application
+-MimeType=x-scheme-handler/xmpp
++MimeType=x-scheme-handler/xmpp;
+diff -r ecfc76d21658 data/gajim.desktop.in.in
+--- a/data/gajim.desktop.in.in Wed Dec 23 22:40:53 2015 +0100
++++ b/data/gajim.desktop.in.in Mon Dec 28 17:38:15 2015 +0100
+@@ -3,7 +3,7 @@
+ _Name=Gajim
+ _GenericName=Jabber IM Client
+ _Comment=A GTK+ Jabber client
+-_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip
++_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip;
+ Version=1.0
+ Exec=gajim
+ Icon=gajim
diff --git a/net-im/gajim/gajim-0.16.5.ebuild b/net-im/gajim/gajim-0.16.5.ebuild
new file mode 100644
index 000000000000..4819a062bc9f
--- /dev/null
+++ b/net-im/gajim/gajim-0.16.5.ebuild
@@ -0,0 +1,127 @@
+# 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="sqlite,xml"
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils python-r1 versionator
+
+MY_PV=${PV/_/-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI="
+ http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+# test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ libnotify? ( dbus )
+ avahi? ( dbus )
+ gnome? ( gnome-keyring )"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.40.1
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+ >=dev-python/python-nbxmpp-0.5.3[${PYTHON_USEDEP}]
+ crypt? (
+ app-crypt/gnupg
+ dev-python/pycrypto[${PYTHON_USEDEP}]
+ )
+ dbus? (
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-libs/dbus-glib
+ libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+ avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
+ )
+ gnome? (
+ dev-python/libgnome-python[${PYTHON_USEDEP}]
+ dev-python/egg-python[${PYTHON_USEDEP}]
+ )
+ gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
+ idle? ( x11-libs/libXScrnSaver )
+ jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
+ kde? ( kde-apps/kwalletmanager )
+ networkmanager? (
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ net-misc/networkmanager
+ )
+ spell? ( app-text/gtkspell:2 )
+ srv? (
+ || (
+ dev-python/libasyncns-python[${PYTHON_USEDEP}]
+ net-dns/bind-tools
+ )
+ )
+ xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-desktop.patch
+ )
+
+src_prepare() {
+ autotools-utils_src_prepare
+ python_copy_sources
+}
+
+src_configure() {
+ configuration() {
+ local myeconfargs=(
+ $(use_enable nls)
+ $(use_with X x)
+ --docdir="/usr/share/doc/${PF}"
+ --libdir="$(python_get_sitedir)"
+ --enable-site-packages
+ )
+ run_in_build_dir autotools-utils_src_configure
+ }
+ python_foreach_impl configuration
+}
+
+src_compile() {
+ compilation() {
+ run_in_build_dir autotools-utils_src_compile
+ }
+ python_foreach_impl compilation
+}
+
+src_test() {
+ testing() {
+ run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
+ }
+ python_foreach_impl testing
+}
+
+src_install() {
+ installation() {
+ run_in_build_dir autotools-utils_src_install
+ python_optimize
+ }
+ python_foreach_impl installation
+
+ rm "${ED}/usr/share/doc/${PF}/README.html" || die
+ dohtml README.html
+}
diff --git a/net-im/jabber-base/jabber-base-0.01-r1.ebuild b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
new file mode 100644
index 000000000000..1b6320c607f0
--- /dev/null
+++ b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="Jabber servers and transports layout package"
+SRC_URI=""
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+S="${WORKDIR}"
+
+#Info for people working in jabber related packages
+
+#/etc/jabber/ for configuration files
+#/var/run/jabber/ for the pid files
+#/var/spool/jabber/ for the flat files databases (actually there must be a ewarn
+#at end of ebuild telling user to creat /var/spool/jabber/JID, as some transports fail to start if
+#the directory is not there, even if they have permissions to creat it)
+#/var/log/jabber/ for the log files
+
+#for the python based transports with no install script:
+#they must inherit python and be installed in:
+#$(python_get_sitedir)/$package-name
+
+#the user should be the one created here username=group=jabber
+
+src_install() {
+ keepdir /etc/jabber
+ keepdir /var/run/jabber
+ keepdir /var/spool/jabber
+ keepdir /var/log/jabber
+}
+
+pkg_postinst() {
+ # Users should not be created in src_install see bug #124680
+ # Add our default jabber group and user
+ enewgroup jabber
+ enewuser jabber -1 -1 -1 jabber
+ # We can't use fowners & fperms convenience wrappers as we are outside the sandbox
+ chown jabber:jabber /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
+ chmod 770 /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
+}
diff --git a/net-im/qwit/qwit-1.1_pre2-r1.ebuild b/net-im/qwit/qwit-1.1_pre2-r1.ebuild
new file mode 100644
index 000000000000..33401ab7b551
--- /dev/null
+++ b/net-im/qwit/qwit-1.1_pre2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2
+
+MY_P=${P/_/-}-src
+
+DESCRIPTION="Qt4 cross-platform client for Twitter"
+HOMEPAGE="https://code.google.com/p/qwit/"
+SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS="AUTHORS"
+
+DEPEND="dev-qt/qtgui:4"
+RDEPEND="${DEPEND}
+ dev-libs/qoauth"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ eqmake4 ${PN}.pro PREFIX=/usr
+}
diff --git a/net-im/simpserver-bin/simpserver-bin-2.1.0.ebuild b/net-im/simpserver-bin/simpserver-bin-2.1.0-r1.ebuild
index cb5179e98fe5..e7f2955c5a15 100644
--- a/net-im/simpserver-bin/simpserver-bin-2.1.0.ebuild
+++ b/net-im/simpserver-bin/simpserver-bin-2.1.0-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
+EAPI=5
+
MY_PN=${PN/-bin/}
MY_P="${MY_PN}-${PV}"
diff --git a/net-irc/bip/Manifest b/net-irc/bip/Manifest
index 7f1005f53c32..7e8596b1a4de 100644
--- a/net-irc/bip/Manifest
+++ b/net-irc/bip/Manifest
@@ -1,2 +1 @@
-DIST bip-0.8.8.tar.gz 220232 SHA256 7ca3fb96f5ee6b76eb398d7ea45344ea24855344ced11632241a33353bba05d7 SHA512 acd62a61379290088320567b299b9d2e236c24aea7c83c4bfb7dedba9727868fb931d7e2eb663c9041794c26583bcc923072049cb42eef0d13702f284bae2b34 WHIRLPOOL b2e5f7a1328832fce7b3c7eb706ec87e7eb023043e714dbc554126730d2e9dc37af2d127e15ef024fff1e95b9dd22351cd48b3b115b58b9fd9ecbdd92f20cda1
DIST bip-0.8.9.tar.gz 256711 SHA256 3c950f71ef91c8b686e6835f9b722aa7ccb88d3da4ec1af19617354fd3132461 SHA512 572adb6e0982d74a39b0380ef6af51ba7f55b880f78e110b93e09616e6345bb4a9a60475df644ec891cae368287d502ba00bbf734370ba50c57b29de6934c138 WHIRLPOOL ffad5a0a525a09e6d31537dd4238353ac820a874f18a9590f039419e9d2b7aff4f92a1882f02db450e9e88957adbc4bc4eb993fbff01f7327bcdd02d0b1b6e6d
diff --git a/net-irc/bip/bip-0.8.8-r1.ebuild b/net-irc/bip/bip-0.8.8-r1.ebuild
deleted file mode 100644
index 86fc9b03ca32..000000000000
--- a/net-irc/bip/bip-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-inherit eutils autotools
-
-DESCRIPTION="Multiuser IRC proxy with SSL support"
-HOMEPAGE="http://bip.milkypond.org/"
-SRC_URI="ftp://ftp.duckcorp.org/bip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug freenode noctcp ssl vim-syntax oidentd"
-
-DEPEND="sys-devel/flex
- virtual/yacc
- ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
- vim-syntax? (
- || ( app-editors/vim app-editors/gvim ) )
- oidentd? ( >=net-misc/oidentd-2.0 )"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-configure.patch" || die
- epatch "${FILESDIR}/${PN}-CVE-2012-0806.patch" || die
-
- eautoreconf
-
- if use noctcp; then
- sed -i -e '/irc_privmsg_check_ctcp(server, line);/s:^://:' src/irc.c || die
- fi
-
- if use freenode; then
- epatch "${FILESDIR}/${PN}-freenode.patch" || die
- fi
-}
-
-src_configure() {
- econf \
- $(use_with ssl openssl) \
- $(use_enable debug) \
- $(use_enable oidentd)
-}
-
-src_compile() {
- # Parallel make fails.
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- dobin src/bip src/bipmkpw || die "dobin failed"
-
- dodoc AUTHORS ChangeLog README NEWS TODO || die "dodoc failed"
- newdoc samples/bip.conf bip.conf.sample || die "newdoc failed"
- doman bip.1 bip.conf.5 bipmkpw.1 || die "doman failed"
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins samples/bip.vim || die "doins failed"
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}"/bip.vim || die "doins failed"
- fi
-}
-
-pkg_postinst() {
- elog 'The default configuration file is "~/.bip/bip.conf"'
- elog "You can find a sample configuration file in"
- elog "/usr/share/doc/${PF}/bip.conf.sample"
-}
diff --git a/net-irc/bip/bip-0.8.9.ebuild b/net-irc/bip/bip-0.8.9.ebuild
index c25551e726b0..d62fd64c4289 100644
--- a/net-irc/bip/bip-0.8.9.ebuild
+++ b/net-irc/bip/bip-0.8.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.duckcorp.org/bip/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug freenode noctcp oidentd vim-syntax"
COMMON_DEPEND="
diff --git a/net-irc/bip/files/bip-0.8.8-configure.patch b/net-irc/bip/files/bip-0.8.8-configure.patch
deleted file mode 100644
index 592bdc664561..000000000000
--- a/net-irc/bip/files/bip-0.8.8-configure.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit 559fa7ed44238e811ac0c11321ed021c35cba2be
-Author: Pierre-Louis Bonicoli <pierre-louis.bonicoli@gmx.fr>
-Date: Wed Sep 14 06:30:09 2011 +0200
-
- don't override user var. Thanks to Alex Legler
-
- Based on gentoo-x86/net-irc/bip/files/bip-configure.patch
- See http://www.gnu.org/software/autoconf/manual/automake.html#User-Variables
- If user doesn't specify CFLAGS, default value is "-Wall -Wextra -g -O2".
-
-diff --git a/Makefile.am b/Makefile.am
-index c2dae4d..f17c314 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -13,13 +13,8 @@ src_bip_SOURCES = src/conf.y src/lex.l \
- src_bipmkpw_SOURCES = src/bipmkpw.c src/md5.c src/util.c
- AM_YFLAGS= -d
- BUILT_SOURCES = src/conf.c src/conf.h src/lex.c
--if DEBUG
-- AM_CFLAGS+=-Wall -g
-- AM_LDFLAGS+=-g
--else
-- AM_CFLAGS+=-Wall
--endif
-
-+AM_CFLAGS=-Wall -Wextra
-
- dist_man_MANS = bip.1 bip.conf.5 bipmkpw.1
-
-diff --git a/configure.ac b/configure.ac
-index 005e697..5740a39 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -44,16 +44,12 @@ AC_ARG_ENABLE([pie], AS_HELP_STRING([--disable-pie], [Do not build a position in
-
- AM_CONDITIONAL(DEBUG, test x$enable_debug = xyes)
- AS_IF([test "x$enable_debug" = "xyes"], [
-- CFLAGS="-O0 -g -W -Wall"
-- LDFLAGS="-g"
- AC_CHECK_FUNC(backtrace_symbols_fd, [
- AC_DEFINE(HAVE_BACKTRACE, [], [Use glibc backtrace on fatal()])
- LDFLAGS="-rdynamic $LDFLAGS"
- backtrace="(with backtrace)"
- ])
- ], [
-- CFLAGS="-O2 -g -W -Wall"
-- LDFLAGS="-g"
- enable_debug=no
- ])
-
diff --git a/net-irc/bip/files/bip-CVE-2012-0806.patch b/net-irc/bip/files/bip-CVE-2012-0806.patch
deleted file mode 100644
index 6ea26aead2bb..000000000000
--- a/net-irc/bip/files/bip-CVE-2012-0806.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-commit 222a33cb84a2e52ad55a88900b7895bf9dd0262c
-Author: Pierre-Louis Bonicoli <pierre-louis.bonicoli@gmx.fr>
-Date: Sat Jan 7 11:41:02 2012 +0100
-
- Buffer Overflow: check against the implicit size of select() arrays
-
- Reported by Julien Tinnes (Fix #269)
- exit is called when the listening socket can not be created
-
-diff --git a/src/bip.c b/src/bip.c
-index d46ee2b..b4ac706 100644
---- a/src/bip.c
-+++ b/src/bip.c
-@@ -1311,7 +1311,7 @@ int main(int argc, char **argv)
- close(fd);
-
- bip.listener = listen_new(conf_ip, conf_port, conf_css);
-- if (!bip.listener)
-+ if (!bip.listener || bip.listener->connected == CONN_ERROR)
- fatal("Could not create listening socket");
-
- for (;;) {
-diff --git a/src/connection.c b/src/connection.c
-index 07ab431..5c4c24a 100644
---- a/src/connection.c
-+++ b/src/connection.c
-@@ -124,6 +124,18 @@ static void connect_trynext(connection_t *cn)
- continue;
- }
-
-+ if (cn->handle >= FD_SETSIZE) {
-+ mylog(LOG_WARN, "too many fd used, close socket %d",
-+ cn->handle);
-+
-+ if (close(cn->handle) == -1)
-+ mylog(LOG_WARN, "Error on socket close: %s",
-+ strerror(errno));
-+
-+ cn->handle = -1;
-+ break;
-+ }
-+
- socket_set_nonblock(cn->handle);
-
- if (cn->connecting_data->src) {
-@@ -789,13 +801,8 @@ list_t *wait_event(list_t *cn_list, int *msec, int *nc)
- /*
- * This shouldn't happen ! just in case...
- */
-- if (cn->handle < 0) {
-- mylog(LOG_WARN, "wait_event invalid socket %d",
-- cn->handle);
-- if (cn_is_connected(cn))
-- cn->connected = CONN_ERROR;
-- continue;
-- }
-+ if (cn->handle < 0 || cn->handle >= FD_SETSIZE)
-+ fatal("wait_event invalid socket %d", cn->handle);
-
- /* exceptions are OOB and disconnections */
- FD_SET(cn->handle, &fds_except);
-@@ -966,6 +973,18 @@ static void create_listening_socket(char *hostname, char *port,
- continue;
- }
-
-+ if (cn->handle >= FD_SETSIZE) {
-+ mylog(LOG_WARN, "too many fd used, close listening socket %d",
-+ cn->handle);
-+
-+ if (close(cn->handle) == -1)
-+ mylog(LOG_WARN, "Error on socket close: %s",
-+ strerror(errno));
-+
-+ cn->handle = -1;
-+ break;
-+ }
-+
- if (setsockopt(cn->handle, SOL_SOCKET, SO_REUSEADDR,
- (char *)&multi_client,
- sizeof(multi_client)) < 0) {
-@@ -1113,10 +1132,21 @@ connection_t *accept_new(connection_t *cn)
-
- mylog(LOG_DEBUG, "Trying to accept new client on %d", cn->handle);
- err = accept(cn->handle, &sa, &sa_len);
-+
- if (err < 0) {
-- mylog(LOG_ERROR, "accept failed: %s", strerror(errno));
-+ fatal("accept failed: %s", strerror(errno));
-+ }
-+
-+ if (err >= FD_SETSIZE) {
-+ mylog(LOG_WARN, "too many client connected, close %d", err);
-+
-+ if (close(err) == -1)
-+ mylog(LOG_WARN, "Error on socket close: %s",
-+ strerror(errno));
-+
- return NULL;
- }
-+
- socket_set_nonblock(err);
-
- conn = connection_init(cn->anti_flood, cn->ssl, cn->timeout, 0);
-diff --git a/src/irc.c b/src/irc.c
-index ebc1b34..147a315 100644
---- a/src/irc.c
-+++ b/src/irc.c
-@@ -2439,9 +2439,10 @@ void bip_on_event(bip_t *bip, connection_t *conn)
-
- if (conn == bip->listener) {
- struct link_client *n = irc_accept_new(conn);
-- assert(n);
-- list_add_last(&bip->conn_list, CONN(n));
-- list_add_last(&bip->connecting_client_list, n);
-+ if (n) {
-+ list_add_last(&bip->conn_list, CONN(n));
-+ list_add_last(&bip->connecting_client_list, n);
-+ }
- return;
- }
-
diff --git a/net-irc/epic5/epic5-1.1.10.ebuild b/net-irc/epic5/epic5-1.1.10.ebuild
deleted file mode 100644
index 9ed22d78eef7..000000000000
--- a/net-irc/epic5/epic5-1.1.10.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-USE_RUBY="ruby19"
-RUBY_OPTIONAL=yes
-inherit autotools eutils multilib ruby-ng toolchain-funcs
-
-DESCRIPTION="Epic5 IRC Client"
-SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.bz2"
-HOMEPAGE="http://epicsol.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="archive ipv6 perl tcl ruby socks5 valgrind"
-
-RDEPEND="
- >=dev-libs/openssl-0.9.8e-r3:0
- >=sys-libs/ncurses-5.6-r2
- virtual/libiconv
- archive? ( app-arch/libarchive )
- perl? ( >=dev-lang/perl-5.8.8-r2 )
- tcl? ( dev-lang/tcl:0 )
- socks5? ( net-proxy/dante )
- ruby? ( $(ruby_implementations_depend) )"
-DEPEND="${RDEPEND}
- valgrind? ( dev-util/valgrind )"
-REQUIRED_USE="ruby? ( $(ruby_get_use_targets) )"
-
-S=${WORKDIR}/${P}
-
-pkg_setup() {
- # bug #489608, bug #497080
- use ruby && ruby-ng_pkg_setup
-}
-
-# Don't use ruby-ng's separated sources support:
-src_unpack() {
- default
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \
- "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \
- "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \
- "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \
- "${FILESDIR}"/${P}-without-localdir.patch \
- "${FILESDIR}"/${P}-socks5-libsocks.patch
- eautoconf
-}
-
-src_configure() {
- econf \
- --libexecdir="${EPREFIX}"/usr/lib/misc \
- $(use_with archive libarchive) \
- $(use_with ipv6) \
- $(use_with perl) \
- $(use_with ruby ruby "$(ruby_implementation_command ${USE_RUBY})") \
- $(use_with socks5) \
- $(use_with tcl tcl "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \
- $(use_with valgrind valgrind)
-}
-
-src_compile() {
- # parallel build failure
- emake -j1
-}
-
-src_install () {
- default
-
- dodoc BUG_FORM COPYRIGHT EPIC4-USERS-README README KNOWNBUGS VOTES
-
- cd "${S}"/doc || die
- docinto doc
- dodoc \
- *.txt colors EPIC* IRCII_VERSIONS missing \
- nicknames outputhelp README.SSL SILLINESS TS4
-}
diff --git a/net-libs/biblesync/Manifest b/net-libs/biblesync/Manifest
new file mode 100644
index 000000000000..9b7fc1c7b6e9
--- /dev/null
+++ b/net-libs/biblesync/Manifest
@@ -0,0 +1 @@
+DIST biblesync-1.1.2.tar.gz 86620 SHA256 886e1ac165b8900254c00a182fa34e3680ef3aa25051418470f15ea09ac02005 SHA512 7725c8228e2dff79edaf065ff4d4816a6cf214d1d874817345cc4154142144bce479ca1ae871053886bff4f6610715a27bce81c25c2a636444d5873e93bfdc62 WHIRLPOOL ae89ac316cc70415ec4e0e458e7d8173b5a59741475bf1638f90c1614618058a664118bbb22d931e936fb7c4a1e8b4897f75a1d9cb7538ab0d8b8b7b96c81da6
diff --git a/net-libs/biblesync/biblesync-1.1.2.ebuild b/net-libs/biblesync/biblesync-1.1.2.ebuild
new file mode 100644
index 000000000000..4f94c30a91b1
--- /dev/null
+++ b/net-libs/biblesync/biblesync-1.1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="A multicast protocol to support Bible software shared co-navigation"
+HOMEPAGE="http://www.crosswire.org/wiki/BibleSync"
+SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-util/cmake"
+RDEPEND=""
diff --git a/net-libs/biblesync/metadata.xml b/net-libs/biblesync/metadata.xml
new file mode 100644
index 000000000000..d68839c92774
--- /dev/null
+++ b/net-libs/biblesync/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>theology</herd>
+ <maintainer>
+ <email>theology@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">gnomesword</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 62d56ac3ebcc..825f812c1bb7 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,5 +1,4 @@
DIST gsoap_2.7.17.zip 10224444 SHA256 d3af1ce9464b28cacdf1dfbe09b689f8927cbcf3948479996aef52a39afa2c16 SHA512 efb5332e90cbed6013ac2f16b940404cc4de9e84bc85e671cb3588bc6620cd86c8db646a4f3cd77bb3b866dfcc8a793186736ab2241bb8cbaca8d313345d14ac WHIRLPOOL 955e845b5a8b9af1697ca8bcdbb77813f149f7ff162ec51e680c398dab9934c36418572004b7bd24200476b6d45b623f294053b932da2fce94f415becd369af7
-DIST gsoap_2.8.12.zip 19974348 SHA256 51eef118544fa846f4d2dea2eedf91c84c46a1abeafc5eee3dcff783f4015a00 SHA512 7f162936d8d331d94b0aa52042c512167198a8de5a279747f49494b0f17442feb4db2ac5abff54e46350562e774b6bdddc577049f7cb59807cab29b12d797a87 WHIRLPOOL 7557396a154405606b2b2a962ac5f19d4853a792c8f96333576e6229506c9fedd8c5652cc1560566dfb51203362063566d2780becb1e1bb0ca2714fabe0a0330
DIST gsoap_2.8.23.zip 22482000 SHA256 e1c30743f1c2cf40b2760568127e14af1b2a00c3026b2e5f0750e8c33d94c061 SHA512 cc90aadfe09aa6406172c9ffa07696851ff594ca7c5b40819494badd8ce978d908d66de63a5831e7aec1bca18ee8b51ed02187057688a3b36eb0a21fe6e0f5a4 WHIRLPOOL e5cfc9c5758847d1fc94cbd38108b80c7548abc0316fe201b58604a3b22d30b9748c81d4aec13f53356593f3ddc2dcba14170a53d63795eab9229ec49d4bc585
DIST gsoap_2.8.26.zip 22605211 SHA256 bfe42848d324be1f7313fd01c1e953caf5ee28fbb640cbf2fa004d32123683d6 SHA512 eee9f4f34c62114f400d644fbb5f1b93dfd12e524746f8dc74d459b993ac170d09598fc254a0471d6dacf26e31298ba93b5e95381c5d9c24445acea2b6957ff5 WHIRLPOOL fecd08fcaf736d573688c643109149a75d2a64ecef15af79e13a74b4da9bad6a80278e4adeaee682c7bb0cdc37402362bb497e20e9f40104dff21d21e589d383
DIST gsoap_2.8.27.zip 22643224 SHA256 cdd9188f3a00caf14fae54d7cc975227128118e818036e5b6bd6e87550e1dc35 SHA512 45c2a653ef588acf41b23c14fdfe2524b37b3324d9ca332a1f8c7ec37fd6e1cf297c798dc7eeb2f90aaa2dd3a72a87f5cde1daf0a513b0259e08a89e386846ad WHIRLPOOL b82a7e9e4ff7b1042ef0c3346ea9cdeb343232d0cc23ec96845adcc44a4b4d773df42fe72a1eaeadb4e33cc63d5458d7bcb0dc97184ab6d0f5e82682eaaba8ad
diff --git a/net-libs/gsoap/files/gsoap-2.7-fix-missing-cookie-support.patch b/net-libs/gsoap/files/gsoap-2.7-fix-missing-cookie-support.patch
new file mode 100644
index 000000000000..7f3ad8d283b9
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.7-fix-missing-cookie-support.patch
@@ -0,0 +1,24 @@
+From: Gokturk Yuksek <gokturk@binghamton.edu>
+Subject: [PATCH] Backport missing cookie support
+
+For <gsoap-2.8.24, successful compilation results in missing cookie
+support due to undefined compilation flag. This is fixed in the later
+versions by upstream.
+
+Upstream-URL: https://sourceforge.net/p/gsoap2/code/85/tree//gsoap/Makefile.am?diff=51af4d3f5fcbc945b53d89a4:84
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=340647
+
+--- a/gsoap/Makefile.am
++++ b/gsoap/Makefile.am
+@@ -42,9 +42,9 @@
+ libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp
+ libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
+ libgsoapssl_a_SOURCES = stdsoap2_ssl.c
+-libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
++libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP -DWITH_COOKIES
+ libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp
+-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
++libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP -DWITH_COOKIES
+
+ BUILT_SOURCES = stdsoap2_cpp.cpp $(lib_LIBRARIES)
+
diff --git a/net-libs/gsoap/gsoap-2.8.12.ebuild b/net-libs/gsoap/gsoap-2.7.17-r1.ebuild
index 923f02d8c311..999aba704f1a 100644
--- a/net-libs/gsoap/gsoap-2.8.12.ebuild
+++ b/net-libs/gsoap/gsoap-2.7.17-r1.ebuild
@@ -1,50 +1,45 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=5
inherit autotools eutils
-MY_P="${PN}-2.8"
+MY_P="${PN}-2.7"
-DESCRIPTION="A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services"
+DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
HOMEPAGE="http://gsoap2.sourceforge.net"
SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
LICENSE="GPL-2 gSOAP"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc debug examples ipv6 gnutls +ssl"
+IUSE="doc debug examples +ssl"
DEPEND="app-arch/unzip
sys-devel/flex
- sys-devel/bison
- sys-libs/zlib
- gnutls? ( net-libs/gnutls )
- ssl? ( dev-libs/openssl )"
-RDEPEND=""
+ sys-devel/bison"
+RDEPEND="sys-libs/zlib
+ ssl? ( dev-libs/openssl:0= )"
S="${WORKDIR}/${MY_P}"
src_prepare() {
# Fix Pre-ISO headers
+ epatch "${FILESDIR}/${PN}-2.7-fix-pre-iso-headers.patch"
epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
- # Fix configure.in for >=automake-1.13
- sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.in || die
+ # causes compilation of app-emulation/virtualbox-ose[vboxwebsrv] to
+ # break (bug #320901):
+ #epatch "${FILESDIR}/${PN}-2.7.15-use_libtool.patch"
eautoreconf
}
src_configure() {
- local myconf=
- use ssl || myconf+="--disable-ssl "
- use gnutls && myconf+="--enable-gnutls "
- use ipv6 && myconf+="--enable-ipv6 "
econf \
- ${myconf} \
- $(use_enable debug) \
+ $(use_enable ssl openssl) \
$(use_enable examples samples)
}
@@ -61,10 +56,10 @@ src_install() {
dohtml changelog.html
- find "${D}"/usr/ -name "*.la" -exec rm {} \;
+ prune_libtool_files --all
if use examples; then
- rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o
+ rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
insinto /usr/share/doc/${PF}/examples
doins -r gsoap/samples/*
fi
diff --git a/net-libs/gsoap/gsoap-2.7.17-r2.ebuild b/net-libs/gsoap/gsoap-2.7.17-r2.ebuild
new file mode 100644
index 000000000000..a6a3adf82314
--- /dev/null
+++ b/net-libs/gsoap/gsoap-2.7.17-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+MY_P="${PN}-2.7"
+
+DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
+HOMEPAGE="http://gsoap2.sourceforge.net"
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
+
+LICENSE="GPL-2 gSOAP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug examples +ssl"
+
+DEPEND="app-arch/unzip
+ sys-devel/flex
+ sys-devel/bison"
+RDEPEND="sys-libs/zlib
+ ssl? ( dev-libs/openssl:0= )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Fix Pre-ISO headers
+ epatch "${FILESDIR}/${PN}-2.7-fix-pre-iso-headers.patch"
+ epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
+ epatch "${FILESDIR}/${PN}-2.7-fix-missing-cookie-support.patch" # 340647
+
+ # causes compilation of app-emulation/virtualbox-ose[vboxwebsrv] to
+ # break (bug #320901):
+ #epatch "${FILESDIR}/${PN}-2.7.15-use_libtool.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable ssl openssl) \
+ $(use_enable examples samples)
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # yes, we also install the license-file since
+ # it contains info about how to apply the licenses
+ dodoc *.txt
+
+ dohtml changelog.html
+
+ prune_libtool_files --all
+
+ if use examples; then
+ rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
+ insinto /usr/share/doc/${PF}/examples
+ doins -r gsoap/samples/*
+ fi
+
+ if use doc; then
+ dohtml -r gsoap/doc/*
+ fi
+}
diff --git a/net-libs/gsoap/gsoap-2.8.26.ebuild b/net-libs/gsoap/gsoap-2.8.26.ebuild
index a565476706c1..2bce2bd11efd 100644
--- a/net-libs/gsoap/gsoap-2.8.26.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.26.ebuild
@@ -67,7 +67,7 @@ src_install() {
prune_libtool_files --all
if use examples; then
- rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o
+ rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
insinto /usr/share/doc/${PF}/examples
doins -r gsoap/samples/*
fi
diff --git a/net-libs/gsoap/gsoap-2.8.27.ebuild b/net-libs/gsoap/gsoap-2.8.27.ebuild
index a565476706c1..2bce2bd11efd 100644
--- a/net-libs/gsoap/gsoap-2.8.27.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.27.ebuild
@@ -67,7 +67,7 @@ src_install() {
prune_libtool_files --all
if use examples; then
- rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o
+ rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
insinto /usr/share/doc/${PF}/examples
doins -r gsoap/samples/*
fi
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.19.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.19.ebuild
index 62eefee92da2..92e6a60e340f 100644
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.19.ebuild
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.19.ebuild
@@ -15,13 +15,14 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug"
-DEPEND="
+RDEPEND="
dev-db/sqlite:3
dev-libs/glib:2
dev-libs/libxml2
"
-
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc
+"
RESTRICT="test"
diff --git a/net-libs/libetpan/libetpan-1.6.ebuild b/net-libs/libetpan/libetpan-1.6.ebuild
index 56421125124f..ce9ff2c8dcd0 100644
--- a/net-libs/libetpan/libetpan-1.6.ebuild
+++ b/net-libs/libetpan/libetpan-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="berkdb debug gnutls ipv6 liblockfile sasl ssl static-libs"
DEPEND="berkdb? ( sys-libs/db:= )
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
index c8d99669f82f..73ea43f0863f 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/12"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
IUSE="epoll messages ssl static-libs test"
RDEPEND="ssl? (
diff --git a/net-libs/libtorrent/libtorrent-0.13.6.ebuild b/net-libs/libtorrent/libtorrent-0.13.6.ebuild
index 42e1ba69d7de..bd8c6e820358 100644
--- a/net-libs/libtorrent/libtorrent-0.13.6.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.6.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
# subslot.
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="debug ipv6 libressl ssl test"
RDEPEND="
diff --git a/net-libs/nghttp2/nghttp2-1.6.0.ebuild b/net-libs/nghttp2/nghttp2-1.6.0.ebuild
index 918c6dae2d04..dfcad5ee4b22 100644
--- a/net-libs/nghttp2/nghttp2-1.6.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-2
else
SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
fi
DESCRIPTION="HTTP/2 C Library"
diff --git a/net-mail/mailutils/files/hdr.at b/net-mail/mailutils/files/hdr.at
new file mode 100644
index 000000000000..7c9d5e85c693
--- /dev/null
+++ b/net-mail/mailutils/files/hdr.at
@@ -0,0 +1,36 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+
+READMSGTEST([readmsg -h],[hdr],
+[readmsg -h SOMETHING],
+[0],
+[From bar@dontmailme.org Fri Dec 28 23:28:09 2001
+Received: (from bar@dontmailme.org)
+ by dontmailme.org id fERKR9N16790
+ for foobar@nonexistent.net; Fri, 28 Dec 2001 22:18:08 +0200
+Date: Fri, 28 Dec 2001 23:28:08 +0200
+From: Bar <bar@dontmailme.org>
+To: Foo Bar <foobar@nonexistent.net>
+Message-Id: <200112232808.fERKR9N16790@dontmailme.org>
+Subject: Re: Jabberwocky
+
+It seems very pretty, but it's *rather* hard to understand!'
+Somehow it seems to fill my head with ideas -- only I don't
+exactly know what they are! However, SOMEBODY killed SOMETHING:
+that's clear, at any rate...
+
+
+])
diff --git a/net-mail/mailutils/files/mailutils-tcp_wrappers.patch b/net-mail/mailutils/files/mailutils-tcp_wrappers.patch
new file mode 100644
index 000000000000..81517caeeb88
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-tcp_wrappers.patch
@@ -0,0 +1,22 @@
+--- a/maidag/maidag.c 2015-07-02 22:45:39.000000000 +0300
++++ b/maidag/maidag.c 2015-12-22 11:55:17.000000000 +0200
+@@ -518,7 +518,9 @@
+
+ mu_gocs_register ("sieve", mu_sieve_module_init);
+
++#ifdef WITH_LIBWRAP
+ mu_tcpwrapper_cfg_init ();
++#endif
+ mu_acl_cfg_init ();
+ mu_m_server_cfg_init (NULL);
+ maidag_cfg_init ();
+@@ -531,7 +533,9 @@
+
+ mu_m_server_create (&server, program_version);
+ mu_m_server_set_conn (server, lmtp_connection);
++#ifdef WITH_LIBWRAP
+ mu_m_server_set_prefork (server, mu_tcp_wrapper_prefork);
++#endif
+ mu_m_server_set_mode (server, MODE_INTERACTIVE);
+ mu_m_server_set_max_children (server, 20);
+ mu_m_server_set_timeout (server, 600);
diff --git a/net-mail/mailutils/files/nohdr.at b/net-mail/mailutils/files/nohdr.at
new file mode 100644
index 000000000000..4caf85570f1e
--- /dev/null
+++ b/net-mail/mailutils/files/nohdr.at
@@ -0,0 +1,26 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+
+READMSGTEST([readmsg -n],[nohdr],
+[readmsg -n SOMETHING],
+[0],
+[It seems very pretty, but it's *rather* hard to understand!'
+Somehow it seems to fill my head with ideas -- only I don't
+exactly know what they are! However, SOMEBODY killed SOMETHING:
+that's clear, at any rate...
+
+
+])
diff --git a/net-mail/mailutils/files/twomsg.at b/net-mail/mailutils/files/twomsg.at
new file mode 100644
index 000000000000..20af66173d6a
--- /dev/null
+++ b/net-mail/mailutils/files/twomsg.at
@@ -0,0 +1,73 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+
+READMSGTEST([readmsg 1 2],[twomsg],
+[1 2],
+[0],
+[Date: Fri, 28 Dec 2001 22:18:08 +0200
+From: Foo Bar <foobar@nonexistent.net>
+To: Bar <bar@dontmailme.org>
+Subject: Jabberwocky
+
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
+`Beware the Jabberwock, my son!
+The jaws that bite, the claws that catch!
+Beware the Jujub bird, and shun
+The frumious Bandersnatch!'
+
+He took his vorpal sword in hand:
+Long time the manxome foe he sought --
+So rested he by the Tumtum gree,
+And stood awhile in thought.
+
+And as in uffish thought he stood,
+The Jabberwock, with eyes of flame,
+Came whiffling through the tulgey wook,
+And burbled as it came!
+
+One, two! One, two! And through and through
+The vorpal blade went snicker-snack!
+He left it dead, and with its head
+He went galumphing back.
+
+`And has thou slain the Jabberwock?
+Come to my arms, my beamish boy!
+O frabjous day! Calloh! Callay!
+He chortled in his joy.
+
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
+
+Date: Fri, 28 Dec 2001 23:28:08 +0200
+From: Bar <bar@dontmailme.org>
+To: Foo Bar <foobar@nonexistent.net>
+Subject: Re: Jabberwocky
+
+It seems very pretty, but it's *rather* hard to understand!'
+Somehow it seems to fill my head with ideas -- only I don't
+exactly know what they are! However, SOMEBODY killed SOMETHING:
+that's clear, at any rate...
+
+
+])
+
diff --git a/net-mail/mailutils/files/weed.at b/net-mail/mailutils/files/weed.at
new file mode 100644
index 000000000000..ec82c6ce23b5
--- /dev/null
+++ b/net-mail/mailutils/files/weed.at
@@ -0,0 +1,29 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007-2012, 2014-2015 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+
+READMSGTEST([readmsg -w],[weed],
+[-w date,subject SOMETHING],
+[0],
+[Date: Fri, 28 Dec 2001 23:28:08 +0200
+Subject: Re: Jabberwocky
+
+It seems very pretty, but it's *rather* hard to understand!'
+Somehow it seems to fill my head with ideas -- only I don't
+exactly know what they are! However, SOMEBODY killed SOMETHING:
+that's clear, at any rate...
+
+
+])
diff --git a/net-mail/mailutils/mailutils-2.99.99.ebuild b/net-mail/mailutils/mailutils-2.99.99.ebuild
index 16a9fecd7e94..4b550a1febc0 100644
--- a/net-mail/mailutils/mailutils-2.99.99.ebuild
+++ b/net-mail/mailutils/mailutils-2.99.99.ebuild
@@ -48,7 +48,8 @@ RDEPEND="!mail-client/nmh
DEPEND="${RDEPEND}
virtual/pkgconfig"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ servers? ( tcpd )"
pkg_setup() {
use python && python-single-r1_pkg_setup
@@ -58,18 +59,22 @@ src_prepare() {
# Disable bytecompilation of Python modules.
echo "#!/bin/sh" > build-aux/py-compile
epatch "${FILESDIR}/${PN}-2.99.98-readline-6.3.patch" #503954
+ epatch "${FILESDIR}/${PN}-tcp_wrappers.patch"
+ # bug 567976
+ sed -i -e /AM_GNU_GETTEXT_VERSION/s/0.18/0.19/ configure.ac || die
+ # add missing tests so that make check doesn't fail
+ cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
if use mysql; then
sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
sql/Makefile.am || die
- eautoreconf
fi
+ eautoreconf
}
src_configure() {
append-flags -fno-strict-aliasing
# maildir is the Gentoo default
- # but fails tests. So set it in config file instead.
econf MU_DEFAULT_SCHEME=maildir \
CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
$(use_with berkdb berkeley-db) \
@@ -90,6 +95,7 @@ src_configure() {
$(use_enable threads pthread) \
$(use_with tokyocabinet) \
$(use_with kyotocabinet) \
+ $(use_with tcpd tcp-wrappers) \
$(use_enable servers build-servers) \
$(use_enable clients build-clients) \
--with-mail-spool=/var/spool/mail \
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index dc5704cc1cd7..50c7cc730beb 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,2 +1,3 @@
DIST apt-cacher-ng_0.8.6.orig.tar.xz 295760 SHA256 255b742d3551fcbfa71b6df4d8892038934812425222a15d085436a4a76b8400 SHA512 e9b8c8cd1c1c1eee3a090599cc3735317c9062d9c8032ac1ab9657793921ab250b3200ec2e1a265a26097655ae88b5cff0e62f7d36483eaa19a1246aac58837d WHIRLPOOL efbeab3503dd3eefb9b6bdd1a54151ea8811f2bc9ed70b498dbe1169a45b7e17dbdafaa73da8b3b7d3448f47f5ace78443ecc3b253a4f68eaea1ffc0c84d3328
DIST apt-cacher-ng_0.8.7.orig.tar.xz 297904 SHA256 7a369632ab6b3f735221de12a10c1d74d706f9cec565cbeea5cc9a630716acd7 SHA512 f39d5d8a7040e8271154e03cdb0758aedddadd5c09fcb0afa7f388993e7a432feea186c8c8d484673d99ded448589a48ad1a80f51c572438e594c630f7739d3b WHIRLPOOL cf68e20b5df592012d2c3fe01bb9e96effe4e24d637745c1621f3d090835b62b6af4bc79a51887e3431525c53c498906451c24f46b60bc67c03488199c83573d
+DIST apt-cacher-ng_0.8.8.orig.tar.xz 298276 SHA256 7847f970ed9b3b3b65fe9c302107ede9cd0c5de57e3ddb497a409e8720f1fe58 SHA512 a31b09594b842d4be23938dfbd0d06ad403f7e1ba58518d7eb0e3496c30125664ca8d3b832bd14933aaa7e115f3bb3793e0bb593a330bff162cddd129cbc0537 WHIRLPOOL f8f661543fb58b96bcc5057ff2e9b29c7a7679d1ef7eb29d18530023b647b78ff339a9658b4ebf2fbec04994828fbf88182cb12153a8b25c673612785f6ef084
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.8.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.8.ebuild
new file mode 100644
index 000000000000..885013a952ad
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.8.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils eutils toolchain-funcs user
+
+DESCRIPTION="Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++"
+HOMEPAGE="
+ http://www.unix-ag.uni-kl.de/~bloch/acng/
+ http://packages.qa.debian.org/a/apt-cacher-ng.html
+"
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse systemd tcpd"
+
+COMMON_DEPEND="
+ app-arch/bzip2
+ app-arch/xz-utils
+ sys-libs/zlib
+ systemd? (
+ sys-apps/systemd
+ )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-util/cmake
+ >sys-devel/gcc-4.8
+ virtual/pkgconfig
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ dev-lang/perl
+ fuse? ( sys-fs/fuse )
+ tcpd? ( sys-apps/tcp-wrappers )
+"
+
+S=${WORKDIR}/${P/_}
+
+pkg_pretend() {
+ if [[ $(gcc-major-version) = 4 ]]; then
+ if [[ $(gcc-minor-version) -lt 8 ]]; then
+ die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+ fi
+ else
+ die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+ fi
+}
+
+pkg_setup() {
+ # add new user & group for daemon
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_configure(){
+ mycmakeargs="-DCMAKE_INSTALL_PREFIX=/usr"
+ if use fuse; then
+ mycmakeargs="-DHAVE_FUSE_25=yes ${mycmakeargs}"
+ else
+ mycmakeargs="-DHAVE_FUSE_25=no ${mycmakeargs}"
+ fi
+ if use tcpd; then
+ mycmakeargs="-DHAVE_LIBWRAP=yes ${mycmakeargs}"
+ else
+ mycmakeargs="-DHAVE_LIBWRAP=no ${mycmakeargs}"
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ pushd ${CMAKE_BUILD_DIR}
+ dosbin ${PN}
+ if use fuse; then
+ dobin acngfs
+ fi
+ popd
+
+ newinitd "${FILESDIR}"/initd-r1 ${PN}
+ newconfd "${FILESDIR}"/confd ${PN}
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/logrotate ${PN}
+
+ doman doc/man/${PN}*
+ if use fuse; then
+ doman doc/man/acngfs*
+ fi
+
+ # Documentation
+ dodoc README TODO VERSION INSTALL ChangeLog
+ if use doc; then
+ dodoc doc/*.pdf
+ dohtml doc/html/*
+ docinto examples/conf
+ dodoc conf/*
+ fi
+
+ # perl daily cron script
+ dosbin scripts/expire-caller.pl
+ exeinto /etc/cron.daily
+ newexe "${FILESDIR}"/cron.daily ${PN}
+
+ # default configuration
+ insinto /etc/${PN}
+ newins "${CMAKE_BUILD_DIR}"/conf/acng.conf ${PN}.conf
+ doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
+
+ keepdir /var/log/${PN}
+ # Some directories must exists
+ keepdir /var/log/${PN}
+ fowners -R ${PN}:${PN} \
+ /etc/${PN} \
+ /var/log/${PN}
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 9382c43e8589..9e862a15f4c2 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,2 +1,3 @@
+DIST NetworkManager-1.0.10.tar.xz 3488600 SHA256 1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc SHA512 0c5df37565c1ec6fafe60fad0ede34d28e7d87200e338489f35eec18c3e88920f47d58eae5a8aba5caeddb26a6f7074e79e8f6a7d4f7584ce3cc9be0df99f1ef WHIRLPOOL e1a0158d69e444224c25a6287bbe4f3b89d623c85f39a59eb2aeffca83b38cd85ccf067af14e5ff79b23b4346f606e15e3d33b9d097c7ef8d50054fdc5056379
DIST NetworkManager-1.0.6.tar.xz 3381092 SHA256 38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd SHA512 74e8f91bbd9a70f1764b06c729717e091d2be0a8e316fe1b6235e644b65f43add5214be7a1100fe9d30b1511f4a00b9892dce79bb8ba0f0b0d57089d2ba6ddbb WHIRLPOOL 5f1d8c905e4aaa78c742c16e773f8fdbcdb2771edf36565f6b419af457776084573aa43b384ba32885992e76b399d4f2fc7dc94ad4295ac28dcfa3d6b6994b97
DIST NetworkManager-1.0.8.tar.xz 3409672 SHA256 8bb128950f8a79ff881afadb46dd55e16f952390cf7cb4e06063431e5144937f SHA512 f27d22aed52fccd037c67983f845a94152263bfbc3a8d8d5693cd8e115dbd0cdfd28e4bed291fce61840ffa05426d48b3e0a18b9596202a7f5048090caa5d87c WHIRLPOOL ab550b88a2f68d74f2064ef2a0ae7473f739cd2640b6c365d1ff9f04d8dec51208f96cd46e36fbdb1dd999b109498d8f76cf683fc121168571b5565a8371cde0
diff --git a/net-misc/networkmanager/networkmanager-1.0.10.ebuild b/net-misc/networkmanager/networkmanager-1.0.10.ebuild
new file mode 100644
index 000000000000..f6ecae9a53a4
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.0.10.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \
+ user readme.gentoo toolchain-funcs vala versionator virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
+kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
+vala +wext +wifi zeroconf" # wimax
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="
+ modemmanager? ( ppp )
+ wext? ( wifi )
+ ^^ ( nss gnutls )
+ ^^ ( dhclient dhcpcd )
+"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# TODO: Qt support?
+COMMON_DEPEND="
+ >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+ >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+ >=dev-libs/libnl-3.2.8:3=
+ >=sys-auth/polkit-0.106
+ net-libs/libndp
+ >=net-libs/libsoup-2.40:2.4=
+ net-misc/iputils
+ sys-libs/readline:0
+ >=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
+ bluetooth? ( >=net-wireless/bluez-5 )
+ connection-sharing? (
+ net-dns/dnsmasq[dhcp]
+ net-firewall/iptables )
+ gnutls? (
+ dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+ net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+ modemmanager? ( >=net-misc/modemmanager-0.7.991 )
+ ncurses? ( >=dev-libs/newt-0.52.15 )
+ nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+ dhclient? ( >=net-misc/dhcp-4[client] )
+ dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+ introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+ ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe )
+ resolvconf? ( net-dns/openresolv )
+ systemd? ( >=sys-apps/systemd-209:0= )
+ !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
+ teamd? ( >=net-misc/libteam-1.9 )
+ zeroconf? ( net-dns/avahi:=[autoipd] )
+"
+RDEPEND="${COMMON_DEPEND}
+ consolekit? ( sys-auth/consolekit )
+ wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/gdbus-codegen
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ >=sys-kernel/linux-headers-2.6.29
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+ test? (
+ $(python_gen_any_dep '
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pygobject:2[${PYTHON_USEDEP}]')
+ )
+"
+
+sysfs_deprecated_check() {
+ ebegin "Checking for SYSFS_DEPRECATED support"
+
+ if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+ eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+ eerror "or NetworkManager will not work correctly."
+ eerror "See https://bugs.gentoo.org/333639 for more info."
+ die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+ fi
+ eend $?
+}
+
+pkg_pretend() {
+ if use kernel_linux; then
+ get_version
+ if linux_config_exists; then
+ sysfs_deprecated_check
+ else
+ ewarn "Was unable to determine your kernel .config"
+ ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+ ewarn "See https://bugs.gentoo.org/333639 for more info."
+ fi
+
+ fi
+}
+
+pkg_setup() {
+ enewgroup plugdev
+}
+
+src_prepare() {
+ DOC_CONTENTS="To modify system network connections without needing to enter the
+ root password, add your user account to the 'plugdev' group."
+
+ # Force use of /run, avoid eautoreconf, upstream bug #737139, fixed in 'master'
+ sed -e 's:$localstatedir/run/:/run/:' -i configure || die
+
+ # Don't build examples, they are not needed and can cause build failure
+ sed -e '/^\s*examples\s*\\/d' -i Makefile.{am,in} || die
+
+ use vala && vala_src_prepare
+
+ epatch_user # don't remove, users often want custom patches for NM
+
+ eautoreconf
+
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=()
+
+ # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+ if use ppp; then
+ local PPPD_VER=`best_version net-dialup/ppp`
+ PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+ PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+ myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+ fi
+
+ # unit files directory needs to be passed only when systemd is enabled,
+ # otherwise systemd support is not disabled completely, bug #524534
+ use systemd && myconf+=( "$(systemd_with_unitdir)" )
+
+ if multilib_is_native_abi; then
+ # work-around man out-of-source brokenness, must be done before configure
+ mkdir man || die
+ find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
+ else
+ # libnl, libndp are only used for executables, not libraries
+ myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' )
+ fi
+
+ # TODO: enable wimax when we have a libnl:3 compatible revision of it
+ # wimax will be removed, bug #522822
+ # ifnet plugin always disabled until someone volunteers to actively
+ # maintain and fix it
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-more-warnings \
+ --disable-static \
+ --localstatedir=/var \
+ --disable-lto \
+ --disable-config-plugin-ibft \
+ --disable-ifnet \
+ --without-netconfig \
+ --with-dbus-sys-dir=/etc/dbus-1/system.d \
+ --with-udev-dir="$(get_udevdir)" \
+ --with-config-plugins-default=keyfile \
+ --with-iptables=/sbin/iptables \
+ $(multilib_native_with libsoup) \
+ $(multilib_native_enable concheck) \
+ --with-crypto=$(usex nss nss gnutls) \
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \
+ --with-suspend-resume=$(multilib_native_usex systemd systemd upower) \
+ $(multilib_native_use_enable bluetooth bluez5-dun) \
+ $(multilib_native_use_enable introspection) \
+ $(multilib_native_use_enable ppp) \
+ --disable-wimax \
+ $(use_with dhclient) \
+ $(use_with dhcpcd) \
+ $(multilib_native_use_with modemmanager modem-manager-1) \
+ $(multilib_native_use_with ncurses nmtui) \
+ $(multilib_native_use_with resolvconf) \
+ $(multilib_native_use_with selinux) \
+ $(multilib_native_use_enable teamd teamdctl) \
+ $(multilib_native_use_enable test tests) \
+ $(multilib_native_use_enable vala) \
+ --without-valgrind \
+ $(multilib_native_use_with wext) \
+ $(multilib_native_use_enable wifi) \
+ "${myconf[@]}"
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ local d
+ for d in api libnm libnm-util libnm-glib; do
+ ln -s "${S}"/docs/${d}/html docs/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ emake
+ else
+ emake all-am
+ emake -C include
+ emake -C introspection # generated headers, needed for libnm
+ emake -C libnm-core
+ emake -C libnm
+ emake -C libnm-util
+ emake -C libnm-glib
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ python_setup
+ Xemake check
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ # Install completions at proper place, bug #465100
+ gnome2_src_install completiondir="$(get_bashcompdir)"
+ else
+ emake DESTDIR="${D}" install-am
+ emake DESTDIR="${D}" install -C include
+ emake DESTDIR="${D}" install -C introspection
+ emake DESTDIR="${D}" install -C libnm-core
+ emake DESTDIR="${D}" install -C libnm
+ emake DESTDIR="${D}" install -C libnm-util
+ emake DESTDIR="${D}" install -C libnm-glib
+ fi
+}
+
+multilib_src_install_all() {
+ ! use systemd && readme.gentoo_create_doc
+
+ newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
+ newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+ # /var/run/NetworkManager is used by some distros, but not by Gentoo
+ rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
+ rmdir -v "${ED}/var/run" || die "rmdir failed"
+
+ # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+ keepdir /etc/NetworkManager/dispatcher.d
+
+ # Provide openrc net dependency only when nm is connected
+ exeinto /etc/NetworkManager/dispatcher.d
+ newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+ sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+ -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+ keepdir /etc/NetworkManager/system-connections
+ chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+ # Allow users in plugdev group to modify system connections
+ insinto /usr/share/polkit-1/rules.d/
+ doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ ! use systemd && readme.gentoo_print_elog
+
+ if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+ ewarn "The ${PN} system configuration file has moved to a new location."
+ ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+ ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+ ewarn
+ ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+ fi
+
+ # The polkit rules file moved to /usr/share
+ old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+ if [[ -f "${old_rules}" ]]; then
+ case "$(md5sum ${old_rules})" in
+ 574d0cfa7e911b1f7792077003060240* )
+ # Automatically delete the old rules.d file if the user did not change it
+ elog
+ elog "Removing old ${old_rules} ..."
+ rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+ ;;
+ * )
+ elog "The ${old_rules}"
+ elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
+ elog "If you edited ${old_rules}"
+ elog "without changing its behavior, you may want to remove it."
+ ;;
+ esac
+ fi
+
+ # ifnet plugin was disabled for systemd users with 0.9.8.6 version
+ # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations)
+ if use systemd; then
+ if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then
+ ewarn "Ifnet plugin won't be used with systemd support enabled"
+ ewarn "as it is meant to be used with openRC and can cause collisions"
+ ewarn "(like bug #485658)."
+ ewarn "Because of this, you will likely need to reconfigure some of"
+ ewarn "your networks. To do this you can rely on Gnome control center,"
+ ewarn "nm-connection-editor or nmtui tools for example once updated"
+ ewarn "NetworkManager version is installed."
+ fi
+ else
+ if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then
+ ewarn "Ifnet plugin is now disabled because of it being unattended"
+ ewarn "and unmaintained for a long time, leading to some unfixed bugs"
+ ewarn "and new problems appearing. We will now use upstream 'keyfile'"
+ ewarn "plugin."
+ ewarn "Because of this, you will likely need to reconfigure some of"
+ ewarn "your networks. To do this you can rely on Gnome control center,"
+ ewarn "nm-connection-editor or nmtui tools for example once updated"
+ ewarn "NetworkManager version is installed."
+ fi
+ fi
+
+ # NM fallbacks to plugin specified at compile time (upstream bug #738611)
+ # but still show a warning to remember people to have cleaner config file
+ if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+ if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+ ewarn
+ ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+ ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+ ewarn
+ fi
+ fi
+
+ # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+ if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+ ewarn "You have psk-flags=1 setting in above files, you will need to"
+ ewarn "either reconfigure affected networks or, at least, set the flag"
+ ewarn "value to '0'."
+ fi
+}
diff --git a/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild b/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild
index 1b537ac718a9..767ca9a647c2 100644
--- a/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild
+++ b/net-misc/openntpd/openntpd-5.7_p4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
IUSE="selinux"
DEPEND="!<=net-misc/ntp-4.2.0-r2
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index a1620d2a7660..8f37fed92f42 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1 +1,2 @@
DIST openvpn-2.3.8.tar.gz 1214843 SHA256 532435eff61c14b44a583f27b72f93e7864e96c95fe51134ec0ad4b1b1107c51 SHA512 b619283d87eea2e47a2f0dfdbf0ffd1d10388fbdaadb33b43c7a2743748a4814f869fad6215d32fab156664d554ae94af456e7bf496890c68e6729b153d76db9 WHIRLPOOL 4868c735ca5e65b34f477457ea38eb6db45fae80563490d1e39ece9bf29b13976dd82d50d054da70c4ee146cb2e88e847bafc3f7ff47112d4494fa0f408d65d0
+DIST openvpn-2.3.9.tar.gz 1222797 SHA256 2c12fe9ea641ac1291e70322cc500641c84e5903dd4f40bf2eda7e9f209b2f9c SHA512 597ad93caf5e4489bfdc78413756af516cad88679460ebadbef91358c6ca505dd0d5c3bb508b463fd34008be80d37f464271db0beec8439619510d7cf3b3b000 WHIRLPOOL 81e06b9d27f8443a7e1ceb9037f4f84521e97e50805e134fa773219768f8e5af8d775f515a4a90f0450ea01ce90eab48e04f3d027e7be8e796388af26e057752
diff --git a/net-misc/openvpn/openvpn-2.3.9.ebuild b/net-misc/openvpn/openvpn-2.3.9.ebuild
new file mode 100644
index 000000000000..7a2c3fa285cc
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.3.9.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib flag-o-matic user systemd
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
+HOMEPAGE="http://openvpn.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="examples down-root iproute2 libressl +lzo pam pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
+
+REQUIRED_USE="static? ( !plugins !pkcs11 )
+ polarssl? ( ssl !libressl )
+ pkcs11? ( ssl )
+ !plugins? ( !pam !down-root )"
+
+DEPEND="
+ kernel_linux? (
+ iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
+ )
+ pam? ( virtual/pam )
+ ssl? (
+ !polarssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.7:* )
+ libressl? ( dev-libs/libressl )
+ )
+ polarssl? ( >=net-libs/polarssl-1.2.10 )
+ )
+ lzo? ( >=dev-libs/lzo-1.07 )
+ pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
+ systemd? ( sys-apps/systemd )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-openvpn )
+"
+
+src_configure() {
+ use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
+ local myconf
+ use polarssl && myconf="--with-crypto-library=polarssl"
+ econf \
+ ${myconf} \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
+ $(use_enable ssl) \
+ $(use_enable ssl crypto) \
+ $(use_enable lzo) \
+ $(use_enable pkcs11) \
+ $(use_enable plugins) \
+ $(use_enable iproute2) \
+ $(use_enable socks) \
+ $(use_enable pam plugin-auth-pam) \
+ $(use_enable down-root plugin-down-root) \
+ $(use_enable systemd)
+}
+
+src_install() {
+ default
+ find "${ED}/usr" -name '*.la' -delete
+ # install documentation
+ dodoc AUTHORS ChangeLog PORTS README README.IPv6
+
+ # Install some helper scripts
+ keepdir /etc/openvpn
+ exeinto /etc/openvpn
+ doexe "${FILESDIR}/up.sh"
+ doexe "${FILESDIR}/down.sh"
+
+ # Install the init script and config file
+ newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+ newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+ # install examples, controlled by the respective useflag
+ if use examples ; then
+ # dodoc does not supportly support directory traversal, #15193
+ insinto /usr/share/doc/${PF}/examples
+ doins -r sample contrib
+ fi
+
+ systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+ systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service
+ systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service
+}
+
+pkg_postinst() {
+ # Add openvpn user so openvpn servers can drop privs
+ # Clients should run as root so they can change ip addresses,
+ # dns information and other such things.
+ enewgroup openvpn
+ enewuser openvpn "" "" "" openvpn
+
+ if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
+ ewarn "WARNING: The openvpn init script has changed"
+ ewarn ""
+ fi
+
+ elog "The openvpn init script expects to find the configuration file"
+ elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+ elog ""
+ elog "To create more VPNs, simply create a new .conf file for it and"
+ elog "then create a symlink to the openvpn init script from a link called"
+ elog "openvpn.newconfname - like so"
+ elog " cd /etc/openvpn"
+ elog " ${EDITOR##*/} foo.conf"
+ elog " cd /etc/init.d"
+ elog " ln -s openvpn openvpn.foo"
+ elog ""
+ elog "You can then treat openvpn.foo as any other service, so you can"
+ elog "stop one vpn and start another if you need to."
+
+ if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+ ewarn ""
+ ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+ ewarn "a client by our init script and as such we force up,down scripts."
+ ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+ ewarn "can move your scripts to."
+ fi
+
+ if use plugins ; then
+ einfo ""
+ einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
+ fi
+
+ einfo ""
+ einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
+ einfo "They can now be emerged via app-crypt/easy-rsa."
+}
diff --git a/net-misc/putty/putty-0.66.ebuild b/net-misc/putty/putty-0.66.ebuild
index c660b8f333e7..91ed4c4448b8 100644
--- a/net-misc/putty/putty-0.66.ebuild
+++ b/net-misc/putty/putty-0.66.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
IUSE="doc +gtk ipv6 kerberos"
SRC_URI="
https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 12270582f57b..00195d69ded9 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1 +1,2 @@
DIST r8168-8.040.00.tar.bz2 87770 SHA256 da0444fcd7aabb7762310cdf2047fd0aeb7a9ed97a3d6b80d62a0fc71e0730bf SHA512 58ec8c1ff8742ad1ee0e2a0fa1141a8ace26cac954542b16325c0d9eba6113a2baaf4de2c61025a6fc6532eb17aa2e7645daee0fef539b219f863355c731d6d8 WHIRLPOOL 80ca19d49e03ca6d1b9524710511a3b632a13ec8045515c3264663a73394cede1e04d4cad2f8f1ea5d7a8b3ab9554c1bfaec7ae356bcdf397ba6d045123d314c
+DIST r8168-8.041.00.tar.bz2 88154 SHA256 13fca576fac856510e8eb70645c84954bdcfed68cd26cf4773138915690ba36e SHA512 56816b8a98bd81c93aeff31ee111de95a827a4da96ef8832d735483abe412e1df9f1de097f5e0c1cce4d9d94932e0747630e94f2869368c4ea06a9e145ad542b WHIRLPOOL 83b70a21ce3d2e29b249f0c6305425348405c64aa9741f32bfb7cd27abbdf314f1bad1207d696296a5f24dcbc99c357280be6b7687aed1e234f41b51af5cba41
diff --git a/net-misc/r8168/r8168-8.041.00.ebuild b/net-misc/r8168/r8168-8.041.00.ebuild
new file mode 100644
index 000000000000..382e7b036143
--- /dev/null
+++ b/net-misc/r8168/r8168-8.041.00.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-mod eutils
+
+DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
+HOMEPAGE="http://www.realtek.com.tw"
+SRC_URI="http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0003-${P}.tar.bz2 -> ${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8168(net:${S}/src)"
+BUILD_TARGETS="modules"
+CONFIG_CHECK="!R8169"
+
+ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
+
+pkg_setup() {
+ linux-mod_pkg_setup
+ BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+}
+
+src_install() {
+ linux-mod_src_install
+ dodoc README
+}
diff --git a/net-misc/rsync/rsync-3.1.2.ebuild b/net-misc/rsync/rsync-3.1.2.ebuild
index 291bcaa96ed1..d9a68b7b102b 100644
--- a/net-misc/rsync/rsync-3.1.2.ebuild
+++ b/net-misc/rsync/rsync-3.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
[[ "${PV}" = *_pre* ]] && KEYWORDS=""
IUSE="acl iconv ipv6 static stunnel xattr"
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index ed74d36cf2df..edebec0f4701 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,2 +1 @@
-DIST smb4k-1.2.0.tar.xz 3911380 SHA256 42b32a7f5c534e17e5130cb8a69ee1f38d82e8c5932091a20e9faf0b16c4fd2f SHA512 3256c24328246a86f19b943c7d10bed7a5979ef5940be1381a07be93c91a80adcf42e5bbfb791dc62edc1d9ece38a5e86c33974706ed23a4db399e4b869acf58 WHIRLPOOL 1b24526acb042c3f06a05b3c1f7516f0a1fe21667abb5bb1330868c48bd7731f4c6aacc307b1befbd9e2407665ba8b1ac1b43478013c671c9fd15e4fff79949d
DIST smb4k-1.2.1.tar.xz 3817104 SHA256 6562ab12c783d47e246d9d0a43b2342288384a7a78e0207a14e1dd6c40ffe97b SHA512 df5782de9b140dc6ec97f4b66e758dc62923a6d6e85843717a0a17b3f853d036bcd3e73cf289819c5b5caa6bc28e3943dea73a745197356a3351d5a643c21f37 WHIRLPOOL 6e89a20d4a7ce48278db2a27c7ce291c737f6a6485a02febedb4fc45dedadff2185867e87ad14d97cb1e56a593c80d7b09b2a1ee65c5a4dae0784700772f100b
diff --git a/net-misc/smb4k/smb4k-1.2.0.ebuild b/net-misc/smb4k/smb4k-1.2.0.ebuild
deleted file mode 100644
index ca3c207dd650..000000000000
--- a/net-misc/smb4k/smb4k-1.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_IN_SOURCE_BUILD="true"
-DECLARATIVE_REQUIRED="always"
-KDE_LINGUAS="bg bs ca ca@valencia cs da de en_GB eo es et fi fr ga gl hu is it
-ja ko lt mai mr nb nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
-inherit kde4-base
-
-DESCRIPTION="The advanced network neighborhood browser for KDE"
-HOMEPAGE="http://sourceforge.net/projects/smb4k/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug"
-
-RDEPEND=">=net-fs/samba-3.4.2[cups]"
-DEPEND="${RDEPEND}
- sys-devel/gettext
-"
-
-DOCS=( AUTHORS BUGS ChangeLog README )
diff --git a/net-misc/smb4k/smb4k-1.2.1.ebuild b/net-misc/smb4k/smb4k-1.2.1.ebuild
index 7eddfc33cd6b..fdd7acd2a64e 100644
--- a/net-misc/smb4k/smb4k-1.2.1.ebuild
+++ b/net-misc/smb4k/smb4k-1.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="4"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="debug"
RDEPEND=">=net-fs/samba-3.4.2[cups]"
diff --git a/net-misc/spice-gtk/spice-gtk-0.30-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.30-r1.ebuild
index 8f6f00b659fd..98d76d9a0f5c 100644
--- a/net-misc/spice-gtk/spice-gtk-0.30-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.30-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
LICENSE="LGPL-2.1"
SLOT="0"
SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
IUSE="dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav"
REQUIRED_USE="
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 5649490aece8..10ef1dc1e829 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1,2 +1 @@
-DIST strongswan-5.3.2.tar.bz2 4320601 SHA256 a4a9bc8c4e42bdc4366a87a05a02bf9f425169a7ab0c6f4482d347e44acbf225 SHA512 60b17645c00769d497f4cea2229b41a217c29fe1109b58be256a0d4a6ccf4765348b9eb89466539c2528756344c2fa969f25ea1cd8856d56c5d55aa78e632e68 WHIRLPOOL e5ca686e25daf2ca9c42ab8a2fcb62635c7ef2c164313dc01265bb7718d9522d478b9be5ef63d52df27dc44654d455b7dc0a41c86312e0a4c2b25aa279f3a21e
DIST strongswan-5.3.4.tar.bz2 4418300 SHA256 938ad1f7b612e039f1d32333f4865160be70f9fb3c207a31127d0168116459aa SHA512 2ab1c9a5d285c7f85b130a827b9525dd238a6d2b4c0c0e15a38a5e09dbb58228bfe4a6ab6c57ba6781f5d0d7f565cbb82e0ee2feac758c8033894c969acb8155 WHIRLPOOL f7ffbefd62cc8eb4325b38392dbf84ea17b5e27b0917f75a31517ee9e864820faf6b30de4beb28ff17fb88fa16d4f042f698e2304542d01cba3e2392f63bb26f
diff --git a/net-misc/strongswan/strongswan-5.3.2.ebuild b/net-misc/strongswan/strongswan-5.3.2.ebuild
deleted file mode 100644
index 2b2527786805..000000000000
--- a/net-misc/strongswan/strongswan-5.3.2.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info systemd user
-
-DESCRIPTION="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
-HOMEPAGE="http://www.strongswan.org/"
-SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA DES"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 x86"
-IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl sqlite pam pkcs11"
-
-STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
-STRONGSWAN_PLUGINS_OPT="blowfish ccm ctr gcm ha ipseckey ntru padlock rdrand unbound whitelist"
-for mod in $STRONGSWAN_PLUGINS_STD; do
- IUSE="${IUSE} +strongswan_plugins_${mod}"
-done
-
-for mod in $STRONGSWAN_PLUGINS_OPT; do
- IUSE="${IUSE} strongswan_plugins_${mod}"
-done
-
-COMMON_DEPEND="!net-misc/openswan
- gmp? ( >=dev-libs/gmp-4.1.5 )
- gcrypt? ( dev-libs/libgcrypt:0 )
- caps? ( sys-libs/libcap )
- curl? ( net-misc/curl )
- ldap? ( net-nds/openldap )
- openssl? ( >=dev-libs/openssl-0.9.8[-bindist] )
- mysql? ( virtual/mysql )
- sqlite? ( >=dev-db/sqlite-3.3.1 )
- networkmanager? ( net-misc/networkmanager )
- pam? ( sys-libs/pam )
- strongswan_plugins_unbound? ( net-dns/unbound )"
-DEPEND="${COMMON_DEPEND}
- virtual/linux-sources
- sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}
- virtual/logger
- sys-apps/iproute2
- !net-misc/libreswan"
-
-UGID="ipsec"
-
-pkg_setup() {
- linux-info_pkg_setup
- elog "Linux kernel version: ${KV_FULL}"
-
- if ! kernel_is -ge 2 6 16; then
- eerror
- eerror "This ebuild currently only supports ${PN} with the"
- eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
- eerror
- fi
-
- if kernel_is -lt 2 6 34; then
- ewarn
- ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
- ewarn
-
- if kernel_is -lt 2 6 29; then
- ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
- ewarn "include all required IPv6 modules even if you just intend"
- ewarn "to run on IPv4 only."
- ewarn
- ewarn "This has been fixed with kernels >= 2.6.29."
- ewarn
- fi
-
- if kernel_is -lt 2 6 33; then
- ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
- ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
- ewarn "miss SHA384 and SHA512 HMAC support altogether."
- ewarn
- ewarn "If you need any of those features, please use kernel >= 2.6.33."
- ewarn
- fi
-
- if kernel_is -lt 2 6 34; then
- ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
- ewarn "ESP cipher is only included in kernels >= 2.6.34."
- ewarn
- ewarn "If you need it, please use kernel >= 2.6.34."
- ewarn
- fi
- fi
-
- if use non-root; then
- enewgroup ${UGID}
- enewuser ${UGID} -1 -1 -1 ${UGID}
- fi
-}
-
-src_prepare() {
- epatch_user
-}
-
-src_configure() {
- local myconf=""
-
- if use non-root; then
- myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
- fi
-
- # If a user has already enabled db support, those plugins will
- # most likely be desired as well. Besides they don't impose new
- # dependencies and come at no cost (except for space).
- if use mysql || use sqlite; then
- myconf="${myconf} --enable-attr-sql --enable-sql"
- fi
-
- # strongSwan builds and installs static libs by default which are
- # useless to the user (and to strongSwan for that matter) because no
- # header files or alike get installed... so disabling them is safe.
- if use pam && use eap; then
- myconf="${myconf} --enable-eap-gtc"
- else
- myconf="${myconf} --disable-eap-gtc"
- fi
-
- for mod in $STRONGSWAN_PLUGINS_STD; do
- if use strongswan_plugins_${mod}; then
- myconf+=" --enable-${mod}"
- fi
- done
-
- for mod in $STRONGSWAN_PLUGINS_OPT; do
- if use strongswan_plugins_${mod}; then
- myconf+=" --enable-${mod}"
- fi
- done
-
- econf \
- --disable-static \
- --enable-ikev1 \
- --enable-ikev2 \
- --enable-swanctl \
- --enable-socket-dynamic \
- $(use_with caps capabilities libcap) \
- $(use_enable curl) \
- $(use_enable constraints) \
- $(use_enable ldap) \
- $(use_enable debug leak-detective) \
- $(use_enable dhcp) \
- $(use_enable eap eap-sim) \
- $(use_enable eap eap-sim-file) \
- $(use_enable eap eap-simaka-sql) \
- $(use_enable eap eap-simaka-pseudonym) \
- $(use_enable eap eap-simaka-reauth) \
- $(use_enable eap eap-identity) \
- $(use_enable eap eap-md5) \
- $(use_enable eap eap-aka) \
- $(use_enable eap eap-aka-3gpp2) \
- $(use_enable eap md4) \
- $(use_enable eap eap-mschapv2) \
- $(use_enable eap eap-radius) \
- $(use_enable eap eap-tls) \
- $(use_enable eap xauth-eap) \
- $(use_enable farp) \
- $(use_enable gmp) \
- $(use_enable gcrypt) \
- $(use_enable mysql) \
- $(use_enable networkmanager nm) \
- $(use_enable openssl) \
- $(use_enable pam xauth-pam) \
- $(use_enable pkcs11) \
- $(use_enable sqlite) \
- "$(systemd_with_unitdir)" \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- doinitd "${FILESDIR}"/ipsec
-
- local dir_ugid
- if use non-root; then
- fowners ${UGID}:${UGID} \
- /etc/ipsec.conf \
- /etc/strongswan.conf
-
- dir_ugid="${UGID}"
- else
- dir_ugid="root"
- fi
-
- diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
- dodir /etc/ipsec.d \
- /etc/ipsec.d/aacerts \
- /etc/ipsec.d/acerts \
- /etc/ipsec.d/cacerts \
- /etc/ipsec.d/certs \
- /etc/ipsec.d/crls \
- /etc/ipsec.d/ocspcerts \
- /etc/ipsec.d/private \
- /etc/ipsec.d/reqs
-
- dodoc NEWS README TODO || die
-
- # shared libs are used only internally and there are no static libs,
- # so it's safe to get rid of the .la files
- find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
-}
-
-pkg_preinst() {
- has_version "<net-misc/strongswan-4.3.6-r1"
- upgrade_from_leq_4_3_6=$(( !$? ))
-
- has_version "<net-misc/strongswan-4.3.6-r1[-caps]"
- previous_4_3_6_with_caps=$(( !$? ))
-}
-
-pkg_postinst() {
- if ! use openssl && ! use gcrypt; then
- elog
- elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
- elog "Please note that this might effect availability and speed of some"
- elog "cryptographic features. You are advised to enable the OpenSSL plugin."
- elif ! use openssl; then
- elog
- elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
- elog "availability and speed of some cryptographic features. There will be"
- elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
- elog "25, 26) and ECDSA."
- fi
-
- if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
- chmod 0750 "${ROOT}"/etc/ipsec.d \
- "${ROOT}"/etc/ipsec.d/aacerts \
- "${ROOT}"/etc/ipsec.d/acerts \
- "${ROOT}"/etc/ipsec.d/cacerts \
- "${ROOT}"/etc/ipsec.d/certs \
- "${ROOT}"/etc/ipsec.d/crls \
- "${ROOT}"/etc/ipsec.d/ocspcerts \
- "${ROOT}"/etc/ipsec.d/private \
- "${ROOT}"/etc/ipsec.d/reqs
-
- ewarn
- ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
- ewarn "security reasons. Your system installed directories have been"
- ewarn "updated accordingly. Please check if necessary."
- ewarn
-
- if [[ $previous_4_3_6_with_caps == 1 ]]; then
- if ! use non-root; then
- ewarn
- ewarn "IMPORTANT: You previously had ${PN} installed without root"
- ewarn "privileges because it was implied by the 'caps' USE flag."
- ewarn "This has been changed. If you want ${PN} with user privileges,"
- ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
- ewarn
- fi
- fi
- fi
- if ! use caps && ! use non-root; then
- ewarn
- ewarn "You have decided to run ${PN} with root privileges and built it"
- ewarn "without support for POSIX capability dropping. It is generally"
- ewarn "strongly suggested that you reconsider- especially if you intend"
- ewarn "to run ${PN} as server with a public ip address."
- ewarn
- ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
- ewarn
- fi
- if use non-root; then
- elog
- elog "${PN} has been installed without superuser privileges (USE=non-root)."
- elog "This imposes several limitations mainly to the IKEv1 daemon 'pluto'"
- elog "but also a few to the IKEv2 daemon 'charon'."
- elog
- elog "Please carefully read: http://wiki.strongswan.org/wiki/nonRoot"
- elog
- elog "pluto uses a helper script by default to insert/remove routing and"
- elog "policy rules upon connection start/stop which requires superuser"
- elog "privileges. charon in contrast does this internally and can do so"
- elog "even with reduced (user) privileges."
- elog
- elog "Thus if you require IKEv1 (pluto) or need to specify a custom updown"
- elog "script to pluto or charon which requires superuser privileges, you"
- elog "can work around this limitation by using sudo to grant the"
- elog "user \"ipsec\" the appropriate rights."
- elog "For example (the default case):"
- elog "/etc/sudoers:"
- elog " ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
- elog "Under the specific connection block in /etc/ipsec.conf:"
- elog " leftupdown=\"sudo -E ipsec _updown iptables\""
- elog
- fi
- elog
- elog "Make sure you have _all_ required kernel modules available including"
- elog "the appropriate cryptographic algorithms. A list is available at:"
- elog " http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
- elog
- elog "The up-to-date manual is available online at:"
- elog " http://wiki.strongswan.org/"
- elog
-}
diff --git a/net-misc/strongswan/strongswan-5.3.4.ebuild b/net-misc/strongswan/strongswan-5.3.4.ebuild
index 81b1889e74d8..2b2527786805 100644
--- a/net-misc/strongswan/strongswan-5.3.4.ebuild
+++ b/net-misc/strongswan/strongswan-5.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
LICENSE="GPL-2 RSA DES"
SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ppc ~ppc64 x86"
IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl sqlite pam pkcs11"
STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
diff --git a/net-misc/termtter/Manifest b/net-misc/termtter/Manifest
index b1b36b5a81c0..d5b95152a82d 100644
--- a/net-misc/termtter/Manifest
+++ b/net-misc/termtter/Manifest
@@ -1 +1 @@
-DIST termtter-2.2.2.gem 1506304 SHA256 2b91e872f6dafbcb7128352b3aa95ed8397c20dab872026a3e2bc4b582a25a74 SHA512 f3df3ec14172d1b6235a0acdfa20fc8fdae0cc9151d7b887d8f60355b064694ff69663f54a039e0e075067baeedf804eb0d583dce616adaa62a75db9f44d1cf4 WHIRLPOOL 1afc095b87ae2b20397d292ac84c970fb1bde9174eef8a9e79671c822cb56d5372ff635d6458d3a9c2635901f248be7f77a63f5353909d85f8521f6b5611bbb1
+DIST termtter-2.2.3.gem 1506304 SHA256 4b72e16b7570db2fa426fd5576cc4677dd1e21bc75dd0561e92bfac20292a6d7 SHA512 11ddc84f111b853b8e03bde1ea407a287108c82cdaf9f74f1fca06701dec3c9a9d1fee4ea2a991fa33a56c3f61ee941efa9b3af77304d000a64510b08039a7a6 WHIRLPOOL 18be31917531550c55b139e623069f4b39a96713d90406f8e017ab37e275b9f7e3bca103622c219a393a6b1fbc20f15482bcb19adedc5c54f2528aac45021d9c
diff --git a/net-misc/termtter/termtter-2.2.2.ebuild b/net-misc/termtter/termtter-2.2.3.ebuild
index e770c3da2e29..7576f52504c1 100644
--- a/net-misc/termtter/termtter-2.2.2.ebuild
+++ b/net-misc/termtter/termtter-2.2.3.ebuild
@@ -4,8 +4,7 @@
EAPI=5
-USE_RUBY="ruby19"
-#RUBY_FAKEGEM_RECIPE_TEST="rake"
+USE_RUBY="ruby20 ruby21"
RUBY_FAKEGEM_RECIPE_TEST=""
RUBY_FAKEGEM_TASK_TEST="spec"
@@ -24,8 +23,8 @@ ruby_add_rdepend "dev-ruby/json
dev-ruby/termcolor
dev-ruby/rubytter
dev-ruby/notify
- dev-ruby/activerecord
- dev-ruby/builder"
+ dev-ruby/activerecord:4.1
+ dev-ruby/builder:3.1"
# dev-ruby/fluent-logger
ruby_add_bdepend "
doc? ( dev-ruby/rdoc )
diff --git a/net-misc/vde/vde-2.3.2-r2.ebuild b/net-misc/vde/vde-2.3.2-r2.ebuild
index d78c5e406f21..2db2a6a9a08e 100644
--- a/net-misc/vde/vde-2.3.2-r2.ebuild
+++ b/net-misc/vde/vde-2.3.2-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://vde.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE="pcap python selinux ssl static-libs"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 78096692c049..453a8fe76190 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,3 @@
DIST youtube-dl-2015.04.03.tar.gz 1472296 SHA256 0521a15a24a9b620728a2f45ea9163ca74660ed443781b6e69b4e06d36d7bf59 SHA512 6b2c85cfa222a31f3462aab583fa98bb92544cd5fb0d395ca0b69a26c24ab174870d02264e058281f09305752d50aa5a06d0d747205499a530b275e3194fc6f9 WHIRLPOOL 391e06ea261f92e03a0b38618307f1c9d53a2dfb9f2062fe0cd3ded1ea0c411033a17ded581616032c74a9e4fb398a57e565bf847196a23a9f89433f861362ae
-DIST youtube-dl-2015.11.27.1.tar.gz 1803857 SHA256 35a7b2947200209bef9e642d1203e9d4a4103e279222c3ca3b5ee3adf3c8c535 SHA512 7771ed739568a52b0168e095eb97b943b82c6ee463a662f5cf94c40fce4f51ad0ca6d09c2569393b1d09568b63859b1837d247c9994c5134ad79af18bb5aa1ad WHIRLPOOL 5fedcea551ba8637773367d46f78d8e68110c993eb12eda31028b1a38bca3b9928c62ea4519da3ba70f3a7aa62948820d892d4ff3d8d38b2bd847b1348183f33
-DIST youtube-dl-2015.12.13.tar.gz 1837788 SHA256 9c788925865ff559b6c9f124d35aed1125046efda7c6a386f0da59d4eac2ead8 SHA512 039778326955ee126ce18ebe9133c9fca03d3fd14bbb56ebff50335e47ce2b24b9ddc8558c35bb4596692ee03b415f72bc238a74bd3034de7ed80a869cc4d64a WHIRLPOOL 806b8898e4ee9c0c79fe0276375ef8e43fbe55c993e8f70f1f321c529f768aeef8a9dc32ca818849f1ad658a072f1b49c13f25a8ee71d3b5eef29d8b9ac7b865
DIST youtube-dl-2015.12.21.tar.gz 1849071 SHA256 7a61ccbc3cd55e712b2fb94a7dedff5052548bbebab9f8c441feec8a02748d4d SHA512 36ad04ccd539a2c63d39e59444033e3eb8d9e2265b769869e54d598ec4a956e3ede939a23fad6531682d0166869b88fd728368a81064690af3f197a45b92b5aa WHIRLPOOL 561239e3c48e75f1e393961d78aeecc2a45058d56bb42ab07accac1d27793cba90a2729424c63f49c50cf9539f683eed069cbdb7ae2bbd45cf0433bc639660b2
+DIST youtube-dl-2015.12.23.tar.gz 1850244 SHA256 fe7088979c78eb900c3db110a577866a01e1dd537cddda25258893f099fff9ba SHA512 e6ca9197b54972ee2a1518c6d76a05c96c0b556a1b0be96bd6fbcf0cccfae4d0555e0aa4c718c6132ca9cb7243f9758b5f28c80be231d702d12a6c32928fb39b WHIRLPOOL fd1dbdb741bc6674b881829b6103b886e0f379b7a5e4d2181f672d445a7a56ceffe6619f114486546e70db3a14b92c7f6ead57586a9d090da77e56d583350b27
diff --git a/net-misc/youtube-dl/youtube-dl-2015.12.13.ebuild b/net-misc/youtube-dl/youtube-dl-2015.12.13.ebuild
deleted file mode 100644
index 7c5ab5b4b433..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2015.12.13.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
-DISTUTILS_SINGLE_IMPL=true
-inherit bash-completion-r1 distutils-r1 eutils
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="offensive test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- if ! use offensive; then
- sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
- youtube_dl/version.py || die
- # these have single line import statements
- local xxx=(
- alphaporno anysex behindkink drtuber eporner eroprofile extremetube
- fourtube foxgay goshgay hellporno hentaistigma hornbunny keezmovies
- mofosex motherless porn91 pornhd pornotube pornovoisines pornoxo
- redtube sexykarma sexu sunporno slutload spankbang spankwire thisav
- trutube tube8 vporn xbef xnxx xtube xvideos xxxymovies youjizz
- youporn
- )
- # these have multi-line import statements
- local mxxx=(
- pornhub xhamster tnaflix
- )
- # do single line imports
- sed -i \
- -e $( printf '/%s/d;' ${xxx[@]} ) \
- youtube_dl/extractor/__init__.py \
- || die
-
- # do multiple line imports
- sed -i \
- -e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
- youtube_dl/extractor/__init__.py \
- || die
-
- sed -i \
- -e $( printf '/%s/d;' ${mxxx[@]} ) \
- youtube_dl/extractor/generic.py \
- youtube_dl/extractor/tumblr.py \
- || die
-
- rm \
- $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
- $( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
- test/test_age_restriction.py \
- || die
- fi
-
- epatch_user
-}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- python_domodule youtube_dl
- dobin bin/${PN}
- dodoc README.txt
- doman ${PN}.1
- newbashcomp ${PN}.bash-completion ${PN}
- python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2015.11.27.1.ebuild b/net-misc/youtube-dl/youtube-dl-2015.12.23.ebuild
index 7c5ab5b4b433..5db7401e49ee 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.11.27.1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.12.23.ebuild
@@ -30,12 +30,12 @@ src_prepare() {
youtube_dl/version.py || die
# these have single line import statements
local xxx=(
- alphaporno anysex behindkink drtuber eporner eroprofile extremetube
- fourtube foxgay goshgay hellporno hentaistigma hornbunny keezmovies
- mofosex motherless porn91 pornhd pornotube pornovoisines pornoxo
- redtube sexykarma sexu sunporno slutload spankbang spankwire thisav
- trutube tube8 vporn xbef xnxx xtube xvideos xxxymovies youjizz
- youporn
+ alphaporno anysex behindkink chaturbate drtuber eporner eroprofile
+ extremetube fourtube foxgay goshgay hellporno hentaistigma
+ hornbunny keezmovies mofosex motherless porn91 pornhd pornotube
+ pornovoisines pornoxo redtube sexykarma sexu sunporno slutload
+ spankbang spankwire thisav trutube tube8 vporn xbef xnxx xtube
+ xvideos xxxymovies youjizz youporn
)
# these have multi-line import statements
local mxxx=(
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
new file mode 100644
index 000000000000..aba829c27973
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
+DISTUTILS_SINGLE_IMPL=true
+inherit bash-completion-r1 distutils-r1 eutils git-r3
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+EGIT_REPO_URI="https://github.com/rg3/youtube-dl.git"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ test? ( dev-python/nose[coverage(+)] )
+"
+
+src_compile() {
+ distutils-r1_src_compile
+ emake -C docs man
+ ${PYTHON} devscripts/bash-completion.py
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ python_domodule youtube_dl
+ dobin bin/${PN}
+ dodoc README.md
+ doman docs/_build/man/${PN}.1
+ newbashcomp ${PN}.bash-completion ${PN}
+ python_fix_shebang "${ED}"
+}
diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest
index 72b768392c9f..355c7689887c 100644
--- a/net-p2p/classified-ads/Manifest
+++ b/net-p2p/classified-ads/Manifest
@@ -1,6 +1,8 @@
DIST classified-ads-0.07.tar.gz 2194177 SHA256 882874da2d1610d64c952969222b9295bab59b519de8a7da69790805fecca394 SHA512 a42e9604ce922968b0d7f345d623b250dae39fad2f43648b996ab10f3e7941ec3de95e89d94f4ec28bba882cf2bd38ea28aac88885522a7375926aee3c5d0843 WHIRLPOOL a797387e0f8537ab5366c55554c8909d656436122c3cbf2b35c7c8cc989a8cf76c3f0d6d39a99ac54e0b7cbcd8063dd1a4ec3a99b320f243338081f665f3b933
DIST classified-ads-0.07_p20150728.tar.gz 2197413 SHA256 e8d488b6c44b198bf1150c7a33ae698887cfb345cb4473d91a5949abeb846d95 SHA512 1cb42252ab695e90212d05144255a66b0d8dc63d8d010b5781e470a4c5e9cdf9c4dce1b9e44cba83d5fb2fef99e3d46fd5cc1b9880db69c9c163475b7e4349fc WHIRLPOOL 458d3947f00709c633d652b753b7801496479f610da0d249e8e2f5f7ddecb341fb885184c027b453aa2f9db7998a74fcbd60bbb9d0bb5765b7b7e45bcdcfc2c0
DIST classified-ads-0.09.tar.gz 2288561 SHA256 c6c0809c269e7596386b612f0a43c705801bad71c64a23a81f763656b22db125 SHA512 3639854cb797830f71261097ba315426be74f0dbcb5190522d50f4507d488d309c0793d1cad5bbc29bc43bd06de16392afc82172cefa766458764b4ac5b90357 WHIRLPOOL 7149c2772ca61a5067722f6aa5066e4dee3aec758b1998633d129cd4704723e6c633522a241cc4332dca94cac0bb59ada9a5472c750d335a764e1ff2f09c9d8f
+DIST classified-ads-0.09_p20151220.tar.gz 2288916 SHA256 4703c8f0183248376c9a0ce220115f44940c8c82efb93082bf313f42c73e1a7f SHA512 2a167e0bf8fe74014ae797cebb6577e481d75afbfd9a4a49587e857777eadd71285f0431ca22fa0a83efde2192d792a4517fbdbfe37cbb2ae1e6ab19f6e89e1e WHIRLPOOL ee12913ae813631e711d33cc62deedc50a4e173dcb3d793757f042eae04ec63c6062e9543a42aac50164a2e68fac59030f3ac43c232fc787b9b2e7020c4c9c84
DIST classified-ads-graphics-0.07.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
DIST classified-ads-graphics-0.07_p20150728.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
DIST classified-ads-graphics-0.09.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
+DIST classified-ads-graphics-0.09_p20151220.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
diff --git a/net-p2p/classified-ads/classified-ads-0.09_p20151220.ebuild b/net-p2p/classified-ads/classified-ads-0.09_p20151220.ebuild
new file mode 100644
index 000000000000..df2195ac8b06
--- /dev/null
+++ b/net-p2p/classified-ads/classified-ads-0.09_p20151220.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="en fi sv da"
+PLOCALE_BACKUP="en"
+inherit qt4-r2 vcs-snapshot qmake-utils
+
+COMMIT_ID="c761d4e7124ebe9c76bc1529b27fe9c0aa1c2078"
+DESCRIPTION="Program for displaying classified advertisement items"
+HOMEPAGE="http://katiska.org/classified-ads/"
+SRC_URI="https://github.com/operatornormal/classified-ads/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz \
+ https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true \
+ -> classified-ads-graphics-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc test"
+
+RDEPEND="dev-libs/openssl:0
+ dev-libs/qjson
+ >=net-libs/libnatpmp-20130911
+ <=net-libs/libnatpmp-20140401-r1
+ >=net-libs/miniupnpc-1.8
+ sys-apps/file
+ sys-devel/gettext
+ dev-qt/qtcore:4[ssl]
+ dev-qt/qtsql:4[sqlite]
+ dev-qt/qtgui:4[debug?]"
+
+DEPEND="${RDEPEND}
+ dev-qt/qttest:4
+ sys-devel/gdb:0
+ doc? ( app-doc/doxygen[dot] )
+ test? ( dev-libs/libgcrypt:0 )
+ "
+
+src_prepare() {
+ # preprocessed graphics are unpacked into wrong directory
+ # so lets move them into correct location:
+ mv ../classified-ads-graphics-${PV}/* ui/ || die
+ # then just run qmake
+ qt4-r2_src_prepare
+}
+
+src_compile() {
+ qt4-r2_src_compile
+ if use doc; then
+ cd doc || die
+ doxygen || die
+ fi
+}
+
+src_test() {
+ cd test || die "test suite missing"
+ "$(qt4_get_bindir)"/qmake || die "test suite configure failed"
+ emake
+ # test suite will create files under $HOME, set $HOME to point to
+ # safe location, ideas stolen from
+ # eclass/distutils-r1.eclass func distutils_install_for_testing
+ BACKUP_HOME=$HOME
+ export HOME=${BUILD_DIR}/tmp
+ mkdir -p $HOME || true
+ ./testca
+ result=$?
+ export HOME=$BACKUP_HOME
+ if [ $result != "0" ]; then
+ die "test suite failed with error code " `echo $result`
+ fi
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}" DESTDIR="${D}"
+ use doc && dodoc -r doc/doxygen.generated/html/
+}
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index cc5f6c3fbdf3..313ff2353cc8 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,3 +1,2 @@
-DIST gtk-gnutella-1.1.5.tar.bz2 19552392 SHA256 c332043a885ba302841a261c118264d903627fd21b062c99538db7dc7dada8a5 SHA512 eb94ef5cbc447ebf75d16eb24f0a4d88197a9b79f842fe73f963af3ba5985cc4ce99605d29e33123754d9a509218b71acc684df27a075c3947278211c1b204e5 WHIRLPOOL c5bc302dd7bd92eac2298c52b557723b473a930a7e1b40cddc74424bef7acf0a9b90f27ba503dc40038c925047dfcf6f80ca8de2f0e20a6429d70267de3ada49
DIST gtk-gnutella-1.1.6.tar.bz2 19571757 SHA256 b755250f6b8af65b449f20e4dac77a677c1c3fd52f603dc9cd82b035740974c3 SHA512 ade3c8e8a776b4ff9351ad60b307f421f804c423811ea2bc7639656e3623fb95c1041c235578e07009c07f7c85911db72b9c17e04fca65a1661c8492c396069f WHIRLPOOL 857578452335885de3f918d54c663cd4d7beb1a3cad7970bf74f796866f3754c66d7a59e64bb2b1400eacb9413c47de51f29d41ef2178916a3cfd6d9e57294fe
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.5.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.5.ebuild
deleted file mode 100644
index f377506cfbef..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.5.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/gtk-gnutella/gtk-gnutella-1.1.6.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.6.ebuild
index 154b509fd546..f377506cfbef 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.6.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
RDEPEND="
dev-libs/glib:2
diff --git a/net-p2p/rtorrent/rtorrent-0.9.6.ebuild b/net-p2p/rtorrent/rtorrent-0.9.6.ebuild
index efbf0261f74c..30c142e200c1 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.6.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="daemon debug ipv6 selinux test xmlrpc"
COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
diff --git a/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild b/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild
deleted file mode 100644
index 773716a1ee98..000000000000
--- a/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils autotools user
-
-DESCRIPTION="An ad-filtering web proxy featuring an effective heuristic ad-detection algorithm"
-HOMEPAGE="http://bfilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bfilter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X debug"
-
-RDEPEND="sys-libs/zlib
- <dev-libs/ace-5.8.3
- dev-libs/libsigc++:2
- X? ( dev-cpp/gtkmm:2.4 x11-libs/libX11 )
- dev-libs/boost"
-
-DEPEND="${RDEPEND}
- dev-util/scons
- virtual/pkgconfig"
-
-RESTRICT="test" # boost's test API has changed
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-glib-2.32.patch
- epatch "${FILESDIR}"/${P}-external-boost.patch
- epatch "${FILESDIR}"/${P}-gtkmm-X11-underlinking.patch
-
- rm -rf "${S}"/boost
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_with X gui) \
- --without-builtin-boost
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- insinto /etc/bfilter
- doins "${FILESDIR}"/forwarding.xml
-
- dodoc AUTHORS ChangeLog "${FILESDIR}"/forwarding-proxy.xml
- dohtml doc/*
-
- newinitd "${FILESDIR}/bfilter.init" bfilter
- newconfd "${FILESDIR}/bfilter.conf" bfilter
-}
-
-pkg_preinst() {
- enewgroup bfilter
- enewuser bfilter -1 -1 -1 bfilter
-}
-
-pkg_postinst() {
- elog "The documentation is available at"
- elog " http://bfilter.sourceforge.net/documentation.php"
- elog "For forwarding bfilter service traffic through a proxy,"
- elog "see forwarding-proxy.xml example installed in the doc directory."
-}
diff --git a/net-proxy/bfilter/bfilter-1.1.4-r2.ebuild b/net-proxy/bfilter/bfilter-1.1.4-r2.ebuild
index 78e16643107b..1096d815e601 100644
--- a/net-proxy/bfilter/bfilter-1.1.4-r2.ebuild
+++ b/net-proxy/bfilter/bfilter-1.1.4-r2.ebuild
@@ -6,13 +6,13 @@ EAPI=5
inherit autotools eutils flag-o-matic user
-DESCRIPTION="An ad-filtering web proxy featuring an effective heuristic ad-detection algorithm"
+DESCRIPTION="Ad-filtering web proxy featuring an effective heuristic ad-detection algorithm"
HOMEPAGE="http://bfilter.sourceforge.net/"
SRC_URI="mirror://sourceforge/bfilter/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="X debug"
RDEPEND="sys-libs/zlib
diff --git a/net-wireless/spectools/spectools-2011.08.1_p20140618-r1.ebuild b/net-wireless/spectools/spectools-2011.08.1_p20140618-r1.ebuild
index 66482683faa0..4f809bfa7e7e 100644
--- a/net-wireless/spectools/spectools-2011.08.1_p20140618-r1.ebuild
+++ b/net-wireless/spectools/spectools-2011.08.1_p20140618-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit autotools eutils toolchain-funcs udev
+inherit autotools eutils flag-o-matic toolchain-funcs udev
MY_PN=${PN}
MY_PV=${PV/\./-}
@@ -43,6 +43,11 @@ src_prepare() {
eautoreconf
}
+src_configure() {
+ append-cflags -std=gnu89
+ default
+}
+
# Please note that upstream removed the --with-gtk-version option
# and GTK is now automagical. GTK1 support was also removed.
src_compile() {
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 9745beb957bf..90d6d69e01ba 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,2 +1,4 @@
DIST EttusResearch-UHD-3.8.2.tar.gz 2170233 SHA256 04fc1e42010560a5c74c714be2729a252b06bf46b982321a3e47ca5ed72a3bce SHA512 7a2939f883bd5445fc8f16e1e09d3fc3dc2b41481dfb4bdefd4a8e4f2c6c0d1c703f2a47e373b295d11419740b5c62d959557ed3fd880bf75977c9716316a844 WHIRLPOOL ff883bd01768d68b7bc20b97d92e38e7f8ee79571a2cc62917f435482fdd415af7166b3032d71b842cabf12a42c3d3da09ea962f68393b7dc723acce49db65d3
+DIST EttusResearch-UHD-3.8.5.tar.gz 2910398 SHA256 e0a36e64bffa7d06ac948fd8fc07ff3ce321e1efc3f7e8604b53e0c3ce842989 SHA512 edbc79e5a524e655e6c9016d2e1d2f0d242a9c7dcfa0130995b4c7cf77b95d4c9ba486e31891554746db755e0b47c46b0b8b9323e8c5de250a15d1271a8ccfc1 WHIRLPOOL 3516b74e247bbf6930cb25f639ff34eec2c95102d7c38ddcf7c892c80394ebd7c3e0c91d77277bb4c719c05d83cd6fc507449f9fd072371456843a3a12f6b778
DIST uhd-images_003.008.002-release.zip 24803095 SHA256 5e3df6bff5040276208d25848ad085e0ecbbd9f8c528be04f19f91d3b169a1ee SHA512 a2a970928f7f4e9bbf983f19c71bcf9b1b26a6f7bd66f1a171e6fc7d329a7107bff0e6425734299a88b639663951e27ec4a49efcb7731cb2f3e94c2cd4557e36 WHIRLPOOL 404bfe4f87e26e0f39b467abebd7735fef42833a117561b8a73917e36d59b20dc9d62fe89bfd19e9daa3d3e7069ec4b1e0a92808f835f8f5f17e8cccd153495a
+DIST uhd-images_003.008.005-release.zip 24897325 SHA256 e04e5b63dd550d8bba8db4c6138996c18a54533a158015cea301800da387e198 SHA512 4d3d60453320a05bf5008ffeddafdf01c08a906e6469a32ece9f1102072e03a8d140487febad7c392ba64f10fc3b94e2fdbe26e2e263a8fe1b1a29077a15e512 WHIRLPOOL 2493d969ae60b715592c7e47ee1648a418d808026b950cc524de492010de9b85087186f39c19d59c70e0d0cb1ebacf760e926ba9cf2edf608e95a6c3a7f30929
diff --git a/net-wireless/uhd/uhd-3.8.2.ebuild b/net-wireless/uhd/uhd-3.8.2.ebuild
index 750ae0af048b..2af6ab81e830 100644
--- a/net-wireless/uhd/uhd-3.8.2.ebuild
+++ b/net-wireless/uhd/uhd-3.8.2.ebuild
@@ -22,7 +22,7 @@ SLOT="0/1"
IUSE=""
RDEPEND="virtual/libusb:1
dev-lang/orc
- dev-libs/boost:=
+ <dev-libs/boost-1.58.0:=
sys-libs/ncurses
"
DEPEND="${RDEPEND}
diff --git a/net-wireless/uhd/uhd-3.8.5.ebuild b/net-wireless/uhd/uhd-3.8.5.ebuild
new file mode 100644
index 000000000000..11d28e3168b0
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.8.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
+
+image_version=uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).00$(get_version_component_range 3)-release
+SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3).tar.gz -> EttusResearch-UHD-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).tar.gz \
+ http://files.ettus.com/binaries/images/${image_version}.zip"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+KEYWORDS="~amd64 ~arm ~x86"
+S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host
+
+LICENSE="GPL-3"
+SLOT="0/1"
+IUSE=""
+RDEPEND="virtual/libusb:1
+ dev-lang/orc
+ dev-libs/boost:=
+ sys-libs/ncurses:0
+ "
+DEPEND="${RDEPEND}
+ dev-python/cheetah
+ app-arch/unzip"
+
+src_prepare() {
+ gnome2_environment_reset #534582
+
+ #this may not be needed in 3.4.3 and above, please verify
+ sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+}
+
+src_install() {
+ cmake-utils_src_install
+ python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ insinto /lib/udev/rules.d/
+ doins "${S}"/utils/uhd-usrp.rules
+ insinto /usr/share/${PN}
+ doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images
+}
diff --git a/perl-core/Devel-PPPort/Devel-PPPort-3.310.0.ebuild b/perl-core/Devel-PPPort/Devel-PPPort-3.310.0.ebuild
new file mode 100644
index 000000000000..ee9df503d38f
--- /dev/null
+++ b/perl-core/Devel-PPPort/Devel-PPPort-3.310.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Devel-PPPort/Devel-PPPort-3.200.0.ebuild,v 1.10 2015/06/04 21:39:06 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=WOLFSAGE
+MODULE_VERSION=3.31
+inherit perl-module
+
+DESCRIPTION="Perl/Pollution/Portability"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~amd64-linux ~arm ~arm64 ~hppa ~hppa-hpux ~ia64 ~ia64-hpux ~ia64-linux ~m68k ~m68k-mint ~mips ~ppc ~ppc64 ~ppc-aix ~ppc-macos ~s390 ~sh ~sparc ~sparc64-solaris ~sparc-solaris ~x64-freebsd ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~x86-linux ~x86-macos ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"
diff --git a/perl-core/Devel-PPPort/Manifest b/perl-core/Devel-PPPort/Manifest
new file mode 100644
index 000000000000..2387c28f1e2f
--- /dev/null
+++ b/perl-core/Devel-PPPort/Manifest
@@ -0,0 +1 @@
+DIST Devel-PPPort-3.31.tar.gz 218537 SHA256 ead2c49f0442a26890723231a92d3c0ac6ac297b814839e421a77d7889a2471d SHA512 7c139bbf80b06abda61de5f1aaff162d0e6bcec3f06c75a8519610d0e5766c9a24513d36681dd082aaee2238eedab9c971c89d0c31ebd16b43f2ed9d9da12e71 WHIRLPOOL 915fceb332eb4ddfb8ec5b43d302dfe63aea8599a7867f52395207c46bb73a2721876528dc4c4b863b553b3a7fb50fd0227dfa8df1cdb1be7038682373162715
diff --git a/perl-core/Devel-PPPort/metadata.xml b/perl-core/Devel-PPPort/metadata.xml
new file mode 100644
index 000000000000..801e9385a1e0
--- /dev/null
+++ b/perl-core/Devel-PPPort/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>perl</herd>
+</pkgmetadata>
diff --git a/perl-core/Module-Metadata/Manifest b/perl-core/Module-Metadata/Manifest
new file mode 100644
index 000000000000..a6f799954134
--- /dev/null
+++ b/perl-core/Module-Metadata/Manifest
@@ -0,0 +1 @@
+DIST Module-Metadata-1.000026.tar.gz 41296 SHA256 38c392eef436d26b76e8d9a478a7d910175c65107bce5763ad9ca40fdb3db690 SHA512 27cbebefc8e76bd8573215f567e6d57e6d8c0f09244867b8a5baf85142e325bddd645d03c5318ebed738dfd60a552491a1bbef6bf9f2d434aa99306c1431ad88 WHIRLPOOL 80a436c77fc26095f90679279c09b588bf2f6f606beb9790db3a4d06c5c7b1566d9cd85210fc31d8f3da946d7a1cb3fd307e552c3e36bfe19e34afe2ddc69070
diff --git a/perl-core/Module-Metadata/Module-Metadata-1.0.26.ebuild b/perl-core/Module-Metadata/Module-Metadata-1.0.26.ebuild
new file mode 100644
index 000000000000..770b3459e99b
--- /dev/null
+++ b/perl-core/Module-Metadata/Module-Metadata-1.0.26.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=ETHER
+MODULE_VERSION=1.000026
+inherit perl-module
+
+DESCRIPTION="Gather package and POD information from perl module files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~amd64-linux ~arm ~arm64 ~hppa ~hppa-hpux ~ia64 ~ia64-hpux ~ia64-linux ~m68k ~m68k-mint ~mips ~ppc ~ppc64 ~ppc-aix ~ppc-macos ~s390 ~sh ~sparc ~sparc64-solaris ~sparc-solaris ~x64-freebsd ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~x86-linux ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=virtual/perl-version-0.870"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do parallel"
diff --git a/perl-core/Module-Metadata/metadata.xml b/perl-core/Module-Metadata/metadata.xml
new file mode 100644
index 000000000000..e5c5365a3cd6
--- /dev/null
+++ b/perl-core/Module-Metadata/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>perl</herd>
+ <upstream>
+ <remote-id type="cpan">Module-Metadata</remote-id>
+ <remote-id type="cpan-module">Module::Metadata</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index ccf22534d838..c4f2704d80f6 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -2,6 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Ian Delaney <idella4@gentoo.org> (28 Dec 2015)
+# dep of testsuite dev-util/cmocka requires keywording for alpha
+# via Bug 569558, then this can be taken out
+media-video/mpv test
+
# Mike Frysinger <vapier@gentoo.org> (22 Dec 2015)
# Needs keywording. #569254
net-firewall/iptables nftables
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 34f66e10f015..13119563dd0b 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -18,6 +18,11 @@
#--- END OF EXAMPLES ---
+# Ian Delaney <idella4@gentoo.org> (28 Dec 2015)
+# proxy maintainer excludes dep uchardet from the build
+# of mpv temporarily but does not require masking in amd64
+media-video/mpv -uchardet
+
# Nathan Phillip Brink <binki@gentoo.org> (26 Sep 2015)
# git useflag requires dev-libs/libgit2 which few arches support
dev-util/geany-plugins -git
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index ee7342e7aebf..31b7d770c9ab 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -2,6 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Jeroen Roovers <jer@gentoo.org> (26 Dec 2015)
+# Mask until >sys-cluster/ceph-0.94 goes stable
+net-analyzer/rrdtool rados
+
# Justin Lecher <jlec@gentoo.org> (3 Dec 2015)
# Missing keywords on deps #567458
kde-apps/kalzium editor
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index ceaf2443e910..1a6e56e73d93 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -4,6 +4,11 @@
# This file requires >=portage-2.1.1
+# Ian Delaney <idella4@gentoo.org> (28 Dec 2015)
+# proxy maintainer excludes dep uchardet from the build
+# of mpv temporarily but does not require masking in x86
+media-video/mpv -uchardet
+
# Ian Delaney <idella4@gentoo.org> (02 Dec 2015)
# mask revdeps of xen that emply a hypervisor in arch x86
app-emulation/libvirt xen
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 463337396546..fddb132cbf0e 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,6 +5,15 @@
# This file requires >=portage-2.1.1
# New entries go on top.
+# Ian Delaney <idella4@gentoo.org> (28 Dec 2015)
+# proxy maintainer excludes dep uchardet from the build
+# of mpv temporarily
+media-video/mpv uchardet
+
+# Manuel Rüger <mrueg@gentoo.org> (24 Dec 2015)
+# media-tv/xawtv is masked for removal
+net-im/ayttm webcam
+
# Brian Evans <grknight@gentoo.org> (17 Dec 2015)
# Drizzle is slated for removal
sys-cluster/gearmand drizzle
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index f9e89e4b9aae..4b90d971e5c4 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -21,9 +21,10 @@ python_single_target_python3_5
curl_ssl_libressl
libressl
-# Hans de Graaff <graaff@gentoo.org> (28 Sep 2015)
+# Hans de Graaff <graaff@gentoo.org> (26 Dec 2015)
# Currently in testing and not ready to go stable yet.
ruby_targets_ruby22
+ruby_targets_ruby23
# Patrick Lauer <patrick@gentoo.org> (28 Apr 2015)
# dependencies not stable yet
diff --git a/profiles/desc/ruby_targets.desc b/profiles/desc/ruby_targets.desc
index ed0c63dee586..417554e62c31 100644
--- a/profiles/desc/ruby_targets.desc
+++ b/profiles/desc/ruby_targets.desc
@@ -12,3 +12,4 @@ ruby19 - Build with MRI Ruby 1.9.x
ruby20 - Build with MRI Ruby 2.0.x
ruby21 - Build with MRI Ruby 2.1.x
ruby22 - Build with MRI Ruby 2.2.x
+ruby23 - Build with MRI Ruby 2.3.x
diff --git a/profiles/license_groups b/profiles/license_groups
index f2fbdd42d778..d54fac5c87bb 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -76,7 +76,7 @@ BINARY-REDISTRIBUTABLE @FREE atheros-hal bh-luxi Broadcom Dina hashcat intel-uco
# License agreements that try to take away your rights. These are more
# restrictive than "all-rights-reserved" or require explicit approval.
-EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA cadsoft Coherent-Graphics CROSSOVER CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2009 FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA GIMPS GOG-EULA google-chrome googleearth Google-TOS IBM-J1.6 Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MSjdbcEULA40 MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 RTCW RTCW-ETEULA SCM-MICRO SJ-Labs skype-4.0.0.7-copyright spin-commercial spin-educational TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi
+EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA cadsoft Coherent-Graphics CROSSOVER CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2009 FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA GIMPS GOG-EULA google-chrome googleearth Google-TOS IBM-J1.6 Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MSjdbcEULA40 MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RTCW RTCW-ETEULA SCM-MICRO SJ-Labs skype-4.0.0.7-copyright spin-commercial spin-educational TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi
# Deprecated license labels, used by repoman
#DEPRECATED as-is
diff --git a/profiles/package.mask b/profiles/package.mask
index 0bb0017e8d36..b52f8a3241cb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,29 @@
#--- END OF EXAMPLES ---
+# Michael Palimaka <kensington@gentoo.org> (27 Dec 2015)
+# Fails to build. Dead upstream. Masked for removal in 30 days.
+# Bug 541522
+dev-util/pmk
+
+# Mikle Kolyada <zlogene@gentoo.org> (26 Dec 2015)
+# Dead upstream (last activity in 2003)
+# Nothing in the tree depends on it
+# Masked for removal
+dev-perl/SpeedyCGI
+
+# Sergey Popov <pinkbyte@gentoo.org> (25 Dec 2015)
+# Old versions lacks multilib support and proper subslots
+# Masked for removal
+<dev-libs/boost-1.55.0
+<dev-util/boost-build-1.55.0
+
+# Manuel Rüger <mrueg@rueg.eu> (24 Dec 2015)
+# Effectively unmaintained, multiple bugs
+# Bug 288611,358013,413987,468186,480854,528750,548480,566226
+# Masked for removal in 30 days.
+media-tv/xawtv
+
# Michael Palimaka <kensington@gentoo.org> (22 Dec 2015)
# Fails to build. Dead upstream. Masked for removal in 30 days.
# Bug 566446
@@ -111,10 +134,6 @@ dev-java/jscience
# experimental features and accept a more unstable release.
>=www-client/chromium-49
-# Mike Gilbert <floppym@gentoo.org> (06 Dec 2015)
-# Masked for testing.
-=sys-apps/dbus-1.10*
-
# Patrice Clement <monsieurp@gentoo.org> (06 Dec 2015)
# We maintain old versions which were never stabilised
# and are too far behind for a trivial version bump.
@@ -253,11 +272,6 @@ app-eselect/eselect-esd
# Dead for years, see bug #248489. Removal in a month.
dev-tex/latex-unicode
-# Patrice Clement <monsieurp@gentoo.org> (07 Nov 2015)
-# Duplicate package since it already exists as virtual/perl-Parse-CPAN-meta.
-# Masked for removal in 30 days.
-dev-perl/Parse-CPAN-Meta
-
# Michał Górny <mgorny@gentoo.org> (30 Oct 2015)
# Uses unsafe ioctls that could result in data corruption. Upstream
# is working on replacing them in the wip/dedup-syscall branch.
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 3ec0aede80e4..08322587fbbd 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -35,7 +35,7 @@ qmail http://ds9a.nl/qmail http://infobase.ibase.com.hk/qmail http://mirror.hud
quakeunity http://www.mirrorservice.org/sites/quakeunity.com http://games.mirrors.tds.net/pub/planetquake3
rubyforge http://files.rubyforge.vm.bytemark.co.uk
rubygems https://rubygems.org/gems
-ruby http://cache.ruby-lang.org/pub/ruby/ https://ftp.ruby-lang.org/pub/ruby/ http://www.dnsbalance.ring.gr.jp/archives/lang/ruby/ http://ruby.taobao.org/mirrors/ruby/ ftp://ftp.fu-berlin.de/unix/languages/ruby/
+ruby https://cache.ruby-lang.org/pub/ruby/ http://ruby.taobao.org/mirrors/ruby/ ftp://ftp.fu-berlin.de/unix/languages/ruby/
samba http://ftp.samba.org/pub/samba ftp://au1.samba.org/pub/samba ftp://ca.samba.org/pub/samba ftp://de.samba.org/pub/samba ftp://fi.samba.org/pub/samba ftp://ftp.azc.uam.mx/mirrors/samba ftp://ftp.samba.gr.jp/pub/samba ftp://gd.tuwien.ac.at/infosys/servers/samba ftp://it.samba.org/pub/samba ftp://pl.samba.org/pub/samba
sabayon http://sabayon.c3sl.ufpr.br/distfiles http://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/distfiles http://ftp.rnl.ist.utl.pt/pub/sabayon/distfiles http://ftp.fsn.hu/pub/linux/distributions/sabayon/distfiles http://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/distfiles http://cross-lfs.sabayonlinux.org/distfiles http://sabayon.mirror.dkm.cz/pub/sabayon/distfiles http://mirror.internode.on.net/pub/sabayon/distfiles http://na.mirror.garr.it/mirrors/sabayonlinux/distfiles http://distfiles.sabayon.org
slang ftp://space.mit.edu/pub/davis/slang ftp://ftp.fu-berlin.de/pub/unix/misc/slang ftp://ftp.ntua.gr/pub/lang/slang/slang
diff --git a/sci-astronomy/stellarium/stellarium-0.14.0.ebuild b/sci-astronomy/stellarium/stellarium-0.14.0.ebuild
index 7d8c7cfa1821..a2f65f0c1b41 100644
--- a/sci-astronomy/stellarium/stellarium-0.14.0.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.14.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug nls sound stars"
RESTRICT="test"
diff --git a/sci-biology/bfast/bfast-0.7.0a.ebuild b/sci-biology/bfast/bfast-0.7.0a.ebuild
index 908334354033..b901ed5e9ab8 100644
--- a/sci-biology/bfast/bfast-0.7.0a.ebuild
+++ b/sci-biology/bfast/bfast-0.7.0a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@ EAPI=5
AUTOTOOLS_AUTORECONF=true
-inherit autotools-utils
+inherit autotools-utils flag-o-matic
DESCRIPTION="Blat-like Fast Accurate Search Tool"
HOMEPAGE="https://sourceforge.net/projects/bfast/"
@@ -36,5 +36,7 @@ src_prepare() {
use test && AUTOTOOLS_IN_SOURCE_BUILD=1
+ append-flags -fgnu89-inline
+
autotools-utils_src_prepare
}
diff --git a/sci-biology/bowtie/Manifest b/sci-biology/bowtie/Manifest
index c692c89b3bb4..1291400cabae 100644
--- a/sci-biology/bowtie/Manifest
+++ b/sci-biology/bowtie/Manifest
@@ -1,3 +1,2 @@
-DIST bowtie-0.12.8-src.zip 15569919 SHA256 f074a0f25e156976c4951fd69651d60caab925af9829054d107ec8b19af3082d SHA512 824eddd7db24177f7e15b90fb93a0426c2b8cee4dbcac2707f4cc7e7e42bafcad3775382b79d9b4d679e0c4b5c17a1b79ad134e91a968037336b34c6262e9c48 WHIRLPOOL 7056444822e7a0de619dcab933a7870ebe7db52008f3dbb2dd72aa189325d7ca4c353133d77150ec67c414e005a834458538f57746b13fd20f06bc7289869800
DIST bowtie-1.1.2-src.zip 7713258 SHA256 b1e9ccc825207efd1893d9e33244c681bcb89b9b2b811eb95a9f5a92eab637ae SHA512 3d3d69bc3a865bb577b5a91440215d0d5b606c7a8751d565e606e36adbfbdef695b1718ae81cd3e2682a39ca7784c4d00976441e7618264ad99b04c7f53c36e8 WHIRLPOOL 08cb824bf7a1ddfbe6692de67191aacf44776d7d4e0ab66bd2a13ecfffd087bc28cdde4c7285c781fa4759de0a239e68f87b702bcc2e24c9b81fda5804360ce7
DIST bowtie2-2.2.6-source.zip 5728779 SHA256 1000e90cdd90c3ca43c69d0d0ad951e190d36a6981a546f430a90ce86d64bfc8 SHA512 3ab5a5475cf214affd91e0d1782fd2d6dedccd979e3c809b5dfb272726d99ff1c7b59d92e387b187a7c2e43557786a1085186ccb96588de91212caf2eb94ce4f WHIRLPOOL 4fb02b3a0d76bbee0fe9abf91a71405922568bc38e593d5740df6279bad6f8b668df0debb0a81f3d3c23623558f34d842dd662a6838cf2d7f0fc8945fd00a298
diff --git a/sci-biology/bowtie/bowtie-0.12.8.ebuild b/sci-biology/bowtie/bowtie-0.12.8.ebuild
deleted file mode 100644
index c26c986ed194..000000000000
--- a/sci-biology/bowtie/bowtie-0.12.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An ultrafast memory-efficient short read aligner"
-HOMEPAGE="http://bowtie-bio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bowtie-bio/${P}-src.zip"
-
-LICENSE="Artistic"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86 ~x64-macos"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-# NB: Bundles code from Maq (http://maq.sf.net) and the SeqAn library (http://www.seqan.de)
-# TODO: properly report system CFLAGS in -DCOMPILE_OPTIONS
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc-47.patch
-}
-
-src_compile() {
- unset CFLAGS
- emake \
- CC="$(tc-getCC)" \
- CPP="$(tc-getCXX)" \
- CXX="$(tc-getCXX)" \
- EXTRA_FLAGS="${LDFLAGS}" \
- RELEASE_FLAGS=""
-}
-
-src_install() {
- dobin bowtie bowtie-*
- exeinto /usr/share/${PN}/scripts
- doexe scripts/*
- newman MANUAL bowtie.1
- dodoc AUTHORS NEWS TUTORIAL
-}
diff --git a/sci-biology/bowtie/bowtie-1.1.2.ebuild b/sci-biology/bowtie/bowtie-1.1.2.ebuild
index a4a8b5b4b8d4..f8796530976a 100644
--- a/sci-biology/bowtie/bowtie-1.1.2.ebuild
+++ b/sci-biology/bowtie/bowtie-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/bowtie-bio/${P}-src.zip"
LICENSE="Artistic"
SLOT="1"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
IUSE="examples +tbb"
diff --git a/sci-biology/bowtie/bowtie-2.2.6.ebuild b/sci-biology/bowtie/bowtie-2.2.6.ebuild
index 89064500da6c..eb29c05430a6 100644
--- a/sci-biology/bowtie/bowtie-2.2.6.ebuild
+++ b/sci-biology/bowtie/bowtie-2.2.6.ebuild
@@ -6,13 +6,13 @@ EAPI=5
inherit eutils toolchain-funcs
-DESCRIPTION="Popular short read aligner for Next-generation sequencing data, allowing for gaps"
+DESCRIPTION="Popular short read aligner for Next-generation sequencing data"
HOMEPAGE="http://bowtie-bio.sourceforge.net/bowtie2/"
SRC_URI="mirror://sourceforge/project/${PN}-bio/${PN}2/${PV}/${PN}2-${PV}-source.zip"
LICENSE="GPL-3"
SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="examples cpu_flags_x86_sse2 +tbb"
diff --git a/sci-biology/bowtie/files/bowtie-0.12.8-gcc-47.patch b/sci-biology/bowtie/files/bowtie-0.12.8-gcc-47.patch
deleted file mode 100644
index 3c8a1e1d9ca4..000000000000
--- a/sci-biology/bowtie/files/bowtie-0.12.8-gcc-47.patch
+++ /dev/null
@@ -1,45 +0,0 @@
- alphabet.h | 24 ++++++++++++------------
- 1 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/alphabet.h b/alphabet.h
-index b464ddf..08d0281 100644
---- a/alphabet.h
-+++ b/alphabet.h
-@@ -38,6 +38,18 @@ static inline TStr reverseComplement(const TStr& s, bool color) {
- return s_rc;
- }
-
-+/// Reverse a string in-place
-+template <typename TStr>
-+static inline void reverseInPlace(TStr& s) {
-+ typedef typename Value<TStr>::Type TVal;
-+ size_t len = length(s);
-+ for(size_t i = 0; i < (len>>1); i++) {
-+ TVal tmp = s[i];
-+ s[i] = s[len-i-1];
-+ s[len-i-1] = tmp;
-+ }
-+}
-+
- /**
- * Reverse-complement s in-place. Ns go to Ns.
- */
-@@ -69,18 +81,6 @@ static inline void reverseComplementInPlace(TStr& s, bool color) {
- }
- }
-
--/// Reverse a string in-place
--template <typename TStr>
--static inline void reverseInPlace(TStr& s) {
-- typedef typename Value<TStr>::Type TVal;
-- size_t len = length(s);
-- for(size_t i = 0; i < (len>>1); i++) {
-- TVal tmp = s[i];
-- s[i] = s[len-i-1];
-- s[len-i-1] = tmp;
-- }
--}
--
- /**
- * Return the reverse-complement of s.
- */
diff --git a/sci-biology/embassy-vienna/embassy-vienna-1.7.2.650.ebuild b/sci-biology/embassy-vienna/embassy-vienna-1.7.2.650.ebuild
index d0fb4d1ccba0..716bb1019663 100644
--- a/sci-biology/embassy-vienna/embassy-vienna-1.7.2.650.ebuild
+++ b/sci-biology/embassy-vienna/embassy-vienna-1.7.2.650.ebuild
@@ -8,8 +8,13 @@ EBO_DESCRIPTION="Vienna RNA package - RNA folding"
AUTOTOOLS_AUTORECONF=1
-inherit emboss-r1
+inherit emboss-r1 flag-o-matic
KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
PATCHES=( "${FILESDIR}"/${P}_fix-build-system.patch )
+
+src_configure() {
+ append-cflags -std=gnu89
+ emboss-r1_src_configure
+}
diff --git a/sci-biology/mcl/Manifest b/sci-biology/mcl/Manifest
index 88b4aef28107..dcdaee7f54f5 100644
--- a/sci-biology/mcl/Manifest
+++ b/sci-biology/mcl/Manifest
@@ -1,2 +1,3 @@
DIST mcl-08-312.tar.gz 2749006 SHA256 0061da0661e99f783d97e6ae10149fe5ce11fa332b24cc8a4a491a072867bb6e SHA512 9f89f81af398710ebb9135c93653d892fc9daef360d70f3b890a3133d8a17dddffe568b110d3370602cead895562bc0dc5a71020834b3b3e9b6d2abf4bf64b0b WHIRLPOOL 6d00665c545edb55605fb0438cc79a412150e68b9c63ffc51c93f8f8c33b9bcd6e4e5e435b3be89a64407a0a8f6f1b8e77567f653e45c08f1675dbf2b9e0b59e
DIST mcl-12-135.tar.gz 2970824 SHA256 3f5e0e7ad1074c7c4ef0139aa3318f92971fede7292dc3571eca2fd1da20a283 SHA512 97234e88f3430f223e1f303577b2b8853f40de6b204de415466719f691f529a795b17bf2fd48d4cc73d05900c87a10ba9afabbe54bce9367ee59215e7db0a8f5 WHIRLPOOL 1505643a460ba5bd6b834d070278a108fba57c9dc2a90a72a8e0726bd54a1b8fe3e4792a63397d58db62b036d22c325db2dd76f696a8692473987395c556a279
+DIST mcl-14-137.tar.gz 3035491 SHA256 b5786897a8a8ca119eb355a5630806a4da72ea84243dba85b19a86f14757b497 SHA512 7e399e571de60da5e1ba9e643b7f0cd98fe484cc8cef517222a57322b5c7a04afa675c7cf0ab88b5801efa9565e5e67a14c4914987964308391d88dd4be1bea2 WHIRLPOOL 6a4afda86cc91c3ddacb64740f020cec2235e22411430281cde9106fb8399663c7854eb1ba5f477624d825280a7762cf5a3f7c6ec824a784a7e200e92d42a168
diff --git a/sci-biology/mcl/files/mcl-14.137-qa-implicit-declarations.patch b/sci-biology/mcl/files/mcl-14.137-qa-implicit-declarations.patch
new file mode 100644
index 000000000000..df4309874d48
--- /dev/null
+++ b/sci-biology/mcl/files/mcl-14.137-qa-implicit-declarations.patch
@@ -0,0 +1,27 @@
+Fix QA issues related to implicit declarations.
+
+* QA Notice: Package triggers severe warnings which indicate that it
+* may exhibit random runtime failures.
+* clmadjust.c:184:10: warning: implicit declaration of function ‘mcxFree’ [-Wimplicit-function-declaration]
+* mcxi.c:42:16: warning: implicit declaration of function ‘isatty’ [-Wimplicit-function-declaration]
+
+--- mcl-14-137/src/shcl/clmadjust.c
++++ mcl-14-137/src/shcl/clmadjust.c
+@@ -14,6 +14,7 @@
+ #include "report.h"
+ #include "clmadjust.h"
+
++#include "util/alloc.h"
+ #include "util/io.h"
+ #include "util/types.h"
+ #include "util/err.h"
+--- mcl-14-137/src/shmcx/mcxi.c
++++ mcl-14-137/src/shmcx/mcxi.c
+@@ -8,6 +8,7 @@
+ */
+
+ #include <stdio.h>
++#include <unistd.h>
+
+ #include "stack.h"
+ #include "glob.h"
diff --git a/sci-biology/mcl/mcl-14.137.ebuild b/sci-biology/mcl/mcl-14.137.ebuild
new file mode 100644
index 000000000000..6912351fd2ed
--- /dev/null
+++ b/sci-biology/mcl/mcl-14.137.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+MY_P="${PN}-${PV/./-}"
+
+DESCRIPTION="A Markov Cluster Algorithm implementation"
+HOMEPAGE="http://micans.org/mcl/"
+SRC_URI="http://micans.org/mcl/src/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+blast"
+
+PATCHES=("${FILESDIR}/${P}-qa-implicit-declarations.patch")
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ find \
+ -name Makefile.am \
+ -exec sed \
+ -e '/docdir/d' \
+ -e '/exampledir/s:doc::g' \
+ -i '{}' + || die
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable blast)
+}
diff --git a/sci-biology/rmblast/rmblast-1.2-r1.ebuild b/sci-biology/rmblast/rmblast-1.2-r1.ebuild
index 768b309813bc..119760b72d67 100644
--- a/sci-biology/rmblast/rmblast-1.2-r1.ebuild
+++ b/sci-biology/rmblast/rmblast-1.2-r1.ebuild
@@ -29,6 +29,7 @@ src_prepare() {
-e 's/-print-file-name=libstdc++.a//' \
-e '/sed/ s/\([gO]\[0-9\]\)\*/\1\\+/' \
-e "/DEF_FAST_FLAGS=/s:=\".*\":=\"${CFLAGS}\":g" \
+ -e 's/2.95\* | 2.96\* | 3\.\* | 4\.\* )/2.95\* | 2.96\* | \[3-9\]\.\* )/g' \
-i src/build-system/configure || die
epatch "${FILESDIR}"/${P}-gcc47.patch
}
diff --git a/sci-biology/t-coffee/files/t-coffee-11.00-mayhem.patch b/sci-biology/t-coffee/files/t-coffee-11.00-mayhem.patch
new file mode 100644
index 000000000000..cbfeeabc181b
--- /dev/null
+++ b/sci-biology/t-coffee/files/t-coffee-11.00-mayhem.patch
@@ -0,0 +1,25 @@
+Author: Andreas Tille <tille@debian.org>
+Last-Update: Mon, 21 Dec 2015 21:30:36 +0100
+Bug-Debian: https://bugs.debian.org/716373
+Description: Fix Mayhem issue
+ The idea behind this patch is that if there is a problem to set the HOME
+ directories no additional processes can exist and so we should *really*
+ exit. Somehow the printf_exit() function does some logic which ends up
+ in an endless loop and thus forcing the exit will help here.
+ .
+ Unfortunately this does not solve the issue completely since inside the
+ Exit call a "Segmentation fault" happens - so some broken pointer handling
+ seems to happen somewhere before.
+
+--- a/t_coffee_source/util_lib/util.c
++++ b/t_coffee_source/util_lib/util.c
+@@ -4642,7 +4642,8 @@ char *get_home_4_tcoffee ()
+ }
+ else
+ {
+- printf_exit (EXIT_FAILURE, stderr, "ERROR: Could not set a HOME directory.\nSet any of the following environement variables to some suitable location: HOME, HOME_4_TCOFFEE, TMP or TEMP [FATAL:%s]\n", PROGRAM);
++ fprintf(stderr, "ERROR: Could not set a HOME directory.\nSet any of the following environement variables to some suitable location: HOME, HOME_4_TCOFFEE, TMP or TEMP [FATAL:%s]\n", PROGRAM);
++ exit(EXIT_FAILURE);
+ }
+
+
diff --git a/sci-biology/t-coffee/files/t-coffee-11.00-set_proper_dir_permissions.patch b/sci-biology/t-coffee/files/t-coffee-11.00-set_proper_dir_permissions.patch
new file mode 100644
index 000000000000..a3f47cd9fce2
--- /dev/null
+++ b/sci-biology/t-coffee/files/t-coffee-11.00-set_proper_dir_permissions.patch
@@ -0,0 +1,35 @@
+Author: Andreas Tille <tille@debian.org>
+Last-Update: Mon, 21 Dec 2015 21:30:36 +0100
+Bug-Debian: https://bugs.debian.org/751579
+Description: When creating subdirectories in $HOME do not
+ make these world writable but keep users umask
+
+--- a/t_coffee_source/util_lib/util.c
++++ b/t_coffee_source/util_lib/util.c
+@@ -7714,6 +7714,10 @@ int my_mkdir ( char *dir_in)
+ int a, buf;
+ char *dir;
+
++ static char *home = getenv ("HOME");
++ static mode_t oldmask = umask(0);
++ int change_umask = 0;
++ if (strncmp (dir_in, home, strlen(home))==0) change_umask = 1;
+
+ dir=(char*)vcalloc ( strlen (dir_in)+strlen (get_home_4_tcoffee())+100, sizeof (char));
+ sprintf ( dir, "%s", dir_in);
+@@ -7733,10 +7737,11 @@ int my_mkdir ( char *dir_in)
+
+ if (access(dir, F_OK)==-1)
+ {
+- mode_t oldmask = umask(0);
+- mkdir (dir, S_IRWXU | S_IRWXG | S_IRWXO);
+- umask(oldmask);
+-
++ if ( change_umask == 1 ) mkdir (dir, 0777-oldmask);
++ else {
++ mkdir (dir, S_IRWXU | S_IRWXG | S_IRWXO);
++ umask(oldmask);
++ }
+ if ( access (dir, F_OK)==-1)
+ {
+ myexit(fprintf_error ( stderr, "\nERROR: Could Not Create Directory %s [FATAL:%s]", dir, PROGRAM)); }
diff --git a/sci-biology/t-coffee/t-coffee-11.00.ebuild b/sci-biology/t-coffee/t-coffee-11.00-r1.ebuild
index 62e8b7033cbe..3f2861c4a478 100644
--- a/sci-biology/t-coffee/t-coffee-11.00.ebuild
+++ b/sci-biology/t-coffee/t-coffee-11.00-r1.ebuild
@@ -31,6 +31,9 @@ src_prepare() {
-e '/@/s:.*;:\t:g' \
-e '/Linking/s:$(CC):$(CC) $(CFLAGS) $(LDFLAGS):g' \
-i t_coffee_source/makefile || die
+ epatch \
+ "${FILESDIR}"/${P}-mayhem.patch \
+ "${FILESDIR}"/${P}-set_proper_dir_permissions.patch
}
src_compile() {
diff --git a/sci-biology/vaal/files/vaal-1.2-as-needed.patch b/sci-biology/vaal/files/vaal-1.2-as-needed.patch
deleted file mode 100644
index 31649010dbe3..000000000000
--- a/sci-biology/vaal/files/vaal-1.2-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- VAAL.orig/MakeDepend.cc 2008-12-18 17:05:48.000000000 +0100
-+++ VAAL/MakeDepend.cc 2010-02-14 13:42:23.734370178 +0100
-@@ -1195,9 +1195,6 @@
- }
- }
- mf << " -L. -L$(LIB) -L$(OBJ) $(LINK_LIBS)";
-- for ( set<string>::iterator dep_iter = lib_deps.begin();
-- dep_iter != lib_deps.end(); ++dep_iter )
-- mf << " " << "$(" << *dep_iter << "_LFLAGS)";
- for ( set<string>::iterator dep_iter = sharedlib_deps.begin();
- dep_iter != sharedlib_deps.end(); ++dep_iter ) {
- // Extract the symbolic name of this library from its filename.
-@@ -1208,6 +1205,9 @@
- mf << " -l" << sharedlib_name;
- }
- mf << " -l" << libname;
-+ for ( set<string>::iterator dep_iter = lib_deps.begin();
-+ dep_iter != lib_deps.end(); ++dep_iter )
-+ mf << " " << "$(" << *dep_iter << "_LFLAGS)";
- mf << "\n\t" << "/bin/rm $(OBJ)/lib" << libname << ".a\n";
- }
- }
diff --git a/sci-biology/vaal/files/vaal-1.2-gcc-x86-no-autocast.patch b/sci-biology/vaal/files/vaal-1.2-gcc-x86-no-autocast.patch
deleted file mode 100644
index c021fadb44b1..000000000000
--- a/sci-biology/vaal/files/vaal-1.2-gcc-x86-no-autocast.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -durr VAAL.orig/SortKmersImpl.h VAAL/SortKmersImpl.h
---- VAAL.orig/SortKmersImpl.h 2009-11-12 13:02:40.116993289 +0000
-+++ VAAL/SortKmersImpl.h 2009-11-12 13:04:59.416388534 +0000
-@@ -98,7 +98,7 @@
- { if ( reads[l].size( ) < KSPAN ) continue;
- unsigned int N = reads[l].size( ) - KSPAN + 1;
- if ( S + 2*N >= R.size( ) ) {
-- unsigned nn = Max( (long unsigned) ( 1.2 * R.size( ) ), (R.size( ) + 2*N) );
-+ unsigned nn = Max( (long unsigned) ( 1.2 * R.size( ) ), (long unsigned) (R.size( ) + 2*N) );
- if ( nn < R.size( ) ) FatalErr( "SortKmers<1>: Unsigned-int overflow (R=" << R.size( ) << ")" );
- R.resize(nn);
- }
-@@ -180,7 +180,7 @@
- }
- if ( q == N ) break;
- if ( S + 2*N >= R.size( ) ) {
-- unsigned nn = Max( (long unsigned) ( 1.2 * R.size( ) ), (R.size( ) + 2*N) );
-+ unsigned nn = Max( (long unsigned) ( 1.2 * R.size( ) ), (long unsigned) (R.size( ) + 2*N) );
- if ( nn < R.size( ) ) FatalErr( "SortKmers<10>: Unsigned-int overflow (R=" << R.size( ) << ")" );
- R.resize(nn);
- }
-@@ -207,7 +207,7 @@
- top += Min( N - top, (unsigned int) 10000 );
-
- if ( S + 20000 >= R.size( ) || S + 2*N >= R.size( ) ) {
-- unsigned nn = Max( (long unsigned) ( 1.2 * R.size( ) ), (R.size( ) + 2*N) );
-+ unsigned nn = Max( (long unsigned) ( 1.2 * R.size( ) ), (long unsigned) (R.size( ) + 2*N) );
- if ( nn < R.size( ) ) FatalErr( "SortKmers<10>: Unsigned-int overflow (R=" << R.size( ) << ")" );
- R.resize(nn);
- }
-@@ -318,7 +318,7 @@
-
- top += Min( N - top, 10000 );
- if ( S + 2*(top - q) >= R.size( ) ) {
-- unsigned nn = Max( (unsigned) ( 1.2 * R.size( ) ), (S + 2*(top - q)) );
-+ unsigned nn = Max( (unsigned) ( 1.2 * R.size( ) ), (unsigned) (S + 2*(top - q)) );
- if ( nn < R.size( ) ) FatalErr( "SortKmers<100>: Unsigned-int overflow (R=" << R.size( ) << ")" );
- R.resize(nn);
- }
diff --git a/sci-biology/vaal/files/vaal-1.2-respect-flags.patch b/sci-biology/vaal/files/vaal-1.2-respect-flags.patch
deleted file mode 100644
index d3420556b608..000000000000
--- a/sci-biology/vaal/files/vaal-1.2-respect-flags.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- VAAL.orig/Makefile.in 2009-04-02 21:43:42.000000000 +0200
-+++ VAAL/Makefile.in 2010-02-14 14:20:26.222370302 +0100
-@@ -161,12 +161,16 @@
- COMPILER = @CC@
- CPLUSPLUS = @CXX@
-
-+CFLAGS = @CFLAGS@
-+CXXFLAGS = @CXXFLAGS@
-+LDFLAGS = @LDFLAGS@
-+
- # QUIET=yes causes the compiler to be less verbose about warnings.
- QUIET = no
-
- # DEBUG=yes forces out-of-date executables to be built with symbolic
- # debugging information. Any other value is ignored.
--DEBUG = yes
-+DEBUG = no
-
- # OPTIM=<compiler optimization> forces user-defined optimizations to be used,
- # rather than the compiler-specific default.
-@@ -174,7 +178,7 @@
- # If OPTIM=none, then no optimization is used.
- # If unset, defaults are used.
- # -fno-exceptions
--OPTIM =
-+OPTIM = none
-
- # PROFILE=yes builds sampled-profiling (i.e. gprof) executables. Any other
- # value is ignored.
-@@ -317,6 +321,7 @@
- # Setup final compilation options:
-
- CPP_OPTIONS = \
-+ $(CXXFLAGS) \
- $(SYS_WARN) \
- $(SYS_OPT) \
- $(SYS_DEBUG) \
-@@ -328,6 +333,7 @@
- @INCLUDES@
-
- LINK_OPTIONS = \
-+ $(LDFLAGS) \
- $(SYS_DEBUG) \
- $(SYS_LINK) \
- $(OMP_LINK) \
-@@ -406,12 +406,12 @@
- $(CPLUSPLUS) $(CPPO) $(CPPC) $(SYS_LANG) $(MAKEDEPEND_OPTS) -o $(BIN)/MakeDepend $(SRC)/MakeDepend.cc
-
- checkLock: $(SRC)/util/checkLock.cc
-- $(CPLUSPLUS) $(SRC)/util/checkLock.cc -o $(BIN)/checkLock
-+ $(CPLUSPLUS) $(CXXFLAGS) $(SRC)/util/checkLock.cc $(LDFLAGS) -o $(BIN)/checkLock
-
- random/Random.o: random/Random.cc
- @ mkdir -p $(OBJ)/${@D}
- cp $(SRC)/random/Random.cc $(SRC)/random/Random.c
-- $(CC) $(SYS_LANG) -c $(SRC)/random/Random.cc -w -Drandom=randomx -Dsrandom=srandomx -o $(OBJ)/random/Random.o
-+ $(CC) $(CFLAGS) $(SYS_LANG) -c $(SRC)/random/Random.cc -w -Drandom=randomx -Dsrandom=srandomx -o $(OBJ)/random/Random.o
- rm $(SRC)/random/Random.c
-
- MemTracker.o: MemTracker.cc
diff --git a/sci-biology/vaal/files/vaal-1.6-gcc47.patch b/sci-biology/vaal/files/vaal-1.6-gcc47.patch
deleted file mode 100644
index 0d80f08d3c21..000000000000
--- a/sci-biology/vaal/files/vaal-1.6-gcc47.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-Fix building with gcc-4.7
-
-https://bugs.gentoo.org/show_bug.cgi?id=423497
-
-Patch written by Kacper Kowalik <xarthisius@gentoo.org>
---- a/src/feudal/MasterVec.h
-+++ b/src/feudal/MasterVec.h
-@@ -62,20 +62,20 @@
- /// This function is deprecated: Use reserve() instead.
- /// The pool size argument is ignored, anyway.
- MasterVec& Reserve( unsigned long raw_mem_size_ignored, size_type capacity )
-- { reserve(capacity); return *this; }
-+ { this->reserve(capacity); return *this; }
-
- /// This function is deprecated: Use clear().shrink_to_fit().
- MasterVec& destroy() { BaseT::clear(); BaseT::shrink_to_fit(); return *this; }
-
- /// This function is deprecated: Use push_back().
- MasterVec& push_back_external( T const& val )
-- { push_back(val); return *this; }
-+ { this->push_back(val); return *this; }
-
- /// This function is deprecated: Use push_back().
- MasterVec& push_back_reserve( T const& val,
- size_type growthIncr = 0,
- float growthFact = 1.3f )
-- { push_back(val,growthFact,growthIncr); return *this; }
-+ { this->push_back(val,growthFact,growthIncr); return *this; }
-
- /// This function is deprecated: Use append().
- MasterVec& Append( MasterVec const& that )
-@@ -83,7 +83,7 @@
-
- /// This function is deprecated: Use append().
- MasterVec& Append( MasterVec const& that, size_type from, size_type to )
-- { append(that.begin(from),that.begin(to)); return *this; }
-+ { this->append(that.begin(from),that.begin(to)); return *this; }
-
- MasterVec const& WriteAll( String const& fileName ) const
- { return WriteRange(fileName,0UL,BaseT::size()); return *this; }
-@@ -108,7 +108,7 @@
- { if ( !append ) BaseT::clear();
- FeudalFileReader rdr(fileName.c_str());
- size_type siz = rdr.getNElements();
-- reserve(BaseT::size()+siz);
-+ this->reserve(BaseT::size()+siz);
- preAlloc(rdr,0,siz);
- for ( size_type iii = 0; iii < siz; ++iii )
- appendFromReader(rdr,iii);
---- a/src/feudal/FeudalControlBlock.cc
-+++ b/src/feudal/FeudalControlBlock.cc
-@@ -24,6 +24,7 @@
- #include <string.h>
- #include <errno.h>
- #include <iostream>
-+#include <unistd.h>
-
- using std::cout;
- using std::endl;
---- a/src/feudal/SerfVec.h
-+++ b/src/feudal/SerfVec.h
-@@ -83,9 +83,9 @@
- { AssertLe(pos,that.size());
- AssertLe(len,that.size()-pos);
- if ( this != &that )
-- { assign(that.begin(pos),that.begin(pos+len)); }
-+ { this->assign(that.begin(pos),that.begin(pos+len)); }
- else
-- { erase(BaseT::begin(),BaseT::begin(pos));
-+ { this->erase(BaseT::begin(),BaseT::begin(pos));
- BaseT::resize(len); }
- return *this; }
-
---- a/src/system/ProcBuf.cc
-+++ b/src/system/ProcBuf.cc
-@@ -195,12 +195,12 @@
- Assert(M_internal_put_buffer == NULL);
- M_internal_put_buffer = new char_type [DEFAULT_PUT_BUFFER_SIZE];
- M_internal_put_buffer_end = M_internal_put_buffer+DEFAULT_PUT_BUFFER_SIZE;
-- setp(M_internal_put_buffer,
-+ this->setp(M_internal_put_buffer,
- M_internal_put_buffer_end);
- } else if (!flush())
- return traits_type::eof();
- if (!traits_type::eq_int_type(c, traits_type::eof()))
-- return sputc(c);
-+ return this->sputc(c);
- else
- return traits_type::not_eof(c);
- }
-@@ -240,7 +240,7 @@
- // (which is start of buffer)
- std::copy_backward(this->eback(), this->egptr(), this->egptr()+1);
- *(this->gptr()) = traits_type::to_char_type(c);
-- setg(this->eback(), this->gptr(), this->egptr()+1);
-+ this->setg(this->eback(), this->gptr(), this->egptr()+1);
- return traits_type::not_eof(c);
- } else
- return traits_type::eof();
-@@ -269,7 +269,7 @@
- // doing wchars and we write an odd # of bytes?
- return false;
- } else {
-- setp(this->pbase(), this->epptr());
-+ this->setp(this->pbase(), this->epptr());
- return true;
- }
- }
-@@ -283,7 +283,7 @@
- Assert(M_internal_get_buffer == NULL);
- M_internal_get_buffer = new char_type[DEFAULT_GET_BUFFER_SIZE];
- M_internal_get_buffer_end = M_internal_get_buffer + DEFAULT_GET_BUFFER_SIZE;
-- setg(M_internal_get_buffer, M_internal_get_buffer_end, M_internal_get_buffer_end);
-+ this->setg(M_internal_get_buffer, M_internal_get_buffer_end, M_internal_get_buffer_end);
- }
- // The "get" pointer should be at the end of the buffer - that's
- // why we need to fill it.
-@@ -318,7 +318,7 @@
- //
- // reset the get pointers
- //
-- setg(M_internal_get_buffer,
-+ this->setg(M_internal_get_buffer,
- M_internal_get_buffer,
- M_internal_get_buffer+numusable/sizeof(char_type));
- return true;
---- a/src/system/SysConf.cc
-+++ b/src/system/SysConf.cc
-@@ -19,6 +19,7 @@
- #include "system/SysConf.h"
- #include "system/Exit.h"
- #include <iostream>
-+#include <unistd.h>
-
- namespace
- {
---- a/src/Vec.h
-+++ b/src/Vec.h
-@@ -261,11 +261,11 @@
-
- template <class U>
- void append( const vec<U>& y )
-- { insert( this->end( ), y.begin( ), y.end( ) ); }
-+ { this->insert( this->end( ), y.begin( ), y.end( ) ); }
-
- void append( const vec<T>& y, size_type i, size_type j ) {
-- if ( j == y.size( ) ) insert( this->end( ), y.begin( ) + i, y.end( ) );
-- else insert( this->end( ), y.begin( ) + i, y.begin( ) + j );
-+ if ( j == y.size( ) ) this->insert( this->end( ), y.begin( ) + i, y.end( ) );
-+ else this->insert( this->end( ), y.begin( ) + i, y.begin( ) + j );
- }
-
- // appends values in y, but only those whose indices are in entries
diff --git a/sci-biology/vaal/files/vaal-1.6-respect-flags.patch b/sci-biology/vaal/files/vaal-1.6-respect-flags.patch
deleted file mode 100644
index 152fb423e924..000000000000
--- a/sci-biology/vaal/files/vaal-1.6-respect-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dur vaal-33805.orig/configure.ac vaal-33805/configure.ac
---- vaal-33805.orig/configure.ac 2010-09-20 04:37:49.858059826 +0000
-+++ vaal-33805/configure.ac 2010-09-20 04:39:41.178059477 +0000
-@@ -14,7 +14,7 @@
- AC_OPENMP
- AC_OPENMP_CEHCK
-
--CXXFLAGS=" -imacros config.h -Wextra -Wall -Wno-unused -ansi -pedantic -Wno-long-long -Wsign-promo -Woverloaded-virtual -Wendif-labels -O3 -ggdb3 -ftemplate-depth-50 -Wno-deprecated -Wno-parentheses -fno-strict-aliasing -mieee-fp -iquote ."
-+CXXFLAGS+=" -imacros config.h -Wextra -Wall -Wno-unused -ansi -pedantic -Wno-long-long -Wsign-promo -Woverloaded-virtual -Wendif-labels -ftemplate-depth-50 -Wno-deprecated -Wno-parentheses -fno-strict-aliasing -mieee-fp -iquote ."
-
- OS_RELEASE="`uname -r`"
- AC_SUBST(CXXFLAGS)
diff --git a/sci-biology/vaal/files/vaal-46233_remove-namespace-std.patch b/sci-biology/vaal/files/vaal-46233_remove-namespace-std.patch
new file mode 100644
index 000000000000..c3c3ec032481
--- /dev/null
+++ b/sci-biology/vaal/files/vaal-46233_remove-namespace-std.patch
@@ -0,0 +1,911 @@
+Remove 'using namespace std' causing massive havoc with newly
+introduced std::align in GCC-5. Fix bug
+https://bugs.gentoo.org/show_bug.cgi?id=568438
+
+--- vaal-46233/src/efasta/EfastaTools.cc
++++ vaal-46233/src/efasta/EfastaTools.cc
+@@ -18,6 +18,8 @@
+ #include "math/Functions.h"
+ #include "math/Array.h"
+
++using std::set;
++
+ #define Err(message) \
+ { cout << message << endl << "\nInvalid.\n" << endl; \
+ TracebackThisProcess( ); }
+--- vaal-46233/src/Equiv.cc
++++ vaal-46233/src/Equiv.cc
+@@ -9,6 +9,8 @@
+ #include "Equiv.h"
+ #include "Vec.h"
+
++using std::swap;
++
+ bool equivalence_relation::equiv(int a, int b) const
+ { if ( a == b ) return true;
+ int c = a;
+--- vaal-46233/src/FastaFilestream.cc
++++ vaal-46233/src/FastaFilestream.cc
+@@ -13,6 +13,8 @@
+
+ #include <strstream>
+
++using std::string;
++
+ template <typename vecT, typename seqT, typename convT, typename verifT>
+ FastaFilestream<vecT,seqT,convT,verifT>::FastaFilestream( const String& filename,
+ FastaNameParser* name_parser )
+--- vaal-46233/src/FastaFilestreamPreview.cc
++++ vaal-46233/src/FastaFilestreamPreview.cc
+@@ -11,6 +11,8 @@
+
+ #include <algorithm>
+
++using std::streamoff;
++
+ FastaFilestreamPreview::FastaFilestreamPreview(istream& filestream)
+ : max_sequence_size_(0), start_offset_(0)
+ {
+--- vaal-46233/src/FastaFilestreamPreview.h
++++ vaal-46233/src/FastaFilestreamPreview.h
+@@ -12,6 +12,8 @@
+
+ #include "Vec.h"
+
++using std::streampos;
++
+ // FastaFilestreamPreview understands just enough about the fasta
+ // format to be able to count the number of sequences in the specified
+ // filestream and to know where each sequence starts in that filestream.
+--- vaal-46233/src/Fastavector.cc
++++ vaal-46233/src/Fastavector.cc
+@@ -14,6 +14,8 @@
+ #include <istream>
+ #include <string>
+
++using std::max;
++
+ // Split this into chunks, separated by gaps ('n'), and return each chunk as a
+ // gapless fastavector.
+ // TODO: generalize this into a templatized STL algorithm.
+--- vaal-46233/src/Fastavector.h
++++ vaal-46233/src/Fastavector.h
+@@ -24,6 +24,9 @@
+ #include <iostream>
+ #include <unistd.h>
+
++using std::string;
++using std::istringstream;
++
+ typedef std::tuple<String, int, int> FastaRegion;
+
+ class fastaindex {
+--- vaal-46233/src/FetchReads.cc
++++ vaal-46233/src/FetchReads.cc
+@@ -36,6 +36,8 @@
+ #include "Qualvector.h"
+ #include "random/Random.h"
+
++using std::istringstream;
++
+ // Heuristic constants:
+
+ namespace
+--- vaal-46233/src/feudal/BaseVec.cc
++++ vaal-46233/src/feudal/BaseVec.cc
+@@ -21,6 +21,7 @@
+ using std::ostream;
+ using std::cout;
+ using std::endl;
++using std::max_element;
+
+ // Cap: in a given basevector, replace any sequence of N > n identical
+ // bases by n of the same base.
+--- vaal-46233/src/graph/Digraph.cc
++++ vaal-46233/src/graph/Digraph.cc
+@@ -16,6 +16,8 @@
+ #include "graph/Digraph.h"
+ #include "math/Functions.h"
+
++using std::make_pair;
++
+ Bool digraph::HasEdge( int v, int w ) const {
+ return find( from_[v].begin(), from_[v].end(), w ) != from_[v].end();
+ }
+--- vaal-46233/src/graph/DigraphTemplate.h
++++ vaal-46233/src/graph/DigraphTemplate.h
+@@ -34,6 +34,8 @@
+ #include "graph/Digraph.h"
+ #include <cstddef>
+
++using std::make_pair;
++
+ template<class E> vec<int> digraphE<E>::EdgesConnectedTo( const vec<int>& v ) const
+ { vec<int> G = VerticesConnectedTo(v), e;
+ for ( int x = 0; x < G.isize( ); x++ )
+--- vaal-46233/src/IndexedAlignmentPlusVector.cc
++++ vaal-46233/src/IndexedAlignmentPlusVector.cc
+@@ -9,6 +9,8 @@
+ #include "IndexedAlignmentPlusVector.h"
+ #include "VecAlignmentPlus.h"
+
++using std::streamoff;
++
+ // These strings are at the head of the vector and index files for verification purposes.
+
+ const String VecAlignmentPlusHeaderIO::mStrVectorHeader( "alignment_plus vector V.2\n" );
+--- vaal-46233/src/IndexedAlignmentPlusVector.h
++++ vaal-46233/src/IndexedAlignmentPlusVector.h
+@@ -15,6 +15,7 @@
+
+ #include "Alignment.h"
+
++using std::streampos;
+
+ // This class encapsulates the header information for both vectors and indices.
+
+--- vaal-46233/src/kmers/kmer_parcels/KmerParcelsBuilder.cc
++++ vaal-46233/src/kmers/kmer_parcels/KmerParcelsBuilder.cc
+@@ -10,6 +10,7 @@
+ #include "kmers/KmerParcels.h"
+ #include "system/WorklistN.h"
+
++using std::fixed;
+
+ inline String Tag(String S = "KPs") { return Date() + " (" + S + "): "; }
+
+--- vaal-46233/src/kmers/kmer_parcels/KmerParcelsClasses.h
++++ vaal-46233/src/kmers/kmer_parcels/KmerParcelsClasses.h
+@@ -6,6 +6,9 @@
+ // Institute is not responsible for its use, misuse, or functionality. //
+ ///////////////////////////////////////////////////////////////////////////////
+
++using std::hex;
++using std::dec;
++
+ // ---------------------------------
+ // NaifTimer
+ // ---------------------------------
+--- vaal-46233/src/kmers/kmer_parcels/KmerParcelsStatistics.h
++++ vaal-46233/src/kmers/kmer_parcels/KmerParcelsStatistics.h
+@@ -10,7 +10,7 @@
+ #ifndef KMERS__KMER_PARCELS__KMER_PARCELS_STATISTICS_H
+ #define KMERS__KMER_PARCELS__KMER_PARCELS_STATISTICS_H
+
+-
++using std::map;
+
+ // --------------------------------------
+ // MapOfCounters
+--- vaal-46233/src/layout/ContigActualloc.h
++++ vaal-46233/src/layout/ContigActualloc.h
+@@ -17,6 +17,8 @@
+ #include "system/Crash.h"
+ #include "Misc.h"
+
++using std::set;
++using std::map;
+
+ //
+ // Class contig_actualloc
+--- vaal-46233/src/lookup/ImperfectLookup.h
++++ vaal-46233/src/lookup/ImperfectLookup.h
+@@ -52,6 +52,8 @@
+ #include "lookup/AlignCollector.h"
+ #include "solid/Solid.h"
+
++using std::unique_ptr;
++
+ class TaskTimer;
+
+
+@@ -534,7 +536,7 @@
+ aligns.resize( nqueries );
+ }
+
+- auto_ptr<TaskTimer> t1, t2;
++ unique_ptr<TaskTimer> t1, t2;
+
+ if ( m_instr_level & IO_TIMER != 0 ) t1.reset( new TaskTimer() );
+ if ( m_instr_level & CPU_TIMER != 0 ) t2.reset( new TaskTimer() );
+--- vaal-46233/src/lookup/LookAlign.cc
++++ vaal-46233/src/lookup/LookAlign.cc
+@@ -29,6 +29,8 @@
+ #include "random/Random.h"
+ #include "system/ParsedArgs.h"
+
++using std::istrstream;
++
+ String QUERY("QUERY");
+
+ void look_align::ResetFromAlign(const align & al, const basevector & b1,
+--- vaal-46233/src/lookup/LookAlignFinder.h
++++ vaal-46233/src/lookup/LookAlignFinder.h
+@@ -12,6 +12,8 @@
+ #include "lookup/LookAlign.h"
+ #include "Vec.h"
+
++using std::set;
++
+ /**
+ Class: LookAlignFinder
+
+--- vaal-46233/src/lookup/LookAlignSort.h
++++ vaal-46233/src/lookup/LookAlignSort.h
+@@ -15,6 +15,8 @@
+
+ #include <functional>
+
++using std::set;
++
+ /// Read in look_aligns from file, sort, and load into vecs
+ /// \param fname name of look_align text file
+ /// \param aligns vector into which to put the alignments
+--- vaal-46233/src/lookup/LookupTable.h
++++ vaal-46233/src/lookup/LookupTable.h
+@@ -18,6 +18,8 @@
+
+ #include <set>
+
++using std::set;
++
+ typedef pair<unsigned int, unsigned int> LocSeq;
+
+ ///
+--- vaal-46233/src/lookup/QueryLookupTableCore.cc
++++ vaal-46233/src/lookup/QueryLookupTableCore.cc
+@@ -456,6 +456,9 @@
+ #include "system/ParsedArgs.h"
+ #include "system/file/FileReader.h"
+
++using std::istrstream;
++using std::less_equal;
++
+ #define ABORT(MSG) \
+ { out << MSG << " Abort." << endl << endl; \
+ exit(1); }
+--- vaal-46233/src/lookup/ShortQueryLookup.cc
++++ vaal-46233/src/lookup/ShortQueryLookup.cc
+@@ -32,6 +32,8 @@
+ #include "lookup/AlignCollector.h"
+ #include "lookup/ImperfectLookup.h"
+
++using std::ios_base;
++
+ // Run an alignment processing chain: seqs -> look -> receiver -> aligns
+ // That is, look turns seqs into hits, which receiver accepts
+ // and turns into alignments which are passed to aligns. The
+--- vaal-46233/src/Map.h
++++ vaal-46233/src/Map.h
+@@ -21,7 +21,7 @@
+ #include <map>
+ #include <ext/hash_map>
+ using namespace __gnu_cxx;
+-
++using std::map;
+
+ ///Return true if k is a key in map m
+ template<class Key, class Value, typename Cmp>
+--- vaal-46233/src/math/Array.h
++++ vaal-46233/src/math/Array.h
+@@ -12,6 +12,9 @@
+ #include "CoreTools.h"
+ #include "Vec.h"
+
++using std::map;
++using std::fill;
++
+ // ==============================================================================
+ // A fixed-size simple c-style 2D array that allocates faster than vec< vec<T> >
+ // The elements are uninitialized.
+--- vaal-46233/src/math/Functions.cc
++++ vaal-46233/src/math/Functions.cc
+@@ -10,8 +10,8 @@
+ #include "STLExtensions.h"
+ #include "math/Functions.h"
+
+-
+-
++using std::isfinite;
++using std::make_pair;
+
+ /* CombineNormalDistribution Filipe Ribeiro 2009-06-22
+ *
+--- vaal-46233/src/math/Functions.h
++++ vaal-46233/src/math/Functions.h
+@@ -14,6 +14,10 @@
+ #include <cmath>
+ #include <numeric>
+
++using std::min;
++using std::cerr;
++using std::swap;
++
+ // ===========================================================================
+ //
+ // Min functions
+--- vaal-46233/src/math/HoInterval.cc
++++ vaal-46233/src/math/HoInterval.cc
+@@ -10,6 +10,8 @@
+ #include "math/HoInterval.h"
+ #include "STLExtensions.h"
+
++using std::make_pair;
++
+ bool ho_interval::Merge(const ho_interval & o) {
+ if (!Meets(*this,o)) return false;
+ *this = Span(*this, o);
+--- vaal-46233/src/math/HoInterval.h
++++ vaal-46233/src/math/HoInterval.h
+@@ -14,6 +14,8 @@
+ #include "feudal/MasterVec.h"
+ #include "feudal/SerfVec.h"
+
++using std::max;
++
+ /// Class: ho_interval
+ /// A half-open interval [a, b).
+ class ho_interval {
+--- vaal-46233/src/PackAlign.h
++++ vaal-46233/src/PackAlign.h
+@@ -133,6 +133,8 @@
+ #include "pairwise_aligners/Mutmer.h"
+ #include "feudal/BinaryStream.h"
+
++using std::make_pair;
++
+ const int Bits2 = 3, Bits3 = 7, Bits4 = 15, Bits10 = 1023, Bits12 = 4095,
+ Bits16 = 65535;
+
+--- vaal-46233/src/pairwise_aligners/MakeAlignsMethod.cc
++++ vaal-46233/src/pairwise_aligners/MakeAlignsMethod.cc
+@@ -19,6 +19,9 @@
+ #include "pairwise_aligners/AlignFromMutmers.h"
+ #include "pairwise_aligners/SmithWatBandedA.h"
+
++using std::map;
++using std::set;
++
+ // If there's a perfect match of length at least perf but we produced no proper
+ // alignment, use banded Smith-Waterman to create one.
+
+--- vaal-46233/src/pairwise_aligners/MatchList.cc
++++ vaal-46233/src/pairwise_aligners/MatchList.cc
+@@ -9,6 +9,8 @@
+
+ #include "pairwise_aligners/MatchList.h"
+
++using std::max;
++
+ bool MatchList::FindMatchInSorted( const int id1, const Match& newMatch ) const
+ {
+ const vec<Match>& sortedMatches = m_sortedMatches[id1];
+--- vaal-46233/src/pairwise_aligners/SuffixTree.h
++++ vaal-46233/src/pairwise_aligners/SuffixTree.h
+@@ -23,6 +23,8 @@
+ #include <list>
+ #include <string>
+
++using std::list;
++
+ /**
+ * Implementation of a suffix tree for basevectors.
+ * This is a data structure for exact (sub)string matching.
+--- vaal-46233/src/paths/AlignHyperKmerPath.cc
++++ vaal-46233/src/paths/AlignHyperKmerPath.cc
+@@ -23,6 +23,9 @@
+ #include "paths/KmerBaseBroker.h"
+ #include "paths/KmerPath.h"
+
++using std::ostringstream;
++using std::set;
++
+ // Function: AlignHyperKmerPath
+ //
+ // AlignHyperKmerPath takes a HyperKmerPath h, whose KmerPath edges are assumed
+--- vaal-46233/src/paths/AlignSeqsToHyper.cc
++++ vaal-46233/src/paths/AlignSeqsToHyper.cc
+@@ -26,6 +26,7 @@
+ #include "paths/ReadsToPathsCoreX.h"
+ #include "paths/SeqOnHyper.h"
+
++using std::multimap;
+
+ // Local class: simple_align
+ //
+--- vaal-46233/src/paths/HyperKmerPath.cc
++++ vaal-46233/src/paths/HyperKmerPath.cc
+@@ -19,6 +19,8 @@
+ #include "paths/HyperKmerPath.h"
+ #include "paths/KmerBaseBroker.h"
+
++using std::ostrstream;
++using std::ends;
+
+ void HyperKmerPath::ReduceLoops( )
+ { for ( int v = 0; v < N( ); v++ )
+--- vaal-46233/src/paths/KmerBaseBroker.h
++++ vaal-46233/src/paths/KmerBaseBroker.h
+@@ -20,6 +20,8 @@
+ #include <algorithm> // for set_union
+ #include <map>
+
++using std::map;
++
+ /**
+ Class: KmerBaseBrokerTemplate
+
+--- vaal-46233/src/paths/KmerPath.h
++++ vaal-46233/src/paths/KmerPath.h
+@@ -22,6 +22,8 @@
+ #include "HashSimple.h"
+ #include "graph/Digraph.h"
+
++using std::make_pair;
++
+ class KmerPathLoc; // forward declaration
+
+ /**
+--- vaal-46233/src/paths/KmerPathInterval.h
++++ vaal-46233/src/paths/KmerPathInterval.h
+@@ -8,6 +8,8 @@
+ #include "CommonSemanticTypes.h"
+ #include "feudal/BinaryStreamTraits.h"
+
++using std::max;
++
+ // Portability note: endianness
+ // The implementations here would need to be changed for big endian architectures.
+
+@@ -285,6 +287,12 @@
+ Models <tagged read path interval>.
+ */
+ // TODO: potentially dangerous truncation of index by PathId, ReadId
++template<class TAG>
++void Contains( const vec<TAG>& segs, kmer_id_t index, vec<longlong>& answer, bool append = false, int cap = -1 );
++
++template<class TAG>
++void Contains( const vec<TAG>& segs, KmerPathInterval rpi, vec<longlong>& answer, bool append = false, int cap = -1 );
++
+ class tagged_rpint {
+
+ public: /* PUBLIC METHODS */
+@@ -362,11 +370,11 @@
+
+ template<class TAG>
+ friend void Contains( const vec<TAG>& segs, kmer_id_t index,
+- vec<longlong>& answer, bool append = false, int cap = -1 );
++ vec<longlong>& answer, bool append, int cap );
+
+ template<class TAG>
+ friend void Contains( const vec<TAG>& segs, KmerPathInterval rpi,
+- vec<longlong>& answer, bool append = false, int cap = -1 );
++ vec<longlong>& answer, bool append, int cap );
+
+ template<class TAG>
+ friend longlong Instance( const vec<TAG>& segs, kmer_id_t k );
+@@ -489,11 +497,11 @@
+
+ template<class TAG>
+ friend void Contains( const vec<TAG>& segs, kmer_id_t index,
+- vec<longlong>& answer, bool append = false, int cap = -1 );
++ vec<longlong>& answer, bool append, int cap );
+
+ template<class TAG>
+ friend void Contains( const vec<TAG>& segs, KmerPathInterval rpi,
+- vec<longlong>& answer, bool append = false, int cap = -1 );
++ vec<longlong>& answer, bool append, int cap );
+
+ template<class TAG>
+ friend longlong Instance( const vec<TAG>& segs, kmer_id_t k );
+@@ -620,11 +628,11 @@
+
+ template<class TAG>
+ friend void Contains( const vec<TAG>& segs, kmer_id_t index,
+- vec<longlong>& answer, bool append = false, int cap = -1 );
++ vec<longlong>& answer, bool append, int cap );
+
+ template<class TAG>
+ friend void Contains( const vec<TAG>& segs, KmerPathInterval rpi,
+- vec<longlong>& answer, bool append = false, int cap = -1 );
++ vec<longlong>& answer, bool append, int cap );
+
+ template<class TAG>
+ friend kmer_id_t Instance( const vec<TAG>& segs, kmer_id_t k );
+--- vaal-46233/src/paths/ReadsToPathsCoreX.cc
++++ vaal-46233/src/paths/ReadsToPathsCoreX.cc
+@@ -20,6 +20,8 @@
+ #include "paths/MakeAlignsPathsParallelX.h"
+ #include "paths/ReadsToPathsCoreX.h"
+
++using std::map;
++
+ static inline
+ String Tag(String S = "RTPCX") { return Date() + " (" + S + "): "; }
+
+--- vaal-46233/src/paths/SuperBaseVector.h
++++ vaal-46233/src/paths/SuperBaseVector.h
+@@ -10,6 +10,8 @@
+ #include <numeric>
+ #include <functional>
+
++using std::mem_fun_ref;
++
+ /// A simple class which holds a series of basevectors with
+ /// (possibly negative) gaps between them. This is what a
+ /// KmerPath logically maps to in sequence space. The function
+--- vaal-46233/src/polymorphism/VAAL2.cc
++++ vaal-46233/src/polymorphism/VAAL2.cc
+@@ -42,7 +42,7 @@
+ #include "feudal/BinaryStream.h"
+ #include "feudal/VirtualMasterVec.h"
+
+-using namespace std;
++
+
+ // Trim reads so that they contain only kmers in the unipaths.
+
+--- vaal-46233/src/polymorphism/VAAL3.cc
++++ vaal-46233/src/polymorphism/VAAL3.cc
+@@ -29,6 +29,8 @@
+ #include "polymorphism/VAALTools.h"
+ #include "solexa/SolexaTools.h"
+
++using std::ostringstream;
++
+ int main( int argc, char *argv[] )
+ {
+ RunTime( );
+--- vaal-46233/src/PrintAlignment.h
++++ vaal-46233/src/PrintAlignment.h
+@@ -14,6 +14,8 @@
+ #include "CoreTools.h"
+ #include "Qualvector.h"
+
++using std::ostringstream;
++
+ void PrintBlanks( ostream& out, int n );
+
+ template<class BASEVEC>
+--- vaal-46233/src/Qualvector.cc
++++ vaal-46233/src/Qualvector.cc
+@@ -10,6 +10,8 @@
+ #include "FastIfstream.h"
+ #include "Qualvector.h"
+
++using std::istrstream;
++
+ /// \file
+ /// \ingroup grp_quals
+ /// \copydoc Qualvector.h
+--- vaal-46233/src/SeqInterval.cc
++++ vaal-46233/src/SeqInterval.cc
+@@ -9,6 +9,8 @@
+ #include "SeqInterval.h"
+ #include "Vec.h"
+
++using std::max;
++using std::min;
+
+ /*
+ * seq_interval
+--- vaal-46233/src/SeqInterval.h
++++ vaal-46233/src/SeqInterval.h
+@@ -14,7 +14,9 @@
+ #include <algorithm>
+ #include <iostream>
+
+-using namespace std;
++using std::binary_function;
++using std::ostream;
++using std::istream;
+
+ /*
+ * class seq_interval
+--- vaal-46233/src/Set.h
++++ vaal-46233/src/Set.h
+@@ -16,7 +16,7 @@
+ #include <set>
+ #include "CoreTools.h"
+
+-using namespace std;
++using std::set;
+
+ template<class T> bool Member( const set<T>& the_set, const T& value )
+ { return the_set.find(value) != the_set.end( ); } // Breaks cxx
+--- vaal-46233/src/ShortVector.h
++++ vaal-46233/src/ShortVector.h
+@@ -14,6 +14,8 @@
+ #include "system/Types.h"
+ #include "feudal/BinaryStream.h"
+
++using std::uninitialized_fill_n;
++
+ // ================================================================================
+ //
+ // A shortvector holds a list of up to 255 things of any type T.
+--- vaal-46233/src/solexa/FourBase2.h
++++ vaal-46233/src/solexa/FourBase2.h
+@@ -15,6 +15,10 @@
+ #include "feudal/MasterVec.h"
+ #include "feudal/SerfVec.h"
+
++using std::max_element;
++using std::min_element;
++using std::accumulate;
++
+ class four_base2 {
+
+ public:
+--- vaal-46233/src/solexa/FourBase.cc
++++ vaal-46233/src/solexa/FourBase.cc
+@@ -9,6 +9,9 @@
+
+ #include "solexa/FourBase.h"
+
++using std::string;
++using std::istringstream;
++
+ int four_base::Call( ) const
+ {
+ int result = 0;
+--- vaal-46233/src/solexa/FourBase.h
++++ vaal-46233/src/solexa/FourBase.h
+@@ -16,6 +16,8 @@
+ #include "feudal/MasterVec.h"
+ #include "feudal/SerfVec.h"
+
++using std::max;
++
+ /*
+ Class: four_base
+
+--- vaal-46233/src/solexa/SolexaMetrics.h
++++ vaal-46233/src/solexa/SolexaMetrics.h
+@@ -42,6 +42,8 @@
+ #include "CommonSemanticTypes.h"
+ #include <map>
+
++using std::map;
++
+ /// Definition of general macros.
+
+ class solexa_metric_db {
+--- vaal-46233/src/solexa/SolexaTools.cc
++++ vaal-46233/src/solexa/SolexaTools.cc
+@@ -20,6 +20,8 @@
+ #include "FastaFileset.h"
+ #include "util/BaitMap.h"
+
++using std::ostringstream;
++
+ void SolexaPredictorParameters::SetFromFile(const String & fname) {
+ Ifstream(is, fname);
+ String params = Slurp(is);
+--- vaal-46233/src/STLExtensions.h
++++ vaal-46233/src/STLExtensions.h
+@@ -9,7 +9,7 @@
+ #ifndef STLEXTENSIONS_H
+ #define STLEXTENSIONS_H
+
+-using namespace std;
++
+
+ #include <functional>
+ #include <vector>
+@@ -21,6 +21,13 @@
+ #include "feudal/BinaryStream.h"
+ #include "system/StaticAssert.h"
+
++using std::binary_function;
++using std::unary_function;
++using std::pair;
++using std::bitset;
++using std::vector;
++using std::ostream;
++
+ /// minimum<T> is a function object.
+ ///
+ /// If f is an object of class minimum<T> and x and y are objects of
+--- vaal-46233/src/system/ParsedArgs.cc
++++ vaal-46233/src/system/ParsedArgs.cc
+@@ -26,6 +26,9 @@
+ #include "system/HostName.h"
+ #include "system/UseGDB.h"
+
++using std::istrstream;
++using std::mem_fun_ref;
++
+ #ifndef FatalErr
+ #define FatalErr(message) { cout << message << endl << endl; exit(-1); }
+ #endif
+--- vaal-46233/src/system/ParsedArgs.h
++++ vaal-46233/src/system/ParsedArgs.h
+@@ -97,6 +97,8 @@
+ #include "TokenizeString.h"
+ #include "ParseSet.h"
+
++using std::stringstream;
++
+ class parsed_arg_help {
+
+ public:
+--- vaal-46233/src/system/ProcBuf.cc
++++ vaal-46233/src/system/ProcBuf.cc
+@@ -15,6 +15,8 @@
+ #include <sys/wait.h>
+ #include <unistd.h>
+
++using std::ios_base;
++
+ namespace
+ {
+ size_t const BUFFER_SIZE = 8192;
+--- vaal-46233/src/system/RunTime.cc
++++ vaal-46233/src/system/RunTime.cc
+@@ -41,6 +41,10 @@
+ #include <unwind.h>
+ #endif
+
++using std::strstream;
++using std::hex;
++using std::setw;
++
+ /// ===========================================================================
+ ///
+ /// ReturnAddress(i), where 0 <= i <= 100: get the return address. The
+--- vaal-46233/src/system/RunTime.h
++++ vaal-46233/src/system/RunTime.h
+@@ -14,6 +14,8 @@
+ #include "system/Exit.h"
+ #include "system/Types.h"
+
++using std::ostream;
++
+ typedef void ArachneSignalHandler(int, siginfo_t*, void*);
+
+ void arachne_signal_handler( int signal_number, siginfo_t* info, void* context,
+--- vaal-46233/src/system/System.cc
++++ vaal-46233/src/system/System.cc
+@@ -35,6 +35,11 @@
+
+ #include <dirent.h>
+
++using std::istringstream;
++using std::istream_iterator;
++using std::ostrstream;
++using std::ends;
++
+ int SystemInternal( String command, const char *shell )
+ {
+ flush(cout);
+--- vaal-46233/src/system/System.h
++++ vaal-46233/src/system/System.h
+@@ -21,6 +21,17 @@
+ #include "system/Exit.h"
+ #include "system/file/TempFile.h"
+
++using std::vector;
++using std::ostream;
++using std::ofstream;
++using std::cout;
++using std::flush;
++using std::endl;
++using std::istream;
++using std::ifstream;
++using std::ios;
++using std::setprecision;
++
+ #ifndef InputErr
+ #define InputErr(message) \
+ { cout << "\nFatal error at " << Date( ) << ": " << message << endl; \
+--- vaal-46233/src/system/TraceVal.h
++++ vaal-46233/src/system/TraceVal.h
+@@ -24,6 +24,9 @@
+ #include "system/Types.h"
+ #include "system/Assert.h"
+
++using std::cout;
++using std::endl;
++
+ // Macros: Tracing macros
+ // TRACEVAL_ON - undefine if you're not doing tracing
+ // TRACEVAL_STOP_TRACING_COPIES -- call before an operation that shuffles
+--- vaal-46233/src/system/Types.h
++++ vaal-46233/src/system/Types.h
+@@ -14,7 +14,7 @@
+ #include <cstdlib>
+ #include <netinet/in.h>
+
+-using namespace std;
++
+
+ // This assumes that all suns run Solaris...
+ #if __sun == 1
+--- vaal-46233/src/util/BaitMap.cc
++++ vaal-46233/src/util/BaitMap.cc
+@@ -236,7 +236,7 @@
+ bool BaitMap::write(String file_name)
+ {
+ std::ofstream out(file_name.c_str());
+- ForceAssert(out);
++ ForceAssert(static_cast<bool>(out));
+
+ for (unsigned int i = 0; i < this->size(); i++)
+ {
+@@ -250,7 +250,7 @@
+ }
+
+ out.close();
+- ForceAssert(out);
++ ForceAssert(static_cast<bool>(out));
+
+ return true;
+ }
+@@ -260,7 +260,7 @@
+ bool BaitMap::write_names(String file_name)
+ {
+ std::ofstream out(file_name.c_str());
+- ForceAssert(out);
++ ForceAssert(static_cast<bool>(out));
+
+ for (unsigned int i = 0; i < this->size(); i++)
+ {
+@@ -268,7 +268,7 @@
+ }
+
+ out.close();
+- ForceAssert(out);
++ ForceAssert(static_cast<bool>(out));
+
+ return true;
+ }
+--- vaal-46233/src/util/BaitMap.h
++++ vaal-46233/src/util/BaitMap.h
+@@ -20,6 +20,8 @@
+
+ #include <map>
+
++using std::map;
++
+ class BaitMap
+ {
+ public:
+--- vaal-46233/src/util/Qualb.cc
++++ vaal-46233/src/util/Qualb.cc
+@@ -10,6 +10,8 @@
+ #include "FastIfstream.h"
+ #include "Qualvector.h"
+
++using std::istrstream;
++
+ int main( int argc, char *argv[] )
+ {
+ RunTime( );
+--- vaal-46233/src/Vec.h
++++ vaal-46233/src/Vec.h
+@@ -48,6 +48,14 @@
+ #include "Compare.h"
+ #include "system/file/FileReader.h"
+
++using std::initializer_list;
++using std::numeric_limits;
++using std::ostream_iterator;
++using std::less;
++using std::equal_to;
++using std::setfill;
++using std::setw;
++
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // vec Class Declaration and Template Definitions
+--- vaal-46233/src/VecUtilities.h
++++ vaal-46233/src/VecUtilities.h
+@@ -37,6 +37,7 @@
+ #include "Vec.h"
+ #include <cstddef>
+
++using std::greater;
+
+ /////////////////////////////////////////////////////////////////////////////
+ //
diff --git a/sci-biology/vaal/vaal-46233-r1.ebuild b/sci-biology/vaal/vaal-46233-r1.ebuild
new file mode 100644
index 000000000000..20b3bf0de466
--- /dev/null
+++ b/sci-biology/vaal/vaal-46233-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Algorithm for detecting SNPs, indels, and other polymorphisms"
+HOMEPAGE="http://www.broadinstitute.org/science/programs/genome-biology/crd/"
+SRC_URI="
+ ftp://ftp.broad.mit.edu/pub/crd/VAAL/latest_source_code/${P}.tar.gz
+ ftp://ftp.broad.mit.edu/pub/crd/VAAL/VAAL_manual.doc"
+
+LICENSE="Whitehead-MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="openmp"
+
+DEPEND=">=dev-libs/boost-1.41.0-r3"
+RDEPEND="${DEPEND}"
+
+DOCS=( "${DISTDIR}/VAAL_manual.doc" )
+PATCHES=( "${FILESDIR}/${P}_remove-namespace-std.patch" )
+
+src_prepare() {
+ sed \
+ -e '/COPYING/d' \
+ -i src/Makefile.am || die
+
+ sed \
+ -e 's:-ggdb::g' \
+ -e '/AC_OPENMP_CEHCK/d' \
+ -i configure.ac || die
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable openmp)
+}
diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
index aad0cb8f1ba9..9a4d897765dd 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1,2 +1,3 @@
DIST avogadro-1.0.3.tar.bz2 4971989 SHA256 efb6fda223da3c027436f0c218a47ce804f7469c58b41134230e9ebad1c98468 SHA512 49e7b8ca43f0f52a65efc7bf9dc45670ae5a5de5d1aa6bf7b58b8368e816be30fe6529c45fa658d7337d4a69327bb0aa8799d8d4b4805860aace28011cc74210 WHIRLPOOL c835ac24b317a1fa310bf3ea75bae4002d01f364d4754e6a7d841594dcce321435c827d60e125d9410f05670a94c887cc250bf49759d02cde34a5839d2324c92
DIST avogadro-1.1.0.tar.bz2 10741835 SHA256 6b4eaf57ae52bf43df9b103c77e6abae71e067053d5c99f82acbce9855ecceb0 SHA512 d621dd3ea9e9223d3a29c6b0c0eec89a935837d0c587fcaaa549f91274a76f78a8c60c2a68a67d2f3aa2e107826befb6658be601c46c5bc0760c95bf7284540a WHIRLPOOL c81e866e60b3383a58de515317c754e3982e716c27974ce43ca0c1209d24544949361a7f2f93a4a940d73fd7a18b184f68c7a1856fea89ae5eba75db74b1012d
+DIST avogadro-1.1.1.tar.bz2 11118046 SHA256 fe6f7bdea17a27a20be25b70d975145999aae9d90ef320217af2bc4d6e7a0a14 SHA512 37e2fc9400f8727b7e69d84c13989aaba6fc88287e106a6ed137e4d0fd8ea181dc4ab49b08148d2077754f014748c8ed6f46881f31a1455029f876b599754827 WHIRLPOOL 6bea2c25675ba29729785b561cbaed33929aeb4638180454b1aed8913160cd6d0315bb09e6ee4033a8d27ce84fd7a4573851fd02c76b64b6aa86e615a19b8c38
diff --git a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild b/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
index 0de1b83085b6..4f7720d37e98 100644
--- a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
+++ b/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
@@ -37,6 +37,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${P}-textrel.patch
"${FILESDIR}"/${P}-xlibs.patch
+ "${FILESDIR}"/${PN}-1.1.1-openbabel.patch
)
pkg_setup() {
diff --git a/sci-chemistry/avogadro/avogadro-1.1.1.ebuild b/sci-chemistry/avogadro/avogadro-1.1.1.ebuild
new file mode 100644
index 000000000000..1fc212151004
--- /dev/null
+++ b/sci-chemistry/avogadro/avogadro-1.1.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils flag-o-matic python-single-r1
+
+DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
+HOMEPAGE="http://avogadro.openmolecules.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+glsl python cpu_flags_x86_sse2 test"
+
+RDEPEND="
+ >=sci-chemistry/openbabel-2.3.0
+ >=dev-qt/qtgui-4.8.5:4
+ >=dev-qt/qtopengl-4.8.5:4
+ x11-libs/gl2ps
+ glsl? ( >=media-libs/glew-1.5.0 )
+ python? (
+ >=dev-libs/boost-1.35.0-r5[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dev-cpp/eigen"
+
+# https://sourceforge.net/p/avogadro/bugs/653/
+RESTRICT="test"
+
+PATCHES=(
+ #"${FILESDIR}"/${PN}-1.1.0-textrel.patch
+ "${FILESDIR}"/${PN}-1.1.0-xlibs.patch
+ "${FILESDIR}"/${P}-eigen3.patch
+ "${FILESDIR}"/${P}-mkspecs-dir.patch
+ "${FILESDIR}"/${P}-no-strip.patch
+ "${FILESDIR}"/${P}-pkgconfig_eigen.patch
+ "${FILESDIR}"/${P}-openbabel.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ sed \
+ -e 's:_BSD_SOURCE:_DEFAULT_SOURCE:g' \
+ -i CMakeLists.txt || die
+ # warning: "Eigen2 support is deprecated in Eigen 3.2.x and it will be removed in Eigen 3.3."
+ append-cppflags -DEIGEN_NO_EIGEN2_DEPRECATED_WARNING
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_THREADEDGL=OFF
+ -DENABLE_RPATH=OFF
+ -DENABLE_UPDATE_CHECKER=OFF
+ -DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"
+ -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
+ $(cmake-utils_use_enable glsl)
+ $(cmake-utils_use_enable test TESTS)
+ $(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
+ $(cmake-utils_use_enable python)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-eigen3.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-eigen3.patch
new file mode 100644
index 000000000000..dc07d6974e12
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.1-eigen3.patch
@@ -0,0 +1,51 @@
+--- avogadro-1.1.1/CMakeLists.txt.omv~ 2014-01-30 13:58:22.999443609 +0100
++++ avogadro-1.1.1/CMakeLists.txt 2014-01-30 13:59:31.086106925 +0100
+@@ -230,13 +230,15 @@ if(NOT Linguist_FOUND)
+ message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations")
+ endif()
+
+-find_package(Eigen3) # find and setup Eigen3 if available
++find_package(Eigen3 REQUIRED) # find and setup Eigen3 if available
+ if(NOT EIGEN3_FOUND)
+ message(STATUS "Cannot find Eigen3, trying Eigen2")
+- find_package(Eigen2 REQUIRED) # Some version is required
++ find_package(Eigen2) # Some version is required
+ else()
+ # Use Stage10 Eigen3 support
+ set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE)
++ add_definitions (-DEIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API)
++ set (EIGEN2_INCLUDE_DIR ${EIGEN3_INCLUDE_DIR})
+ endif()
+
+ find_package(ZLIB REQUIRED)
+--- avogadro-1.1.1/libavogadro/src/extensions/qtaim/CMakeLists.txt.omv~ 2014-01-30 14:12:33.859401753 +0100
++++ avogadro-1.1.1/libavogadro/src/extensions/qtaim/CMakeLists.txt 2014-01-30 14:15:07.652727522 +0100
+@@ -4,6 +4,8 @@ set(LINK_LIBS avogadro)
+ set(PLUGIN_LABEL extensions)
+ set(PLUGIN_TARGET extensions)
+
++add_definitions(-DEIGEN2_SUPPORT_STAGE20_RESOLVE_API_CONFLICTS -std=gnu++11)
++
+ set(qtaimextension_SRCS
+ qtaimextension.cpp
+ # qtaimdialog.cpp
+--- avogadro-1.1.1/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt.omv~ 2014-01-30 13:59:05.889441500 +0100
++++ avogadro-1.1.1/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt 2014-01-30 13:59:08.832774688 +0100
+@@ -1,5 +1,5 @@
+ find_package(Qt4 4.6 REQUIRED)
+-find_package(Eigen2 REQUIRED)
++find_package(Eigen3 REQUIRED)
+
+ include_directories(${QT_INCLUDE_DIR} ${EIGEN2_INCLUDE_DIR})
+
+--- avogadro-1.1.1/cmake/modules/AvogadroUse.cmake.orig 2014-10-13 20:13:59.909828034 +0100
++++ avogadro-1.1.1/cmake/modules/AvogadroUse.cmake 2014-10-13 20:15:09.492822908 +0100
+@@ -12,7 +12,7 @@
+
+ # Add the Avogadro modules directory to the CMake module path
+ set(CMAKE_MODULE_PATH ${Avogadro_PLUGIN_DIR}/cmake ${CMAKE_MODULE_PATH})
+-find_package(Eigen2 REQUIRED)
++find_package(Eigen3 REQUIRED)
+ include_directories(${EIGEN2_INCLUDE_DIR})
+ if(Avogadro_ENABLE_GLSL)
+ find_package(GLEW)
diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-mkspecs-dir.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-mkspecs-dir.patch
new file mode 100644
index 000000000000..45c616422efe
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.1-mkspecs-dir.patch
@@ -0,0 +1,12 @@
+diff -up avogadro-1.1.1/CMakeLists.txt.mkspecs-dir avogadro-1.1.1/CMakeLists.txt
+--- avogadro-1.1.1/CMakeLists.txt.mkspecs-dir 2014-01-24 23:43:01.618510517 -0600
++++ avogadro-1.1.1/CMakeLists.txt 2014-01-24 23:44:03.236844746 -0600
+@@ -547,7 +547,7 @@ if(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF)
+ # )
+ install(FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/avogadro.prf"
+- DESTINATION "${CMAKE_INSTALL_PREFIX}/${QT_MKSPECS_RELATIVE}/features"
++ DESTINATION "${QT_MKSPECS_DIR}/features"
+ )
+ # endif ("${QT_MKSPECS_DIR}" MATCHES ^$"${CMAKE_INSTALL_PREFIX}/")
+ else()
diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-no-strip.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-no-strip.patch
new file mode 100644
index 000000000000..490dd58907df
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.1-no-strip.patch
@@ -0,0 +1,12 @@
+diff -up avogadro-1.1.1/CMakeLists.txt.no-strip avogadro-1.1.1/CMakeLists.txt
+--- avogadro-1.1.1/CMakeLists.txt.no-strip 2014-01-24 23:14:44.473840038 -0600
++++ avogadro-1.1.1/CMakeLists.txt 2014-01-24 23:15:46.869166459 -0600
+@@ -114,7 +114,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+ endif()
+ # Set up additional build flags for particular build types. These will be added to CMAKE_CXX_FLAGS,
+ # they will not replace them.
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s")
++ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+ "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS_WARN}")
+ set(CMAKE_CXX_FLAGS_DEBUG "-g3 -fno-inline ${CMAKE_CXX_FLAGS_WARN}")
diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-openbabel.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-openbabel.patch
new file mode 100644
index 000000000000..4bdc6b2e780e
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.1-openbabel.patch
@@ -0,0 +1,16 @@
+ libavogadro/src/python/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavogadro/src/python/CMakeLists.txt b/libavogadro/src/python/CMakeLists.txt
+index efb518a..1a3d91a 100644
+--- a/libavogadro/src/python/CMakeLists.txt
++++ b/libavogadro/src/python/CMakeLists.txt
+@@ -21,7 +21,7 @@ if (WIN32)
+ target_link_libraries(python-module avogadro ${PYTHON_LIBRARIES})
+ else()
+ target_link_libraries(python-module stdc++ avogadro
+- ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
++ ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} ${OPENBABEL2_LIBRARIES})
+ endif()
+
+ # Let's try to use this instead:
diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-pkgconfig_eigen.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-pkgconfig_eigen.patch
new file mode 100644
index 000000000000..93dbe2ff4ecc
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.1-pkgconfig_eigen.patch
@@ -0,0 +1,8 @@
+diff -up avogadro-1.1.1/avogadro.pc.in.eigen avogadro-1.1.1/avogadro.pc.in
+--- avogadro-1.1.1/avogadro.pc.in.eigen 2013-12-06 09:50:04.000000000 -0600
++++ avogadro-1.1.1/avogadro.pc.in 2014-01-25 00:37:45.732007852 -0600
+@@ -9,3 +9,4 @@ Description: Avogadro libraries
+ Version: @Avogadro_VERSION_FULL@
+ Libs: -L${libdir} -lavogadro
+ Cflags: -I${pkgincludedir}
++Requires.private: eigen3
diff --git a/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild b/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
index 457cb4750d08..e85ddb0478b3 100644
--- a/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
+++ b/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@ EAPI=5
inherit autotools-utils fdo-mime flag-o-matic gnome2-utils eutils
-DESCRIPTION="Periodic table viewer that provides detailed information on the chemical elements"
+DESCRIPTION="Periodic table viewer with detailed information on the chemical elements"
HOMEPAGE="http://freecode.com/projects/gelemental/"
SRC_URI="
http://www.kdau.com/files/${P}.tar.bz2
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="GPL-3 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc static-libs"
RDEPEND="
diff --git a/sci-chemistry/gelemental/gelemental-1.2.0.ebuild b/sci-chemistry/gelemental/gelemental-1.2.0.ebuild
deleted file mode 100644
index fe562c2ce32b..000000000000
--- a/sci-chemistry/gelemental/gelemental-1.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools-utils fdo-mime gnome2-utils eutils
-
-DESCRIPTION="Periodic table viewer that provides detailed information on the chemical elements"
-HOMEPAGE="http://freecode.com/projects/gelemental/"
-SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc static-libs"
-
-RDEPEND="
- dev-cpp/gtkmm:2.4
- dev-cpp/glibmm:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/gettext
- dev-util/intltool
- doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gcc4.3.patch
- "${FILESDIR}"/${P}-glib-2.32.patch
- "${FILESDIR}"/${P}-doxygen.patch )
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
- local myeconfargs=( $(use_enable doc api-docs) )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install apidir="/usr/share/doc/${PF}/html"
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/sci-chemistry/tm-align/Manifest b/sci-chemistry/tm-align/Manifest
index d9e8dc8632b3..93b1493475aa 100644
--- a/sci-chemistry/tm-align/Manifest
+++ b/sci-chemistry/tm-align/Manifest
@@ -1 +1,2 @@
DIST TMtools20140601.tar.gz 934391 SHA256 5032f7ab1824c8b2191b4a3667e1405feb6ccf7c900f57632aa506fff8ec1bf5 SHA512 99b90425ff051c836e19225601ddfb1576bec9c8f233aafeba96075f924a3c0892b5b1cfef36254ff5ef468a6dbf64f7fcc9a3ce24a0d869b3c1eb87c0149765 WHIRLPOOL 5ba7d9cb71e3055dff62851c68e127314b9ca70c4bbc39aeba35e5a4b02dc0cffeacb52c6369c90875d8062603c830acf604cfc339bdecfeb3dd6c10015e20de
+DIST TMtools20150914.tar.gz 982948 SHA256 de318e77ac5d7b9bf095bdc1c0d03d5536d6d7099ec2b6a2c201136da9274da4 SHA512 5fda29f6437ac9b0216a037496a01502de07e5a36736815833cb09217158a959370e750b75c55a54a49c733e4bd28be53b2dcbb25d71e2897273a4280ed3b530 WHIRLPOOL d366aa0d62d11b4af6137f87168c6156257c9e91c76c165ad256115016e571c94dce4235f015b5c0adecc4a8104ea432f53de2bd135332596235c56b9830b19f
diff --git a/sci-chemistry/tm-align/tm-align-20150914.ebuild b/sci-chemistry/tm-align/tm-align-20150914.ebuild
new file mode 100644
index 000000000000..e711c75b0ee2
--- /dev/null
+++ b/sci-chemistry/tm-align/tm-align-20150914.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils flag-o-matic fortran-2
+
+DESCRIPTION="Quick & Accurate Structural Alignment"
+HOMEPAGE="http://zhanglab.ccmb.med.umich.edu/TM-align/"
+SRC_URI="http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools${PV}.tar.gz"
+
+LICENSE="tm-align"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static custom-cflags"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ cp "${FILESDIR}"/CMakeLists.txt . || die
+ use static && append-fflags -static && append-ldflags -static
+ # recommended by upstream
+ use custom-cflags || replace-flags -O* -O3 && append-fflags -ffast-math
+}
diff --git a/sci-electronics/quartus-prime-lite/Manifest b/sci-electronics/quartus-prime-lite/Manifest
new file mode 100644
index 000000000000..ea5a4733086e
--- /dev/null
+++ b/sci-electronics/quartus-prime-lite/Manifest
@@ -0,0 +1 @@
+DIST Quartus-lite-15.1.0.185-linux.tar 5969776640 SHA256 fd670ee4caee69e9533b7a826af1040bc0e35ef68ca1b43e73d8b69cbf14c7f4 SHA512 7996bc9e0561b650c0318d608b4f59560dd631e3a38c403105f797049c395ce25a0ff5d4346cf6e91338fa297d7e8752ef5a3f83f496d4431ad3591de4335045 WHIRLPOOL 1549939fc9e7ce94b9b2c3032db78ff66ca1f4542831fe15fadb83ba0efab4305430924ed0ac3d47288f7ae85c4b75818c87a5399a6868adcee606e20388d894
diff --git a/sci-electronics/quartus-prime-lite/metadata.xml b/sci-electronics/quartus-prime-lite/metadata.xml
new file mode 100644
index 000000000000..42ed446b917c
--- /dev/null
+++ b/sci-electronics/quartus-prime-lite/metadata.xml
@@ -0,0 +1,8 @@
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>brendan@horan.hk</email>
+ <name>Brendan Horan</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185.ebuild b/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185.ebuild
new file mode 100644
index 000000000000..395c34ee4215
--- /dev/null
+++ b/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Full-featured EDA product for altera devices"
+HOMEPAGE="https://www.altera.com/products/design-software/fpga-design/quartus-prime/overview.html"
+SRC_URI="Quartus-lite-${PV}-linux.tar"
+# variable to store the download URL
+DOWNLOADPAGE="http://dl.altera.com/?edition=lite"
+
+LICENSE="Quartus-prime-megacore"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/libpng:1.2"
+
+RESTRICT="fetch bindist"
+
+S=${WORKDIR}
+
+pkg_nofetch() {
+ elog "Due to licensing restrictions, you need to download the distfile manually."
+ elog "Please navigate to ${DOWNLOADPAGE}"
+ elog "Sign in with your Altera account (you need to register)"
+ elog "Download ${SRC_URI} and place it into ${DISTDIR}"
+ elog "And restart the installation."
+}
+
+pkg_pretend() {
+ einfo "The checksum and unpack will take quite some time to run"
+}
+
+src_install() {
+ einfo "The Quartus install runs in unattended mode"
+ einfo "you wont see much and it will take a long time"
+
+ ./setup.sh --mode unattended --unattendedmodeui none \
+ --installdir "${D}/opt/quartus-lite-${PV}"
+ make_desktop_entry "/opt/quartus-lite-${PV}/quartus/bin/quartus" \
+ "Quartus lite ${PV}" "/opt/quartus-lite-${PV}/quartus/adm/quartusii.png"
+}
+
+pkg_postinst() {
+ elog "To launch Quartus, run /opt/quartus-lite-${PV}/quartus/bin/quartus"
+}
diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild
index c8b1e329dcb6..9fc8276c9aeb 100644
--- a/sci-geosciences/gdal-grass/gdal-grass-2.0.0.ebuild
+++ b/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="postgres"
RDEPEND="
>=sci-libs/gdal-2.0.0
- >=sci-geosciences/grass-7.0.1-r3
+ sci-geosciences/grass:0=
"
DEPEND="${RDEPEND}
dev-libs/expat
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 4fc483a5fd30..09a6c76feba9 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1 +1,2 @@
DIST grass-7.0.1.tar.gz 33733368 SHA256 0987dd1618fde24b05785a502c7db8c09401a522a7a3ee50543068fab4eb405f SHA512 cb1c356eb19f793530e4e313cc5e81b3be27817eea8961c6e5673b955726e7ae26c38942d6a620dc89c60b8051cdb0ed549c70fdfab8c65f5d17c901521ffaff WHIRLPOOL ed97e45873ea39df32e4ad9ed663087e0077d4bfbbbc9f1fc89729c1d411d550e3354fbc937741c465d94929b6da30311e44926db53fe0f1edb3ce7b850b2266
+DIST grass-7.0.2.tar.gz 38102415 SHA256 2eabd84c5426c675b7f3046213bbacb0cee9d0225df15e1530b93f43ec6b190b SHA512 5f6432263e4d52c914dfdd2bc8199f32c8f366b0ffae6a178033af7eee7b3c2632668b3d3cd70219969ecfd5ad6abefe6e65f0eaf72f27784fea3b4b9d51acfe WHIRLPOOL e1f5a90e793db74bcdf891b5f5a00c2bafa2842a6415ec433a45d6604d4943aa3d95b6e4d95265753a4ee8fc6819ec1b66ddea2d11802ac1c7a37150f7cea6d1
diff --git a/sci-geosciences/grass/grass-7.0.1-r4.ebuild b/sci-geosciences/grass/grass-7.0.1-r5.ebuild
index 1c6a17bd844d..2f1201c631ac 100644
--- a/sci-geosciences/grass/grass-7.0.1-r4.ebuild
+++ b/sci-geosciences/grass/grass-7.0.1-r5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite(-)?"
WANT_AUTOCONF="2.1"
-inherit eutils gnome2 multilib python-single-r1 versionator wxwidgets autotools
+inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
MY_PM=${MY_PM/.}
@@ -19,7 +19,7 @@ HOMEPAGE="http://grass.osgeo.org/"
SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/7.0.1-r5"
KEYWORDS="~amd64 ~x86"
IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
diff --git a/sci-geosciences/grass/grass-7.0.2.ebuild b/sci-geosciences/grass/grass-7.0.2.ebuild
new file mode 100644
index 000000000000..c63746be33cc
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.0.2.ebuild
@@ -0,0 +1,270 @@
+# 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="sqlite(-)?"
+WANT_AUTOCONF="2.1"
+
+inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
+
+MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
+MY_PM=${MY_PM/.}
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
+HOMEPAGE="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7.0.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-admin/eselect-1.2
+ media-libs/libprojectm
+ sci-libs/proj
+ sci-libs/xdrfile
+ sci-libs/gdal
+ sys-libs/gdbm
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ fftw? ( sci-libs/fftw:3.0 )
+ geos? ( sci-libs/geos )
+ blas? ( virtual/blas
+ sci-libs/cblas-reference )
+ lapack? ( virtual/lapack )
+ liblas? ( sci-geosciences/liblas )
+ mysql? ( virtual/mysql )
+ netcdf? ( sci-libs/netcdf )
+ odbc? ( dev-db/unixODBC )
+ opencl? ( virtual/opencl )
+ opengl? ( virtual/opengl )
+ png? ( media-libs/libpng:0= )
+ postgres? ( >=dev-db/postgresql-8.4:= )
+ readline? ( sys-libs/readline:0= )
+ sqlite? ( dev-db/sqlite:3 )
+ tiff? ( media-libs/tiff:0= )
+ truetype? ( media-libs/freetype:2 )
+ X? (
+ >=dev-python/wxpython-2.8.10.1:2.8[cairo,opengl?]
+ x11-libs/cairo[X,opengl?]
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXp
+ x11-libs/libXpm
+ x11-libs/libXt
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/bison
+ X? (
+ dev-lang/swig
+ x11-proto/xextproto
+ x11-proto/xproto
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ opengl? ( X )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch
+ "${FILESDIR}/${PN}"-7.0.1-soname.patch
+)
+
+pkg_setup() {
+ if use lapack; then
+ local mylapack
+ mylapack=$(eselect lapack show) || die
+ if [[ -z "${mylapack/.*reference.*/}" ]] && \
+ [[ -z "${mylapack/.*atlas.*/}" ]]; then
+ ewarn "You need to set lapack to atlas or reference. Do:"
+ ewarn " eselect lapack set <impl>"
+ ewarn "where <impl> is atlas, threaded-atlas or reference"
+ die "setup failed"
+ fi
+ fi
+
+ if use blas; then
+ local myblas
+ myblas=$(eselect blas show) || die
+ if [[ -z "${myblas/.*reference.*/}" ]] && \
+ [[ -z "${myblas/.*atlas.*/}" ]]; then
+ ewarn "You need to set blas to atlas or reference. Do:"
+ ewarn " eselect blas set <impl>"
+ ewarn "where <impl> is atlas, threaded-atlas or reference"
+ die "setup failed"
+ fi
+ fi
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Fix unversioned python calls
+ local pyver=${EPYTHON/python/}
+ sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
+ sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
+
+ # fix header being unconditionally included
+ # see upstream https://trac.osgeo.org/grass/ticket/2779
+ sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
+ -i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
+
+ epatch "${PATCHES[@]}"
+
+ epatch_user
+ eautoconf
+
+ ebegin "Fixing python shebangs"
+ python_fix_shebang -q "${S}"
+ eend $?
+}
+
+src_configure() {
+ if use X; then
+ WX_BUILD=yes
+ WX_GTK_VER=2.8
+ need-wxwidgets unicode
+ fi
+
+ addwrite "${ROOT}dev/dri/renderD128"
+
+ econf \
+ --enable-shared \
+ --disable-w11 \
+ $(use_with cxx) \
+ $(use_with tiff) \
+ $(use_with png) \
+ $(use_with postgres) \
+ $(use_with mysql) \
+ $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
+ $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/mysql") \
+ $(use_with sqlite) \
+ $(use_with opengl) \
+ $(use_with odbc) \
+ $(use_with fftw) \
+ $(use_with blas) \
+ $(use_with lapack) \
+ $(use_with X cairo) \
+ $(use_with truetype freetype) \
+ $(use_with truetype freetype-includes "${ROOT}usr/include/freetype2") \
+ $(use_with nls) \
+ $(use_with readline) \
+ --without-opendwg \
+ --with-regex \
+ $(use_with threads pthread) \
+ $(use_with openmp) \
+ $(use_with opencl) \
+ --with-gdal="${ROOT}usr/bin/gdal-config" \
+ $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
+ $(use_with X wxwidgets "${WX_CONFIG}") \
+ $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
+ $(use_with geos geos "${ROOT}usr/bin/geos-config") \
+ --with-proj-includes="${ROOT}usr/include/libprojectM" \
+ --with-proj-libs="${ROOT}usr/$(get_libdir)" \
+ --with-proj-share="${ROOT}usr/share/proj/" \
+ $(use_with X x)
+}
+
+src_compile() {
+ # we don't want to link against embedded mysql lib
+ emake CC="$(tc-getCC)" MYSQLDLIB=""
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ INST_DIR="${D}usr/${MY_PM}" \
+ prefix="${D}usr" BINDIR="${D}usr/bin" \
+ PREFIX="${D}usr/" \
+ install
+
+ pushd "${D}usr/${MY_PM}" &> /dev/null || die
+
+ # fix docs
+ dodoc AUTHORS CHANGES
+ dohtml -r docs/html/*
+ rm -rf docs/ || die
+ rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
+
+ # manuals
+ dodir /usr/share/man/man1
+ rm -rf man/ || die
+
+ # translations
+ if use nls; then
+ dodir /usr/share/locale/
+ mv locale/* "${D}usr/share/locale/" || die
+ rm -rf locale/ || die
+ # pt_BR is broken
+ mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
+ fi
+
+ popd &> /dev/null || die
+
+ # place libraries where they belong
+ mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
+
+ # place header files where they belong
+ mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
+ # make rules are not required on installed system
+ rm -rf "${D}usr/include/Make" || die
+
+ # mv remaining gisbase stuff to libdir
+ mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
+
+ # get proper folder for grass path in script
+ local gisbase
+ gisbase="${ROOT}usr/$(get_libdir)/${MY_PM}"
+ sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \
+ -i "${D}usr/bin/${MY_PM}" || die
+
+ # get proper fonts path for fontcap
+ sed -i \
+ -e "s|${D}usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \
+ "${D}usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die
+
+ # set proper python interpreter
+ sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}usr/bin/${MY_PM}" || die
+
+ if use X; then
+ local GUI="-gui"
+ [[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
+ make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
+ doicon -s 48 gui/icons/${PN}-48x48.png
+ fi
+
+ # install .pc file so other apps know where to look for grass
+ insinto /usr/$(get_libdir)/pkgconfig/
+ doins grass.pc
+
+ # fix weird +x on tcl scripts
+ find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
+}
+
+pkg_postinst() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 80f4f570b88d..c354b3e937b0 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
+DIST qgis-2.12.1.tar.bz2 69088412 SHA256 96b9bb6ef62ec042b938e4b3112cc8e2e96caad36d6615b484ad757a65e80429 SHA512 647ad827f6b139a301a5fd1387333842d0187390db1906a37713b41a24bd97e37624ba2b1b500b473132d17e0d856efd0a033b2159930d005c9f74845547958e WHIRLPOOL 05895935df656937b3a1848a07eee8ee96692a8a34d30515d143b2f08cd652640b5116a81025e822497cc26d0e6f6347a6344657272a4c6c6de5d128792b98ad
DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 2d8595802e03..c7d2ce32745c 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -13,5 +13,7 @@
<use>
<flag name="bundled-libs">Use internal copy of <pkg>x11-libs/qwtpolar</pkg></flag>
<flag name="spatialite">Enable Spatial DBMS over sqlite <pkg>dev-db/spatialite</pkg></flag>
+ <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
+ <flag name="mapserver">Determines whether mapserver should be built</flag>
</use>
</pkgmetadata>
diff --git a/sci-geosciences/qgis/qgis-2.12.1.ebuild b/sci-geosciences/qgis/qgis-2.12.1.ebuild
new file mode 100644
index 000000000000..119b1cd1a41a
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.12.1.ebuild
@@ -0,0 +1,153 @@
+# 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="sqlite"
+
+inherit eutils multilib gnome2-utils cmake-utils python-single-r1
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="
+ http://qgis.org/downloads/qgis-${PV}.tar.bz2
+ examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples grass gsl mapserver postgres python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ mapserver? ( python )"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/expat
+ sci-geosciences/gpsbabel
+ >=sci-libs/gdal-1.6.1[geos,python?,${PYTHON_USEDEP}]
+ sci-libs/geos
+ gsl? ( sci-libs/gsl )
+ sci-libs/libspatialindex
+ sci-libs/proj
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtsvg:4
+ dev-qt/qtsql:4
+ dev-qt/qtwebkit:4
+ dev-qt/designer:4
+ x11-libs/qscintilla
+ || (
+ ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+ ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
+ )
+ grass? ( || ( >=sci-geosciences/grass-7.0.0 ) )
+ mapserver? ( dev-libs/fcgi )
+ postgres? ( dev-db/postgresql:* )
+ python? (
+ dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ ${PYTHON_DEPS}
+ )
+ dev-db/sqlite:3
+ dev-db/spatialite
+ app-crypt/qca:2[qt4,openssl]
+"
+
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ sys-devel/flex"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DQGIS_MANUAL_SUBDIR=/share/man/"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DQGIS_LIB_SUBDIR=$(get_libdir)"
+ "-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
+ "-DWITH_INTERNAL_QWTPOLAR=OFF"
+ "-DPEDANTIC=OFF"
+ "-DWITH_APIDOC=OFF"
+ "-DWITH_SPATIALITE=ON"
+ "-DWITH_INTERNAL_SPATIALITE=OFF"
+ $(cmake-utils_use_with postgres POSTGRESQL)
+ $(cmake-utils_use_with grass GRASS)
+ $(cmake-utils_use_with mapserver SERVER)
+ $(cmake-utils_use_with python BINDINGS)
+ $(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
+ $(cmake-utils_use_with python PYSPATIALITE)
+ $(cmake-utils_use_with gsl GSL)
+ $(cmake-utils_use_enable test TESTS)
+ $(usex grass "-DGRASS_PREFIX=/usr/" "")
+ )
+
+ if has_version '>=x11-libs/qwtpolar-1' && has_version 'x11-libs/qwt:5' ; then
+ elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
+ if has_version '>=x11-libs/qwt-6.1.2' ; then
+ mycmakeargs+=(
+ "-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+ "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
+ )
+ else
+ mycmakeargs+=(
+ "-DQWT_INCLUDE_DIR=/usr/include/qwt6"
+ "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
+ )
+ fi
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ dodoc BUGS ChangeLog CODING
+
+ newicon -s 128 images/icons/qgis-icon.png qgis.png
+ make_desktop_entry qgis "QGIS " qgis
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins -r "${WORKDIR}"/qgis_sample_data/*
+ fi
+
+ python_optimize "${D}"/usr/share/qgis/python/plugins \
+ "${D}"/$(python_get_sitedir)/qgis
+
+ if use grass; then
+ python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
+ python_optimize "${D}"/usr/share/qgis/grass/scripts
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ else
+ if use python ; then
+ elog "Support of PostgreSQL is disabled."
+ elog "But some installed python-plugins needs import psycopg2 module."
+ elog "If you do not need this modules just disable them in main menu."
+ elog "Or you need to set USE=postgres"
+ fi
+ fi
+
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index b8ef93d9df75..1e91026fd076 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1 +1,2 @@
DIST avogadrolibs-0.7.2.tar.gz 637001 SHA256 217eb5d62082bbaacefe8ad3c8c8ddbbd41931d306038774f761c0155aeccc76 SHA512 a796af1ab3eb77eb2e5484e9e9cb9d7cf68759c9afbd48ddeb237513583e2c207c7c70b2e87b37843886fc737410456ee451e8fe5a21707bdc01fdf600d4cbb8 WHIRLPOOL 81f0d1949c0a93b9efd1f47f276929b01ca761a5875015be3feafb493be3629b0b8e00c0ba930e1ca73b79fc621a67f7e2ab41ae5e4fc10dddd18449238d933f
+DIST avogadrolibs-0.8.0.tar.bz2 619784 SHA256 0f9a39e3469c4b4622a55ceeace3565c5f7f4df13fdadb73aa1f7d9bba43856c SHA512 edcd220e7c05962543b3cdd61faacb838060a69acb61677150256e2e8f36cad513f58a5071b6ef20510aa4aa6699e517c57d70017d8f1b57936c7f87c9da21c7 WHIRLPOOL 87ea3436af93ec860e90bdbe1b7c24408dae69e17755300f526a03b4e5d0f76217d0d3b695e917c5bf315758b4e2d3ee0c1511734d13e58251ade1d63709949b
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
new file mode 100644
index 000000000000..2472a69c9c02
--- /dev/null
+++ b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
+HOMEPAGE="http://www.openchemistry.org/"
+SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD GPL-2+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc opengl qt5 static-plugins test vtk"
+
+REQUIRED_USE="qt5? ( opengl )"
+
+RDEPEND="
+ >=sci-chemistry/molequeue-0.7
+ sci-libs/chemkit
+ sci-libs/hdf5:=
+ opengl? (
+ dev-qt/qtopengl:5
+ media-libs/glew
+ )
+ qt5? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+ )
+ vtk? ( sci-libs/vtk )
+"
+DEPEND="${DEPEND}
+ dev-cpp/eigen:3
+ test? ( dev-cpp/gtest )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_PROTOCALL=OFF
+ -DBUILD_GPL_PLUGINS=ON
+ -DUSE_MOLEQUEUE=ON
+ $(cmake-utils_use_build doc DOCUMENTATION)
+ $(cmake-utils_use_use opengl OPENGL)
+ $(cmake-utils_use_use qt5 QT)
+ $(cmake-utils_use_build static-plugins STATIC_PLUGINS)
+ $(cmake-utils_use_enable test TESTING)
+ $(cmake-utils_use_use vtk VTK)
+ )
+ cmake-utils_src_configure
+}
diff --git a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
new file mode 100644
index 000000000000..ef362bcf4aa4
--- /dev/null
+++ b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fortran-2 autotools multilib flag-o-matic toolchain-funcs
+
+LAPACKPV="3.1.1"
+LAPACKPN="lapack-lite"
+
+DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
+HOMEPAGE="http://www.netlib.org/blas/"
+SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+DEPEND="app-eselect/eselect-blas"
+RDEPEND="${DEPEND}
+ doc? ( app-doc/blas-docs )"
+
+S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
+
+src_prepare() {
+ ESELECT_PROF=reference
+ epatch \
+ "${FILESDIR}"/${P}-autotool.patch \
+ "${FILESDIR}"/${P}-pkg-config.patch
+ eautoreconf
+
+ cp "${FILESDIR}"/eselect.blas.reference-ng "${T}"/eselect.blas.reference || die
+ sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.blas.reference || die
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+ "${T}"/eselect.blas.reference || die
+ fi
+}
+
+src_configure() {
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference
+}
+
+src_compile() {
+ emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ default
+ eselect blas add $(get_libdir) "${T}"/eselect.blas.reference ${ESELECT_PROF}
+}
+
+pkg_postinst() {
+ local p=blas
+ local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+ if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+ # work around eselect bug #189942
+ local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
+ [[ -e ${configfile} ]] && rm -f ${configfile}
+ eselect ${p} set ${ESELECT_PROF}
+ elog "${p} has been eselected to ${ESELECT_PROF}"
+ else
+ elog "Current eselected ${p} is ${current_lib}"
+ elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+ elog "\t eselect ${p} set ${ESELECT_PROF}"
+ fi
+}
diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
new file mode 100644
index 000000000000..33fa88130deb
--- /dev/null
+++ b/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils fortran-2 multilib toolchain-funcs
+
+MyPN="${PN/-reference/}"
+
+DESCRIPTION="C wrapper interface to the F77 reference BLAS implementation"
+HOMEPAGE="http://www.netlib.org/blas/"
+SRC_URI="http://www.netlib.org/blas/blast-forum/${MyPN}.tgz"
+
+SLOT="0"
+LICENSE="public-domain"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+ virtual/blas
+ app-eselect/eselect-cblas"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+ESELECT_PROF=reference
+S="${WORKDIR}/CBLAS"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-autotool.patch
+ eautoreconf
+
+ cp "${FILESDIR}"/eselect.cblas.reference "${T}"/ || die
+ sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.reference || die
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+ "${T}"/eselect.cblas.reference || die
+ fi
+}
+
+src_configure() {
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference \
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+}
+
+src_install() {
+ default
+ dodoc cblas_example*c
+ eselect cblas add $(get_libdir) "${T}"/eselect.cblas.reference ${ESELECT_PROF}
+}
+
+pkg_postinst() {
+ local p=cblas
+ local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+ if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+ # work around eselect bug #189942
+ local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
+ [[ -e ${configfile} ]] && rm -f ${configfile}
+ eselect ${p} set ${ESELECT_PROF}
+ elog "${p} has been eselected to ${ESELECT_PROF}"
+ else
+ elog "Current eselected ${p} is ${current_lib}"
+ elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+ elog "\t eselect ${p} set ${ESELECT_PROF}"
+ fi
+}
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 362db48635ff..813f8a071cbb 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,3 +1,4 @@
DIST gdal-1.11.1.tar.gz 10731242 SHA256 f46b5944a8cabc8516673f231f466131cdfd2cdc6677dbee5d96ec7fc58a3340 SHA512 17214ae17a5199d73477d17cf8680396aee8a28d4333cf55818bdd869548dc6a4d7535d7e05949696db31a7be4a511c5ca73199af3dda48d9a40d5640618e9c3 WHIRLPOOL 1f07ee4acccf58552ddef6b5a306b9dbe832014f6890d353f195ab0d47dfc4e81164b7c8b9cefc9915035d113d2f28818f05e89918728eadb0e80e43e7220b5b
DIST gdal-1.11.2.tar.gz 10746847 SHA256 66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845 SHA512 f1f025de5a618cc2458b6d1f066647341ad4ded1cc2a08e4b78756d96d38715ddd8ba34b7c263369bde66cb20c7919195e13b60a1ecadee25ef80db79f3eb7da WHIRLPOOL 77274f6f9b9bb29fc21c6f274512bccebc7748420c31e3e626d26087194f69b9606354603b393b77903451b073d034f2508403193fdf738f5b099d7808771653
DIST gdal-2.0.0.tar.gz 11582325 SHA256 53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6 SHA512 74ae9d01a69652c92a16bc91f71b4c8416697d5f7aa137d385f58b7dc63c165c26330464c98891ac66b09475de24fbbff61f506ad1c9ecf64ffe08f1429fbad5 WHIRLPOOL 7d4a27e94e41ea53050ae3b8f1f06720e13626885455897caf6659a88c87bf61c087102963182b580e56a8840e3b57b6fbb8adadde64fd4679d5c37c3aa682c7
+DIST gdal-2.0.1.tar.gz 11592723 SHA256 b55f794768e104a2fd0304eaa61bb8bda3dc7c4e14f2c9d0913baca3e55b83ab SHA512 b3b22e53b6e4b68911d84260d79ed382625f9d71722759a89f49fdd736d1f1ad183bda99e0f09d3f368fead89b509df58daa35a367473dfd5628855d331efa23 WHIRLPOOL 1b1218d5d6c84e41051475c38b412ebb49511c4a1ae948f56edb5939d9eb9599546b9bd89a3cb6b2517d205723201e77bde64955bb3eb0b5bccfda799d5bffe3
diff --git a/sci-libs/gdal/gdal-2.0.1.ebuild b/sci-libs/gdal/gdal-2.0.1.ebuild
new file mode 100644
index 000000000000..3eabe0dfc203
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.0.1.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_AUTOCONF="2.5"
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools eutils libtool perl-module distutils-r1 python-r1 toolchain-funcs java-pkg-opt-2
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python spatialite sqlite threads xls"
+
+RDEPEND="
+ dev-libs/expat
+ dev-libs/json-c
+ dev-libs/libpcre
+ dev-libs/libxml2
+ media-libs/tiff:0=
+ sci-libs/libgeotiff
+ sys-libs/zlib[minizip(+)]
+ armadillo? ( sci-libs/armadillo[lapack] )
+ curl? ( net-misc/curl )
+ fits? ( sci-libs/cfitsio )
+ geos? ( >=sci-libs/geos-2.2.1 )
+ gif? ( media-libs/giflib )
+ gml? ( >=dev-libs/xerces-c-3 )
+ hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
+ java? ( >=virtual/jre-1.6:* )
+ jpeg? ( virtual/jpeg:0= )
+ jpeg2k? ( media-libs/jasper )
+ mysql? ( virtual/mysql )
+ netcdf? ( sci-libs/netcdf )
+ odbc? ( dev-db/unixODBC )
+ ogdi? ( sci-libs/ogdi )
+ opencl? ( virtual/opencl )
+ pdf? ( >=app-text/poppler-0.24.3:= )
+ perl? ( dev-lang/perl:= )
+ png? ( media-libs/libpng:0= )
+ postgres? ( >=dev-db/postgresql-8.4:= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ sqlite? ( dev-db/sqlite:3 )
+ spatialite? ( dev-db/spatialite )
+ xls? ( dev-libs/freexl )
+"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ java? ( >=virtual/jdk-1.6 )
+ perl? ( dev-lang/swig:0 )
+ python? ( dev-lang/swig:0 )"
+
+AT_M4DIR="${S}/m4"
+MAKEOPTS+=" -j1"
+
+REQUIRED_USE="
+ spatialite? ( sqlite )
+ mdb? ( java )
+"
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ java-pkg-opt-2_src_prepare
+
+ # fix datadir and docdir placement
+ sed -i \
+ -e "s:@datadir@:@datadir@/gdal:" \
+ -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+ "${S}"/GDALmake.opt.in || die
+
+ # the second sed expression should fix bug 371075
+ sed -i \
+ -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+ -e "s:--prefix=\$(DESTDIR):--prefix=:" \
+ "${S}"/swig/python/GNUmakefile || die
+
+ # -soname is only accepted by GNU ld/ELF
+ [[ ${CHOST} == *-darwin* ]] \
+ && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
+ || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
+
+ # Fix spatialite/sqlite include issue
+ sed -i \
+ -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
+ ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
+
+ # Fix freexl configure check
+ sed -i \
+ -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
+ configure.in || die
+
+ sed \
+ -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+ -i configure.in || die
+
+ sed \
+ -e 's:^ar:$(AR):g' \
+ -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+ tc-export AR RANLIB
+
+ eautoreconf
+
+ prepare_python() {
+ mkdir -p "${BUILD_DIR}" || die
+ find "${S}" -type d -maxdepth 1 -exec ln -s {} "${BUILD_DIR}"/ \; ||die
+ find "${S}" -type f -maxdepth 1 -exec cp --target="${BUILD_DIR}"/ {} + ||die
+# mkdir -p "${BUILD_DIR}"/swig/python || die
+# mkdir -p "${BUILD_DIR}"/apps || die
+# cp -dpR --target="${BUILD_DIR}"/swig/ \
+# "${S}"/swig/{python,SWIGmake.base,GNUmakefile} || die
+# ln -s "${S}"/swig/include "${BUILD_DIR}"/swig/ || die
+# ln -s "${S}"/apps/gdal-config "${BUILD_DIR}"/apps/ || die
+# ln -s "${S}"/port "${BUILD_DIR}"/ || die
+ }
+ if use python; then
+ python_foreach_impl prepare_python
+ fi
+}
+
+gdal_src_configure() {
+ local myopts=""
+
+ if use java; then
+ myopts+="
+ --with-java=$(java-config --jdk-home 2>/dev/null)
+ $(use_with mdb)"
+ else
+ myopts+=" --without-java --without-mdb"
+ use mdb && ewarn "mdb requires java use enabled. disabling"
+ fi
+
+ if use sqlite; then
+ myopts+=" LIBS=-lsqlite3"
+ fi
+
+ # pcidsk is internal, because there is no such library yet released
+ # also that thing is developed by the gdal people
+ # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+ # bsb - legal issues
+ # oracle - disabled, i dont have and can't test
+ # ingres - same story as oracle oci
+ # podofo - we use poppler instead they are exclusive for each other
+ # tiff is a hard dep
+ ECONF_SOURCE="${S}" econf \
+ --includedir="${EPREFIX}/usr/include/${PN}" \
+ --disable-static \
+ --enable-shared \
+ --with-expat \
+ --with-geotiff \
+ --with-grib \
+ --with-libtiff \
+ --with-libz="${EPREFIX}/usr/" \
+ --with-ogr \
+ --without-bsb \
+ --without-dods-root \
+ --without-dwgdirect \
+ --without-epsilon \
+ --without-fme \
+ --without-grass \
+ --without-hdf4 \
+ --without-idb \
+ --without-ingres \
+ --without-jp2mrsid \
+ --without-kakadu \
+ --without-libtool \
+ --without-mrsid \
+ --without-msg \
+ --without-oci \
+ --without-pcraster \
+ --without-podofo \
+ --without-sde \
+ $(use_enable debug) \
+ $(use_with armadillo) \
+ $(use_with aux_xml pam) \
+ $(use_with curl) \
+ --without-ecw \
+ $(use_with fits cfitsio) \
+ $(use_with geos) \
+ $(use_with gif) \
+ $(use_with gml xerces) \
+ $(use_with hdf5) \
+ $(use_with jpeg pcidsk) \
+ $(use_with jpeg) \
+ $(use_with jpeg2k jasper) \
+ $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
+ $(use_with netcdf) \
+ $(use_with odbc) \
+ $(use_with ogdi ogdi "${EPREFIX}"/usr) \
+ $(use_with opencl) \
+ $(use_with pdf poppler) \
+ $(use_with perl) \
+ $(use_with png) \
+ $(use_with postgres pg) \
+ $(use_with python) \
+ $(use_with spatialite) \
+ $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
+ $(use_with threads) \
+ $(use_with xls freexl) \
+ ${myopts}
+
+ # mysql-config puts this in (and boy is it a PITA to get it out)
+ if use mysql; then
+ sed -i \
+ -e "s: -rdynamic : :" \
+ GDALmake.opt || die "sed LIBS failed"
+ fi
+
+ if [[ -n $use_python ]]; then
+ # updated for newer swig (must specify the path to input files)
+ sed -i \
+ -e "s: gdal_array.i: ../include/gdal_array.i:" \
+ -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
+ swig/python/GNUmakefile || die "sed python makefile failed"
+ sed -i \
+ -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
+ swig/python/setup.cfg || die "sed python setup.cfg failed"
+# -e "s:gdal_config=.*$:gdal_config=../../../apps/gdal-config:g" \
+ fi
+}
+
+src_configure() {
+ local use_python=""
+
+ gdal_src_configure
+
+ if use python; then
+ use_python="yes"
+ python_foreach_impl run_in_build_dir gdal_src_configure
+ fi
+}
+
+src_compile() {
+ if use perl; then
+ rm "${S}"/swig/perl/*_wrap.cpp
+ emake -C "${S}"/swig/perl generate
+ fi
+
+ default
+
+ if use perl ; then
+ pushd "${S}"/swig/perl > /dev/null
+ perl-module_src_configure
+ perl-module_src_compile
+ popd > /dev/null
+ fi
+
+ use doc && emake docs
+
+ compile_python() {
+ rm -f swig/python/*_wrap.cpp
+ emake -C swig/python generate
+ emake -C swig/python build
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir compile_python
+ fi
+}
+
+src_install() {
+ if use perl ; then
+ pushd "${S}"/swig/perl > /dev/null
+ perl-module_src_install
+ popd > /dev/null
+ sed -e 's:BINDINGS = \(.*\) perl:BINDINGS = \1:g' \
+ -i GDALmake.opt || die
+ fi
+
+ default
+
+ use perl && perl_delete_localpod
+
+ dodoc Doxyfile HOWTO-RELEASE NEWS
+
+ use doc && dohtml html/*
+
+ install_python() {
+ emake -C swig/python DESTDIR="${D}" install
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir install_python
+ newdoc swig/python/README.txt README-python.txt
+ insinto /usr/share/${PN}/samples
+ doins swig/python/samples/*
+ python_replicate_script "${ED}"/usr/bin/*py
+ fi
+
+ pushd man/man1 > /dev/null
+ for i in * ; do
+ newman ${i} ${i}
+ done
+ popd > /dev/null
+}
+
+pkg_postinst() {
+ elog "Check available image and data formats after building with"
+ elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
new file mode 100644
index 000000000000..6f7fb7d73bb9
--- /dev/null
+++ b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils fortran-2 flag-o-matic multilib toolchain-funcs
+
+MyPN="${PN/-reference/}"
+PATCH_V="3.2.1"
+
+DESCRIPTION="FORTRAN reference implementation of LAPACK Linear Algebra PACKage"
+HOMEPAGE="http://www.netlib.org/lapack/index.html"
+SRC_URI="
+ mirror://gentoo/${MyPN}-${PV}.tgz
+ mirror://gentoo/${PN}-${PATCH_V}-autotools.patch.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+RDEPEND="
+ app-eselect/eselect-lapack
+ virtual/blas"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/lapack-docs )"
+
+S="${WORKDIR}/${MyPN}-${PV}"
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ if [[ $(tc-getFC) =~ if ]]; then
+ ewarn "Using Intel Fortran at your own risk"
+ export LDFLAGS="$(raw-ldflags)"
+ export NOOPT_FFLAGS=-O
+ fi
+ ESELECT_PROF=reference
+}
+
+src_prepare() {
+ epatch \
+ "${WORKDIR}"/${PN}-${PATCH_V}-autotools.patch \
+ "${FILESDIR}"/${P}-parallel-make.patch
+ eautoreconf
+
+ # set up the testing routines
+ sed \
+ -e "s:g77:$(tc-getFC):" \
+ -e "s:-funroll-all-loops -O3:${FFLAGS} $($(tc-getPKG_CONFIG) --cflags blas):" \
+ -e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $($(tc-getPKG_CONFIG) --cflags blas):" \
+ -e "s:../../blas\$(PLAT).a:$($(tc-getPKG_CONFIG) --libs blas):" \
+ -e "s:lapack\$(PLAT).a:SRC/.libs/liblapack.a:" \
+ make.inc.example > make.inc \
+ || die "Failed to set up make.inc"
+
+ cp "${FILESDIR}"/eselect.lapack.reference-ng "${T}"/eselect.lapack.reference || die
+ sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.lapack.reference || die
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+ "${T}"/eselect.lapack.reference || die
+ fi
+ sed \
+ -e '/Libs:/s|: |: -L${libdir} |g' \
+ -i lapack.pc.in || die
+}
+
+src_configure() {
+ econf \
+ --libdir="${EPREFIX}/usr/$(get_libdir)/lapack/reference" \
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+}
+
+src_install() {
+ default
+ eselect lapack add $(get_libdir) "${T}"/eselect.lapack.reference ${ESELECT_PROF}
+}
+
+src_test() {
+ MAKEOPTS+=" -j1"
+ cd "${S}"/TESTING/MATGEN && emake || die
+ cd "${S}"/TESTING && emake || die
+}
+
+pkg_postinst() {
+ local p=lapack
+ local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+ if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+ # work around eselect bug #189942
+ local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
+ [[ -e ${configfile} ]] && rm -f ${configfile}
+ eselect ${p} set ${ESELECT_PROF}
+ elog "${p} has been eselected to ${ESELECT_PROF}"
+ else
+ elog "Current eselected ${p} is ${current_lib}"
+ elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+ elog "\t eselect ${p} set ${ESELECT_PROF}"
+ fi
+}
diff --git a/sci-libs/libmems/Manifest b/sci-libs/libmems/Manifest
index c1c88d19ccc9..831b8362fe3d 100644
--- a/sci-libs/libmems/Manifest
+++ b/sci-libs/libmems/Manifest
@@ -1,2 +1 @@
-DIST libmems-1.6.tar.bz2 441051 SHA256 624ef4921f00c2c81d179819a5d1af91f01b1ec66dfa5f7c977b8e42696e76b4 SHA512 4a4fdc2849c5e292175249834e702421c975b6fc5995c50abce90ad2e18df3a4fd0192330a0200dc18aa26bcce4de15baccd6f269555a7710dd4e620c0ca0738 WHIRLPOOL 4ea1cf8feca0a165dc970dc93e36a8602eb746ccb31bedfc20f960c9bb0c8268152f39b5725c6c917a2869df93d0539b518db4db4b43815172218f6620913cfe
DIST libmems-1.6_p1.tar.xz 226628 SHA256 c692d7d42378e7264d0a39674d1a6072183ee4c073ad90858153986b6a8b4848 SHA512 c6336f69b767bba010617deb2de9bb8fbbbaf516de3b1d293b062c76c6a763166080badd730938c6d849602d64a968edb6d4622b5d3e7ea7a6d8bc38164d3d73 WHIRLPOOL bc216dfb0c24c13b7b770da00100730e0e9b350c7bb6b312a480a83b51bc8c212e6ed73f08a88a7d262da8d4ed9a4c788883cbcfa3f2b2cdc362888e85b7f66a
diff --git a/sci-libs/libmems/files/libmems-1.6_p1-broken-constness.patch b/sci-libs/libmems/files/libmems-1.6_p1-broken-constness.patch
new file mode 100644
index 000000000000..0bd922c9e111
--- /dev/null
+++ b/sci-libs/libmems/files/libmems-1.6_p1-broken-constness.patch
@@ -0,0 +1,24 @@
+Fix bug 529770 caused by non-const copy constructor.
+
+--- libmems-1.6_p1/libMems/Aligner.cpp
++++ libmems-1.6_p1/libMems/Aligner.cpp
+@@ -939,7 +939,7 @@
+ MatchLeftEndComparator( unsigned seq = 0 ){
+ m_seq = seq;
+ }
+- MatchLeftEndComparator( MatchLeftEndComparator& msc ){
++ MatchLeftEndComparator( const MatchLeftEndComparator& msc ){
+ m_seq = msc.m_seq;
+ }
+ // TODO?? make this do a wraparound comparison if all is equal?
+--- libmems-1.6_p1/libMems/Aligner.h
++++ libmems-1.6_p1/libMems/Aligner.h
+@@ -49,7 +49,7 @@
+ LabeledMemComparator( uint seq ){
+ m_seq = seq;
+ }
+- LabeledMemComparator( LabeledMemComparator& lmc ){
++ LabeledMemComparator( const LabeledMemComparator& lmc ){
+ m_seq = lmc.m_seq;
+ }
+ boolean operator()(const LabeledMem& a, const LabeledMem& b) const{
diff --git a/sci-libs/libmems/files/libmems-1.6_p1-build.patch b/sci-libs/libmems/files/libmems-1.6_p1-build.patch
index 63e5f1216756..04d5dd9c82ac 100644
--- a/sci-libs/libmems/files/libmems-1.6_p1-build.patch
+++ b/sci-libs/libmems/files/libmems-1.6_p1-build.patch
@@ -17,3 +17,13 @@ index 6101f71..d66053d 100644
LIBMEMS_H = \
RepeatHash.h MatchHashEntry.h \
+--- a/libMems/dmSML/util.c
++++ b/libMems/dmSML/util.c
+@@ -2,6 +2,7 @@
+ #include "config.h"
+ #endif
+
++#include <stdlib.h>
+ #include <stdio.h>
+ #include "libMems/dmSML/util.h"
+
diff --git a/sci-libs/libmems/files/libmems-1.6_p1-format-security.patch b/sci-libs/libmems/files/libmems-1.6_p1-format-security.patch
new file mode 100644
index 000000000000..3ad3da2a8d80
--- /dev/null
+++ b/sci-libs/libmems/files/libmems-1.6_p1-format-security.patch
@@ -0,0 +1,16 @@
+ libMems/dmSML/dmsort.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libMems/dmSML/dmsort.c b/libMems/dmSML/dmsort.c
+index 4c99215..2cbfa7e 100644
+--- a/libMems/dmSML/dmsort.c
++++ b/libMems/dmSML/dmsort.c
+@@ -825,7 +825,7 @@ int InitdmSML( long working_mb, long buffer_size, const char* input_filename, co
+ if ( fgets(buf, sizeof(buf), fp) )
+ {
+ sscanf(buf, "MemTotal: %ld kB", &memTotal);
+- fprintf( stderr, buf );
++ fprintf( stderr, "%s", buf );
+ }
+ fclose(fp);
+ // allocate about 6/10 of physical memory
diff --git a/sci-libs/libmems/libmems-1.6.ebuild b/sci-libs/libmems/libmems-1.6.ebuild
deleted file mode 100644
index 56bb4be6dd7f..000000000000
--- a/sci-libs/libmems/libmems-1.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit autotools
-
-DESCRIPTION="Library for sci-biology/mauve"
-HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="doc"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
- dev-libs/boost
- sci-libs/libgenome
- sci-libs/libmuscle"
-DEPEND="${CDEPEND}
- doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
- eautoreconf
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
-}
diff --git a/sci-libs/libmems/libmems-1.6_p1.ebuild b/sci-libs/libmems/libmems-1.6_p1-r1.ebuild
index f5dc6f098f55..ac61e5455337 100644
--- a/sci-libs/libmems/libmems-1.6_p1.ebuild
+++ b/sci-libs/libmems/libmems-1.6_p1-r1.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=6
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils
+inherit autotools
DESCRIPTION="Library for sci-biology/mauve"
HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/"
@@ -29,4 +27,11 @@ PATCHES=(
"${FILESDIR}"/${P}-build.patch
"${FILESDIR}"/${P}-boost.patch
"${FILESDIR}"/${P}-gcc-4.7.patch
+ "${FILESDIR}"/${P}-broken-constness.patch
+ "${FILESDIR}"/${P}-format-security.patch
)
+
+src_prepare() {
+ default
+ eautoreconf
+}
diff --git a/sci-libs/libmems/libmems-9999.ebuild b/sci-libs/libmems/libmems-9999.ebuild
index ff9052c10cfb..98938e3cd183 100644
--- a/sci-libs/libmems/libmems-9999.ebuild
+++ b/sci-libs/libmems/libmems-9999.ebuild
@@ -1,18 +1,15 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=6
-AUTOTOOLS_AUTORECONF=yes
-
-ESVN_REPO_URI="https://mauve.svn.sourceforge.net/svnroot/mauve/libMems/trunk"
-
-inherit autotools-utils subversion
+inherit autotools subversion
DESCRIPTION="Library for sci-biology/mauve"
HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/"
SRC_URI=""
+ESVN_REPO_URI="https://mauve.svn.sourceforge.net/svnroot/mauve/libMems/trunk"
SLOT="0"
LICENSE="GPL-2"
@@ -28,3 +25,8 @@ DEPEND="${CDEPEND}
RDEPEND="${CDEPEND}"
S="${WORKDIR}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
diff --git a/sci-mathematics/cgal/cgal-4.3-r1.ebuild b/sci-mathematics/cgal/cgal-4.3-r1.ebuild
index caf5f20129e9..d4f65bc93bbf 100644
--- a/sci-mathematics/cgal/cgal-4.3-r1.ebuild
+++ b/sci-mathematics/cgal/cgal-4.3-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="LGPL-3 GPL-3 Boost-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="doc examples +gmp mpfi qt4"
RDEPEND="
diff --git a/sci-mathematics/maxima/maxima-5.37.3-r3.ebuild b/sci-mathematics/maxima/maxima-5.37.3-r4.ebuild
index bfead7886481..b769f1a25a18 100644
--- a/sci-mathematics/maxima/maxima-5.37.3-r3.ebuild
+++ b/sci-mathematics/maxima/maxima-5.37.3-r4.ebuild
@@ -26,7 +26,7 @@ PATCH_V=( 1 1 . 2 2 1 )
IUSE="emacs tk nls unicode X ${LISPS[*]}"
# Languages
-LANGS="es pt pt_BR"
+LANGS="de es pt pt_BR"
for lang in ${LANGS}; do
IUSE="${IUSE} linguas_${lang}"
done
diff --git a/sci-misc/repsnapper/Manifest b/sci-misc/repsnapper/Manifest
index 1c51da697a9f..eb0b5ab85519 100644
--- a/sci-misc/repsnapper/Manifest
+++ b/sci-misc/repsnapper/Manifest
@@ -1,2 +1,3 @@
DIST repsnapper-2.2.0b3.tar.gz 1314244 SHA256 2f55ce6bc19bba84bb6dbcda12f6546fa306fa163527d009ea8d730b85d80513 SHA512 52828b06734976369347cd1daa87cf027eea88bbf53e9a8501511f9dbdacf0388a64ec9e87b2cf3a546d332f80a069ee7934d4ac33d6b2d6e831ef326ae69b98 WHIRLPOOL c7b072ab9f465969e9b3f35c7c2fc8d9c4864e2b59aa9a983f6f8c9f8e7b21d6f29627fd0e6098035911b451790b54a72554e2737ab7da92938cb3bd89e8c242
DIST repsnapper-2.3.2a3.tar.gz 1344447 SHA256 7c4bc3603401847ce1f15298435c511f76fd74c5d5ae4fc1561c7f378c182fe5 SHA512 f68510baefb898954f58aa5e35909b8215edcd8ee74028e717ad97293091f4b323628ca0ba80ff685d1aef0db4785a2887986b89a95769a70f8f23ab031dafa4 WHIRLPOOL 0693876194c5837091b9f9df7d359833b86222345239f3cf946a0e6efd2f87efc35380745cb2a4dd5587a5193c9a3e54d36454fabb0d38722a02ac70d510645d
+DIST repsnapper-2.4a0.tar.gz 888457 SHA256 06d993b6eafc31b246181f64ef404de6948362d7096407ff06576e2ed416f7da SHA512 b79c51f53ae29d09f5a328366c10b9e775d396f6da0ef24aa71b522fbd718af2f658700838f64ba01ce9c5cab90e39960b0ca5ed2554f802ff37ef258ae89031 WHIRLPOOL 303b34674b4d761069ad4ab935462ef0b7c16e886a8b97039ebd2a3b532664feea00192b23b79bd39cce75b042fed971626e52695c147d088aa3bbe11d69e0e1
diff --git a/sci-misc/repsnapper/files/std-c11.patch b/sci-misc/repsnapper/files/std-c11.patch
new file mode 100644
index 000000000000..a8ff67ae3878
--- /dev/null
+++ b/sci-misc/repsnapper/files/std-c11.patch
@@ -0,0 +1,31 @@
+--- src/slicer/poly.cpp.orig 2015-12-28 07:54:32.774722105 +0100
++++ src/slicer/poly.cpp 2015-12-28 07:54:41.188055896 +0100
+@@ -225,7 +225,7 @@
+ // Start with first vertex as closest
+ uint nindex = 0;
+ mindist = (vertices[0]-p).squared_length();
+- if (isnan(mindist)) { // for infinity point p return point 0 and distance 0
++ if (std::isnan(mindist)) { // for infinity point p return point 0 and distance 0
+ mindist = 0.;
+ return 0;
+ }
+--- src/slicer/printlines.cpp.orig 2015-12-28 07:54:05.814720635 +0100
++++ src/slicer/printlines.cpp 2015-12-28 07:54:19.821388065 +0100
+@@ -240,7 +240,7 @@
+ if (abs(absolute_extrusion) < 0.00001)
+ travel_speed = max(minspeed, speed); // in case speed is too low
+
+- if (!isnan(absolute_extrusion))
++ if (!std::isnan(absolute_extrusion))
+ // allowed to push/pull at arbitrary speed
+ extrudedMaterial += absolute_extrusion;
+ else
+@@ -335,7 +335,7 @@
+ else
+ factor = 1./newlines.size();
+ newlines[i].absolute_extrusion *= factor;
+- assert(!isnan(newlines[i].absolute_extrusion));
++ assert(!std::isnan(newlines[i].absolute_extrusion));
+
+ }
+ return newlines;
diff --git a/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild b/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild
new file mode 100644
index 000000000000..49fc14dcaa78
--- /dev/null
+++ b/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools flag-o-matic versionator
+
+MY_PV="$(get_version_component_range 1-3)$(get_version_component_range 4)"
+MY_PV=${MY_PV/p/}
+
+DESCRIPTION="Host software for controlling the RepRap open source 3D printer"
+HOMEPAGE="https://github.com/timschmidt/repsnapper"
+SRC_URI="https://github.com/timschmidt/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-cpp/gtkglextmm-1.2
+ dev-cpp/gtkmm:2.4
+ dev-cpp/libxmlpp
+ dev-libs/libzip
+ virtual/opengl
+"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+ epatch "${FILESDIR}/std-c11.patch"
+ eautoreconf
+ append-cxxflags -std=c++11
+}
diff --git a/sci-physics/h2o-gtk/h2o-gtk-0.1.ebuild b/sci-physics/h2o-gtk/h2o-gtk-0.1.ebuild
index fb30e916c6d9..a8884840b89c 100644
--- a/sci-physics/h2o-gtk/h2o-gtk-0.1.ebuild
+++ b/sci-physics/h2o-gtk/h2o-gtk-0.1.ebuild
@@ -2,9 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
-
-inherit autotools-utils
+EAPI=5
+inherit autotools-utils flag-o-matic
DESCRIPTION="GTK+ UI for libh2o -- water & steam properties"
HOMEPAGE="https://bitbucket.org/mgorny/h2o-gtk/"
@@ -19,3 +18,8 @@ RDEPEND="dev-cpp/gtkmm
>=sci-libs/libh2oxx-0.2
sci-libs/plotmm"
DEPEND="${RDEPEND}"
+
+src_prepare() {
+ autotools-utils_src_prepare
+ append-cxxflags -std=c++11
+}
diff --git a/sys-apps/biosdevname/Manifest b/sys-apps/biosdevname/Manifest
index 6a8f719540b0..2a0f11352a63 100644
--- a/sys-apps/biosdevname/Manifest
+++ b/sys-apps/biosdevname/Manifest
@@ -1,3 +1,3 @@
-DIST biosdevname-0.4.1.tar.gz 187782 SHA256 230e5bffd17f46b6d820faa46ea79ace3eecaf919852ee7ff231e73f6b9f8fe7 SHA512 1c7534dd31acbba7121fc4f904d828b6bfc035248cde3366a58f4596f601c81618b44a96d67b99d4a17cf8d985c971be41196134f6d43ae63b4f8cd4308bed22 WHIRLPOOL 33917ad8ed6493b3fd6b5880e592031fc028e975e428cc9b2b5b16b299f5be647baac6a601c70b9422931a1cf6f98133944e18e9355afe2a0453d456e4697407
DIST biosdevname-0.6.1.tar.gz 195604 SHA256 b43580589a3f40afc836afbff9bcd837224c710b75a4d0b576f2e4d44ec158cc SHA512 46962c50618eb87c3ade5f4866bbb3fddb75f3a450bc32610d54062375b53bcd4c2f17cc3d729335c7d582043d0b491c8d8e1dc50d7de9c7683846b8dc8b0d77 WHIRLPOOL 9fa40a118ca57dd4e1a226ab0bea117f0291b0ee8807a5c2a9a56ef850d52d9500bb59a0d9e1fcba4cb87e85f269c76216bbee4eb331906cfa545b69ef3c6774
DIST biosdevname-0.6.2.tar.gz 195655 SHA256 7c6620e9a65e2929411036db04cc009e11a83b80a72282858e26cd19b598e466 SHA512 b4c56d9ba7ed539cb2fe05ec34f4345542237d77e0e2ce56835d95a2148baa59db5af1724e7569567999620bb963ad7867634bb9c8ba1b5b30cbf809a527eb81 WHIRLPOOL 85c0de6a59a2c9635721fa649cbd089920caee0842c4f4777a6a290df82a788c9573204aed501d336fe18a13e5e5c486226550bf3ff1b24ec826ab1b2604d9d9
+DIST biosdevname-0.7.1.tar.gz 193878 SHA256 81d4cb3ac3f4cafeb80c20ec0f34735804cb169b3efa4f67df6a58c5d102218b SHA512 ae641f86752338f375688655edf23c76e49f5387e036eff406adc191be4298fac10d0f4c942c3d31bb5ea7779a51d13a9bf1a5c62e0c748ef7f9f58dc344ec08 WHIRLPOOL a79f5373abcb6fd2b84dae8c34d955be830b675fe0fa5525ecf10403d2c30d33b648f71b263bd48c110fe47f5f03f399b35db3aac963f7a5fb96d64c6cdcc442
diff --git a/sys-apps/biosdevname/biosdevname-0.4.1.ebuild b/sys-apps/biosdevname/biosdevname-0.4.1.ebuild
deleted file mode 100644
index 72022c9aefe7..000000000000
--- a/sys-apps/biosdevname/biosdevname-0.4.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit udev
-
-DESCRIPTION="Sets BIOS-given device names instead of kernel eth* names"
-HOMEPAGE="http://linux.dell.com/biosdevname/"
-SRC_URI="http://linux.dell.com/biosdevname/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="virtual/udev"
-DEPEND="${CDEPEND}
- sys-apps/pciutils"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
- sed -i -e 's|/sbin/biosdevname|/usr\0|g' biosdevname.rules.in || die
- sed -i -e "/RULEDEST/s:/lib/udev:$(get_udevdir):" configure{,.ac} || die
-}
-
-pkg_postinst() {
- elog "To make it working you need to remove"
- elog ""
- elog " /etc/udev/rules.d/70-persistent-net.rules"
- elog ""
- elog "and then reboot the machine. After reboot ethernet devices names will"
- elog "change to the ones reported by BIOS. For more information you might"
- elog "want to read following document:"
- elog ""
- elog " http://fedoraproject.org/wiki/Features/ConsistentNetworkDeviceNaming"
- elog ""
- elog "To disable this feature, pass biosdevname=0 to kernel command line."
- elog ""
- elog "If you use Dracut, you might want to enable 'biosdevname' module"
- elog "(in DRACUT_MODULES variable)."
-}
diff --git a/sys-apps/biosdevname/biosdevname-0.7.1.ebuild b/sys-apps/biosdevname/biosdevname-0.7.1.ebuild
new file mode 100644
index 000000000000..81ebb0ffe09e
--- /dev/null
+++ b/sys-apps/biosdevname/biosdevname-0.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit udev
+
+DESCRIPTION="Sets BIOS-given device names instead of kernel eth* names"
+HOMEPAGE="http://linux.dell.com/biosdevname/"
+SRC_URI="http://linux.dell.com/biosdevname/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="virtual/udev"
+DEPEND="${CDEPEND}
+ sys-apps/pciutils"
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+ sed -i -e 's|/sbin/biosdevname|/usr\0|g' biosdevname.rules.in || die
+ sed -i -e "/RULEDEST/s:/lib/udev:$(get_udevdir):" configure{,.ac} || die
+}
diff --git a/sys-apps/busybox/busybox-1.24.1.ebuild b/sys-apps/busybox/busybox-1.24.1.ebuild
index 981dd02f48ac..49df22f214c4 100644
--- a/sys-apps/busybox/busybox-1.24.1.ebuild
+++ b/sys-apps/busybox/busybox-1.24.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P=${PN}-${PV/_/-}
SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
fi
LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 197448c7e7da..9931b73970e9 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,3 +1,4 @@
DIST findutils-4.4.2.tar.gz 2149838 SHA256 434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a SHA512 262d0a8301158e6541b9f24e4e043d8d8c1b196b18dbe59c3bedcf17b50c95708e33ab23a07e3bfb947ad495faafffdca3c296fb525794ca60f2dfd682f228c1 WHIRLPOOL 2af1467403ece2f290be6b9f69db013d386427ab553efcf750ce36bf608fab0d37708209c22bf61b8a82f41aa13bf25a247c62f78dc95446290b7a4bd35d3393
-DIST findutils-4.5.14.tar.gz 3536727 SHA256 0de3cf625a5c9f154eee3171e072515ffdde405244dd00502af617ac57b73ae2 SHA512 e26f0d58c316202d99d7dcc1c4d4d40591150dcf198dff2dab0f8ef5e4dc039a5ff42ef536bfc08d860f39ee4bd8215591b4cb460ff45f73007040fc5f99e66b WHIRLPOOL 116b725ffb76562a3f1e9bbfa475a791b873746a7ae362eea1a97f3b701c6e32508eafb10fe47a3ad8f56ef0e67fb04a5d98a7baf5371646945718e7aff5ad60
-DIST findutils-4.5.15.tar.gz 3815470 SHA256 bc843179f32cba7bec8192edc91b4ad0d0bf434e61b82c04d9d2c8115617d9fb SHA512 425e14ce956fcfe83412d49b63f9487cda2ce935b6f707c4fe7d4334449d1db47369bad8358979b2782ac749047bf6396e49fb92bef114518a1d6c133417e186 WHIRLPOOL f6a3761dc2c50faca0a7684731ed543676382ac4c23ed48804d70c243b53ddd34ba41c0e96fbb20a079d3e51b4a1f1773707d8b1ed7c4e44b4685544b1ae7470
+DIST findutils-4.5.16.tar.gz 3869606 SHA256 d116b48cf2a90a457726f58e24842bfa6078447d0c53be0fd1593f2555f7caae SHA512 d03100ea0708448ac714e86b6bc8ae4d9667f46df1cf0d29e1cfad6f52656254a47a2dd7ef88aaa68f94f399e848cd9d0977e25eda3781cfcd20819dc9fa76d6 WHIRLPOOL d42c7028eccdb38229aa725fade1a6aa2b2a57a65f317ccff83cf3da5594463f7810c17cc10fa5ced89a4213780133a57fd61948dc5d03b300a57f927e103eb2
+DIST findutils-4.5.17.tar.gz 3871981 SHA256 a41f171f0e05b6960ae1081dc21fb87f58bf939395d6559e297b59a493136a4f SHA512 a3f9a522e721e1d5c4d1b2839dcf85e829c531cb3eb63ec99765b0d5367c7a64b51ec4150e93be3fca5c620eebd3ca7a3bd7eee868663068658ee23b003bdd7a WHIRLPOOL da22ebab27435c32718d082a9991548745d13468558562590609e57478f586e7789a49e88138e9f23833189a4dc3d79fbbeaba8b3481f1cf812f1dd8a9db93b8
+DIST findutils-4.5.18.tar.gz 3870196 SHA256 e3b570534c7897e8de117396345e2e20f17f704389b7e1daa7889fd089afbdd7 SHA512 2ae70cef9aee81d4402298db11890efa0ec38dba561dfc11afc9c91af7c1c6a7cca221f669c45b00e65eba53a8b08f5124ed4e862d9e26bcf69c48a927e6b398 WHIRLPOOL ece27a2830792e162ca5e53d7d0fefa8959292b6945180a331ac4dc1a999bd858649f761a5dee44bb35e85ffa0dd633b1b65aeeb294ac4a8846ad1cdbfaf351e
diff --git a/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch b/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch
deleted file mode 100644
index 0bfe7017b8b4..000000000000
--- a/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 284afcb4a01996bb1a56f87da1e7c541fd0a903c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 4 Apr 2015 18:34:51 -0400
-Subject: [PATCH] test: fix bashisms
-
-These test scripts use #!/bin/sh, but then try to use bash-specific
-[[...]] tests. Change them to [...] instead.
-
-Reported-by: Paolo Pedroni <paolo.pedroni@iol.it>
-URL: https://bugs.gentoo.org/531020
-
-* find/testsuite/binary_locations.sh: Change [[...]] to [...].
-* find/testsuite/sv-34079.sh: Likewise.
----
- find/testsuite/binary_locations.sh | 6 +++---
- find/testsuite/sv-34079.sh | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/find/testsuite/binary_locations.sh b/find/testsuite/binary_locations.sh
-index 96943a0..238d57f 100644
---- a/find/testsuite/binary_locations.sh
-+++ b/find/testsuite/binary_locations.sh
-@@ -1,15 +1,15 @@
- # Source this file, don't execute it.
-
--if [[ -z "${testname}" ]]; then
-+if [ -z "${testname}" ]; then
- echo 'Please set $testname before sourcing binary_locations.sh.' >&2
- exit 1
- fi
-
- parent="$(cd .. && pwd)"
--if [[ -f "${parent}/ftsfind" ]]; then
-+if [ -f "${parent}/ftsfind" ]; then
- ftsfind="${parent}/ftsfind"
- oldfind="${parent}/find"
--elif [[ -f "${parent}/oldfind" ]]; then
-+elif [ -f "${parent}/oldfind" ]; then
- ftsfind="${parent}/find"
- oldfind="${parent}/oldfind"
- else
-diff --git a/find/testsuite/sv-34079.sh b/find/testsuite/sv-34079.sh
-index 5773a3f..928a9af 100755
---- a/find/testsuite/sv-34079.sh
-+++ b/find/testsuite/sv-34079.sh
-@@ -41,7 +41,7 @@ make_test_data() {
- }
-
-
--if [[ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]]; then
-+if [ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]; then
- if outdir=$(mktemp -d); then
- # Create some test files.
- bad=""
-@@ -64,7 +64,7 @@ if [[ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]]; then
- bad="failed to set up the test in ${outdir}"
- fi
- rm -rf "${outdir}" || exit 1
-- if [[ -n "${bad}" ]]; then
-+ if [ -n "${bad}" ]; then
- echo "${bad}" >&2
- exit 1
- fi
---
-2.3.5
-
diff --git a/sys-apps/findutils/findutils-4.5.15.ebuild b/sys-apps/findutils/findutils-4.5.16.ebuild
index 71678a577e93..7b49dced7311 100644
--- a/sys-apps/findutils/findutils-4.5.15.ebuild
+++ b/sys-apps/findutils/findutils-4.5.16.ebuild
@@ -31,11 +31,6 @@ src_prepare() {
# Don't build or install locate because it conflicts with slocate,
# which is a secure version of locate. See bug 18729
sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
- # Disable gnulib build test that has no impact on the source.
- # Re-enable w/next version bump (and gnulib is updated). #554728
- [[ ${PV} != "4.5.15" ]] && die "re-enable test #554728"
- echo 'exit 0' > tests/test-update-copyright.sh || die
}
src_configure() {
diff --git a/sys-apps/findutils/findutils-4.5.14-r1.ebuild b/sys-apps/findutils/findutils-4.5.17.ebuild
index f4f5a4415e0a..7b49dced7311 100644
--- a/sys-apps/findutils/findutils-4.5.14-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.5.17.ebuild
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI="5"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit eutils flag-o-matic toolchain-funcs python-any-r1
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~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="debug nls selinux static"
+IUSE="debug nls selinux static test"
RDEPEND="selinux? ( sys-libs/libselinux )
nls? ( virtual/libintl )"
@@ -28,15 +28,9 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-test-bashisms.patch #531020
# Don't build or install locate because it conflicts with slocate,
# which is a secure version of locate. See bug 18729
sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
- # Disable gnulib build test that has no impact on the source.
- # Re-enable w/next version bump (and gnulib is updated). #554728
- [[ ${PV} != "4.5.14" ]] && die "re-enable test #554728"
- echo 'exit 0' > tests/test-update-copyright.sh || die
}
src_configure() {
@@ -54,6 +48,12 @@ src_configure() {
--libexecdir='$(libdir)'/find
}
+src_compile() {
+ # We don't build locate, but the docs want a file in there.
+ emake -C locate dblocation.texi
+ default
+}
+
src_install() {
default
diff --git a/sys-apps/findutils/findutils-4.5.18.ebuild b/sys-apps/findutils/findutils-4.5.18.ebuild
new file mode 100644
index 000000000000..8d96f1d0fe25
--- /dev/null
+++ b/sys-apps/findutils/findutils-4.5.18.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils flag-o-matic toolchain-funcs python-any-r1
+
+DESCRIPTION="GNU utilities for finding files"
+HOMEPAGE="https://www.gnu.org/software/findutils/"
+SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~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="debug nls selinux static test"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ test? ( ${PYTHON_DEPS} )
+ nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Don't build or install locate because it conflicts with slocate,
+ # which is a secure version of locate. See bug 18729
+ sed -i '/^SUBDIRS/s/locate//' Makefile.in
+}
+
+src_configure() {
+ use static && append-ldflags -static
+
+ program_prefix=$(usex userland_GNU '' g)
+ econf \
+ --with-packager="Gentoo" \
+ --with-packager-version="${PVR}" \
+ --with-packager-bug-reports="https://bugs.gentoo.org/" \
+ --program-prefix=${program_prefix} \
+ $(use_enable debug) \
+ $(use_enable nls) \
+ $(use_with selinux) \
+ --libexecdir='$(libdir)'/find
+}
+
+src_compile() {
+ # We don't build locate, but the docs want a file in there.
+ emake -C locate dblocation.texi
+ default
+}
diff --git a/sys-apps/hwids/hwids-20150717-r1.ebuild b/sys-apps/hwids/hwids-20150717-r1.ebuild
index e932771bb187..c387bc7d3c1f 100644
--- a/sys-apps/hwids/hwids-20150717-r1.ebuild
+++ b/sys-apps/hwids/hwids-20150717-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]]; then
inherit git-2
else
SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
fi
LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/less/less-481.ebuild b/sys-apps/less/less-481.ebuild
index b20fe2c0a6cb..20ee6e869c8c 100644
--- a/sys-apps/less/less-481.ebuild
+++ b/sys-apps/less/less-481.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz
LICENSE="|| ( GPL-3 BSD-2 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pcre unicode"
DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/net-tools/net-tools-1.60_p20141019041918-r1.ebuild b/sys-apps/net-tools/net-tools-1.60_p20141019041918-r1.ebuild
index ecf9b98bc5be..b2dad721b428 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20141019041918-r1.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20141019041918-r1.ebuild
@@ -13,7 +13,7 @@ else
PATCH_VER="1"
SRC_URI="mirror://gentoo/${P}.tar.xz
mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/openrc/openrc-0.18.4.ebuild b/sys-apps/openrc/openrc-0.18.4.ebuild
index 1016516aafd7..4c3e4758ff11 100644
--- a/sys-apps/openrc/openrc-0.18.4.ebuild
+++ b/sys-apps/openrc/openrc-0.18.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
fi
LICENSE="BSD-2"
diff --git a/sys-apps/portage/portage-2.2.24.ebuild b/sys-apps/portage/portage-2.2.24.ebuild
index 823c9501a270..c22c8f2554a2 100644
--- a/sys-apps/portage/portage-2.2.24.ebuild
+++ b/sys-apps/portage/portage-2.2.24.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
SLOT="0"
IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
diff --git a/sys-apps/systemd/systemd-226-r2.ebuild b/sys-apps/systemd/systemd-226-r2.ebuild
index b384d5d82765..6cb08dd42bac 100644
--- a/sys-apps/systemd/systemd-226-r2.ebuild
+++ b/sys-apps/systemd/systemd-226-r2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
fi
inherit autotools bash-completion-r1 linux-info multilib \
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 941cf8b6fad6..5566c882b0c5 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -1,6 +1,8 @@
DIST elilo-3.10.tar.gz 210896 SHA256 65d0d7cc31bd0ef6824b9394dbf8991eb850aa4ba2dde1f9302e3da3cb2a4399 SHA512 4ec104f2d6a36745689619976e9811b5f5cd0d25be0f613d649ca2ff379e0514ab77c03bb474b32da87d73bd687d3d9faa9f2d07859e4c208b5d5a5a50d47e24 WHIRLPOOL f2d70ab94f1b82aac9ad8409557f2b0fb5d25f124e546f1e457e20a4da2b68baf1749377fb7a45b3bb6203bf9c54309adf9b9e072d7871e9d1a6b1d17b3c2fdb
DIST elilo-3.12-source.tar.gz 215125 SHA256 5005534ae972603c65caa8debb2bf3c4a22b895588323bc1b0a7a9f114e030ee SHA512 a9dceb1e03ec1cabcaef696e4d1b8fe8683b0feeef2171781536bc469f8bcd0b3ab9b4460b149bb1bf68c651bce8c7abec5ef4f47e78113a611594a69e91239c WHIRLPOOL 9e874b4512721c75b12f9c635e7bbdf63b0d0427bbcf880c38d9c53b54c53c15cf15a9ddfae788d7068a9d8ae615d1492f2af4f9046d6c7c48e3507ba13bbb7e
+DIST elilo-3.16-all.tar.gz 485844 SHA256 69e361d95c01ea2657200b2215464fc0235b01d3e317d2f2276284259b06d392 SHA512 4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842 WHIRLPOOL 5cf749f7120cc1789afc856dc8e0ad7fd4a34885caac7ab96da838ea35eec2d09356d602e0e8a9f28ce5fd021f977d4d17b7c16e03c8e54dcfe658f5c9b42c4e
DIST elilo-nightly_2006-03-14.tgz 168991 SHA256 b5174f1d921212b65f708869ea374e7c3e4e1b0771738b03ae6a1830cb4fe65c SHA512 8f4bab99c9e823e1755a299e04a5d89b09d74e06a986b9732b2f48bd96c389c54d5af1fb59c4e06fe55dbe80340cfcdf63a9b0c1de1a1ed5cd0a3dd2df5f5fc2 WHIRLPOOL d389ae56432d45ed96d156fb982f9f961e774ca41e6c8dc8cc3a1cc4290436b944b945a14954e9ca7eff4de67dd7fa9bd53960d8c92edc2e9de8c87bf47f3967
DIST elilo_3.10-1.diff.gz 26456 SHA256 de81eb071d4c7a3f02c629911cfd95f0fdc8705575df7a596e5630788bbb3643 SHA512 87e5bea09e66c65f048fab99ca9dfc5f0e61dd48b4ee012b7139d66af92291a79b33e2577139bfa529fd3c303b247a344384614927dfc3c2cff894bb032a3bc6 WHIRLPOOL d8c33bd0b5310206c89bf9b8d02443b9414adb2754651a412ff05a0727ae70e7d97a5d26817295dea0b37d71662f016ec58d95f0d33d6dba828d61e962dabcaf
DIST elilo_3.12-1.diff.gz 28806 SHA256 26532bdf9a8c3455d12f22c59d1d5d9656dcb432dabd1a80cdbcd010e93305b5 SHA512 ed3394880ae0dae63a3e6b92ccb2a8251b6fa6bbfda7e45a53fa45a06a899a89b9a760dafd44425b424b0455b7d37d6e8738da2477fae42ebf67a3b038a7e944 WHIRLPOOL 0167eb79a8fdb9d6f0417abd75c1f325ddab2f451126955a7542045f42febd6188c03e3f7dd5a0020c67bba489dbb8afb4585687a53d2c026f03a49104c0c032
+DIST elilo_3.14-3.debian.tar.gz 32179 SHA256 30d4e5eabfcdea8bc6c3ae3af05cff9e182847d388a83016c85a1f3fbb42296f SHA512 b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f WHIRLPOOL c5ffda521ee6e4253bc45160e712371d2a561841198152289d84971430a17a973e93382cec460efa9f7a09053b910748352ce97dde7e45d2ea737b14ddc5078e
DIST elilo_3.6-1.diff.gz 14944 SHA256 cc9e3d753823ad1bc50f935017e8b5cdc5d76cac2a37c498c862ef021e0e0073 SHA512 962672f516de48f88bd453248d6469a4962fb7551214de9f73125deb64121ab08d123746b2cf8c1c202177f7272aad4cb63e6970f1860c772930bae580817bee WHIRLPOOL 23f1c3b6fd8cfb7356cc165765b724ab10278b35ad36427c018b2931a9723e887f2cbecaa21bd3cd13fa5784035683e40a8cfc6df4cf65acaeb3fac1d6488dc9
diff --git a/sys-boot/elilo/elilo-3.16.ebuild b/sys-boot/elilo/elilo-3.16.ebuild
new file mode 100644
index 000000000000..472488d9ce12
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.16.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="http://elilo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
+ mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0g
+ dev-util/patchutils"
+RDEPEND="sys-boot/efibootmgr
+ sys-fs/dosfstools"
+
+S="${WORKDIR}/${P}-source"
+
+src_unpack() {
+ unpack ${A} ./${P}-source.tar.gz
+ mv debian "${S}"/ || die
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
+
+ # The patches Debian had were merged upstream.
+ #epatch debian/patches/*.diff
+
+ case $(tc-arch) in
+ ia64) iarch=ia64 ;;
+ x86) iarch=ia32 ;;
+ amd64) iarch=x86_64 ;;
+ *) die "unknown architecture: $(tc-arch)" ;;
+ esac
+
+ # Now Gentooize it.
+ sed -i \
+ -e '1s:/bin/sh:/bin/bash:' \
+ -e "s:##VERSION##:${PV}:" \
+ -e 's:Debian GNU/:Gentoo :g' \
+ -e 's:Debian:Gentoo:g' \
+ -e 's:debian:gentoo:g' \
+ -e "s:dpkg --print-architecture:echo ${iarch}:" \
+ debian/elilo.sh || die
+}
+
+src_compile() {
+ # "prefix" on the next line specifies where to find gcc, as, ld,
+ # etc. It's not the usual meaning of "prefix". By blanking it we
+ # allow PATH to be searched.
+ local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+ emake -j1 \
+ prefix= \
+ AS="$(tc-getAS)" \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ HOSTARCH=${iarch} \
+ ARCH=${iarch} \
+ EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
+ GNUEFILIB="${libdir}" \
+ EFILIB="${libdir}" \
+ EFICRT0="${libdir}"
+}
+
+src_install() {
+ exeinto /usr/lib/elilo
+ doexe elilo.efi
+
+ newsbin debian/elilo.sh elilo
+ dosbin tools/eliloalt
+
+ insinto /etc
+ newins "${FILESDIR}"/elilo.conf.sample elilo.conf
+
+ dodoc docs/* "${FILESDIR}"/elilo.conf.sample
+ doman debian/*.[0-9]
+}
diff --git a/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch b/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch
new file mode 100644
index 000000000000..b574c29f220b
--- /dev/null
+++ b/sys-boot/elilo/files/elilo-3.16-elilo-loop.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/299665
+
+patch by Dennis Schridde <devurandom@gmx.net>
+
+--- a/debian/elilo.sh
++++ b/debian/elilo.sh
+@@ -321,6 +321,8 @@
+
+ mnt()
+ {
++ local loop
++
+ ## we can even create bootstrap filesystem images directly if you
+ ## ever wanted too.
+ if [ -f "$boot" ] ; then
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index f898fca29dd2..95e3c0d57f84 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,4 +1,5 @@
DIST cinder-2015.1.1.tar.gz 2068679 SHA256 11c6c7e749021978b9daeb631aa9f776a9ab70ea1549e8443a225a20ca98a945 SHA512 8d0cb81ef474b82ce4e377818916b1c2cf3566993c58f756ead17ee57d3316d61cfc0603cfce4e4460c43a6ef17813f5d85126fbaceed54c86060f3e22e39313 WHIRLPOOL a3a896c33a436c485490dd95169252e014757f8c6f555ffa61e26406b9405dbedd90f89bf424b2cfd2f145770f064ce551b59395b337f9b6d883301ca50d49b9
DIST cinder-2015.1.2.tar.gz 2079511 SHA256 8baa42a3008b0bb0870df678237c0d06ab8ee148b3bf5c00c6b95cfe05c52333 SHA512 312b89068b80c642b8055084575e378ae449b615b6135f15f7aa327808e7a4f05887d0626dc69329c8d08001cf8a8488453b783a81c0f083340e15a8dd411f26 WHIRLPOOL dc3b532603167ac7a910120aca122d54646190c9d1a38a024d03675051b726f09f62d55f8bf5e404d83f8a9df8968bd953c3abf30d6eb45851134d399177fa7e
DIST cinder-7.0.0.tar.gz 2584282 SHA256 8c6b0729ca6a5eaed273b1ca918064e0fd29bcbc537e19ba4dd9cdc73a090933 SHA512 6c34c28450f7eee435df9a59ea4ddbb8209e168b5399e2022223aa76001fd31d00ae0b0012cee5a32f887321a6c3b9f02d206edf99b08fd08d909734e0720f44 WHIRLPOOL 5a116e024d7bc0aad5aef70b59b2d4de8dbbc64f79f0a348d102bed57ecbfcb8f24f79f0e52dbd2bbfd74d6585d01529bea4126e2228cd2cc13507a5cf8d0781
+DIST cinder-7.0.1.tar.gz 2599206 SHA256 e02c37efdff0e1792f2a621b2dbb260e66db7c61fc0bba8cc1dd428e09eb05dc SHA512 1b32b96624f05e23b1ca78136ed2a8854df0da474912a2bcdda28395f233115271ae9f9f2e4eafa2efa97b2c9ae9143413bf60e13dc3c4f6251a6ba08e95daa0 WHIRLPOOL 92d9345ae81751c71b74964b6e8cbd33fc797cd8b9c449651449cd878a335811e4895ca3e1cd23d0f28d8bec68d23b6a199a6c2a21510d5858cfbe3f971d1444
DIST liberty-cinder.conf.sample 122223 SHA256 dad765cbe995576c23b4aa45e316272826fd9a293bf111bcdcb2da9ab562fb43 SHA512 64696a606233fa6a0f2c844924a61e48552f38ce54dadbc8202455d32b9fa37575c8e1d5c1b3e086d37f832e60f754007f2bfa9cd4915e3ae5fd52e283896f64 WHIRLPOOL 2d03754cfe60be0b0f278181e3b9cec399227e643032d9bb53fdafb4504793da6459ceb9b93802d5452ab9b77d9b613ff87f04605833553011a0847d9d3f7e2c
diff --git a/sys-cluster/cinder/cinder-7.0.1.ebuild b/sys-cluster/cinder/cinder-7.0.1.ebuild
new file mode 100644
index 000000000000..bf4eb5d8faba
--- /dev/null
+++ b/sys-cluster/cinder/cinder-7.0.1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
+ https://dev.gentoo.org/~prometheanfire/dist/cinder/liberty/cinder.conf.sample -> liberty-cinder.conf.sample"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ app-admin/sudo
+ test? (
+ ${RDEPEND}
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
+ >=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
+ <=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ <=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.2[${PYTHON_USEDEP}]
+ <=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+ <=dev-python/mox3-0.12.0[${PYTHON_USEDEP}]
+ >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+ <=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
+ >=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
+ <=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+ <=dev-python/oslotest-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ <=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ <=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+ >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+ <=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ <=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
+ >=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
+ <=dev-python/os-testr-0.4.2[${PYTHON_USEDEP}]
+ >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+ <=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
+ >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
+ <=dev-python/bandit-0.16.2[${PYTHON_USEDEP}]
+ >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
+ )"
+
+RDEPEND="
+ ${CDEPEND}
+ ~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ <=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+ <=dev-python/enum34-1.1.1[$(python_gen_usedep 'python2_7')]
+ >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+ <=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+ >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+ <=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+ <=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
+ <=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+ >=dev-python/kombu-3.0.7[${PYTHON_USEDEP}]
+ <=dev-python/kombu-3.0.30[${PYTHON_USEDEP}]
+ >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+ <=dev-python/lxml-3.5.0[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+ !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+ <=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+ <=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-middleware-3.1.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-middleware-3.2.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-reports-0.1.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-reports-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-rootwrap-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-versionedobjects-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+ <=dev-python/osprofiler-0.3.1[${PYTHON_USEDEP}]
+ >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+ <=dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
+ <=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ <=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ <=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
+ <=dev-python/pyparsing-2.0.6[${PYTHON_USEDEP}]
+ ~dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
+ >=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+ <=dev-python/python-glanceclient-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
+ !~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
+ <=dev-python/python-novaclient-2.35.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+ !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+ <=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+ <=dev-python/python-swiftclient-2.7.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+ <=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ <=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+ <=dev-python/routes-2.2[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
+ <=dev-python/taskflow-1.25.0[${PYTHON_USEDEP}]
+ >=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
+ <=dev-python/rtslib-fb-2.1.58[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ <=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ sqlite? (
+ >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ dev-python/mysql-python
+ >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ dev-python/psycopg:2
+ >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ )
+ >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+ <=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
+ ~dev-python/suds-0.6[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+ <=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-vmware-0.16.0[${PYTHON_USEDEP}]
+ <=dev-python/oslo-vmware-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/os-brick-0.4.0[${PYTHON_USEDEP}]
+ <=dev-python/os-brick-0.6.0[${PYTHON_USEDEP}]
+ iscsi? (
+ sys-block/tgt
+ sys-block/open-iscsi
+ )
+ lvm? ( sys-fs/lvm2 )
+ memcached? ( net-misc/memcached )
+ app-emulation/qemu
+ sys-fs/sysfsutils"
+# qemu is needed for image conversion
+
+PATCHES=(
+
+)
+
+pkg_setup() {
+ linux-info_pkg_setup
+ CONFIG_CHECK_MODULES="ISCSI_TCP"
+ if linux_config_exists; then
+ for module in ${CONFIG_CHECK_MODULES}; do
+ linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+ done
+ fi
+ enewgroup cinder
+ enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+ nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install() {
+ distutils-r1_python_install
+ keepdir /etc/cinder
+ dodir /etc/cinder/rootwrap.d
+
+ for svc in api scheduler volume; do
+ newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+ done
+
+ insinto /etc/cinder
+ insopts -m0640 -o cinder -g cinder
+ newins "${FILESDIR}/etc.liberty/api-httpd.conf" "api-httpd.conf"
+ newins "${FILESDIR}/etc.liberty/api-paste.ini" "api-paste.ini"
+ newins "${DISTDIR}/liberty-cinder.conf.sample" "cinder.conf.sample"
+ newins "${FILESDIR}/etc.liberty/logging_sample.conf" "logging_sample.conf"
+ newins "${FILESDIR}/etc.liberty/policy.json" "policy.json"
+ newins "${FILESDIR}/etc.liberty/rootwrap.conf" "rootwrap.conf"
+ insinto /etc/cinder/rootwrap.d
+ newins "${FILESDIR}/etc.liberty/rootwrap.d/volume.filters" "volume.filters"
+
+ dodir /var/log/cinder
+ fowners cinder:cinder /var/log/cinder
+
+ #add sudoers definitions for user nova
+ insinto /etc/sudoers.d/
+ insopts -m 0440 -o root -g root
+ newins "${FILESDIR}/cinder.sudoersd" cinder
+}
+
+pkg_postinst() {
+ if use iscsi ; then
+ elog "Cinder needs tgtd to be installed and running to work with iscsi"
+ elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+ fi
+}
diff --git a/sys-devel/bison/bison-2.7.1.ebuild b/sys-devel/bison/bison-2.7.1.ebuild
index 951b3ffbffe0..fd0e06aa878d 100644
--- a/sys-devel/bison/bison-2.7.1.ebuild
+++ b/sys-devel/bison/bison-2.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static"
RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-devel/gcc/gcc-4.8.3.ebuild b/sys-devel/gcc/gcc-4.8.3.ebuild
index 40fb333bb190..3b9c0b6dc90b 100644
--- a/sys-devel/gcc/gcc-4.8.3.ebuild
+++ b/sys-devel/gcc/gcc-4.8.3.ebuild
@@ -22,7 +22,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
inherit eutils toolchain
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.4.ebuild b/sys-devel/gcc/gcc-4.8.4.ebuild
index e99481871e4d..468bba8ed81e 100644
--- a/sys-devel/gcc/gcc-4.8.4.ebuild
+++ b/sys-devel/gcc/gcc-4.8.4.ebuild
@@ -22,7 +22,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
inherit eutils toolchain
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.5.ebuild b/sys-devel/gcc/gcc-4.8.5.ebuild
index f1da2545fba7..00154dc14c3b 100644
--- a/sys-devel/gcc/gcc-4.8.5.ebuild
+++ b/sys-devel/gcc/gcc-4.8.5.ebuild
@@ -22,7 +22,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
inherit eutils toolchain
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.9.3.ebuild b/sys-devel/gcc/gcc-4.9.3.ebuild
index e9624868e16c..5868123f46c2 100644
--- a/sys-devel/gcc/gcc-4.9.3.ebuild
+++ b/sys-devel/gcc/gcc-4.9.3.ebuild
@@ -22,7 +22,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
inherit eutils toolchain
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index b343363fe105..72f21e0ad2fe 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,4 +1,3 @@
DIST gettext-0.19.4.tar.gz 17717034 SHA256 8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97 WHIRLPOOL 2eb56c47d76f63b6557ae825538a35ae59f3f77da35321688547d9c420f47879c79ca1ab8ebd6bc6b4a3a8ce59ed620648884cd46455f6218213587f76967918
-DIST gettext-0.19.5.1.tar.gz 18353792 SHA256 a198d53b0c1fb11421ead197b7e76b144e887c9ef5a685323e92cbc950227731 SHA512 c2c1dc51d9c24c92b86619ec613b87266eae08a21280855e5b0d44c09e7efc8390341ded85dd85270c5a933ee21a6179373cc5cf275b6bc80cb510c7830d0ef4 WHIRLPOOL 2a2143edc4f3fdb37109aeb762072aa49f88045d55913ae282d203d5a7b3e848df5318c9e4f5e44f63a9f9a7c61c6018900df55b3bdfe06fa975a709322656d6
-DIST gettext-0.19.5.tar.gz 18352722 SHA256 1258814ba174e4783194be2dc93648bd630d4dda166eae034e4ad54489dcf73a SHA512 10b435bba4fcdcf15be3182b3c9756eef5b6ef6ec1416c1b12af35345fc1668c26dce81081e2616b7e2b0d174051fddd6fe6266e4709652a751a91fcf241e610 WHIRLPOOL 94db59cc7a1f3bf833e23a9c9aa25524c571b9585928d083438e7357d034236493584c0137f0c2bb58120f2e55f35055bc36731736162d9ad3e01aa6a1cf270e
DIST gettext-0.19.6.tar.gz 18619659 SHA256 ed4b4c19bd3a3034eb6769500a3592ff616759ef43cf30586dbb7a17c9dd695d SHA512 46adfd4a6d0038aba999658bebe51117e3ab3dc149a9054c1087d3e79ec7ba3371a7e78a8ca30a8872d162c2dc44aba6e67e4d64808c4f92e1e2bd674174f1db WHIRLPOOL 1988f9ddfd603734b4a632291925c8e5b31e7384eea1c6641d52aa58cb6b8f892e7664dd145a53435b7d2a4540ac65aeae1cb528a004c35832087c2820dafbcb
+DIST gettext-0.19.7.tar.gz 19235781 SHA256 5386d2a40500295783c6a52121adcf42a25519e2d23675950619c9e69558c23f SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d WHIRLPOOL eb51c4be7c0a92c5c33c16329003e21947e0b9d1583c4a785ae6836f81273ea7ec2823a0a28ae81c3b977f2148c0f3bd524949484383ff87510e1d2bc642a786
diff --git a/sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch b/sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch
deleted file mode 100644
index 1a9eaea8413c..000000000000
--- a/sys-devel/gettext/files/gettext-0.19.5.1-version-hack.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-the gettext tooling does not quite understand 4 version components.
-hack it so the output in the configure script sticks to 3 parts.
-this is a horrible hack that really needs an upstream fix.
-
-https://lists.gnu.org/archive/html/bug-gettext/2015-07/msg00027.html
-https://bugs.gentoo.org/556024
-
---- a/gettext-tools/misc/gettextize.in
-+++ b/gettext-tools/misc/gettextize.in
-@@ -1235,7 +1235,7 @@
- func_modify_configure_in "(AC_OUTPUT): Remove command that created po/Makefile."
- sed -e '/^\(dnl \|\)AC_LINK_FILES(\$nls_cv_header_libgt, \$nls_cv_header_intl)$/d' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
- func_modify_configure_in "(AC_LINK_FILES): Remove invocation."
--sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"$version"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-+sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"${version%.?}"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
- func_modify_configure_in "(AM_GNU_GETTEXT_VERSION): Bump to $version."
- $do_changelog && func_ChangeLog_finish
-
diff --git a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild b/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild
deleted file mode 100644
index b6fb8a8ac2c2..000000000000
--- a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
-
-# only runtime goes multilib
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- dev-libs/libxml2
- dev-libs/expat
- acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses )
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
- !git? ( cvs? ( dev-vcs/cvs ) )
- git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # only installed for native ABI
- /usr/include/gettext-po.h
-)
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- # This patch should not be included in version bumps (at least to 0.19.2).
- # Perhaps 0.19.5.2 will be broken in the same way. #556024
- [[ ${PV} != 0.19.5.1 ]] && die
- epatch "${FILESDIR}"/${P}-version-hack.patch #556024
-
- epunt_cxx
- elibtoolize
-}
-
-multilib_src_configure() {
- local myconf=(
- # switches common to runtime and top-level
- --cache-file="${BUILD_DIR}"/config.cache
- --docdir="/usr/share/doc/${PF}"
-
- $(use_enable cxx libasprintf)
- $(use_enable java)
- $(use_enable static-libs static)
- )
-
- # Build with --without-included-gettext (on glibc systems)
- if use elibc_glibc || use elibc_musl ; then
- myconf+=(
- --without-included-gettext
- $(use_enable nls)
- )
- else
- myconf+=(
- --with-included-gettext
- --enable-nls
- )
- fi
- use cxx || export CXX=$(tc-getCC)
-
- local ECONF_SOURCE=${S}
- if ! multilib_is_native_abi ; then
- # for non-native ABIs, we build runtime only
- ECONF_SOURCE+=/gettext-runtime
- else
- # remaining switches
- myconf+=(
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
-
- $(use_enable acl)
- $(use_enable ncurses curses)
- $(use_enable openmp)
- $(use_with git)
- $(usex git --without-cvs $(use_with cvs))
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi ; then
- dosym msgfmt /usr/bin/gmsgfmt #43435
- dobin gettext-tools/misc/gettextize
-
- [[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
- fi
-}
-
-multilib_src_install_all() {
- use nls || rm -r "${D}"/usr/share/locale
- use static-libs || prune_libtool_files --all
-
- rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
-
- if use java ; then
- java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
- rm -f "${D}"/usr/share/${PN}/*.jar
- rm -f "${D}"/usr/share/${PN}/*.class
- if use doc ; then
- java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
- rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
- fi
- fi
-
- if use doc ; then
- dohtml "${D}"/usr/share/doc/${PF}/*.html
- else
- rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
- fi
- rm -f "${D}"/usr/share/doc/${PF}/*.html
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
diff --git a/sys-devel/gettext/gettext-0.19.5.ebuild b/sys-devel/gettext/gettext-0.19.5.ebuild
deleted file mode 100644
index 0b284dd905df..000000000000
--- a/sys-devel/gettext/gettext-0.19.5.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
-
-# only runtime goes multilib
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- dev-libs/libxml2
- dev-libs/expat
- acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses )
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
- !git? ( cvs? ( dev-vcs/cvs ) )
- git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # only installed for native ABI
- /usr/include/gettext-po.h
-)
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
- epunt_cxx
- elibtoolize
-}
-
-multilib_src_configure() {
- local myconf=(
- # switches common to runtime and top-level
- --cache-file="${BUILD_DIR}"/config.cache
- --docdir="/usr/share/doc/${PF}"
-
- $(use_enable cxx libasprintf)
- $(use_enable java)
- $(use_enable static-libs static)
- )
-
- # Build with --without-included-gettext (on glibc systems)
- if use elibc_glibc || use elibc_musl ; then
- myconf+=(
- --without-included-gettext
- $(use_enable nls)
- )
- else
- myconf+=(
- --with-included-gettext
- --enable-nls
- )
- fi
- use cxx || export CXX=$(tc-getCC)
-
- local ECONF_SOURCE=${S}
- if ! multilib_is_native_abi ; then
- # for non-native ABIs, we build runtime only
- ECONF_SOURCE+=/gettext-runtime
- else
- # remaining switches
- myconf+=(
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
-
- $(use_enable acl)
- $(use_enable ncurses curses)
- $(use_enable openmp)
- $(use_with git)
- $(usex git --without-cvs $(use_with cvs))
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi ; then
- dosym msgfmt /usr/bin/gmsgfmt #43435
- dobin gettext-tools/misc/gettextize
-
- [[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
- fi
-}
-
-multilib_src_install_all() {
- use nls || rm -r "${D}"/usr/share/locale
- use static-libs || prune_libtool_files --all
-
- rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
-
- if use java ; then
- java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
- rm -f "${D}"/usr/share/${PN}/*.jar
- rm -f "${D}"/usr/share/${PN}/*.class
- if use doc ; then
- java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
- rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
- fi
- fi
-
- if use doc ; then
- dohtml "${D}"/usr/share/doc/${PF}/*.html
- else
- rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
- fi
- rm -f "${D}"/usr/share/doc/${PF}/*.html
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
diff --git a/sys-devel/gettext/gettext-0.19.6.ebuild b/sys-devel/gettext/gettext-0.19.7.ebuild
index 0f921c07273d..7677f88eb8dd 100644
--- a/sys-devel/gettext/gettext-0.19.6.ebuild
+++ b/sys-devel/gettext/gettext-0.19.7.ebuild
@@ -2,25 +2,33 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+# Note: Keep version bumps in sync with dev-libs/libintl.
-inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
+EAPI="5"
+
+inherit eutils mono-env libtool java-pkg-opt-2 multilib-minimal
DESCRIPTION="GNU locale utilities"
HOMEPAGE="https://www.gnu.org/software/gettext/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3+ LGPL-2.1+"
+# Only libasprintf is under the LGPL (and libintl is in a sep package),
+# so put that license behind USE=cxx.
+LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
# only runtime goes multilib
+# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
+# would depend on older subslots if they were available (based on the ABIs that
+# are explicitly handled), but expat doesn't currently use subslots.
DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- dev-libs/libxml2
+ >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+ dev-libs/libxml2:=
dev-libs/expat
acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses )
+ ncurses? ( sys-libs/ncurses:0= )
java? ( >=virtual/jdk-1.4 )"
RDEPEND="${DEPEND}
!git? ( cvs? ( dev-vcs/cvs ) )
@@ -51,49 +59,35 @@ multilib_src_configure() {
--cache-file="${BUILD_DIR}"/config.cache
--docdir="/usr/share/doc/${PF}"
+ # Emacs support is now in a separate package
+ --without-emacs
+ --without-lispdir
+ # glib depends on us so avoid circular deps
+ --with-included-glib
+ # libcroco depends on glib which ... ^^^
+ --with-included-libcroco
+ # this will _disable_ libunistring (since it is not bundled),
+ # see bug #326477
+ --with-included-libunistring
+ # Never build libintl since it's in dev-libs/libintl now.
+ --without-included-gettext
+
+ $(use_enable acl)
+ $(use_enable cxx c++)
$(use_enable cxx libasprintf)
+ $(use_with git)
+ $(usex git --without-cvs $(use_with cvs))
$(use_enable java)
+ $(use_enable ncurses curses)
+ $(use_enable nls)
+ $(use_enable openmp)
$(use_enable static-libs static)
)
- # Build with --without-included-gettext (on glibc systems)
- if use elibc_glibc || use elibc_musl ; then
- myconf+=(
- --without-included-gettext
- $(use_enable nls)
- )
- else
- myconf+=(
- --with-included-gettext
- --enable-nls
- )
- fi
- use cxx || export CXX=$(tc-getCC)
-
local ECONF_SOURCE=${S}
if ! multilib_is_native_abi ; then
# for non-native ABIs, we build runtime only
ECONF_SOURCE+=/gettext-runtime
- else
- # remaining switches
- myconf+=(
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
-
- $(use_enable acl)
- $(use_enable ncurses curses)
- $(use_enable openmp)
- $(use_with git)
- $(usex git --without-cvs $(use_with cvs))
- )
fi
econf "${myconf[@]}"
@@ -105,8 +99,6 @@ multilib_src_install() {
if multilib_is_native_abi ; then
dosym msgfmt /usr/bin/gmsgfmt #43435
dobin gettext-tools/misc/gettextize
-
- [[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
fi
}
diff --git a/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch b/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch
new file mode 100644
index 000000000000..3854a18497b1
--- /dev/null
+++ b/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch
@@ -0,0 +1,86 @@
+From 5dad120f9c9bc74c73edadb0467d8df81ae46066 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Wed, 5 Aug 2015 05:34:27 -0700
+Subject: [PATCH 08/13] Apply split-layout-compiler-rt.patch
+
+https://llvm.org/bugs/show_bug.cgi?id=24155
+---
+ lib/msan/msan.h | 30 ++++++++++++++++++++----------
+ lib/msan/msan_allocator.cc | 12 +++++++++++-
+ 2 files changed, 31 insertions(+), 11 deletions(-)
+
+diff --git a/lib/msan/msan.h b/lib/msan/msan.h
+index cd8bc19..6251b38 100644
+--- a/lib/msan/msan.h
++++ b/lib/msan/msan.h
+@@ -94,17 +94,27 @@ const MappingDesc kMemoryLayout[] = {
+
+ #elif SANITIZER_LINUX && SANITIZER_WORDSIZE == 64
+
+-// Requries PIE binary and ASLR enabled.
+-// Main thread stack and DSOs at 0x7f0000000000 (sometimes 0x7e0000000000).
+-// Heap at 0x600000000000.
++// All of the following configurations are supported.
++// ASLR disabled: main executable and DSOs at 0x555550000000
++// PIE and ASLR: main executable and DSOs at 0x7f0000000000
++// non-PIE: main executable below 0x100000000, DSOs at 0x7f0000000000
++// Heap at 0x700000000000.
+ const MappingDesc kMemoryLayout[] = {
+- {0x000000000000ULL, 0x200000000000ULL, MappingDesc::INVALID, "invalid"},
+- {0x200000000000ULL, 0x400000000000ULL, MappingDesc::SHADOW, "shadow"},
+- {0x400000000000ULL, 0x600000000000ULL, MappingDesc::ORIGIN, "origin"},
+- {0x600000000000ULL, 0x800000000000ULL, MappingDesc::APP, "app"}};
+-
+-#define MEM_TO_SHADOW(mem) (((uptr)(mem)) & ~0x400000000000ULL)
+-#define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x200000000000ULL)
++ {0x000000000000ULL, 0x050000000000ULL, MappingDesc::APP, "app-1"},
++ {0x050000000000ULL, 0x100000000000ULL, MappingDesc::SHADOW, "shadow-2"},
++ {0x100000000000ULL, 0x150000000000ULL, MappingDesc::INVALID, "invalid"},
++ {0x150000000000ULL, 0x200000000000ULL, MappingDesc::ORIGIN, "origin-2"},
++ {0x200000000000ULL, 0x300000000000ULL, MappingDesc::SHADOW, "shadow-3"},
++ {0x300000000000ULL, 0x400000000000ULL, MappingDesc::ORIGIN, "origin-3"},
++ {0x400000000000ULL, 0x500000000000ULL, MappingDesc::INVALID, "invalid"},
++ {0x500000000000ULL, 0x550000000000ULL, MappingDesc::SHADOW, "shadow-1"},
++ {0x550000000000ULL, 0x600000000000ULL, MappingDesc::APP, "app-2"},
++ {0x600000000000ULL, 0x650000000000ULL, MappingDesc::ORIGIN, "origin-1"},
++ {0x650000000000ULL, 0x700000000000ULL, MappingDesc::INVALID, "invalid"},
++ {0x700000000000ULL, 0x800000000000ULL, MappingDesc::APP, "app-3"}};
++
++#define MEM_TO_SHADOW(mem) (((uptr)(mem)) ^ 0x500000000000ULL)
++#define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x100000000000ULL)
+
+ #else
+ #error "Unsupported platform"
+diff --git a/lib/msan/msan_allocator.cc b/lib/msan/msan_allocator.cc
+index 6df3566..e588bf8 100644
+--- a/lib/msan/msan_allocator.cc
++++ b/lib/msan/msan_allocator.cc
+@@ -49,7 +49,8 @@ struct MsanMapUnmapCallback {
+ typedef SizeClassAllocator32<0, SANITIZER_MMAP_RANGE_SIZE, sizeof(Metadata),
+ SizeClassMap, kRegionSizeLog, ByteMap,
+ MsanMapUnmapCallback> PrimaryAllocator;
+-#elif defined(__x86_64__)
++
++#elif SANITIZER_FREEBSD && SANITIZER_WORDSIZE == 64
+ static const uptr kAllocatorSpace = 0x600000000000ULL;
+ static const uptr kAllocatorSize = 0x80000000000; // 8T.
+ static const uptr kMetadataSize = sizeof(Metadata);
+@@ -67,6 +68,15 @@ struct MsanMapUnmapCallback {
+ typedef SizeClassAllocator64<kAllocatorSpace, kAllocatorSize, kMetadataSize,
+ DefaultSizeClassMap,
+ MsanMapUnmapCallback> PrimaryAllocator;
++#elif SANITIZER_LINUX && SANITIZER_WORDSIZE == 64
++ static const uptr kAllocatorSpace = 0x700000000000ULL;
++ static const uptr kAllocatorSize = 0x80000000000; // 8T.
++ static const uptr kMetadataSize = sizeof(Metadata);
++ static const uptr kMaxAllowedMallocSize = 8UL << 30;
++
++ typedef SizeClassAllocator64<kAllocatorSpace, kAllocatorSize, kMetadataSize,
++ DefaultSizeClassMap,
++ MsanMapUnmapCallback> PrimaryAllocator;
+ #endif
+ typedef SizeClassAllocatorLocalCache<PrimaryAllocator> AllocatorCache;
+ typedef LargeMmapAllocator<MsanMapUnmapCallback> SecondaryAllocator;
+--
+2.6.4
+
diff --git a/sys-devel/llvm/files/llvm-3.7-msan-fix.patch b/sys-devel/llvm/files/llvm-3.7-msan-fix.patch
new file mode 100644
index 000000000000..e44baa8a5164
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-3.7-msan-fix.patch
@@ -0,0 +1,79 @@
+From 8b0f2fff6e080c053e4fd94d44a694768b8c156e Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Wed, 5 Aug 2015 05:35:26 -0700
+Subject: [PATCH 78/84] Apply split-layout-llvm.patch
+
+https://llvm.org/bugs/show_bug.cgi?id=24155
+---
+ lib/Transforms/Instrumentation/MemorySanitizer.cpp | 31 ++++++++++++++++------
+ 1 file changed, 23 insertions(+), 8 deletions(-)
+
+diff --git a/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/lib/Transforms/Instrumentation/MemorySanitizer.cpp
+index 286a563..2ab8bfc 100644
+--- a/lib/Transforms/Instrumentation/MemorySanitizer.cpp
++++ b/lib/Transforms/Instrumentation/MemorySanitizer.cpp
+@@ -194,6 +194,12 @@ static cl::opt<bool> ClCheckConstantShadow("msan-check-constant-shadow",
+ static const char *const kMsanModuleCtorName = "msan.module_ctor";
+ static const char *const kMsanInitName = "__msan_init";
+
++static cl::opt<bool> ClSplitLayout(
++ "msan-split-layout", cl::desc(
++ "use experimental memory layout compatible with "
++ "non-pie and non-aslr execution"),
++ cl::Hidden, cl::init(true));
++
+ namespace {
+
+ // Memory map parameters used in application-to-shadow address calculation.
+@@ -228,6 +234,13 @@ static const MemoryMapParams Linux_X86_64_MemoryMapParams = {
+ 0x200000000000, // OriginBase
+ };
+
++static const MemoryMapParams Linux_X86_64_Split_MemoryMapParams = {
++ 0, // AndMask (not used)
++ 0x500000000000, // XorMask
++ 0, // ShadowBase (not used)
++ 0x100000000000, // OriginBase
++};
++
+ // mips64 Linux
+ static const MemoryMapParams Linux_MIPS64_MemoryMapParams = {
+ 0x004000000000, // AndMask
+@@ -483,7 +496,8 @@ bool MemorySanitizer::doInitialization(Module &M) {
+ case Triple::Linux:
+ switch (TargetTriple.getArch()) {
+ case Triple::x86_64:
+- MapParams = Linux_X86_MemoryMapParams.bits64;
++ MapParams = ClSplitLayout ? &Linux_X86_64_Split_MemoryMapParams
++ : Linux_X86_MemoryMapParams.bits64;
+ break;
+ case Triple::x86:
+ MapParams = Linux_X86_MemoryMapParams.bits32;
+@@ -893,16 +907,17 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
+ ///
+ /// Offset = (Addr & ~AndMask) ^ XorMask
+ Value *getShadowPtrOffset(Value *Addr, IRBuilder<> &IRB) {
++ Value *OffsetLong = IRB.CreatePointerCast(Addr, MS.IntptrTy);
++
+ uint64_t AndMask = MS.MapParams->AndMask;
+- assert(AndMask != 0 && "AndMask shall be specified");
+- Value *OffsetLong =
+- IRB.CreateAnd(IRB.CreatePointerCast(Addr, MS.IntptrTy),
+- ConstantInt::get(MS.IntptrTy, ~AndMask));
++ if (AndMask)
++ OffsetLong =
++ IRB.CreateAnd(OffsetLong, ConstantInt::get(MS.IntptrTy, ~AndMask));
+
+ uint64_t XorMask = MS.MapParams->XorMask;
+- if (XorMask != 0)
+- OffsetLong = IRB.CreateXor(OffsetLong,
+- ConstantInt::get(MS.IntptrTy, XorMask));
++ if (XorMask)
++ OffsetLong =
++ IRB.CreateXor(OffsetLong, ConstantInt::get(MS.IntptrTy, XorMask));
+ return OffsetLong;
+ }
+
+--
+2.6.4
+
diff --git a/sys-devel/llvm/llvm-3.7.0-r5.ebuild b/sys-devel/llvm/llvm-3.7.0-r5.ebuild
new file mode 100644
index 000000000000..cc861921a4d8
--- /dev/null
+++ b/sys-devel/llvm/llvm-3.7.0-r5.ebuild
@@ -0,0 +1,540 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils eutils flag-o-matic multilib \
+ multilib-minimal python-single-r1 toolchain-funcs pax-utils
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="http://llvm.org/"
+SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
+ clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
+ http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
+ http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
+ lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz )
+ !doc? ( http://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.bz2 )"
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml
+ python +static-analyzer test xml video_cards_radeon kernel_Darwin"
+
+COMMON_DEPEND="
+ sys-libs/zlib:0=
+ clang? (
+ python? ( ${PYTHON_DEPS} )
+ static-analyzer? (
+ dev-lang/perl:*
+ ${PYTHON_DEPS}
+ )
+ xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+ )
+ gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+ libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+ libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+ ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+ ocaml? (
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/findlib
+ dev-ml/ocaml-ctypes
+ !!<=sys-devel/llvm-3.7.0-r1[ocaml] )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${COMMON_DEPEND}
+ dev-lang/perl
+ >=sys-devel/make-3.81
+ >=sys-devel/flex-2.5.4
+ >=sys-devel/bison-1.875d
+ || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
+ ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
+ )
+ || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
+ kernel_Darwin? ( sys-libs/libcxx )
+ clang? ( xml? ( virtual/pkgconfig ) )
+ doc? ( dev-python/sphinx )
+ gold? ( sys-libs/binutils-libs )
+ libffi? ( virtual/pkgconfig )
+ lldb? ( dev-lang/swig )
+ !!<dev-python/configparser-3.3.0.2
+ ocaml? ( test? ( dev-ml/ounit ) )
+ ${PYTHON_DEPS}"
+RDEPEND="${COMMON_DEPEND}
+ clang? ( !<=sys-devel/clang-${PV}-r99 )
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+
+# pypy gives me around 1700 unresolved tests due to open file limit
+# being exceeded. probably GC does not close them fast enough.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ lldb? ( clang xml )"
+
+S=${WORKDIR}/${P/_}.src
+
+pkg_pretend() {
+ # in megs
+ # !clang !debug !multitarget -O2 400
+ # !clang !debug multitarget -O2 550
+ # clang !debug !multitarget -O2 950
+ # clang !debug multitarget -O2 1200
+ # !clang debug multitarget -O2 5G
+ # clang !debug multitarget -O0 -g 12G
+ # clang debug multitarget -O2 16G
+ # clang debug multitarget -O0 -g 14G
+
+ local build_size=550
+ use clang && build_size=1200
+
+ if use debug; then
+ ewarn "USE=debug is known to increase the size of package considerably"
+ ewarn "and cause the tests to fail."
+ ewarn
+
+ (( build_size *= 14 ))
+ elif is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn "The C++ compiler -g option is known to increase the size of the package"
+ ewarn "considerably. If you run out of space, please consider removing it."
+ ewarn
+
+ (( build_size *= 10 ))
+ fi
+
+ # Multiply by number of ABIs :).
+ local abis=( $(multilib_get_enabled_abis) )
+ (( build_size *= ${#abis[@]} ))
+
+ local CHECKREQS_DISK_BUILD=${build_size}M
+ check-reqs_pkg_pretend
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ echo 'int main() {return 0;}' > "${T}"/test.cxx || die
+ ebegin "Trying to build a C++11 test program"
+ if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
+ eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
+ eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
+ eerror "to gcc-4.7 or an equivalent version supporting C++11."
+ die "Currently active compiler does not support -std=c++11"
+ fi
+ eend ${?}
+ fi
+}
+
+pkg_setup() {
+ pkg_pretend
+}
+
+src_unpack() {
+ default
+
+ if use clang; then
+ mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \
+ || die "clang source directory move failed"
+ mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \
+ || die "compiler-rt source directory move failed"
+ mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \
+ || die "clang-tools-extra source directory move failed"
+ fi
+
+ if use lldb; then
+ mv "${WORKDIR}"/lldb-${PV/_}.src "${S}"/tools/lldb \
+ || die "lldb source directory move failed"
+ fi
+}
+
+src_prepare() {
+ # Make ocaml warnings non-fatal, bug #537308
+ sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die
+ # Fix libdir for ocaml bindings install, bug #559134
+ epatch "${FILESDIR}"/cmake/${P}-ocaml-multilib.patch
+ # Do not build/install ocaml docs with USE=-doc, bug #562008
+ epatch "${FILESDIR}"/cmake/${P}-ocaml-build_doc.patch
+
+ # Make it possible to override Sphinx HTML install dirs
+ # https://llvm.org/bugs/show_bug.cgi?id=23780
+ epatch "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+
+ # Prevent race conditions with parallel Sphinx runs
+ # https://llvm.org/bugs/show_bug.cgi?id=23781
+ epatch "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+
+ # Prevent installing libgtest
+ # https://llvm.org/bugs/show_bug.cgi?id=18341
+ epatch "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
+
+ # Fix llvm-config for shared linking and sane flags
+ # https://bugs.gentoo.org/show_bug.cgi?id=565358
+ epatch "${FILESDIR}"/llvm-3.7-llvm-config.patch
+
+ # Fix msan with newer kernels, #569894
+ epatch "${FILESDIR}"/llvm-3.7-msan-fix.patch
+
+ if use clang; then
+ # Automatically select active system GCC's libraries, bugs #406163 and #417913
+ epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+
+ epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch
+
+ sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
+ tools/clang/tools/scan-build/scan-build || die
+
+ # Install clang runtime into /usr/lib/clang
+ # https://llvm.org/bugs/show_bug.cgi?id=23792
+ epatch "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+ epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+
+ # Do not force -march flags on arm platforms
+ # https://bugs.gentoo.org/show_bug.cgi?id=562706
+ epatch "${FILESDIR}"/cmake/${P}-compiler_rt_arm_march_flags.patch
+
+ # Make it possible to override CLANG_LIBDIR_SUFFIX
+ # (that is used only to find LLVMgold.so)
+ # https://llvm.org/bugs/show_bug.cgi?id=23793
+ epatch "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+
+ pushd projects/compiler-rt >/dev/null || die
+
+ # Fix msan with newer kernels, compiler-rt part, #569894
+ epatch "${FILESDIR}"/compiler-rt-3.7-msan-fix.patch
+
+ # Fix WX sections, bug #421527
+ find lib/builtins -type f -name '*.S' -exec sed \
+ -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
+ -i {} + || die
+
+ popd >/dev/null || die
+ fi
+
+ if use lldb; then
+ # Do not install dummy readline.so module from
+ # https://llvm.org/bugs/show_bug.cgi?id=18841
+ sed -e 's/add_subdirectory(readline)/#&/' \
+ -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
+
+ # Fix Python paths, bugs #562436 and #562438
+ epatch "${FILESDIR}"/${PN}-3.7-lldb_python.patch
+ sed -e "s/GENTOO_LIBDIR/$(get_libdir)/" \
+ -i tools/lldb/scripts/Python/finishSwigPythonLLDB.py || die
+
+ # Fix build with ncurses[tinfo], #560474
+ # http://llvm.org/viewvc/llvm-project?view=revision&revision=247842
+ epatch "${FILESDIR}"/cmake/${P}-lldb_tinfo.patch
+ fi
+
+ # User patches
+ epatch_user
+
+ python_setup
+
+ # Native libdir is used to hold LLVMgold.so
+ NATIVE_LIBDIR=$(get_libdir)
+}
+
+multilib_src_configure() {
+ local targets
+ if use multitarget; then
+ targets=all
+ else
+ targets='host;BPF;CppBackend'
+ use video_cards_radeon && targets+=';AMDGPU'
+ fi
+
+ local ffi_cflags ffi_ldflags
+ if use libffi; then
+ ffi_cflags=$(pkg-config --cflags-only-I libffi)
+ ffi_ldflags=$(pkg-config --libs-only-L libffi)
+ fi
+
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ "${mycmakeargs[@]}"
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=ON
+ -DLLVM_ENABLE_TIMESTAMPS=OFF
+ -DLLVM_TARGETS_TO_BUILD="${targets}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ -DLLVM_ENABLE_FFI=$(usex libffi)
+ -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DWITH_POLLY=OFF # TODO
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ -DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+ -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+
+ -DHAVE_HISTEDIT_H=$(usex libedit)
+ )
+
+ if use clang; then
+ mycmakeargs+=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+ # libgomp support fails to find headers without explicit -I
+ # furthermore, it provides only syntax checking
+ -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+ )
+ fi
+
+ if use lldb; then
+ mycmakeargs+=(
+ -DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+ -DLLDB_DISABLE_CURSES=$(usex !ncurses)
+ -DLLDB_ENABLE_TERMINFO=$(usex ncurses)
+ )
+ fi
+
+ if ! multilib_is_native_abi || ! use ocaml; then
+ mycmakeargs+=(
+ -DOCAMLFIND=NO
+ )
+ fi
+# Note: go bindings have no CMake rules at the moment
+# but let's kill the check in case they are introduced
+# if ! multilib_is_native_abi || ! use go; then
+ mycmakeargs+=(
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+ )
+# fi
+
+ if multilib_is_native_abi; then
+ mycmakeargs+=(
+ -DLLVM_BUILD_DOCS=$(usex doc)
+ -DLLVM_ENABLE_SPHINX=$(usex doc)
+ -DLLVM_ENABLE_DOXYGEN=OFF
+ -DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
+ -DSPHINX_WARNINGS_AS_ERRORS=OFF
+ -DLLVM_INSTALL_UTILS=ON
+ )
+
+ if use clang; then
+ mycmakeargs+=(
+ -DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang"
+ )
+ fi
+
+ if use gold; then
+ mycmakeargs+=(
+ -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+ )
+ fi
+
+ if use lldb; then
+ mycmakeargs+=(
+ -DLLDB_DISABLE_PYTHON=$(usex !python)
+ )
+ fi
+
+ else
+ if use clang; then
+ mycmakeargs+=(
+ # disable compiler-rt on non-native ABI because:
+ # 1. it fails to configure because of -m32
+ # 2. it is shared between ABIs so no point building
+ # it multiple times
+ -DLLVM_EXTERNAL_COMPILER_RT_BUILD=OFF
+ -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF
+ )
+ fi
+ if use lldb; then
+ mycmakeargs+=(
+ # only run swig on native abi
+ -DLLDB_DISABLE_PYTHON=ON
+ )
+ fi
+ fi
+
+ if use clang; then
+ mycmakeargs+=(
+ -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+ -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+ -DCLANG_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}"
+ )
+
+ # -- not needed when compiler-rt is built with host compiler --
+ # cmake passes host C*FLAGS to compiler-rt build
+ # which is performed using clang, so we need to filter out
+ # some flags clang does not support
+ # (if you know some more flags that don't work, let us know)
+ #filter-flags -msahf -frecord-gcc-switches
+ fi
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ # TODO: not sure why this target is not correctly called
+ multilib_is_native_abi && use doc && use ocaml && cmake-utils_src_make docs/ocaml_doc
+
+ pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+ pax-mark m "${BUILD_DIR}"/bin/lli
+ pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+ if use test; then
+ pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+ pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+ pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+ fi
+}
+
+multilib_src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ local test_targets=( check )
+ # clang tests won't work on non-native ABI because we skip compiler-rt
+ multilib_is_native_abi && use clang && test_targets+=( check-clang )
+ cmake-utils_src_make "${test_targets[@]}"
+}
+
+src_install() {
+ local MULTILIB_CHOST_TOOLS=(
+ /usr/bin/llvm-config
+ )
+
+ local MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/llvm/Config/config.h
+ /usr/include/llvm/Config/llvm-config.h
+ )
+
+ if use clang; then
+ # note: magic applied in multilib_src_install()!
+ CLANG_VERSION=${PV%.*}
+
+ MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/clang
+ /usr/bin/clang++
+ /usr/bin/clang-cl
+ /usr/bin/clang-${CLANG_VERSION}
+ /usr/bin/clang++-${CLANG_VERSION}
+ /usr/bin/clang-cl-${CLANG_VERSION}
+ )
+
+ MULTILIB_WRAPPED_HEADERS+=(
+ /usr/include/clang/Config/config.h
+ )
+ fi
+
+ multilib-minimal_src_install
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+
+ if multilib_is_native_abi; then
+ # Install man pages.
+ use doc || doman "${WORKDIR}"/${P}-manpages/*.1
+
+ # Symlink the gold plugin.
+ if use gold; then
+ dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
+ dosym "../../../../$(get_libdir)/LLVMgold.so" \
+ "/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
+ fi
+ fi
+
+ # apply CHOST and CLANG_VERSION to clang executables
+ # they're statically linked so we don't have to worry about the lib
+ if use clang; then
+ local clang_tools=( clang clang++ clang-cl )
+ local i
+
+ # cmake gives us:
+ # - clang-X.Y
+ # - clang -> clang-X.Y
+ # - clang++, clang-cl -> clang
+ # we want to have:
+ # - clang-X.Y
+ # - clang++-X.Y, clang-cl-X.Y -> clang-X.Y
+ # - clang, clang++, clang-cl -> clang*-X.Y
+ # so we need to fix the two tools
+ for i in "${clang_tools[@]:1}"; do
+ rm "${ED%/}/usr/bin/${i}" || die
+ dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}"
+ dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}"
+ done
+
+ # now prepend ${CHOST} and let the multilib-build.eclass symlink it
+ if ! multilib_is_native_abi; then
+ # non-native? let's replace it with a simple wrapper
+ for i in "${clang_tools[@]}"; do
+ rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die
+ cat > "${T}"/wrapper.tmp <<-_EOF_
+ #!${EPREFIX}/bin/sh
+ exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}"
+ _EOF_
+ newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}"
+ done
+ fi
+ fi
+}
+
+multilib_src_install_all() {
+ insinto /usr/share/vim/vimfiles
+ doins -r utils/vim/*/.
+ # some users may find it useful
+ dodoc utils/vim/vimrc
+
+ if use clang; then
+ pushd tools/clang >/dev/null || die
+
+ if use static-analyzer ; then
+ pushd tools/scan-build >/dev/null || die
+
+ dobin ccc-analyzer scan-build
+ dosym ccc-analyzer /usr/bin/c++-analyzer
+ doman scan-build.1
+
+ insinto /usr/share/llvm
+ doins scanview.css sorttable.js
+
+ popd >/dev/null || die
+ fi
+
+ if use static-analyzer ; then
+ pushd tools/scan-view >/dev/null || die
+
+ python_doscript scan-view
+
+ touch __init__.py || die
+ python_moduleinto clang
+ python_domodule *.py Resources
+
+ popd >/dev/null || die
+ fi
+
+ if use python ; then
+ pushd bindings/python/clang >/dev/null || die
+
+ python_moduleinto clang
+ python_domodule *.py
+
+ popd >/dev/null || die
+ fi
+
+ # AddressSanitizer symbolizer (currently separate)
+ dobin "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
+
+ popd >/dev/null || die
+
+ python_fix_shebang "${ED}"
+ if use lldb && use python; then
+ python_optimize
+ fi
+ fi
+}
+
+pkg_postinst() {
+ if use clang; then
+ elog "To enable OpenMP support in clang, install sys-libs/libomp"
+ elog "and use the '-fopenmp=libomp' command line option"
+ fi
+}
diff --git a/sys-fs/eudev/eudev-3.1.5.ebuild b/sys-fs/eudev/eudev-3.1.5.ebuild
index 25f0d21e6c90..4e61a04544a2 100644
--- a/sys-fs/eudev/eudev-3.1.5.ebuild
+++ b/sys-fs/eudev/eudev-3.1.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-2
else
SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.116-r3 b/sys-fs/lvm2/files/lvm.rc-2.02.116-r3
new file mode 100644
index 000000000000..059e8805a35e
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.116-r3
@@ -0,0 +1,134 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+_get_lvm_path() {
+ local lvm_path=
+ for lvm_path in /bin/lvm /sbin/lvm ; do
+ [ -x "$lvm_path" ] && break
+ done
+ echo "${lvm_path}"
+}
+
+_need_lvmetad()
+{
+ local lvm_path="$(_get_lvm_path)"
+ [ ! -x "${lvm_path}" ] && return 1
+ ${lvm_path} dumpconfig global | grep -q 'use_lvmetad=1'
+}
+
+depend() {
+ before checkfs fsck
+ after modules device-mapper
+ need lvmetad sysfs
+ # We may use lvmetad based on the configuration. If we added lvmetad
+ # support while lvm2 is running then we aren't dependent on it. For the
+ # more common case, if its disabled in the config we aren't dependent
+ # on it.
+ config /etc/lvm/lvm.conf
+ local _need=
+ if service_started; then
+ _need=$(service_get_value need)
+ else
+ if _need_lvmetad; then
+ _need="${_need} lvmetad"
+ fi
+ fi
+ need ${_need}
+}
+
+config='global { locking_dir = "/run/lock/lvm" }'
+
+dm_in_proc() {
+ local retval=0
+ for x in devices misc ; do
+ grep -qs 'device-mapper' /proc/${x}
+ retval=$((${retval} + $?))
+ done
+ return ${retval}
+}
+
+start() {
+ # LVM support for /usr, /home, /opt ....
+ # This should be done *before* checking local
+ # volumes, or they never get checked.
+
+ # NOTE: Add needed modules for LVM or RAID, etc
+ # to /etc/modules.autoload if needed
+ lvm_path="$(_get_lvm_path)"
+ for lvm_path in /bin/lvm /sbin/lvm ; do
+ [ -x "$lvm_path" ] && break
+ done
+ if [ ! -x "$lvm_path" ]; then
+ eerror "Cannot find lvm binary in /sbin or /bin!"
+ return 1
+ fi
+ if [ -z "${CDBOOT}" ] ; then
+ if [ -e /proc/modules ] && ! dm_in_proc ; then
+ modprobe dm-mod 2>/dev/null
+ fi
+ if [ -d /proc/lvm ] || dm_in_proc ; then
+ ebegin "Setting up the Logical Volume Manager"
+ #still echo stderr for debugging
+ lvm_commands="#! ${lvm_path} --config '${config}'\n"
+ # Extra PV find pass because some devices might not have been available until very recently
+ lvm_commands="${lvm_commands}pvscan\n"
+ # Now make the nodes
+ lvm_commands="${lvm_commands}vgscan --mknodes\n"
+ # And turn them on!
+ lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n"
+ # Order of this is important, have to work around dash and LVM readline
+ printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
+ eend $? "Failed to setup the LVM"
+ fi
+ fi
+}
+
+start_post()
+{
+ # Save if we needed lvmetad
+ if _need_lvmetad; then
+ service_set_value need lvmetad
+ fi
+}
+
+stop() {
+ for lvm_path in /bin/lvm /sbin/lvm ; do
+ [ -x "$lvm_path" ] && break
+ done
+ if [ ! -x "$lvm_path" ]; then
+ eerror "Cannot find lvm binary in /sbin or /bin!"
+ return 1
+ fi
+# Stop LVM2
+if [ -x /sbin/vgs ] && \
+ [ -x /sbin/vgchange ] && \
+ [ -x /sbin/lvchange ] && \
+ [ -f /etc/lvmtab -o -d /etc/lvm ] && \
+ [ -d /proc/lvm -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
+then
+ einfo "Shutting down the Logical Volume Manager"
+
+ VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
+
+ if [ "$VGS" ]
+ then
+ ebegin " Shutting Down LVs & VGs"
+ #still echo stderr for debugging
+ lvm_commands="#! ${lvm_path} --config '${config}'\n"
+ # Extra PV find pass because some devices might not have been available until very recently
+ lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n"
+ # Now make the nodes
+ lvm_commands="${lvm_commands}vgchange --sysinit -a ln ${VGS}\n"
+ # Order of this is important, have to work around dash and LVM readline
+ printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
+ eend $? "Failed (possibly some LVs still needed for /usr or root)"
+ fi
+
+ einfo "Finished shutting down the Logical Volume Manager"
+ return 0
+fi
+}
+
+# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3 b/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3
new file mode 100644
index 000000000000..db0b698ec2ec
--- /dev/null
+++ b/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3
@@ -0,0 +1,18 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+pidfile="/run/lvmetad.pid"
+command="/sbin/lvmetad"
+command_args="${LVMETAD_OPTS:=-p ${pidfile}}"
+start_stop_daemon_args="--pidfile ${pidfile}"
+
+depend() {
+ :
+}
+
+start_pre()
+{
+ checkpath --directory /run/lvm || return 1
+}
diff --git a/sys-fs/lvm2/lvm2-2.02.116-r3.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r3.ebuild
new file mode 100644
index 000000000000..bbb4279c2222
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.116-r3.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://sources.redhat.com/lvm2/"
+SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+ ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
+ systemd? ( udev )
+ clvm? ( !systemd )"
+
+DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
+ readline? ( sys-libs/readline:0= )
+ udev? ( >=virtual/libudev-208:=[static-libs?] )"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="${DEPEND_COMMON}
+ >=sys-apps/baselayout-2.2
+ !<sys-apps/openrc-0.11
+ !<sys-fs/cryptsetup-1.1.2
+ !!sys-fs/clvm
+ !!sys-fs/lvm-user
+ >=sys-apps/util-linux-2.16
+ lvm2create_initrd? (
+ app-arch/cpio
+ sys-apps/makedev
+ )
+ thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+# USE 'static' currently only works with eudev, bug 520450
+DEPEND="${DEPEND_COMMON}
+ virtual/pkgconfig
+ >=sys-devel/binutils-2.20.1-r1
+ static? (
+ selinux? ( sys-libs/libselinux[static-libs] )
+ udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
+ >=sys-apps/util-linux-2.16[static-libs]
+ )"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+pkg_setup() {
+ local CONFIG_CHECK="~SYSVIPC"
+
+ if use udev; then
+ local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+ if linux_config_exists; then
+ local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+ if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+ ewarn "It's recommended to set an empty value to the following kernel config option:"
+ ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+ fi
+ fi
+ fi
+
+ check_extra_config
+
+ # 1. Genkernel no longer copies /sbin/lvm blindly.
+ if use static; then
+ elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+ elog "their static versions. If you need the static binaries,"
+ elog "you must append .static to the filename!"
+ fi
+}
+
+src_prepare() {
+ # Gentoo specific modification(s):
+ epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch
+
+ sed -i \
+ -e "1iAR = $(tc-getAR)" \
+ -e "s:CC ?= @CC@:CC = $(tc-getCC):" \
+ make.tmpl.in || die #444082
+
+ sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
+
+ if use udev && ! use device-mapper-only; then
+ sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
+ elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
+ elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
+ elog "if it was previously disabled."
+ fi
+
+ sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
+
+ # For upstream -- review and forward:
+ epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+ epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+ epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+ epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+ epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
+ epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
+ epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid
+ epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
+
+ # Without thin-privision-tools, there is nothing to install for target install_man7:
+ use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; }
+
+ eautoreconf
+}
+
+src_configure() {
+ filter-flags -flto
+ local myconf
+ local buildmode
+
+ myconf="${myconf} $(use_enable !device-mapper-only dmeventd)"
+ myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
+ myconf="${myconf} $(use_enable !device-mapper-only applib)"
+ myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
+ myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
+ use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs"
+
+ # Most of this package does weird stuff.
+ # The build options are tristate, and --without is NOT supported
+ # options: 'none', 'internal', 'shared'
+ if use static; then
+ buildmode="internal"
+ # This only causes the .static versions to become available
+ myconf="${myconf} --enable-static_link"
+ else
+ buildmode="shared"
+ fi
+ dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
+
+ # dmeventd requires mirrors to be internal, and snapshot available
+ # so we cannot disable them
+ myconf="${myconf} --with-mirrors=${dmbuildmode}"
+ myconf="${myconf} --with-snapshots=${dmbuildmode}"
+ if use thin; then
+ myconf="${myconf} --with-thin=internal --with-cache=internal"
+ local texec
+ for texec in check dump repair restore; do
+ myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
+ myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
+ done
+ else
+ myconf="${myconf} --with-thin=none --with-cache=none"
+ fi
+
+ if use lvm1; then
+ myconf="${myconf} --with-lvm1=${buildmode}"
+ else
+ myconf="${myconf} --with-lvm1=none"
+ fi
+
+ # disable O_DIRECT support on hppa, breaks pv detection (#99532)
+ use hppa && myconf="${myconf} --disable-o_direct"
+
+ if use clvm; then
+ myconf="${myconf} --with-cluster=${buildmode}"
+ # 4-state! Make sure we get it right, per bug 210879
+ # Valid options are: none, cman, gulm, all
+ #
+ # 2009/02:
+ # gulm is removed now, now dual-state:
+ # cman, none
+ # all still exists, but is not needed
+ #
+ # 2009/07:
+ # TODO: add corosync and re-enable ALL
+ local clvmd=""
+ use cman && clvmd="cman"
+ #clvmd="${clvmd/cmangulm/all}"
+ [ -z "${clvmd}" ] && clvmd="none"
+ myconf="${myconf} --with-clvmd=${clvmd}"
+ myconf="${myconf} --with-pool=${buildmode}"
+ else
+ myconf="${myconf} --with-clvmd=none --with-cluster=none"
+ fi
+
+ econf \
+ $(use_enable readline) \
+ $(use_enable selinux) \
+ --enable-pkgconfig \
+ --with-confdir="${EPREFIX}"/etc \
+ --exec-prefix="${EPREFIX}" \
+ --sbindir="${EPREFIX}/sbin" \
+ --with-staticdir="${EPREFIX}"/sbin \
+ --libdir="${EPREFIX}/$(get_libdir)" \
+ --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+ --with-default-dm-run-dir=/run \
+ --with-default-run-dir=/run/lvm \
+ --with-default-locking-dir=/run/lock/lvm \
+ --with-default-pid-dir=/run \
+ $(use_enable udev udev_rules) \
+ $(use_enable udev udev_sync) \
+ $(use_with udev udevdir "$(get_udevdir)"/rules.d) \
+ $(use_enable systemd udev-systemd-background-jobs) \
+ "$(systemd_with_unitdir)" \
+ ${myconf} \
+ CLDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+ pushd include >/dev/null
+ emake
+ popd >/dev/null
+
+ if use device-mapper-only ; then
+ emake device-mapper
+ else
+ emake
+ emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
+ fi
+}
+
+src_install() {
+ local inst
+ INSTALL_TARGETS="install install_tmpfiles_configuration"
+ # install systemd related files only when requested, bug #522430
+ use systemd && INSTALL_TARGETS="${INSTALL_TARGETS} install_systemd_units install_systemd_generators"
+ use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
+ for inst in ${INSTALL_TARGETS}; do
+ emake DESTDIR="${D}" ${inst}
+ done
+
+ newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+ newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+ if use !device-mapper-only ; then
+ newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
+ newinitd "${FILESDIR}"/lvm.rc-2.02.116-r3 lvm
+ newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
+
+ newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
+ newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
+ fi
+
+ if use clvm; then
+ newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
+ newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
+ fi
+
+ if use static-libs; then
+ dolib.a libdm/ioctl/libdevmapper.a
+ dolib.a libdaemon/client/libdaemonclient.a #462908
+ #gen_usr_ldscript libdevmapper.so
+ dolib.a daemons/dmeventd/libdevmapper-event.a
+ #gen_usr_ldscript libdevmapper-event.so
+ else
+ rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+ fi
+
+ if use lvm2create_initrd; then
+ dosbin scripts/lvm2create_initrd/lvm2create_initrd
+ doman scripts/lvm2create_initrd/lvm2create_initrd.8
+ newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+ fi
+
+ insinto /etc
+ doins "${FILESDIR}"/dmtab
+
+ dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_postinst() {
+ ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+ ewarn "# rc-update add lvm boot"
+ ewarn
+ ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
+ ewarn "to enable lvm autoactivation and metadata caching."
+}
+
+src_test() {
+ einfo "Tests are disabled because of device-node mucking, if you want to"
+ einfo "run tests, compile the package and see ${S}/tests"
+}
diff --git a/sys-fs/udev/udev-225.ebuild b/sys-fs/udev/udev-225.ebuild
index f73638f12457..fdbc35befa5f 100644
--- a/sys-fs/udev/udev-225.ebuild
+++ b/sys-fs/udev/udev-225.ebuild
@@ -17,7 +17,7 @@ else
https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
fi
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 2bb773064554..d8bbfb20867f 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -8,6 +8,7 @@ DIST genkernel-3.4.49.2.tar.bz2 266427 SHA256 62ade4f83cefc2278e1dc7cf1456974b03
DIST genkernel-3.4.50.tar.bz2 273874 SHA256 d1450b9a38837147f3ec2600bcd05a56df5537a1d9de0c41db123833a5f2f450 SHA512 8b56c0736abaffa1c04dd1315d38ed35be46b72a2e20b5602e946dbabde9c05a66691d3059306f58a17f436124912dd0b39ccc012fff8562b1531cfcb90e7d28 WHIRLPOOL 09d88f2013267021e792b784850057472b40d216b45c8cd8f67c9340c30ee4cdf8161beaa7fd628fb71755a35fed6e64adddd9b957f5c5b7698207fb70d4a7e4
DIST genkernel-3.4.51.4.tar.xz 250400 SHA256 72062b11628eb967690691a7003625fffcd183117a22a8ae718e9bec116ec24f SHA512 85c138fea889b12662e9b0a782b1cd9121c740de35d96f3c56ed37d13fdc0178b265a30f409e7247b69ed4209e5dd13e9cff297079d626bad85f8846d8144e3b WHIRLPOOL 4ca49fe6cf5307ee950da89862a915766a6ca9b36995bb3937ff42cce2f250a845b9733c773e5f77212f2e4b15bfef5aade1f378bd71d7097f8d73292db3df44
DIST genkernel-3.4.52.2.tar.xz 278792 SHA256 3bb893bcf6b3bcf11ded61127a4321df8d4405d196ae256873b9c6680310cb6e SHA512 af8c93b77bdc7601e102311e1a2e168400a83ebf0d664d67fa99e0f4891835c62627cbce5be0e2d14b7e16389441643e90386fe258b4164c1ea414edba7a8557 WHIRLPOOL d2d527a64db46386af6f3b09d37aca0aef6aaecda7249c9247c7c81e6f31d4cec1160473feb5a55750331e80232c140b70ad9cf77f6026fb4173f539cdc170b4
+DIST genkernel-3.4.52.3.tar.xz 282976 SHA256 7873c7ff94f3a36f2c71f4915e82b92afd16f1ecd29af290c5d3e8d300857bf5 SHA512 a68b0149b9a69f59ab3e8d772f35f12643b9500c0c684d4824ca1f3c669b0ea01989a55643cd5b413f35d6fff284cd5ede7183971e202b3788caeb399259191f WHIRLPOOL 6212b7df42755784ade2741150e7093c3dea440cc89897991985fb867d46a05b56931d1a7b083f141fd71ffe96237b1cd26d53ce4e35a155f28508a8e131c03f
DIST gnupg-1.4.11.tar.bz2 3407075 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6 SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae WHIRLPOOL 6f914627e2f527f6616e1f99d2ae06942b734f839d03a45ffa45bf67516a81d58f89e6a85612cf8e5fd83be04ab0b6bc2da8f81114143dad7523e5fcea62366b
DIST mdadm-3.1.5.tar.bz2 292709 SHA256 1d547d0b36a88968e9fc9fb08b0e64de54a53f3d1cfa3656a9f319180f0727d3 SHA512 6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d WHIRLPOOL 003595a1338b3a95ccc176b07a31f26dd5fda9460f2c4d3513b9ca09cdab1c91dab05f8914f2354047fccff42c4dcfc6131a383c84467c2838ac7b1af2f9bef8
DIST open-iscsi-2.0-872.tar.gz 900081 SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0 WHIRLPOOL 4b04c8481c6c5f094ca6f7761828006a84eda7a22a6b3a4d65e7b3e4b39e73ef839ec710b491e7ca731b047fa8c74a9c03a17e85519a62dfbeb95222cfbdd935
diff --git a/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild
index 370ed78fe925..312e070011ee 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild
@@ -43,7 +43,7 @@ else
inherit bash-completion-r1 eutils
SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86"
+ KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild
new file mode 100644
index 000000000000..741f56b3328a
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# genkernel-9999 -> latest Git branch "master"
+# genkernel-VERSION -> normal genkernel release
+
+EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
+
+VERSION_BUSYBOX='1.20.2'
+VERSION_DMRAID='1.0.0.rc16-3'
+VERSION_MDADM='3.1.5'
+VERSION_FUSE='2.8.6'
+VERSION_ISCSI='2.0-872'
+VERSION_LVM='2.02.88'
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.11'
+
+RH_HOME="ftp://sources.redhat.com/pub"
+DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="http://www.busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+ ${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+ mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
+ ${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+ ${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+ ${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+ http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
+ mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+ http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+ mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
+
+if [[ ${PV} == 9999* ]]
+then
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
+ https://anongit.gentoo.org/git/proj/${PN}.git"
+ inherit git-2 bash-completion-r1 eutils
+ S="${WORKDIR}/${PN}"
+ SRC_URI="${COMMON_URI}"
+ KEYWORDS=""
+else
+ inherit bash-completion-r1 eutils
+ SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
+ ${COMMON_URI}"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="cryptsetup ibm selinux"
+
+DEPEND="sys-fs/e2fsprogs
+ selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+ cryptsetup? ( sys-fs/cryptsetup )
+ app-arch/cpio
+ >=app-misc/pax-utils-0.2.1
+ !<sys-apps/openrc-0.9.9"
+# pax-utils is used for lddtree
+
+if [[ ${PV} == 9999* ]]; then
+ DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+pkg_pretend() {
+ if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
+ ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+ ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+ ewarn "to have genkernel create an initramfs with LUKS support."
+ ewarn "Sorry for the inconvenience."
+ echo
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999* ]] ; then
+ git-2_src_unpack
+ else
+ unpack ${P}.tar.xz
+ fi
+}
+
+src_prepare() {
+ if [[ ${PV} == 9999* ]] ; then
+ einfo "Producing ChangeLog from Git history..."
+ pushd "${S}/.git" >/dev/null || die
+ git log > "${S}"/ChangeLog || die
+ popd >/dev/null || die
+ fi
+ if use selinux ; then
+ sed -i 's/###//g' "${S}"/gen_compile.sh || die
+ fi
+
+ # Update software.sh
+ sed -i \
+ -e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+ -e "s:VERSION_MDADM:$VERSION_MDADM:" \
+ -e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+ -e "s:VERSION_FUSE:$VERSION_FUSE:" \
+ -e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+ -e "s:VERSION_LVM:$VERSION_LVM:" \
+ -e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+ -e "s:VERSION_GPG:$VERSION_GPG:" \
+ "${S}"/defaults/software.sh \
+ || die "Could not adjust versions"
+
+ epatch_user
+}
+
+src_compile() {
+ if [[ ${PV} == 9999* ]]; then
+ emake
+ fi
+}
+
+src_install() {
+ insinto /etc
+ doins "${S}"/genkernel.conf
+
+ doman genkernel.8
+ dodoc AUTHORS ChangeLog README TODO
+ dobin genkernel
+ rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+ if use ibm ; then
+ cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+ else
+ cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+ fi
+ insinto /usr/share/genkernel
+ doins -r "${S}"/*
+
+ newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+ insinto /etc
+ doins "${FILESDIR}"/initramfs.mounts
+
+ cd "${DISTDIR}"
+ insinto /usr/share/genkernel/distfiles
+ doins ${A/${P}.tar.xz/}
+}
+
+pkg_postinst() {
+ echo
+ elog 'Documentation is available in the genkernel manual page'
+ elog 'as well as the following URL:'
+ echo
+ elog 'https://www.gentoo.org/doc/en/genkernel.xml'
+ echo
+ ewarn "This package is known to not work with reiser4. If you are running"
+ ewarn "reiser4 and have a problem, do not file a bug. We know it does not"
+ ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
+ ewarn "broken in this regard. Try using a sane filesystem like ext4."
+ echo
+ ewarn "The LUKS support has changed from versions prior to 3.4.4. Now,"
+ ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+ echo
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.12.ebuild
index ac012247814a..922bfd0f3494 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.1.12.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.1.12.ebuild
@@ -13,7 +13,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha amd64 ~arm ~arm64 -hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 -hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 79b5362058ee..521cf84360e8 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -5,3 +5,4 @@ DIST patch-4.4-rc3.xz 6514956 SHA256 41b73ce54efdde419218de2ca2b1bcc2bc135b5e33a
DIST patch-4.4-rc4.xz 6583896 SHA256 e2a1f4198c0f56b0fb9cdf7056a3efb5c99d117e6c55341b69f8e77c01bea450 SHA512 45cfa607086fd41f37e374696042fed0c122449652282d334c3d72c808d609108e99eee538eb9a7529a0498986d31984fc3714a29bab01210548c07647fd8e83 WHIRLPOOL 78274ee4996eaf9951be09cf96c951617adf1e01c29284893720ba37bca1485e9182f8d7e237a288ef053d2a0160869898df39e9130d10c317c0d3ad91617684
DIST patch-4.4-rc5.xz 6618504 SHA256 d976f02cae338d12981c1d9479077379ac7b7b8210fa216549ca24c51b68d85a SHA512 38f1d3b1999374850e7c857d35afeca38d7ae253face09cc689220b38aa0e87a53effcfee13ad6b821a0a7b8a1a9c0ab7a2c0b114d63dbf44f48a41f0c32483f WHIRLPOOL 765f27ca1270a2d3b0d0013a34f71d3891742e57b18f641eacb1ba070abfa8928a7bea7b8e42717ac6568930e83db5c6d113bee40d0a46b17abfb03778b1c42e
DIST patch-4.4-rc6.xz 6663416 SHA256 e4dde89da4c186e16f0af79fb812314a1afb2746349b57831baebb9c762b6c78 SHA512 a8b362c98f76997070e2b8703836c00e5938c37c9c3cf77f4d68c77f78ee5935e305210681c8d45d534027abca249e0b607a57fc4f7df15b756c2a32e4401427 WHIRLPOOL c3e6ba088509c3aa27da021aac74602d90a308d6c66440646ac97a046e644428cd9749d98e3dbcadb9cf6526fb35fea621e83fbd73e1233be8d261060c2d27aa
+DIST patch-4.4-rc7.xz 6677688 SHA256 263c181c3d3a53e9bcd501dbc8f8afc6ed8b81f695bc5a670271530f1e671104 SHA512 3895e3a9515f215bdc3f57c9106392dbd19c7ec1b7c360f405b5e203fa1419487781e85416441b14dad46e03c4389d62d0eda18a0a42d26a1a75b47bcb1a81d2 WHIRLPOOL 72d7cd2daea90837ab7e20dc961c50f5e5e77b9a3501ae2ba165d8d0b80656426db6e100243f4555a40301667a63621c127df4b410d814d09c115f469312c5ce
diff --git a/sys-kernel/git-sources/git-sources-4.4_rc7.ebuild b/sys-kernel/git-sources/git-sources-4.4_rc7.ebuild
new file mode 100644
index 000000000000..5b6ded7aad84
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.4_rc7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_BASE_VER="4.3"
+K_EXP_GENPATCHES_NOUSE="1"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ >=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+ postinst_sources
+}
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index f24d55e35475..73dfa7ef1505 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -4,4 +4,5 @@ DIST mips-sources-4.2.0-patches-v4.tar.xz 156096 SHA256 171594c765df5beeb21170d1
DIST mips-sources-4.3.0-patches-v1.tar.xz 151104 SHA256 a08b5180eda10b71e229a9cb1da577412b64bba0dee12748754cbe1dcbb5c79c SHA512 33c216a2923b82778a36cc77bcd49b985974551c81b4102c8783119bbf72a23cfb6e6e3e7c9412fff0fd5310f289956e313ee72da6797e1d1e42111d971662d5 WHIRLPOOL 6c80f80718f11815e72f9a4eb3e812d0c1bfb13831ef638e5fe4f27182ddd3ea858f398289527e2c5a7f647b763f2ec7361f3159d602468fbb828d01f22d33de
DIST mipsgit-4.2.0-20151126.diff.xz 6308 SHA256 a6f71ddc5f22008f4e3fdd57fa457dc5b9a1bbfc4e66b064bc02c9b04e0f0916 SHA512 58311ed6a6d3292d5f977c7514ae7357c77b96c98282ba5e9a2425b2278c9d8a90599393413cf640ec5b538707e23d06f9b46c158f8685c9ce96fcb99a9f9be2 WHIRLPOOL ca5b63ec1bd817689bb564ed63ed32f0295f926c0f64c69b1342bf357e50105a9c16d0489b2d4a8d3c6aa519bb35461ec1f948adb12909297377e4aab5e01fc1
DIST mipsgit-4.3.0-20151126.diff.xz 2184 SHA256 a919800a221e0fdb4cffca8a24eb42b156818eec2ea666d126866c3effab9938 SHA512 fb50654f0727e031aa7e37b39e4054cedf80d1be5f81f69d03e39c07181f35c95727a637436237f1f75afadaa8af5f5ec3090809adc14b49b5054de89b9daf23 WHIRLPOOL dd61d9727600fe30834f4d6c3a8e12e5848b90580b1b24f30c769df08f72582c012fae9c3e08fcbbe846216e2cb6d36502f79c7ce9a592017609839155d5683a
-DIST patch-4.2.6.xz 210240 SHA256 419f91fa4a6bb0d2c160ef6812341e5aac7e776550efe1d0958ae3b1ce0ea8ce SHA512 bc5414945ba11cc82f1007a7432f682253bc04babb4bd1d40c8f79bad9c9923ca088687caa6b7ec6d5a0b52b9a4d932e15f939b5af9f823e38bb6ad2df2faf4f WHIRLPOOL 99ca0c517cfbd0cf39cf4a2016557dfaeec3aa60854fb1135ddfa8d43b9b55679c92d25999a6d1ac8b92ad8541401f2f29735ad149b5931ccf00d81787d0ae0b
+DIST patch-4.2.8.xz 267084 SHA256 712f93e2f5e8985248852753189001b036b8366008b8c10e3421bb1d45fc20bf SHA512 6353f1fb4e4d4229a9d45f61f666800beb04240d228499f4c4e84a9c7b32fb5a008698d906a722c996251bcf7d82426811a0a679243ff17fded88320c93ec325 WHIRLPOOL 5b6aa338c1b5f68acebb0783a579ef8aa57710cd992edf00f3df4feac63b7ac47426d74c2b4bf44c569df600cb10cbe01e055db6f952be435016d5c1cd9ce7da
+DIST patch-4.3.3.xz 72360 SHA256 95cd81fcbb87953f672150d60950548edc04a88474c42de713b91811557fefa5 SHA512 1b9cc343a589a7cdaa66284b3d7129be9869195f5b839dac0222050af42dc7a7451d4e2bf176c1a9939d6572a44a9b6f4534b0c7a79032881a9bc8f8f56c9c69 WHIRLPOOL 0a949df196f2b9d744af703910fc5a9a3da555648b190bd58febc14da1fdfc229f3528d38157dca3671301713857feaa747d0cf18a9477f62bd22d2ad1729472
diff --git a/sys-kernel/mips-sources/mips-sources-4.2.6.ebuild b/sys-kernel/mips-sources/mips-sources-4.2.8.ebuild
index 0e93e52b746e..0e93e52b746e 100644
--- a/sys-kernel/mips-sources/mips-sources-4.2.6.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.2.8.ebuild
diff --git a/sys-kernel/mips-sources/mips-sources-4.3.0.ebuild b/sys-kernel/mips-sources/mips-sources-4.3.3.ebuild
index 53b423e84569..53b423e84569 100644
--- a/sys-kernel/mips-sources/mips-sources-4.3.0.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.3.3.ebuild
diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch b/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch
new file mode 100644
index 000000000000..72a616a046a8
--- /dev/null
+++ b/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/503838
+http://gcc.gnu.org/PR60465
+https://sourceware.org/ml/libc-alpha/2015-12/msg00556.html
+https://trofi.github.io/posts/189-glibc-on-ia64-or-how-relocations-bootstrap.html
+
+newer versions of gcc generate relocations in the elf_get_dynamic_info func
+which glibc relies on to populate some info structs. those structs are then
+used by ldso to process relocations in itself. glibc requires that there are
+no relocations until that point (*after* elf_get_dynamic_info), so we end up
+crashing during elf_get_dynamic_info because the relocation has not yet been
+processed.
+
+this hack shuffles the code in a way that tricks gcc into not generating the
+relocation. we need to figure out something better for upstream.
+
+--- a/elf/get-dynamic-info.h
++++ b/elf/get-dynamic-info.h
+@@ -66,8 +66,12 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
+ info[DT_VALTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
+ + DT_VERSIONTAGNUM + DT_EXTRANUM] = dyn;
+ else if ((d_tag_utype) DT_ADDRTAGIDX (dyn->d_tag) < DT_ADDRNUM)
+- info[DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
+- + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] = dyn;
++ {
++ d_tag_utype i =
++ DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
++ + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM;
++ info[i] = dyn;
++ }
+ ++dyn;
+ }
+
diff --git a/sys-libs/glibc/glibc-2.19-r1.ebuild b/sys-libs/glibc/glibc-2.19-r1.ebuild
index a683fa59060a..998b7fda0c9c 100644
--- a/sys-libs/glibc/glibc-2.19-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r1.ebuild
@@ -157,8 +157,11 @@ eblit-src_unpack-pre() {
}
eblit-src_unpack-post() {
+ cd "${S}"
+
+ epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
+
if use hardened ; then
- cd "${S}"
einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
epatch "${FILESDIR}"/2.19/glibc-2.19-hardened-configure-picdefault.patch
diff --git a/sys-libs/glibc/glibc-2.20-r2.ebuild b/sys-libs/glibc/glibc-2.20-r2.ebuild
index 8280980a4169..0ea96b27052f 100644
--- a/sys-libs/glibc/glibc-2.20-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.20-r2.ebuild
@@ -160,6 +160,8 @@ eblit-src_unpack-pre() {
eblit-src_prepare-post() {
cd "${S}"
+ epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
+
if use hardened ; then
einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
diff --git a/sys-libs/glibc/glibc-2.21-r1.ebuild b/sys-libs/glibc/glibc-2.21-r1.ebuild
index 9963ae3152d5..3dcbb52c367d 100644
--- a/sys-libs/glibc/glibc-2.21-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.21-r1.ebuild
@@ -160,6 +160,8 @@ eblit-src_unpack-pre() {
eblit-src_prepare-post() {
cd "${S}"
+ epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
+
if use hardened ; then
einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
diff --git a/sys-libs/glibc/glibc-2.22-r1.ebuild b/sys-libs/glibc/glibc-2.22-r1.ebuild
index d6f6033f0d08..6e41fa91e665 100644
--- a/sys-libs/glibc/glibc-2.22-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.22-r1.ebuild
@@ -163,6 +163,8 @@ eblit-src_unpack-pre() {
eblit-src_prepare-post() {
cd "${S}"
+ epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
+
if use hardened ; then
# We don't enable these for non-hardened as the output is very terse --
# it only states that a crash happened. The default upstream behavior
diff --git a/sys-process/xjobs/xjobs-20140125.ebuild b/sys-process/xjobs/xjobs-20140125.ebuild
index d1bd03a06173..2c2b13191832 100644
--- a/sys-process/xjobs/xjobs-20140125.ebuild
+++ b/sys-process/xjobs/xjobs-20140125.ebuild
@@ -5,7 +5,7 @@
EAPI=5
DESCRIPTION="Reads commands line by line and executes them in parallel"
-HOMEPAGE="http://www.maier-komor.de/${PN}.html"
+HOMEPAGE="http://www.maier-komor.de/xjobs.html"
SRC_URI="http://www.maier-komor.de/${PN}/${P}.tgz"
LICENSE="GPL-2"
diff --git a/virtual/libgudev/libgudev-230.ebuild b/virtual/libgudev/libgudev-230.ebuild
index 93baaeac3b92..f76a8234800c 100644
--- a/virtual/libgudev/libgudev-230.ebuild
+++ b/virtual/libgudev/libgudev-230.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE=""
SLOT="0/0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE="introspection static-libs"
DEPEND=""
diff --git a/virtual/perl-podlators/perl-podlators-2.5.3-r1.ebuild b/virtual/perl-podlators/perl-podlators-2.5.3-r1.ebuild
index 5b46e9ea22ec..d2f0d851dd35 100644
--- a/virtual/perl-podlators/perl-podlators-2.5.3-r1.ebuild
+++ b/virtual/perl-podlators/perl-podlators-2.5.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
+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/virtual/python-asyncio/python-asyncio-0.ebuild b/virtual/python-asyncio/python-asyncio-0.ebuild
index 74cf47f6bf7e..4393af68ab93 100644
--- a/virtual/python-asyncio/python-asyncio-0.ebuild
+++ b/virtual/python-asyncio/python-asyncio-0.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
LICENSE=""
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=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/virtual/python-backports_abc/python-backports_abc-0.ebuild b/virtual/python-backports_abc/python-backports_abc-0.ebuild
index d1a561200a07..6fc888fd8b0d 100644
--- a/virtual/python-backports_abc/python-backports_abc-0.ebuild
+++ b/virtual/python-backports_abc/python-backports_abc-0.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
LICENSE=""
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=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/virtual/python-futures/python-futures-0.ebuild b/virtual/python-futures/python-futures-0.ebuild
index 4cc6e5ab2f2c..bd0d71deac45 100644
--- a/virtual/python-futures/python-futures-0.ebuild
+++ b/virtual/python-futures/python-futures-0.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
LICENSE=""
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=""
RDEPEND="${PYTHON_DEPS}
diff --git a/virtual/python-singledispatch/python-singledispatch-0.ebuild b/virtual/python-singledispatch/python-singledispatch-0.ebuild
index 59a31862840b..b79ec274563c 100644
--- a/virtual/python-singledispatch/python-singledispatch-0.ebuild
+++ b/virtual/python-singledispatch/python-singledispatch-0.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
IUSE=""
RDEPEND="$(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)"
diff --git a/virtual/rubygems/rubygems-11.ebuild b/virtual/rubygems/rubygems-11.ebuild
index bdbaa0da09ec..efe92dd5406c 100644
--- a/virtual/rubygems/rubygems-11.ebuild
+++ b/virtual/rubygems/rubygems-11.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22 rbx"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22 ruby23 rbx"
inherit ruby-ng
@@ -21,7 +21,8 @@ RDEPEND="
ruby_targets_ruby19? ( >=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19] )
ruby_targets_ruby20? ( >=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20] )
ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.0.14[ruby_targets_ruby21] )
- ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.4.2[ruby_targets_ruby22] )"
+ ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.4.2[ruby_targets_ruby22] )
+ ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.5.1[ruby_targets_ruby23] )"
pkg_setup() { :; }
src_unpack() { :; }
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index 743950428d5a..7bdb75686aa2 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -1,3 +1,3 @@
-DIST mod_wsgi-4.4.10.tar.gz 633173 SHA256 150091d399d37360108b5e75ec1872251706d75e6c24c9c5e06b4e6d90ecb2c4 SHA512 30c36fab69d50815df18f7323dcc71a2788e58031ea70fd0c9a8fc411527d3532cdecd3a619cf5f70a58991a6e120cbffe8f16a3eb9ee13457956f2afdc07776 WHIRLPOOL 70f61c16457af06c730866c66414c303b60ffd89f9c39eb10b264a019fd9eabb1343424c995eafae3de7d6e8b0c6533a3b2e5060122cd39ba06556e657744277
DIST mod_wsgi-4.4.13.tar.gz 631708 SHA256 e7a84e4af0da953070ab993268118791c7d3c7383d99e8b1c2e0ff88eb29c286 SHA512 e3a057534a6bfbc974d8159df7e926ac47a4ac58f691a2e23dbe98d07a7f82244ef3554386766a0d7b0ad8592bcea15e9570edd793de0031a04e2fd081144a56 WHIRLPOOL 4c0c7c38454771ddd9a22e84053d9cb31fc74252cb029b4cfbb7654e615589b0848609d2b63e06584f5bf778758349a1448f452e8db38148ded869a2fe59eae9
+DIST mod_wsgi-4.4.21.tar.gz 541367 SHA256 69e0b83e6735d04e4b0b75472d178eaf3b935f4f83788f138a2610b67b635187 SHA512 b77523839e6d57b4d6920d8093d2f042c8de1fc965c64dfef425a1c909f7d08e6cce8e2c30cfc7b9956127bfc57233583ecf51a0cbd2c56c540e67c2e408480c WHIRLPOOL e19f5cae4608f8d481d9bb607fa667b0d8686f5f21275265a9ec0a48f16f9624e81ba0c59dc4b420c1afd9848c46a907c926bccbfeba30cb3967689e0922a6c6
DIST mod_wsgi-4.4.9.tar.gz 623831 SHA256 6d62cc584ca3a06e5d27799db594728d66735fdfd1930e50b9853e82019a388a SHA512 346ba680bdac59695258849594f109f9a7886ac863944895978610a3ff33c78b687842beb32fc5e4a044893c5b7f43bc08ac60b7d481ae1a46866071794de7c0 WHIRLPOOL 1aaa80e1f6b321674cfd91bfa0056ba135f849fbb374309f4be96e1664d70b923525bf8b7396574757e8b5c7e5a2eb9f54c2f553e32b25e81f98ec675c021ea1
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.4.10.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.4.21.ebuild
index f934d33de906..f934d33de906 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.4.10.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.4.21.ebuild
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index aafe739cfd6a..d4af3bab1391 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,2 +1,3 @@
DIST passenger-4.0.60.tar.gz 5271049 SHA256 bbb8c18cc371441ce4ee9a4de4d124b6ec5e6af6e95a472b93a72d0357dc88fe SHA512 144df1e5e3dfbf9f9fa13d959c0324760b01c5e86b3f8e52c3d7d9c32eec916a35cc5c52a8c7a5ab9ed1ccee4d7efc9f77fc9940ad1515937a7bfe964753b219 WHIRLPOOL c8f3993b2745eb577c2eddbca2fd280e7db56adbeb4f72ba4b29770d95b991a8012243d1a9bd19aa59a28cfb9326117d649f70cf6d406a4e53acd1e40deb5b57
DIST passenger-5.0.22.tar.gz 5412739 SHA256 0dfefb780ff134e6dd9352886f1086b980777adf27a98507ebfed648938b628f SHA512 9fe709d7d83d65e3f610cd0aacfa07122790d2b0797a5e807be129012254ded63d20b8e6cbe194e47bc7761af8fec67e884ed7f370d18baf06778e3035b0708b WHIRLPOOL 6348af6c8e434d1b64de024ddaf769000d9b6a7d33dc23c5d83d3bdb835f9ee78ca73ead764442f5e481949a28814fe6d2a77891240ebb7a0252c201695e50cb
+DIST passenger-5.0.23.tar.gz 5413416 SHA256 c659fe84ce95635a8561dd5580455f94a431411a61493ab9aa447b881e23dacf SHA512 6d4b3a28c9b277285fa3dbde0ec99c159de5173873204c76a422b0e99e4035a36efe3e729c42d1b0c2198cc3cd8690d7098991af37cf1b0698f3a0ff7e1e288e WHIRLPOOL 322ef7f90df3d0ec6dca0e752539823aebbb9fdc1854322839bde8ebc436a82f652d24aabca4f7dad298879e943926052641f55e83da8fe0bb93aea71c2e1f53
diff --git a/www-apache/passenger/passenger-5.0.23.ebuild b/www-apache/passenger/passenger-5.0.23.ebuild
new file mode 100644
index 000000000000..709ed181fa14
--- /dev/null
+++ b/www-apache/passenger/passenger-5.0.23.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/"
+SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+ >=dev-ruby/rack-1.0.0:*
+ >=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+ >=dev-libs/libuv-1.5.0
+ net-misc/curl[ssl]
+ www-servers/apache[apache2_modules_unixd(+)]"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+need_apache2
+
+pkg_setup() {
+ use debug && append-flags -DPASSENGER_DEBUG
+}
+
+all_ruby_prepare() {
+ epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+
+ # Change these with sed instead of a patch so that we can easily use
+ # the toolchain-funcs methods.
+ sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+ -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+ -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+ # Avoid fixed debugging CFLAGs.
+ sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+ # Use sed here so that we can dynamically set the documentation directory.
+ sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+ -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
+ -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+ src/ruby_supportlib/phusion_passenger.rb || die
+ sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+ # Don't install a tool that won't work in our setup.
+ sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
+ rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+ # Make sure we use the system-provided version where possible
+ rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
+
+ # Avoid building documentation to avoid a dependency on mizuho.
+ #sed -i -e 's/, :doc//' build/packaging.rb || die
+ touch doc/*.html || die
+
+ # Fix hard-coded use of AR
+ sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die
+}
+
+all_ruby_compile() {
+ V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+ APXS2="${APXS}" \
+ HTTPD="${APACHE_BIN}" \
+ FS_LIBDIR='/usr/'$(get_libdir) \
+ USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+ ruby -S rake apache2 || die "rake failed"
+}
+
+each_ruby_compile() {
+ append-flags -fno-strict-aliasing
+
+ V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+ APXS2="${APXS}" \
+ HTTPD="${APACHE_BIN}" \
+ FS_LIBDIR='/usr/'$(get_libdir) \
+ USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+ ${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+ APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+ apache-module_src_install
+
+ # Patch in the correct libdir
+ sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+
+ dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+ DISTDIR="${D}" \
+ RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+ RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+ APXS2="${APXS}" \
+ HTTPD="${APACHE_BIN}" \
+ FS_LIBDIR='/usr/'$(get_libdir) \
+ EXTRA_LDFLAGS="${LDFLAGS}" \
+ USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+ ${RUBY} -S rake fakeroot || die "rake failed"
+}
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 64660fcfb83c..00a6c24c25f4 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1,2 @@
-DIST icingaweb2-2.0.0.tar.gz 9854668 SHA256 a6a5383049e632108ce19b4b85f16a7fdd2f5acb3a6d2af3935254e2bc7fb2e6 SHA512 fb0094b19429d7da533f05ffcb601b47a231e0d5af076775ea8a7c487b0584884172041f443851132bc27634de341190a97e76c750b529dc91b23d166e70ed58 WHIRLPOOL 2d88174296a29b576ba1d4bcf0bcf5a75d166e41c0972327c4c418d3e7bb54ebd74d5d59318c40dc9767d2271954750f9f7248072c8cced6c892a96e5ff5900a
DIST icingaweb2-2.1.0.tar.gz 9957758 SHA256 1fa15efe4056eca4012358d009da1b90c4b4dd3e18d446de33eeaa48728389fd SHA512 fa694bdaba51b82c33b8fd726807df4c626cd944f1d2949cc8768df3e9bbebdb78888f6aaeba2e88f1f843dab8608d69e1b69f6630e438ab9854d3c8b99f4502 WHIRLPOOL 6b3cba5a701757000909c664d115755efaf3564a77a34a71bc4baa96b058efe1d682867fbaedae22e6a1126aa3dfb47389f8474c42f5a45fbffebc77529a7261
+DIST icingaweb2-2.1.2.tar.gz 9800997 SHA256 869a4d0cf72506d098418f3c6bfd642b459dc5e68b5bf349b1e59fb20c3ee73d SHA512 00755ea4dff7084d7fb91cfb36ff14632f18f75231eeecbb09afb293a6a143d84df86dc36d5f4fe47cc36c633857d0897c62278d0fa0c95bd60972b43dd500c7 WHIRLPOOL a4c1662258337d747662e0d3d73f54324a981b595c319e88e094df85dff5d226f925010bbcd64f0cc5639c1ceb606bc7eeca89829faf2115278086295700e5cc
diff --git a/www-apps/icingaweb2/icingaweb2-2.0.0-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.1.2.ebuild
index f3aaa1adfeb2..d713714186ee 100644
--- a/www-apps/icingaweb2/icingaweb2-2.0.0-r1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.1.2.ebuild
@@ -15,7 +15,7 @@ IUSE="apache2 ldap mysql nginx postgres"
KEYWORDS="~amd64 ~x86"
DEPEND=">=net-analyzer/icinga2-2.1.1
- dev-lang/php:*[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
+ dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
dev-php/pecl-imagick
apache2? ( >=www-servers/apache-2.4.0 )
nginx? ( >=www-servers/nginx-1.7.0:* )"
diff --git a/www-apps/jekyll-sass-converter/Manifest b/www-apps/jekyll-sass-converter/Manifest
index 89c8aea468e0..dcf84eb34612 100644
--- a/www-apps/jekyll-sass-converter/Manifest
+++ b/www-apps/jekyll-sass-converter/Manifest
@@ -1 +1 @@
-DIST jekyll-sass-converter-1.3.0.tar.gz 7272 SHA256 a036da688c95ada34749435396dbae81909a43714d41737c9a59d6bc2cbadf21 SHA512 5382224d0d20a3772ff280710a0fa1d3cf2d2946cad54031da51467f1d1ea880f60266c12a4575c6015d0b455bbefd665b719b67dd721f35c610c6a73ecefd24 WHIRLPOOL 7add5b8279ac6b0bce9caf89476c1f0746426cb34007655158f24d5ba1718475cb59d33cbcc33880a2cf4227d1917845acada2c0427a453195e0a8fc3c3400ef
+DIST jekyll-sass-converter-1.4.0.tar.gz 7986 SHA256 934891e329d8258d7968e9b604bc4cf811b640a2ff71f8aa640830132c99fe0e SHA512 2ba7a10b687aa1cdd193c85c70efc15b9ff97987e29b7c591382c706a7d6a588c376995858ab0b1aff38b118eef9fd71c2175a1e6f9a3bc396966fdf13949d1b WHIRLPOOL 44950a3379aae76dabd1fd7bde72f9d48e4a5c99cfed6453356274e06885530d2c10641934f7ddb5f6037f83f06a772b98f638f4aaa6eaf3d550975296d304c7
diff --git a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.3.0.ebuild b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.4.0.ebuild
index 23ec54d2393e..94b85ab9db6c 100644
--- a/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.3.0.ebuild
+++ b/www-apps/jekyll-sass-converter/jekyll-sass-converter-1.4.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="README.md History.markdown"
@@ -20,10 +20,5 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE=""
-ruby_add_rdepend ">=dev-ruby/sass-3.2"
+ruby_add_rdepend "dev-ruby/sass:3.4"
ruby_add_bdepend "test? ( >=www-apps/jekyll-2 )"
-
-all_ruby_prepare() {
- # Fix tests until rspec:3 is in tree.
- sed -i -e "s/truthy/true/" -e "s/falsey/false/" spec/scss_converter_spec.rb spec/sass_converter_spec.rb || die
-}
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 8d6ce8dce2b5..15e87a20628d 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,7 +1,11 @@
DIST owncloud-5.0.19.tar.bz2 10657208 SHA256 38888db65938c9b62816a6a54f52247e12c8909ea0976631eb60a4d92c1b9577 SHA512 c09c56db98ca0f36372c16c799839ebe488fecba57179814378bd1bd3cc1569cacaad48cfe7bed5cf592ccef5e46052c0cd90934a43eab008a0458d279634a56 WHIRLPOOL a212d60158b3f9a3dd1846a9b3f80444656d2afbf7f5c4d0df4ca8fb1a524bd091abc22db5026e7cb5587fe5777af8eac71fd93bdfb2e27d9ff513c36f0561da
DIST owncloud-6.0.9.tar.bz2 30852001 SHA256 f0770dcf6d223129c2aa4b710a1dfdb668d96717543c935011998b45675d19c0 SHA512 f28c7b6d2d81c78adc27a0f5b68dd0f9a57ed90ee4e73945ac0892a4792ec81e00b19485fb3bbec9ba9133608e9eb7a08cb682b5fdae01aedda21132ea5ab5ec WHIRLPOOL 37cf6ff9d087f1af032cfe8c86800f38f38ba7eb2a6f02056e4e36bf0a7ad1ec7f2d96ae2f2e801a8b70757808a9619c33199968b15c6b0c2945551b453f5f75
DIST owncloud-7.0.11.tar.bz2 28637003 SHA256 21dd75de4ed832f16f577eb6763d04c663ef13251153ba2e8847e3f5799d2ad2 SHA512 1e3ca44f85e6cfdfb5691253b6954529cb8b96bc806e82c45bbac55b95ea74f8457237f3c96758ed72a8b04ac6c98684f6c89944975bd3657001a30e2cfb2dc1 WHIRLPOOL 6001e66086e48fae7beeb7e3b7b7fe0708d84a8596302e31e3a56acfed4469bbd01c07ce540d7bddb2b86effa5ea6b89dfad2d1463fa0a5b63c0b88a7f202844
+DIST owncloud-7.0.12.tar.bz2 28498821 SHA256 d1a0f73f5094ec1149b50e2409b5fea0a9bebb16d663789d4b8f98fed341aa91 SHA512 7795550022622bde6b4b43b2d1867410b223c99b02ea8d2c63d0e6f09eb5c3bd7a9e2115e6efd87c64e27fa50b61c44c42d3103107f0389f5733e0a702d25818 WHIRLPOOL f27fdc52cd8ecc4db0f3fe5dde04ff1eef384a79318fdc94aab4e3b0e09f247f512310fce724dfd5c85415f752b7476af59b618bbb9646a5f333438b00b86a65
+DIST owncloud-8.0.10.tar.bz2 26165073 SHA256 3054b997f258178b57efc526e14384829ac8ab94757191f2d03c13fcb0a3cd93 SHA512 dd1664d0858ca55ac0009182ee079fd5f18bba034e26a0d69ae3238a9dda5b87f2dcc2b96092f2d813356ff929847860f48c466c922fd610a888715450a79d69 WHIRLPOOL 8d8ce24c77052828bb4475ff6a121f3029f75e8ca4693102e7ee8be99da58692b3c3763877dd0b4ab8ef7d7c17aff6a1ca201ab3116e98450083fe483063171c
DIST owncloud-8.0.9.tar.bz2 24121882 SHA256 0c1f915f4123dbe07d564cf0172930568690ab5257d2fca4fec4ec515858bef1 SHA512 902182fbbb8fbf6f001a5b3cb7d878a2106f2a9dc6a2810a220fcd3b2600512c1447cfbe5608004743d83079f50d0841eebfdd73d3baf87ddeab45a19c474d12 WHIRLPOOL 20fa34730b1f0dd2e87eb4ed373c2a727e67841bdaa304f11c288e37e2050f82accbb5ab013bf73709391e74966710cbeca82d4b5ff6885cb0ec0537d34f424c
DIST owncloud-8.1.4.tar.bz2 25160172 SHA256 e0f4bf0c85821fc1b6e7f6268080ad3ca3e98c41baa68a9d616809d74a77312d SHA512 168f432c3733ee2c6ed10027b0235920817e7617bb1355ea9f3b85b5c5a88413f1d4c24d745abe7ef2362fa808b2e6bdc95b5cbf4f8aaea3dd3e5907fe5297f1 WHIRLPOOL 589f72d0814b10ca4a3139944346265c12183ecf5b3f9cf6308b77ec46cb005feef2d79bccc9c0c5271125b0574af9f6874da85e05b61337020af405314a36a6
+DIST owncloud-8.1.5.tar.bz2 27250814 SHA256 6d8687e40af32c5ca5adfea3fee556ed987b77ad15a1ead5d40cc87a8b76f4b4 SHA512 961a78e0c0367da2542ec41e5f9c2e4edccb4cdb004a78c4bc3ae7884457b595102e4e0ff5e667a61853d71fbb466b96a0cd3386ab7ec5e2f96c2c141995ab30 WHIRLPOOL f72024042730a693fd3425b65fd2a1f53002aaa65df51b9e65dc297657665c7df32c05dcd1b5319f46f0e4554bf75d2192831b9c786bca5e2c55de73d807a091
DIST owncloud-8.2.0.tar.bz2 26072679 SHA256 fcfe99cf1c3aa06ff369e5b1a602147c08dd977af11800fe06c6a661fa5f770c SHA512 82777951bf4ded1997ea5bb19a145a2feabd9cf454637be9522c14b5d7bc35784d847cd281c2596590ffebe8cc5c02173b35376b612ebc8c113a5e80685b5084 WHIRLPOOL cd4fff556960bdd680e46586b1b835b34b3d86c3279d4c6256755ef6458f9f5e13d8d5d331458104273b60897efa1eac06166f085e5fa33bde4cf58d7d285196
DIST owncloud-8.2.1.tar.bz2 26444342 SHA256 5390b2172562a5bf97a46e9a621d1dd92f9b74efaccbb77978c39eb90d6988d4 SHA512 303e2e573809a8fa661f66fc2bab9c04bc8803f8ffffc1b2d5c4bce23ef067cf450db6c32cc012d3366fcd92ae92d0ceb5d9148bc90e87dae6d97ad84f4bd081 WHIRLPOOL dd9acfbe114f8110ead6bcb2f181a2e7aeb438396f27fd16d26bc0b353898e612087a5b06728dec2445104b3d7067a266439846a29f570e478e21dfe0050b68b
+DIST owncloud-8.2.2.tar.bz2 28922075 SHA256 d5b935f904744b8b40b310f19679702387c852498d0dc7aaeda4555a3db9ad5b SHA512 3830e8311931da3cbb596e927afe638dee6a5d9fd47d623faf4dabbde96fe39ced1bf7006c1b9e39ff52e72e2b849fe9d1012c3b1a86ca9f8c873d820b944b78 WHIRLPOOL 4338b16514f4b9499cc905e5c207358b983fd19598aaac33f8d682bc3855436f908c949ed046c109d3faca8c2735c5280fce4e4101ee46549e8cb5e81ac1a4c6
diff --git a/www-apps/owncloud/owncloud-7.0.12.ebuild b/www-apps/owncloud/owncloud-7.0.12.ebuild
new file mode 100644
index 000000000000..f45c2ab7c03a
--- /dev/null
+++ b/www-apps/owncloud/owncloud-7.0.12.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="http://owncloud.org"
+SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,postgres?,session,simplexml,sqlite?,xmlwriter,zip]
+ virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+ webapp_pkg_setup
+}
+
+src_prepare() {
+ epatch_user
+}
+
+src_install() {
+ webapp_src_preinst
+
+ insinto "${MY_HTDOCSDIR}"
+ doins -r .
+ dodir "${MY_HTDOCSDIR}"/data
+
+ webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+ webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+ webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+ webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+ webapp_src_install
+}
diff --git a/www-apps/owncloud/owncloud-8.0.10.ebuild b/www-apps/owncloud/owncloud-8.0.10.ebuild
new file mode 100644
index 000000000000..1de78dcd7000
--- /dev/null
+++ b/www-apps/owncloud/owncloud-8.0.10.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="http://owncloud.org"
+SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlwriter,zip]
+ virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+ webapp_pkg_setup
+}
+
+src_prepare() {
+ epatch_user
+}
+
+src_install() {
+ webapp_src_preinst
+
+ insinto "${MY_HTDOCSDIR}"
+ doins -r .
+ dodir "${MY_HTDOCSDIR}"/data
+
+ webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+ webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+ webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+ webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+ webapp_src_install
+}
+
+pkg_postinst() {
+ elog "Additional applications (calendar, ...) are no longer provided by default."
+ elog "You can install them after login via the applications management page"
+ elog "(check the recommended tab). No application data is lost."
+ webapp_pkg_postinst
+}
diff --git a/www-apps/owncloud/owncloud-8.1.5.ebuild b/www-apps/owncloud/owncloud-8.1.5.ebuild
new file mode 100644
index 000000000000..1de78dcd7000
--- /dev/null
+++ b/www-apps/owncloud/owncloud-8.1.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="http://owncloud.org"
+SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlwriter,zip]
+ virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+ webapp_pkg_setup
+}
+
+src_prepare() {
+ epatch_user
+}
+
+src_install() {
+ webapp_src_preinst
+
+ insinto "${MY_HTDOCSDIR}"
+ doins -r .
+ dodir "${MY_HTDOCSDIR}"/data
+
+ webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+ webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+ webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+ webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+ webapp_src_install
+}
+
+pkg_postinst() {
+ elog "Additional applications (calendar, ...) are no longer provided by default."
+ elog "You can install them after login via the applications management page"
+ elog "(check the recommended tab). No application data is lost."
+ webapp_pkg_postinst
+}
diff --git a/www-apps/owncloud/owncloud-8.2.2.ebuild b/www-apps/owncloud/owncloud-8.2.2.ebuild
new file mode 100644
index 000000000000..1de78dcd7000
--- /dev/null
+++ b/www-apps/owncloud/owncloud-8.2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="http://owncloud.org"
+SRC_URI="http://download.owncloud.org/community/${P}.tar.bz2 -> ${PF}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlwriter,zip]
+ virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+ webapp_pkg_setup
+}
+
+src_prepare() {
+ epatch_user
+}
+
+src_install() {
+ webapp_src_preinst
+
+ insinto "${MY_HTDOCSDIR}"
+ doins -r .
+ dodir "${MY_HTDOCSDIR}"/data
+
+ webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+ webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+ webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+ webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+ webapp_src_install
+}
+
+pkg_postinst() {
+ elog "Additional applications (calendar, ...) are no longer provided by default."
+ elog "You can install them after login via the applications management page"
+ elog "(check the recommended tab). No application data is lost."
+ webapp_pkg_postinst
+}
diff --git a/www-client/firefox-bin/firefox-bin-38.5.0.ebuild b/www-client/firefox-bin/firefox-bin-38.5.0.ebuild
index 76b8401e330c..218bcb6ef1c1 100644
--- a/www-client/firefox-bin/firefox-bin-38.5.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-38.5.0.ebuild
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
HOMEPAGE="http://www.mozilla.com/firefox"
RESTRICT="strip mirror"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="selinux startup-notification"
diff --git a/www-client/firefox/firefox-38.5.0.ebuild b/www-client/firefox/firefox-38.5.0.ebuild
index 48ff07d8baa5..e134db801a77 100644
--- a/www-client/firefox/firefox-38.5.0.ebuild
+++ b/www-client/firefox/firefox-38.5.0.ebuild
@@ -38,7 +38,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6
DESCRIPTION="Firefox Web Browser"
HOMEPAGE="http://www.mozilla.com/firefox"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/jd/jd-2.8.5_p120826.ebuild b/www-client/jd/jd-2.8.5_p120826.ebuild
index e21b80c489d9..f0fb174834de 100644
--- a/www-client/jd/jd-2.8.5_p120826.ebuild
+++ b/www-client/jd/jd-2.8.5_p120826.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit eutils autotools autotools-utils
+inherit eutils autotools autotools-utils flag-o-matic
MY_P="${P/_p/-}"
MY_P="${MY_P/_/-}"
@@ -38,6 +38,7 @@ S="${WORKDIR}/${MY_P}"
AUTOTOOLS_AUTORECONF=1
src_configure() {
+ append-cxxflags -std=c++11
# use gnomeui sm instead of Xorg SM/ICE
local myeconfargs=(
--with-xdgopen
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 046df91eef12..647a59c9b953 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -2,3 +2,5 @@ DIST opera-developer_35.0.2064.0_amd64.deb 46017124 SHA256 1f4221dcf266cfe5a7b0c
DIST opera-developer_35.0.2064.0_i386.deb 46705518 SHA256 cffb1dd084208249a2e989a4cdfc047e449a54d6557533bae26f8500b127de0b SHA512 51767d2ff8c2eaee6abee069be31984e81885ebf34604c1a5fc4a15e1a150753b6b308334ef87f5db3e1a4b83c7d77d6b9cda9963aec3482fb9d60bc3f03b86f WHIRLPOOL 502859b3c8ea12bbaf9483feac5ca30efdd8ad993c542f0d31f9e12f19c3380c4581cd060d57ae18aae3f3d50dc788d64056ef44b2aa37f197386eb71d74d2de
DIST opera-developer_36.0.2072.0_amd64.deb 45379122 SHA256 e9a553903352120c7b84d8985d7c5dd52a59407cde93b15dcfbc9ac77344cb5a SHA512 fbf9b9ea2e7704681213dcecb176a942ab27907978366fe4f65fadfb8d565bad90197433a6bb66f51ee52afc011ba06981cd2b26d8ff97c85ea7f62e6484b2ed WHIRLPOOL 54e8635ed35fcc9908d690f04af553263218aea47c81a1906bb36874b815b23ad8b5a3e31aa7f4f8a46a903f6f46dcb716be415e9dcac6e03511b99cf77310b0
DIST opera-developer_36.0.2072.0_i386.deb 47196596 SHA256 6aefedb8c25d7e8e2401231b0cd228a905d6b0b09d034034cc0300ec359bc778 SHA512 3329fccf93077772517d52dfcec898ab268b5cb9fa8526738059a1c198f2bcac42dfc71a174f5bf8fc9905b8ff6dc18a1646f6e04b10675165ede080c49aada2 WHIRLPOOL 885729776ddcd644e9ada8bfe7b84299e110370591652b10c46147a19245da514492a89f8c65abc86bc4362eb9cd347142824417199d4ed544e02be5e280e6b1
+DIST opera-developer_36.0.2079.0_amd64.deb 46430558 SHA256 bbbd0a95fc0a25c82c5c41dd7d28ba67e37480d0b26b7791b05cea6a8c7a0de5 SHA512 460d8b476f9d736101085ec45f75af5d9d391ed13f702a11132cfb22c8c553b810bf9b1c98316a7f2143e2058f42fd0edc46812116a6b4c1f32e51ba0167b6a6 WHIRLPOOL df9bb13d4e28a110c654f12dbf37473eec6fe81ef605a45f1b6f5c2ba282dcbbd5b88f70fc905507ea07227fd2d3aca2162270eceb652fe9e4d4209d24c2cdd9
+DIST opera-developer_36.0.2079.0_i386.deb 47359312 SHA256 05d908ba11ce2306094da45c9ca987932bf1d578a79a6ef43b05025a200fce2f SHA512 cd161d4cd1866acba3563b806594185d7d19387a25e5439595bf4ea4c7727af3f8f8c744a655486657c95b7089f3a5a039c0b547654b57f5bad7165dc1d4824c WHIRLPOOL 90577377351282d538e2a9ccefeddf34e5eaf1031c0254ee2dd6d35c8f91e3f6ef6e6b3da7db1dc13163eebce4f5d1bfd811da21d1f5df49c130f64c98ce82ae
diff --git a/www-client/opera-developer/opera-developer-36.0.2079.0.ebuild b/www-client/opera-developer/opera-developer-36.0.2079.0.ebuild
new file mode 100644
index 000000000000..bfeded8ebfc9
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-36.0.2079.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+ af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+ hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
+ sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+ amd64? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
+ x86? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_i386.deb" )
+"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ gnome-base/gconf:2
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype
+ net-misc/curl
+ net-print/cups
+ sys-apps/dbus
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/libnotify
+ x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+ unpack_deb ${A}
+}
+
+src_prepare() {
+ case ${ARCH} in
+ amd64)
+ mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+ rm -r usr/lib || die
+ ;;
+ x86)
+ mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+ ;;
+ esac
+
+ rm usr/bin/${PN} || die
+
+ rm usr/share/doc/${PN}/copyright || die
+ mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+ pushd "${OPERA_HOME}/localization" > /dev/null || die
+ chromium_remove_language_paks
+ popd > /dev/null || die
+
+ sed -i \
+ -e 's|^TargetEnvironment|X-&|g' \
+ usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+ mv * "${D}" || die
+ dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+ fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index cea1d6f45af8..18ff0ada747c 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1 +1,2 @@
DIST surf-0.6.tar.gz 14781 SHA256 fdc1ccfaee5c4f008eeb8fe5f9200d3ad71296e8d7af52bdd6a771f111866805 SHA512 f3550535351e37296280d33d229998e1f00aa605d0dab4a58944cf213721e823a1cfd9134b7bca2a4d61e265122a30d5dc917a290163ed8af2b24cd75d41a100 WHIRLPOOL 2a163d450b47b4964ce3686d76bf6e3a747984f0e86f84e2dccfa9d3e885bc26adf0100cdef48ae19d91f34a2d14d6c4950d2a7db7d333612e2b1fc48b077f99
+DIST surf-0.7.tar.gz 18792 SHA256 95608546fb64d01c7a8153c356be0e284ebe120c3c596a94eb3f3ad47e1c494a SHA512 a6a0e172d99f8ce5a7eb63bd34ef3e55ae26059cc94148cf7c50ac665a5e64d90f4a6b1e71b73c1fa763dfaef9b50aaae79e924724f564b2ddf2b8aef4268ff6 WHIRLPOOL 6dbda75a102e108fb0d2910018b0b622189d3729326ba7ce69c4995c599f0d041bc5add771bdd27444752b6e627fcff6c546259e8605189f465e825578a9949b
diff --git a/www-client/surf/files/surf-0.7-gentoo.patch b/www-client/surf/files/surf-0.7-gentoo.patch
new file mode 100644
index 000000000000..0be4598f1c46
--- /dev/null
+++ b/www-client/surf/files/surf-0.7-gentoo.patch
@@ -0,0 +1,84 @@
+--- a/config.mk
++++ b/config.mk
+@@ -4,27 +4,27 @@
+ # Customize below to fit your system
+
+ # paths
+-PREFIX = /usr/local
++PREFIX = /usr
+ MANPREFIX = ${PREFIX}/share/man
+
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = $(shell $(PKG_CONFIG) --cflags x11)
++X11LIB = $(shell $(PKG_CONFIG) --libs x11)
+
+-GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0`
+-GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0`
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 webkit-1.0)
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 webkit-1.0)
+
+ # includes and libs
+-INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
++INCS = -I. -I/usr/include ${X11INC} ${GTKINC}
++LIBS = ${X11LIB} ${GTKLIB}
+
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS = -g ${LIBS}
++CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
++LDFLAGS = ${LIBS}
+
+ # Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+ #LDFLAGS = ${LIBS}
+
+ # compiler and linker
+-CC = cc
++CC ?= cc
+--- a/Makefile
++++ b/Makefile
+@@ -15,18 +15,16 @@
+ @echo "CC = ${CC}"
+
+ .c.o:
+- @echo CC $<
+- @${CC} -c ${CFLAGS} $<
++ ${CC} -c ${CFLAGS} $<
+
+ ${OBJ}: config.h config.mk
+
+ config.h:
+ @echo creating $@ from config.def.h
+- @cp config.def.h $@
++ cp config.def.h $@
+
+ surf: ${OBJ}
+- @echo CC -o $@
+- @${CC} -o $@ surf.o ${LDFLAGS}
++ ${CC} -o $@ surf.o ${LDFLAGS}
+
+ clean:
+ @echo cleaning
+@@ -44,13 +42,13 @@
+
+ install: all
+ @echo installing executable file to ${DESTDIR}${PREFIX}/bin
+- @mkdir -p ${DESTDIR}${PREFIX}/bin
+- @cp -f surf ${DESTDIR}${PREFIX}/bin
+- @chmod 755 ${DESTDIR}${PREFIX}/bin/surf
++ mkdir -p ${DESTDIR}${PREFIX}/bin
++ cp -f surf ${DESTDIR}${PREFIX}/bin
++ chmod 755 ${DESTDIR}${PREFIX}/bin/surf
+ @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
+- @sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1
+- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1
++ mkdir -p ${DESTDIR}${MANPREFIX}/man1
++ sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1
++ chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1
+
+ uninstall:
+ @echo removing executable file from ${DESTDIR}${PREFIX}/bin
diff --git a/www-client/surf/surf-0.6-r1.ebuild b/www-client/surf/surf-0.6-r1.ebuild
index d5f45712de12..418ef8214691 100644
--- a/www-client/surf/surf-0.6-r1.ebuild
+++ b/www-client/surf/surf-0.6-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="amd64 x86"
COMMON_DEPEND="
- dev-libs/glib
+ dev-libs/glib:2
net-libs/libsoup
net-libs/webkit-gtk:2
x11-libs/gtk+:2
diff --git a/www-client/surf/surf-0.6-r2.ebuild b/www-client/surf/surf-0.6-r2.ebuild
index 327f7d878b68..d724870d2140 100644
--- a/www-client/surf/surf-0.6-r2.ebuild
+++ b/www-client/surf/surf-0.6-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
COMMON_DEPEND="
- dev-libs/glib
+ dev-libs/glib:2
net-libs/libsoup
net-libs/webkit-gtk:2
x11-libs/gtk+:2
diff --git a/www-client/surf/surf-0.7.ebuild b/www-client/surf/surf-0.7.ebuild
new file mode 100644
index 000000000000..3aa0aecc791e
--- /dev/null
+++ b/www-client/surf/surf-0.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils savedconfig toolchain-funcs
+
+DESCRIPTION="a simple web browser based on WebKit/GTK+"
+HOMEPAGE="http://surf.suckless.org/"
+SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+ dev-libs/glib:2
+ net-libs/libsoup
+ net-libs/webkit-gtk:2
+ x11-libs/gtk+:2
+ x11-libs/libX11
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+RDEPEND="
+ !sci-chemistry/surf
+ ${COMMON_DEPEND}
+ x11-apps/xprop
+ x11-misc/dmenu
+ !savedconfig? (
+ net-misc/curl
+ x11-terms/st
+ )
+"
+
+pkg_setup() {
+ if ! use savedconfig; then
+ elog "The default config.h assumes you have"
+ elog " net-misc/curl"
+ elog " x11-terms/st"
+ elog "installed to support the download function."
+ elog "Without those, downloads will fail (gracefully)."
+ elog "You can fix this by:"
+ elog "1) Installing these packages, or"
+ elog "2) Setting USE=savedconfig and changing config.h accordingly."
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.7-gentoo.patch
+
+ epatch_user
+
+ restore_config config.h
+
+ tc-export CC PKG_CONFIG
+}
+
+src_install() {
+ default
+ save_config config.h
+}
+
+pkg_postinst() {
+ if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 0.4.1-r1 ]]; then
+ ewarn "Please correct the permissions of your \$HOME/.surf/ directory"
+ ewarn "and its contents to no longer be world readable (see bug #404983)"
+ fi
+}
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 97df92ea65b9..cf2697d9a9b5 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS=""
COMMON_DEPEND="
- dev-libs/glib
+ dev-libs/glib:2
net-libs/libsoup
net-libs/webkit-gtk:2
x11-libs/gtk+:2
diff --git a/www-misc/shellinabox/shellinabox-2.19.ebuild b/www-misc/shellinabox/shellinabox-2.19.ebuild
index d8f3e6626817..f069cf349ea0 100644
--- a/www-misc/shellinabox/shellinabox-2.19.ebuild
+++ b/www-misc/shellinabox/shellinabox-2.19.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+ssl +pam"
RDEPEND="${DEPEND}"
diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest
index 2b411b88227b..097bfb444f94 100644
--- a/www-plugins/freshplayerplugin/Manifest
+++ b/www-plugins/freshplayerplugin/Manifest
@@ -1,3 +1,4 @@
DIST freshplayerplugin-0.3.1.tar.gz 2711793 SHA256 4ed582896fff618d8025dd51bbf2fae0c5e36e2875065acc536b2c76befb593c SHA512 78e87548ecd758ad9ff0dab59b1b2f68b8b9a639ff19de08046a7090ab51d87f0e4c879b1b0075151ff17642d50ff937e199733c55c4a9cff94599fd98eae9de WHIRLPOOL d8be949cc9a2087d8f62fcfb4a1786d68574a5ec52dccc45da06df9838ee84e8dd4d7f3c3f86703e428df1b3f4d6d75c1e87d0809d3f78550a16ed278d51b211
DIST freshplayerplugin-0.3.2.tar.gz 2713241 SHA256 b3687b9d67ab88c64fea32b17f281f142bf861e33d9135b00da5d90d385d9ce5 SHA512 9c908ce1a168c0797dc3b0da8e98d722cc32d729acb1c4a8f38b7e95c23fe870baabe4b3f8790d021711578fdb9a61f44aba27cebb924fec9aabcf8cd91323e5 WHIRLPOOL 2e9b78bcc3605409ec6853caf31aab03658c044e0d05449a620b31261323856503db8db960db9992d6db4fd61df8f9feb05800124c2f4a450c4ff65b22fc7c34
DIST freshplayerplugin-0.3.3.tar.gz 2722467 SHA256 0dc20d6ca083b24225d8bbab88be1ed483034bde71eb360962de47cdb2e51f00 SHA512 ae85adb7e894adf8c1cd4228d15975c9d5fefdb6c6d3aa90e65d93865996c787f6378eb145f35ed348db67cec0adad794b78a0f77519236c28082630ad3756bc WHIRLPOOL 3e9694738d5e926b44588560b2a6bf50eeeefc35855722bda2494a9d08bd11c8ed844791cdd8a312592be0ef002d3ee6b1c7fc090bbd94ca438ccc8a148eac99
+DIST freshplayerplugin-0.3.4.tar.gz 768318 SHA256 6f0009e64c59caa5c674b63eabb709ba8da6c85fc7cd45a1d66392e3a24da9a5 SHA512 d64fa3e6e38b4e17bef04b09c529ff03e86bb4b348e1e6b9a05f7ff4ee98327e288becd1cc6727db687ddca9e9ed04243c80c5e95e927cafad49a273d9c0d216 WHIRLPOOL 8fe0d582c25042b233d11fba83c50bd5a54e111c7f84b27ed28ba6cfc83c2101095e0460c67d122a3598d020d061f44e8de8bc922a164a251aeb589ac805291d
diff --git a/www-plugins/freshplayerplugin/files/0.3.4-cmake.patch b/www-plugins/freshplayerplugin/files/0.3.4-cmake.patch
new file mode 100644
index 000000000000..59a1a428e55d
--- /dev/null
+++ b/www-plugins/freshplayerplugin/files/0.3.4-cmake.patch
@@ -0,0 +1,70 @@
+diff -uarN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2015-04-25 11:17:24.000000000 -0400
++++ b/CMakeLists.txt 2015-04-26 20:14:43.152014529 -0400
+@@ -61,35 +61,36 @@
+ # optional dependencies
+ message(STATUS "checking for optional dependencies")
+
+-pkg_check_modules(PULSEAUDIO QUIET libpulse)
+-pkg_check_modules(JACK QUIET jack)
+-pkg_check_modules(SOXR QUIET soxr)
+ set(WITH_PULSEAUDIO TRUE CACHE STRING "enable PulseAudio support")
+ set(WITH_JACK TRUE CACHE STRING "enable JACK Audio Connection Kit")
+
+-if (PULSEAUDIO_FOUND AND WITH_PULSEAUDIO)
++if (WITH_PULSEAUDIO)
++ pkg_check_modules(PULSEAUDIO libpulse)
++ if (NOT PULSEAUDIO_FOUND)
++ message(FATAL_ERROR "PulseAudio requested but not found.")
++ endif()
+ add_definitions(-DHAVE_PULSEAUDIO=1)
+- message(STATUS " found libpulse, version ${PULSEAUDIO_VERSION} (optional)")
++ message(STATUS " found libpulse, version ${PULSEAUDIO_VERSION}")
+ list(APPEND REQ_LIBRARY_DIRS ${PULSEAUDIO_LIBRARY_DIRS})
+ list(APPEND REQ_INCLUDE_DIRS ${PULSEAUDIO_INCLUDE_DIRS})
+ list(APPEND REQ_LIBRARIES ${PULSEAUDIO_LIBRARIES})
+-else()
+- message(STATUS " no libpulse found (optional)")
+ endif()
+
+-if (JACK_FOUND AND WITH_JACK)
+- message(STATUS " found jack, version ${JACK_VERSION} (optional)")
+- if (SOXR_FOUND)
+- message(STATUS " found soxr, version ${SOXR_VERSION}")
+- add_definitions(-DHAVE_JACK=1)
+- list(APPEND REQ_LIBRARY_DIRS "${JACK_LIBRARY_DIRS}" "${SOXR_LIBRARY_DIRS}")
+- list(APPEND REQ_INCLUDE_DIRS "${JACK_INCLUDE_DIRS}" "${SOXR_INCLUDE_DIRS}")
+- list(APPEND REQ_LIBRARIES "${JACK_LIBRARIES}" "${SOXR_LIBRARIES}")
+- else()
+- message(STATUS " no soxr found, JACK output disabled")
++if (WITH_JACK)
++ pkg_check_modules(JACK QUIET jack)
++ if (NOT JACK_FOUND)
++ message(FATAL_ERROR "JACK support requested but not found.")
++ endif()
++ pkg_check_modules(SOXR QUIET soxr)
++ if (NOT SOXR_FOUND)
++ message(FATAL_ERROR "SOXR libray not found but needed for JACK support.")
+ endif()
+-else()
+- message(STATUS " no jack found (optional)")
++ message(STATUS " found jack, version ${JACK_VERSION}")
++ message(STATUS " found soxr, version ${SOXR_VERSION}")
++ add_definitions(-DHAVE_JACK=1)
++ list(APPEND REQ_LIBRARY_DIRS "${JACK_LIBRARY_DIRS}" "${SOXR_LIBRARY_DIRS}")
++ list(APPEND REQ_INCLUDE_DIRS "${JACK_INCLUDE_DIRS}" "${SOXR_INCLUDE_DIRS}")
++ list(APPEND REQ_LIBRARIES "${JACK_LIBRARIES}" "${SOXR_LIBRARIES}")
+ endif()
+
+ list(APPEND REQ_LIBRARIES img-resources)
+--- a/src/CMakeLists.txt 2015-12-20 08:38:33.000000000 -0500
++++ b/src/CMakeLists.txt 2015-12-26 20:45:07.000000000 -0500
+@@ -5,7 +5,7 @@
+
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+
+-set(MOZPLUGIN_INSTALL_DIR "lib${LIB_SUFFIX}/mozilla/plugins/" CACHE PATH "plugin install directory")
++set(MOZPLUGIN_INSTALL_DIR "lib${LIB_SUFFIX}/nsbrowser/plugins/" CACHE PATH "plugin install directory")
+
+ add_subdirectory(uri_parser)
+ add_subdirectory(config_parser)
diff --git a/www-plugins/freshplayerplugin/files/0.3.4-git-revision.patch b/www-plugins/freshplayerplugin/files/0.3.4-git-revision.patch
new file mode 100644
index 000000000000..96cfce94c936
--- /dev/null
+++ b/www-plugins/freshplayerplugin/files/0.3.4-git-revision.patch
@@ -0,0 +1,11 @@
+--- a/cmake/update-version-info.sh 2015-12-20 08:38:33.000000000 -0500
++++ b/cmake/update-version-info.sh 2015-12-26 20:14:00.000000000 -0500
+@@ -18,7 +18,7 @@
+ GIT_COMMAND_EXISTS=1
+ command -v git >/dev/null 2>&1 || GIT_COMMAND_EXISTS=0
+
+-if [ $GIT_COMMAND_EXISTS -eq 0 ]; then
++if [ $GIT_COMMAND_EXISTS -eq 0 -o ! -d "${CMAKE_SOURCE_DIR}/.git" ]; then
+ update_header "no vcs hash"
+ exit 0
+ fi
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.4.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.4.ebuild
new file mode 100644
index 000000000000..3428e4c95186
--- /dev/null
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="2.8.8"
+
+inherit cmake-utils multilib
+
+LICENSE="MIT"
+HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
+DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
+SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT=0
+IUSE="gtk3 jack libav libressl pulseaudio vaapi vdpau"
+
+KEYWORDS="~amd64 ~x86"
+
+HWDEC_DEPEND="
+ libav? ( media-video/libav:0=[vaapi?,vdpau?,x264] )
+ !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?,x264] )
+ x11-libs/libva
+ x11-libs/libvdpau
+"
+
+COMMON_DEPEND="
+ dev-libs/glib:2=
+ dev-libs/libevent:=[threads]
+ media-libs/alsa-lib:=
+ media-libs/freetype:2=
+ media-libs/libv4l:0=
+ media-libs/mesa:=[egl,gles2]
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
+ x11-libs/libdrm:=
+ x11-libs/pango:=[X]
+ jack? (
+ media-sound/jack-audio-connection-kit
+ media-libs/soxr
+ )
+ pulseaudio? ( media-sound/pulseaudio )
+ !gtk3? ( x11-libs/gtk+:2= )
+ gtk3? ( x11-libs/gtk+:3= )
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ vaapi? ( ${HWDEC_DEPEND} )
+ vdpau? ( ${HWDEC_DEPEND} )
+"
+
+DEPEND="${COMMON_DEPEND}
+ dev-util/ragel
+ virtual/pkgconfig
+ "
+RDEPEND="${COMMON_DEPEND}
+ || (
+ www-plugins/chrome-binary-plugins[flash]
+ www-client/google-chrome
+ www-client/google-chrome-beta
+ www-client/google-chrome-unstable
+ )
+ "
+
+PATCHES=( "${FILESDIR}/0.3.4-cmake.patch" "${FILESDIR}/0.3.4-git-revision.patch" )
+DOCS=( ChangeLog data/freshwrapper.conf.example README.md )
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_with jack JACK)
+ $(cmake-utils_use_with pulseaudio PULSEAUDIO)
+ -DWITH_GTK=$(usex gtk3 3 2)
+ -DCMAKE_SKIP_RPATH=1
+ )
+ if use vaapi || use vdpau ; then
+ mycmakeargs+=( -DWITH_HWDEC=1 )
+ else
+ mycmakeargs+=( -DWITH_HWDEC=0 )
+ fi
+ cmake-utils_src_configure
+}
diff --git a/www-servers/tomcat/tomcat-7.0.65.ebuild b/www-servers/tomcat/tomcat-7.0.65.ebuild
index c0cceb967e0b..fab694741468 100644
--- a/www-servers/tomcat/tomcat-7.0.65.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.65.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="7"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="extra-webapps websockets"
RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.0.28-r2.ebuild b/www-servers/tomcat/tomcat-8.0.28-r2.ebuild
index 80bf31e13cfd..014b8792141a 100644
--- a/www-servers/tomcat/tomcat-8.0.28-r2.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.28-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="8"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="extra-webapps"
RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tornado/tornado-4.2.1.ebuild b/www-servers/tornado/tornado-4.2.1.ebuild
index 3a86564ccc38..c75d69a21a3f 100644
--- a/www-servers/tornado/tornado-4.2.1.ebuild
+++ b/www-servers/tornado/tornado-4.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
CDEPEND="
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index d7c7ea639596..00a5f8f6d5ae 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,4 +1,4 @@
-DIST xf86-input-libinput-0.13.0.tar.bz2 295850 SHA256 b9535c58904f47e8f85fee045b4a2b549c91216ddc9b0ee733d47d1b049fe3da SHA512 27dcb80d1b806a3f03afc8112325dfdd9864e8d744de2b91f084288beeca29e3926392dcd6d751c7ab8332d6547c5a912f7e64e885501dc40c956565cc758941 WHIRLPOOL 7c46d0596f10d40da5b7d206c0bab0f7c7b9e4503aff0120f111aa831ffcc5842a66a18df4a963e809ed807a21b8f76ec9e9ca73c942c2b861f7162b6609c7fa
DIST xf86-input-libinput-0.14.0.tar.bz2 312256 SHA256 e8d05798a556e5ea0d9f1823bb632e425487e8bcf89711ed93b079bbee742265 SHA512 229b45cb9e76ca96dce4247b421135ff74054f2cbcfd019d2ceb409fdb4bc8166e3fa1d068ba6e8f6d6ac0c44ade275e31cc6a1ee6d7f6de8918eced5c59d508 WHIRLPOOL 45400e7966d730fe809043ced977dc0faa456336157dba9049558f0489463c8ade5f9a130b77ea2e85ae82e27c320e1f70780acca53fae253f930a53c0ac823b
DIST xf86-input-libinput-0.15.0.tar.bz2 314205 SHA256 28707c504194648b11a1e26acf13039b60bf344efa6aa9788afed6d47f019a41 SHA512 f9c9f5f09537cd4830bd17720135102a9b02454e0acc4a80230ddd066c39a106c91260f7774da364760fd4f3b59b8ba9ab6abc83ad49ae6e9dad1609b9b25cf4 WHIRLPOOL 3dad70a7ce44dd8812d4dd1ebdcf7325c521b5dce4763c87bdd89962df577a4d9b9cf457ca7d72cc987554034636429d2f047b8a7cf257bd79b2c233e56f3925
+DIST xf86-input-libinput-0.16.0.tar.bz2 340816 SHA256 fdade531e91e79acf6dce8ac55fa4f65abe3f1358c5d3d777ae48dbc74b76f49 SHA512 6b1243a29d94e6b26e92da04ce9d308d0957c46fcacb16711f5037f351bb48e9e80070a7e8d4f7e934698d4b394df982c81df489a8bb8b8f6021e2c99c0b0c19 WHIRLPOOL e0b13a91c54d9823ff03ea4fe67ce48abe744c9bb3929c81286794e8edb5211668237d75d578c64df22bc1b286a97cba2e5769c6cb7b96aff0611c9c7107eacc
DIST xf86-input-libinput-0.6.0.tar.bz2 287826 SHA256 2f29be1ed7f9b9c597b6f5c6ef24c37a244a0ba87ccd1c2586ffa4d08452ad79 SHA512 536324b4bf52b6a1905655d6d82af5d12d40503e48018e10b1922bcfd18bddad742a716bcc7588188993f46f9724874456e90a70e5a764432f968a66a9d2b639 WHIRLPOOL 5d8994c86b5682d7e5ae0e53b7c8d1b13fdba304603b9ecf3c97297ab732e59111f4c902403a6d0a19492f3e34a7b9a718fbbe105591da19260a3c1f3e2c2a4b
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.13.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.16.0.ebuild
index 556abbfa38e9..a59a6b472a25 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.13.0.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.16.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="X.org input driver based on libinput"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
IUSE=""
-RDEPEND=">=dev-libs/libinput-0.21.0:0="
+RDEPEND=">=dev-libs/libinput-1.1.0:0="
DEPEND="${RDEPEND}"
-DOCS=( "README.md" "conf/99-libinput.conf" )
+DOCS=( "README.md" "conf/90-libinput.conf" )
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 232dd0d5c78a..c8c02fbeb938 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,3 +1,3 @@
-DIST goffice-0.10.23.tar.xz 2356604 SHA256 1325fc38f2476977bd8d71588ccb2a57aa418260406b7c28a20098b6b4e33f9f SHA512 1930fb744c33a9b2166243fbeefdae1ec31343890db311b8d7044efbb7c670f8f71512df91966c081c76dd0ed88bc2c1dc2dce589ffb9cfc44c6799677eefccb WHIRLPOOL 0b0a6c6696f7831b6c9b16dcd1c501e6c36e312343f862ba745acc41d144b16391c54bb4ea1a8ca9e0dcd431306e8630a5e1f54a1e23422414d7eecfd7ae8860
DIST goffice-0.10.24.tar.xz 2358736 SHA256 cda70eab0b0b0e29c3bea09849bcfca0c2ccc20038ee69e7e14cde664484af5a SHA512 67732854942769d221a677614edd51bfe9fcdaaf19f532a4182d5d0f0f31b4385ef6fbbf4be8a2f2b5f2d39d1cbb0218712c42cfcc0efaf754d0f4a9fd001b17 WHIRLPOOL 189e7f5ee790cd85d3f55ee6c441cfa829b692d1fc3d24dc9e036de4298653fd21db7e3853e6550fd2c2e76eaa54d0d15a233d98b2d2d47803e9ec72b833b84b
+DIST goffice-0.10.25.tar.xz 2358836 SHA256 cdeab902c7811a0b31c71872497f7ec21ebaeeb8a05b86bdd48d112b06c9ffa2 SHA512 eb62883833d4578309f0849c9643576cd83bb336d1e1c0a2f677b0d2849d65c005ca5e4d4ae6bf13b37a308798b204cd2a8eb9577165d6f4e0a161792115109b WHIRLPOOL 76f66e09ef3fcbe82ddc242e799cf41f540474ea952f9d7c7ac15b9422dec1989cd508cb16a2597ebf086300e45df972d1c4050a4edc1471c4efbeea5dc156e8
DIST goffice-0.8.17.tar.xz 1814488 SHA256 165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15 SHA512 61a3063d37e2ded4d4065d261f728c862daea04090ac38abe2524089ed1ee253e0d77e501f5b3451b1e011491a8225f90fd4914f28ce2a347ecf561098e6400c WHIRLPOOL 12ac2587af25c41686797b9bd5ff93429687217cb3d14e130067685701fd0685ed1c4f9900eb34a15cfb30dcdfe9ebe9f9856a1b4eb6684555d0a9cb1ef86ff1
diff --git a/x11-libs/goffice/goffice-0.10.23.ebuild b/x11-libs/goffice/goffice-0.10.25.ebuild
index 9093e1a260a3..3b351e27f315 100644
--- a/x11-libs/goffice/goffice-0.10.23.ebuild
+++ b/x11-libs/goffice/goffice-0.10.25.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/goffice/"
LICENSE="GPL-2"
SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="+introspection"
# Build fails with -gtk
diff --git a/x11-libs/goffice/goffice-0.8.17-r1.ebuild b/x11-libs/goffice/goffice-0.8.17-r1.ebuild
deleted file mode 100644
index cea128cf5250..000000000000
--- a/x11-libs/goffice/goffice-0.8.17-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 flag-o-matic
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="https://git.gnome.org/browse/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.8"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="doc gnome"
-
-# Build fails with -gtk
-# FIXME: add lasem to tree
-RDEPEND=">=dev-libs/glib-2.16:2
- >=gnome-extra/libgsf-1.14.9
- >=dev-libs/libxml2-2.4.12:2
- >=x11-libs/pango-1.8.1
- >=x11-libs/cairo-1.2[svg]
- x11-libs/libXext
- x11-libs/libXrender
- >=x11-libs/gtk+-2.16:2
- gnome? ( >=gnome-base/gconf-2:2 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=dev-util/intltool-0.35
- doc? ( >=dev-util/gtk-doc-1.11 )
-
- dev-util/gtk-doc-am
- gnome-base/gnome-common"
-# eautoreconf requires: gtk-doc-am, gnome-common
-
-pkg_setup() {
- DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
- # Gsettings is still experimental
- if use gnome; then
- G2CONF="${G2CONF} --with-config-backend=gconf"
- else
- G2CONF="${G2CONF} --with-config-backend=keyfile"
- fi
-
- G2CONF="${G2CONF}
- --without-lasem
- --with-gtk"
-
- filter-flags -ffast-math
-}
-
-src_prepare() {
- # bug #404271, https://bugzilla.gnome.org/show_bug.cgi?id=670316
- epatch "${FILESDIR}/${P}-no-pcre.patch"
- eautoreconf
- gnome2_src_prepare
-}
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r13.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r13.ebuild
index e4ad4b9517e1..e28810036231 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r13.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r13.ebuild
@@ -7,7 +7,7 @@ EAPI=5
GNOME_TARBALL_SUFFIX="gz"
GNOME2_LA_PUNT="yes"
-inherit autotools eutils gnome2 toolchain-funcs multilib-minimal
+inherit autotools eutils flag-o-matic gnome2 toolchain-funcs multilib-minimal
DESCRIPTION="The GIMP Toolkit"
HOMEPAGE="http://www.gtk.org/"
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
MULTILIB_CHOST_TOOLS=(/usr/bin/gtk-config)
src_prepare() {
+ append-cflags -std=gnu89
epatch "${FILESDIR}"/${P}-m4.patch
epatch "${FILESDIR}"/${P}-automake.patch
epatch "${FILESDIR}"/${P}-cleanup.patch
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..5f5333c2a37d
--- /dev/null
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org X Display Manager Control Protocol library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="dev-libs/libbsd
+ x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc docs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index d76be0515621..d69f155a703a 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1 +1,2 @@
DIST tint2-0.11.tar.bz2 91716 SHA256 fe106e6a6057d2631abddde9f82d3fd4fb1985c4fb93f10d3886417a9e22471d SHA512 db88c17780d24b82badbedbce4518d736dfcb2a730ff500bcb36f2b32f65271c2424f0c2a34981f9d3af033b84252db0c8217e2dd7ca57f9a0eadbc98796115c WHIRLPOOL 4c497995bc5713199a8e624ebfa463edbd610b6d948f1cbfce11ec78e4cd2cd6fad51bd58937b0fce343bb86a29a35bc40eec2bafb687c6ee89355bceb5486ec
+DIST tint2-0.12.3.tar.gz 251977 SHA256 655cde38f4d358d69f3628f722c7da7768e193769ac876cc24b59f328bcd3d6c SHA512 8022895617905446bc01e548ece9df63d32ae1ef3bafc2de2c79fb2c0e91ab78d036e8c9165ea4d4224dd70edb510266bbea47baf382abbf27a275b60b7d1465 WHIRLPOOL 057ba74074d5e013d9c882a6cbef1bd75f80b1eba857bda933c5936511b1d2b9a519c770b1a2f31360774232e03962ca47dea73ad5f4ef21bcd6530d2c123662
diff --git a/x11-misc/tint2/files/0.12.3-no-hardcode-update-icon-cache.patch b/x11-misc/tint2/files/0.12.3-no-hardcode-update-icon-cache.patch
new file mode 100644
index 000000000000..f923e0651737
--- /dev/null
+++ b/x11-misc/tint2/files/0.12.3-no-hardcode-update-icon-cache.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 155672e2245a..a4b6dc0c7eda 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -176,7 +176,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasin
+ install( TARGETS tint2 DESTINATION bin )
+ install( FILES tint2.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2.desktop DESTINATION ${DATADIR}/applications )
+-install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
+ install( FILES sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} )
+diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt
+index e8c6db38fe20..f844c24371e7 100644
+--- a/src/tint2conf/CMakeLists.txt
++++ b/src/tint2conf/CMakeLists.txt
+@@ -71,4 +71,3 @@ add_subdirectory(po)
+ install( TARGETS tint2conf DESTINATION bin )
+ install( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
+-install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
diff --git a/x11-misc/tint2/tint2-0.12.3.ebuild b/x11-misc/tint2/tint2-0.12.3.ebuild
new file mode 100644
index 000000000000..c2415d390047
--- /dev/null
+++ b/x11-misc/tint2/tint2-0.12.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
+HOMEPAGE="https://gitlab.com/o9000/tint2"
+SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="battery examples svg startup-notification tint2conf"
+
+DEPEND="
+ dev-libs/glib:2
+ svg? ( gnome-base/librsvg:2 )
+ >=media-libs/imlib2-1.4.2[X]
+ x11-libs/cairo
+ x11-libs/pango[X]
+ tint2conf? ( x11-libs/gtk+:2 )
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ >=x11-libs/libXrandr-1.3
+ x11-libs/libXrender
+ startup-notification? ( x11-libs/startup-notification )
+ "
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+PATCHES=( "${FILESDIR}/${PV}-no-hardcode-update-icon-cache.patch" )
+
+src_unpack() {
+ default
+ # Chop off the SHA1 gitlab's automated tarballs inject
+ mv "${PN}-v${PV}-"* "${PN}-v${PV}"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable battery BATTERY)
+ $(cmake-utils_use_enable examples EXAMPLES)
+ $(cmake-utils_use_enable tint2conf TINT2CONF)
+ $(cmake-utils_use_enable startup-notification SN)
+ $(cmake-utils_use_enable svg RSVG)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/x11-misc/virtualgl/files/vgl.initd-r3 b/x11-misc/virtualgl/files/vgl.initd-r3
new file mode 100644
index 000000000000..79010252215b
--- /dev/null
+++ b/x11-misc/virtualgl/files/vgl.initd-r3
@@ -0,0 +1,46 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: description="*" and other OpenRC 0.9+ candies
+
+depend() {
+ need xdm
+ after sshd
+}
+
+start() {
+ ebegin "Starting VirtualGL"
+ truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key
+
+ set_xauth
+
+ if [ -z "$XAUTHORITY" ]; then
+
+ einfo "Waiting for xauthority..."
+
+ # wait for xauth file
+ while true; do
+ set_xauth
+
+ if [ -e "$XAUTHORITY" ]; then
+ break;
+ fi
+
+ sleep 1
+ done
+ fi
+
+
+ xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . $(xauth -f $XAUTHORITY list | awk '{print $3;exit}') && \
+ chmod 644 /var/lib/VirtualGL/vgl_xauth_key
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping VirtualGL"
+ [ -f /var/lib/VirtualGL/vgl_xauth_key ] && \
+ rm /var/lib/VirtualGL/vgl_xauth_key
+ eend $?
+}
diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
new file mode 100644
index 000000000000..a0454f6cc5ea
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-multilib multilib systemd
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="http://www.virtualgl.org/"
+
+MY_PN="VirtualGL"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl ssl"
+
+RDEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
+ media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXv[${MULTILIB_USEDEP}]
+ virtual/glu[${MULTILIB_USEDEP}]
+ virtual/opengl[${MULTILIB_USEDEP}]
+ amd64? ( abi_x86_32? (
+ >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
+ >=x11-libs/libX11-1.6.2[abi_x86_32]
+ >=x11-libs/libXext-1.3.2[abi_x86_32]
+ >=x11-libs/libXv-1.0.10[abi_x86_32]
+ >=virtual/glu-9.0-r1[abi_x86_32]
+ >=virtual/opengl-7.0-r1[abi_x86_32]
+ ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # Use /var/lib, bug #428122
+ sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+ server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+ default
+}
+
+src_configure() {
+ abi_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use ssl VGL_USESSL)
+ -DVGL_DOCDIR=/usr/share/doc/"${PF}"
+ -DTJPEG_INCLUDE_DIR=/usr/include
+ -DVGL_LIBDIR=/usr/$(get_libdir)
+ -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+ -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+ -DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
+ )
+ cmake-utils_src_configure
+ }
+ multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+ cmake-multilib_src_install
+
+ # Make config dir
+ dodir /var/lib/VirtualGL
+ fowners root:video /var/lib/VirtualGL
+ fperms 0750 /var/lib/VirtualGL
+ newinitd "${FILESDIR}/vgl.initd-r3" vgl
+ newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+ exeinto /usr/libexec
+ doexe "${FILESDIR}/vgl-helper.sh"
+ systemd_dounit "${FILESDIR}/vgl.service"
+
+ # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+ mv "${D}"/usr/bin/{,v}glxinfo || die
+
+ # Remove license files, bug 536284
+ rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index 2c8f119e4c02..dfeab6554ce6 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,3 +1,2 @@
DIST xfe-1.40.1.tar.gz 2627754 SHA256 ec3d9495bb329c6199f6265dbfb514ffd3bdb8801e36ccc4e8fac6cea15bcc71 SHA512 d4d701dc84b342ca6f728073ff746d7308cc1cf1254956e41831cfa933649c7ac2ed32a55e6dc92047636e99f14d2609f5307aab5af07c700e597dd1cf4bf4cb WHIRLPOOL 00469cfe07604986b0a24fbcbb79c2174af6fc91ccaa7c08a47c31e6450ae637d3e1db002485d730f4ee241156c155754dcebd5a0d629941f101921c2825f533
-DIST xfe-1.40.tar.gz 2574477 SHA256 2b476f15beff1a1ce85dd4ce6559bb7ceca78b866c63fb4986456862a36862a8 SHA512 22cf9fd60dcd4b594d7ff39ea78d10a8c71ee2433025acf32b7e69457a5e86852b54e448ebc1e3f63f39bf720767064c74c46eaf2b999c14ae76417d33272892 WHIRLPOOL 5c3ce54db8ac3c7e99f590100a493e3611ea2cad90b498d0b673d1366a85ed0280c8aa664f60f9de633192964a5cead4efee65e6eee69f65fdd0928061e07e0e
DIST xfe-1.41.tar.gz 2752508 SHA256 d31ac9fdfa9223e54920ee8aabe20b43fa08ee4b6a5ee11a2d3c210506a3603f SHA512 eb9e1dfb02e5ae4bb9ccbf78bef8744ef61a72fb47795bb4598905c2f7ed01c65ed4443fd1b8981feb457b24daae1aa438170942eb97ec8b450c61b0742e4d2a WHIRLPOOL 9fc16836f8fb70d32b57902b504ccd438166d888da50049812f93b597e6dfa9920e357490d53f3718e4ae2b25d71977a528aeefa84d56d76d50ac7b5c85ce359
diff --git a/x11-misc/xfe/xfe-1.40.1.ebuild b/x11-misc/xfe/xfe-1.40.1.ebuild
index ab823b4c8dfd..ce72a0b34a3a 100644
--- a/x11-misc/xfe/xfe-1.40.1.ebuild
+++ b/x11-misc/xfe/xfe-1.40.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
IUSE="debug nls startup-notification"
RDEPEND="
diff --git a/x11-misc/xfe/xfe-1.40.ebuild b/x11-misc/xfe/xfe-1.40.ebuild
deleted file mode 100644
index ce72a0b34a3a..000000000000
--- a/x11-misc/xfe/xfe-1.40.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PLOCALES="
- bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr
- zh_CN zh_TW
-"
-inherit autotools l10n
-
-DESCRIPTION="MS-Explorer-like minimalist file manager for X"
-HOMEPAGE="http://roland65.free.fr/xfe"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="debug nls startup-notification"
-
-RDEPEND="
- media-libs/libpng:0
- x11-libs/fox:1.6[truetype,png]
- x11-libs/libX11
- x11-libs/libXft
- startup-notification? ( x11-libs/startup-notification )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- nls? (
- dev-util/intltool
- sys-devel/gettext
- )
-"
-
-DOCS=( AUTHORS BUGS ChangeLog README TODO )
-
-src_prepare() {
- cat >po/POTFILES.skip <<-EOF
- src/icons.cpp
- xfe.desktop.in.in
- xfi.desktop.in.in
- xfp.desktop.in.in
- xfv.desktop.in.in
- xfw.desktop.in.in
- EOF
-
- # malformed LINGUAS file
- # recent intltool expects newline for every linguas
- sed -i \
- -e '/^#/!s:\s\s*:\n:g' \
- po/LINGUAS || die
-
- # remove not selected locales
- rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;}
- l10n_for_each_disabled_locale_do rm_locale
-
- sed -i \
- -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
- configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable nls) \
- $(use_enable startup-notification sn) \
- --enable-minimalflags
-}
diff --git a/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.15.ebuild b/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.15.ebuild
index a63565f3649b..329e8d11e464 100644
--- a/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.15.ebuild
+++ b/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.15.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit gnome2-utils
DESCRIPTION="Fallback theme for the freedesktop icon theme specification"
-HOMEPAGE="http://icon-theme.freedesktop.org/wiki/HicolorTheme"
+HOMEPAGE="http://freedesktop.org/wiki/Software/icon-theme"
SRC_URI="http://icon-theme.freedesktop.org/releases/${P}.tar.xz"
LICENSE="GPL-2"
diff --git a/x11-wm/enlightenment/0001-x11-wm-enlightenment-fix-live-git-keywords.patch b/x11-wm/enlightenment/0001-x11-wm-enlightenment-fix-live-git-keywords.patch
new file mode 100644
index 000000000000..3feae625d474
--- /dev/null
+++ b/x11-wm/enlightenment/0001-x11-wm-enlightenment-fix-live-git-keywords.patch
@@ -0,0 +1,121 @@
+From d2b58499a79a5cc94227de723b8a4b8eb70c5f65 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 24 Dec 2015 15:04:05 -0500
+Subject: [PATCH] x11-wm/enlightenment: fix live git keywords
+
+---
+ x11-wm/enlightenment/Manifest | 1 +
+ .../enlightenment/enlightenment-0.17.9999.ebuild | 3 +-
+ x11-wm/enlightenment/enlightenment-0.20.1.ebuild | 91 ++++++++++++++++++++++
+ 3 files changed, 93 insertions(+), 2 deletions(-)
+ create mode 100644 x11-wm/enlightenment/enlightenment-0.20.1.ebuild
+
+diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
+index 0330286..821795d 100644
+--- a/x11-wm/enlightenment/Manifest
++++ b/x11-wm/enlightenment/Manifest
+@@ -3,3 +3,4 @@ DIST e16-1.0.17.tar.gz 2417299 SHA256 41ed67b648acc9b570cc681cf69d0accf38b69fd5d
+ DIST enlightenment-0.18.8.tar.bz2 27616548 SHA256 e99b1d8a9c64dad80611310bd3dc3a7b6d9eaefbd21d0f4a3c350aed9137ca13 SHA512 8ba767b7004c78130eda315a4b7c06d5dcd4034e4d9ef588d0012eca70fb677cff8f9a81bb5a33e6e8891d52f9f93e0f1cf4d3fadec505afd6c1f476b964fe73 WHIRLPOOL edbd586f1c00574457fe2123d1a0c86e00b8c949abf04677535b0d4378bc66822cc72f48138be622a8c671f40f65fe5ce42b6d8af3f96259b15136981f556994
+ DIST enlightenment-0.19.10.tar.xz 24594372 SHA256 8bdc2b764765e807df263962cb3c4793256a34ce74cf854f623a47859f7a4f5d SHA512 c9ee8e9a6a6575103cb1785fc478cfdcd7c544e21eb8738d3877f8742fb0250bae751ae7d05b6b57b7ca37c7011e7ae183da1aa251233c85dd7e38a23f897243 WHIRLPOOL a0d320c52850de00db1a2778f2d71be58b0567854e0c07e03b00ef42f8b94a00abff0616ae389831a117a37a1f554f6e41474e9e8fec0186a8079f970d1db977
+ DIST enlightenment-0.19.12.tar.xz 24569084 SHA256 55f23c337e3092e735ae37ada8f6701adab5ddd13f37ef38c63eec8a536f0b25 SHA512 30332fa0108a4361dd7cc961325b607fccef99caa1db6eaf068fc97de9978ad21dde5724a7e8f6612441fb0529a56461c8df63de25579f67d452fa9bf382d859 WHIRLPOOL e19f84c4a6311ef583d8f2bd53bc85a13e37bc65bdccc1823953685e0946f18cfaf0a75ee97f1a97e5d7fb9c9b0711b92f00f6949e5ca44718b6bf2347cb3a4c
++DIST enlightenment-0.20.1.tar.xz 25038128 SHA256 820b14ab3decd585a011973d97efc0679a90f803b9d72f0726166a3262c1f4ee SHA512 6afffebfe5d223c288f80589b105badcfbd34c9277078fa7704937ae5173d2b866c57c2aee46d7cae9a6c9ac8d59f0b62bb0081e819b69a37d48571cbfc492cb WHIRLPOOL b4428665554086e6d97b42687a683d0facc25ec3013a2c91cbccce4943edb0541667db243268692a5e9f9a86231a1a0104548e887986baa64c480074eb0360fb
+diff --git a/x11-wm/enlightenment/enlightenment-0.20.1.ebuild b/x11-wm/enlightenment/enlightenment-0.20.1.ebuild
+new file mode 100644
+index 0000000..929c4d1
+--- /dev/null
++++ b/x11-wm/enlightenment/enlightenment-0.20.1.ebuild
+@@ -0,0 +1,91 @@
++# Copyright 1999-2015 Gentoo Foundation
++# Distributed under the terms of the GNU General Public License v2
++# $Id$
++
++EAPI="5"
++
++MY_P=${P/_/-}
++
++if [[ ${PV} == *9999 ]] ; then
++ EGIT_SUB_PROJECT="core"
++ EGIT_URI_APPEND="${PN}"
++else
++ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
++ EKEY_STATE="snap"
++fi
++
++inherit enlightenment
++
++DESCRIPTION="Enlightenment DR17 window manager"
++
++LICENSE="BSD-2"
++SLOT="0.17/${PV%%_*}"
++
++# The @ is just an anchor to expand from
++__EVRY_MODS=""
++__CONF_MODS="
++ +@applications +@comp +@dialogs +@display
++ +@interaction +@intl +@menus
++ +@paths +@performance +@randr +@shelves +@theme +@wallpaper2
++ +@window-manipulation +@window-remembers"
++__NORM_MODS="
++ @access +@appmenu +@backlight +@bluez4 +@battery +@clock
++ +@connman +@contact +@cpufreq +@everything +@fileman
++ +@fileman-opinfo +@gadman +@ibar +@ibox +@illume2 +@mixer +@msgbus
++ +@music-control +@notification +@pager +@quickaccess +@shot
++ +@start +@syscon +@systray +@tasks +@teamwork +@temperature +@tiling
++ +@winlist +@wizard @wl-desktop-shell @wl-screenshot +@xkbswitch"
++IUSE_E_MODULES="
++ ${__CONF_MODS//@/enlightenment_modules_conf-}
++ ${__NORM_MODS//@/enlightenment_modules_}"
++
++IUSE="pam spell static-libs systemd +udev ukit wayland ${IUSE_E_MODULES}"
++
++RDEPEND="
++ pam? ( sys-libs/pam )
++ systemd? ( sys-apps/systemd )
++ wayland? (
++ dev-libs/efl[wayland]
++ >=dev-libs/wayland-1.2.0
++ >=x11-libs/pixman-0.31.1
++ >=x11-libs/libxkbcommon-0.3.1
++ )
++ >=dev-libs/efl-1.15.2[X]
++ >=media-libs/elementary-1.15
++ x11-libs/xcb-util-keysyms"
++DEPEND="${RDEPEND}"
++
++S=${WORKDIR}/${MY_P}
++
++src_prepare() {
++ epatch "${FILESDIR}"/quickstart.diff
++ enlightenment_src_prepare
++}
++
++src_configure() {
++ E_ECONF=(
++ --disable-install-sysactions
++ $(use_enable doc)
++ --disable-device-hal
++ $(use_enable nls)
++ $(use_enable pam)
++ $(use_enable systemd)
++ --enable-device-udev
++ $(use_enable udev mount-eeze)
++ $(use_enable ukit mount-udisks)
++ $(use_enable wayland wayland-clients)
++ )
++ local u c
++ for u in ${IUSE_E_MODULES} ; do
++ u=${u#+}
++ c=${u#enlightenment_modules_}
++ E_ECONF+=( $(use_enable ${u} ${c}) )
++ done
++ enlightenment_src_configure
++}
++
++src_install() {
++ enlightenment_src_install
++ insinto /etc/enlightenment
++ newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
++}
+--
+2.6.2
+
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 2e56dc6e42e4..821795d831db 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,9 +1,6 @@
DIST e16-1.0.11.tar.gz 2281672 SHA256 c7bc9fed4a83d2791df2acd6aa9e710cc162f2b54312c834f41940fb60a1f13e SHA512 01a323bbcdbf2ae63179c78423aadd59fe15eed2425abe3b5546c0d2bf9e6458dec0cee75d0704592839d742467d580a018449faab81dfa57ff45aa6d4a56c54 WHIRLPOOL f5b244de3deb17a0b5676057894f1928e3225cd19ee71e382a50184d49a050ea35d288a85f3b80d4abd3bb6c1e0f29cfa6257436c92940d483d8d637eb037dae
-DIST e16-1.0.13.tar.gz 2299510 SHA256 66487942fe6c63050fb7c8fe424f37355a8005ed417355b6e78becd867a12dd2 SHA512 965c853363c15154ca99b71deba3aa1d23bdfee0664b3511b39f52e066ca673a9b042e203e079357c9ca355484006cc4a90d0e0fb29b7396d582f7b9aa302da5 WHIRLPOOL 37118b388e08014ef81038f9e101e4abdf58876a5f468c31926a2f54d51f58154d76abe0080c6a45369a3ab0bb5ddf1c980badcdb1b45002ae63c0dcdb36f072
-DIST e16-1.0.14.tar.gz 2340182 SHA256 45b9a554e366f609764efaed1bf7230e999c3fd7ff5789abf08cccc13dc6d2d2 SHA512 7ac6c6349831c49af54facba55cf804c3a55b2e111e85c714bf186385a8a823b52381b8aff0b19e8d3382c44d44a62a252c951a0398d7d6a774c152c9f9bb33f WHIRLPOOL 478cf0f78a2693a7b5ff926a14bc8750b3d8ed956cc4222ab3ac0baa6d485d35d60b3ec80e98b68e32d6ca6938cd64532640810c8dae127934888069ae0e3982
-DIST e16-1.0.15.tar.gz 2392041 SHA256 ce8e87618c5d0b85882197a92ceee8d4240caacffb525bae7721eb0e0a83a7ea SHA512 bc2a891b172b7201a24629cd52df6817ce03b0d5978e2a75db6abba4c21d8670bd94243d7026bc8f50cefb7562c34266aa8332901dde593d0d44e8b3a5dfd5e8 WHIRLPOOL 59cff86ef7a694a8a23e04ff5609958ded65cccb786f1845866ecb6a8cf0c6e892666b429780f6dba12913411ffb97dd67ae7df2d48a431ddef66af4d2973ffd
-DIST e16-1.0.16.tar.gz 2395638 SHA256 a50ecbcf1cf239a5b36cc592364b2b1ee8e4135098704e5b1b949f989811cff1 SHA512 1cd3e42221546b08a7fa1431ab603d79963d91da86b0ec53d4578b8e02697b6b54db1ee75ae7e948c780905ad059c4be77d72f8bb33d3808e03842d53922eb8e WHIRLPOOL 4e26917992d90e69af1e1574582048e09ee4ef4e461c4f0e05739d80f63647575b548c97f8afc0bf79a97647d632463b22bbf9c431a3977b8e9ef83ea952220a
DIST e16-1.0.17.tar.gz 2417299 SHA256 41ed67b648acc9b570cc681cf69d0accf38b69fd5d0af6b8ea8a6eacbf87659d SHA512 d6ad565cf638de5240fbcd0f1cd37977c69e6af31a4ff9127e9c570fdf57a56bde50978620fbc34508d02661effa17f0c8b91ca23faebc0b77f9d40e166ba021 WHIRLPOOL d4996798db0ce676c0cdce8bc6a354fcb6649ee4a9c579dc4c51beaeb96d7dcd2dfe0f063ead6724b21bb9f7f66608596412a251df0c2670b944f7376cb3e504
DIST enlightenment-0.18.8.tar.bz2 27616548 SHA256 e99b1d8a9c64dad80611310bd3dc3a7b6d9eaefbd21d0f4a3c350aed9137ca13 SHA512 8ba767b7004c78130eda315a4b7c06d5dcd4034e4d9ef588d0012eca70fb677cff8f9a81bb5a33e6e8891d52f9f93e0f1cf4d3fadec505afd6c1f476b964fe73 WHIRLPOOL edbd586f1c00574457fe2123d1a0c86e00b8c949abf04677535b0d4378bc66822cc72f48138be622a8c671f40f65fe5ce42b6d8af3f96259b15136981f556994
DIST enlightenment-0.19.10.tar.xz 24594372 SHA256 8bdc2b764765e807df263962cb3c4793256a34ce74cf854f623a47859f7a4f5d SHA512 c9ee8e9a6a6575103cb1785fc478cfdcd7c544e21eb8738d3877f8742fb0250bae751ae7d05b6b57b7ca37c7011e7ae183da1aa251233c85dd7e38a23f897243 WHIRLPOOL a0d320c52850de00db1a2778f2d71be58b0567854e0c07e03b00ef42f8b94a00abff0616ae389831a117a37a1f554f6e41474e9e8fec0186a8079f970d1db977
DIST enlightenment-0.19.12.tar.xz 24569084 SHA256 55f23c337e3092e735ae37ada8f6701adab5ddd13f37ef38c63eec8a536f0b25 SHA512 30332fa0108a4361dd7cc961325b607fccef99caa1db6eaf068fc97de9978ad21dde5724a7e8f6612441fb0529a56461c8df63de25579f67d452fa9bf382d859 WHIRLPOOL e19f84c4a6311ef583d8f2bd53bc85a13e37bc65bdccc1823953685e0946f18cfaf0a75ee97f1a97e5d7fb9c9b0711b92f00f6949e5ca44718b6bf2347cb3a4c
+DIST enlightenment-0.20.1.tar.xz 25038128 SHA256 820b14ab3decd585a011973d97efc0679a90f803b9d72f0726166a3262c1f4ee SHA512 6afffebfe5d223c288f80589b105badcfbd34c9277078fa7704937ae5173d2b866c57c2aee46d7cae9a6c9ac8d59f0b62bb0081e819b69a37d48571cbfc492cb WHIRLPOOL b4428665554086e6d97b42687a683d0facc25ec3013a2c91cbccce4943edb0541667db243268692a5e9f9a86231a1a0104548e887986baa64c480074eb0360fb
diff --git a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
index c79a1cc1e4e1..388d6466a8a3 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI="5"
if [[ ${PV} == *9999 ]] ; then
ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/E16/e"
inherit subversion autotools
@@ -64,8 +64,7 @@ src_configure() {
econf \
$(use_enable nls) \
$(use_enable dbus) \
- $(use_enable pulseaudio sound-pulse) \
- --disable-sound-esound \
+ $(use_enable pulseaudio sound pulse) \
$(use_enable pango) \
$(use_enable xinerama) \
$(use_enable xrandr) \
diff --git a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
index bde419396bec..7d245d57f6e1 100644
--- a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_URI_APPEND="${PN}"
else
SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
- EKEY_STATE="snap"
+ EKEY_STATE="live"
fi
inherit enlightenment
@@ -19,7 +19,6 @@ inherit enlightenment
DESCRIPTION="Enlightenment DR17 window manager"
LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~x86"
SLOT="0.17/${PV%%_*}"
# The @ is just an anchor to expand from
diff --git a/x11-wm/enlightenment/enlightenment-0.19.12.ebuild b/x11-wm/enlightenment/enlightenment-0.19.12.ebuild
index 9e967889f140..7f227e7532b5 100644
--- a/x11-wm/enlightenment/enlightenment-0.19.12.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.19.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_URI_APPEND="${PN}"
else
SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
- EKEY_STATE="snap"
+ EKEY_STATE="release"
fi
inherit enlightenment
@@ -19,7 +19,6 @@ inherit enlightenment
DESCRIPTION="Enlightenment DR17 window manager"
LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~x86"
SLOT="0.17/${PV%%_*}"
# The @ is just an anchor to expand from
diff --git a/x11-wm/enlightenment/enlightenment-0.20.1.ebuild b/x11-wm/enlightenment/enlightenment-0.20.1.ebuild
new file mode 100644
index 000000000000..929c4d164a1e
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.20.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_SUB_PROJECT="core"
+ EGIT_URI_APPEND="${PN}"
+else
+ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
+ EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Enlightenment DR17 window manager"
+
+LICENSE="BSD-2"
+SLOT="0.17/${PV%%_*}"
+
+# The @ is just an anchor to expand from
+__EVRY_MODS=""
+__CONF_MODS="
+ +@applications +@comp +@dialogs +@display
+ +@interaction +@intl +@menus
+ +@paths +@performance +@randr +@shelves +@theme +@wallpaper2
+ +@window-manipulation +@window-remembers"
+__NORM_MODS="
+ @access +@appmenu +@backlight +@bluez4 +@battery +@clock
+ +@connman +@contact +@cpufreq +@everything +@fileman
+ +@fileman-opinfo +@gadman +@ibar +@ibox +@illume2 +@mixer +@msgbus
+ +@music-control +@notification +@pager +@quickaccess +@shot
+ +@start +@syscon +@systray +@tasks +@teamwork +@temperature +@tiling
+ +@winlist +@wizard @wl-desktop-shell @wl-screenshot +@xkbswitch"
+IUSE_E_MODULES="
+ ${__CONF_MODS//@/enlightenment_modules_conf-}
+ ${__NORM_MODS//@/enlightenment_modules_}"
+
+IUSE="pam spell static-libs systemd +udev ukit wayland ${IUSE_E_MODULES}"
+
+RDEPEND="
+ pam? ( sys-libs/pam )
+ systemd? ( sys-apps/systemd )
+ wayland? (
+ dev-libs/efl[wayland]
+ >=dev-libs/wayland-1.2.0
+ >=x11-libs/pixman-0.31.1
+ >=x11-libs/libxkbcommon-0.3.1
+ )
+ >=dev-libs/efl-1.15.2[X]
+ >=media-libs/elementary-1.15
+ x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/quickstart.diff
+ enlightenment_src_prepare
+}
+
+src_configure() {
+ E_ECONF=(
+ --disable-install-sysactions
+ $(use_enable doc)
+ --disable-device-hal
+ $(use_enable nls)
+ $(use_enable pam)
+ $(use_enable systemd)
+ --enable-device-udev
+ $(use_enable udev mount-eeze)
+ $(use_enable ukit mount-udisks)
+ $(use_enable wayland wayland-clients)
+ )
+ local u c
+ for u in ${IUSE_E_MODULES} ; do
+ u=${u#+}
+ c=${u#enlightenment_modules_}
+ E_ECONF+=( $(use_enable ${u} ${c}) )
+ done
+ enlightenment_src_configure
+}
+
+src_install() {
+ enlightenment_src_install
+ insinto /etc/enlightenment
+ newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+}
diff --git a/x11-wm/enlightenment/enlightenment-1.0.13.ebuild b/x11-wm/enlightenment/enlightenment-1.0.13.ebuild
deleted file mode 100644
index 93d69c254bef..000000000000
--- a/x11-wm/enlightenment/enlightenment-1.0.13.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-if [[ ${PV} == *9999 ]] ; then
- ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/E16/e"
- inherit subversion autotools
- SRC_URI=""
- #KEYWORDS=""
- S=${WORKDIR}/e16/e
-else
- SRC_URI="mirror://sourceforge/enlightenment/e16-${PV/_/-}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
- S=${WORKDIR}/e16-${PV/_pre?}
-fi
-inherit eutils
-
-DESCRIPTION="Enlightenment Window Manager (e16)"
-HOMEPAGE="https://www.enlightenment.org/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="dbus doc nls pango pulseaudio xcomposite xinerama xrandr"
-
-RDEPEND="pulseaudio? ( media-sound/pulseaudio )
- dbus? ( sys-apps/dbus )
- pango? ( x11-libs/pango )
- =media-libs/freetype-2*
- >=media-libs/imlib2-1.3.0[X]
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXdamage
- x11-libs/libXxf86vm
- x11-libs/libXft
- xrandr? ( x11-libs/libXrandr )
- x11-libs/libXrender
- x11-misc/xbitmaps
- xinerama? ( x11-libs/libXinerama )
- xcomposite? ( x11-libs/libXcomposite )
- nls? ( virtual/libintl )
- virtual/libiconv"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- xinerama? ( x11-proto/xineramaproto )
- xcomposite? ( x11-proto/compositeproto )
- x11-proto/xproto
- nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( app-doc/edox-data )"
-
-src_prepare() {
- if [[ ! -e configure ]] ; then
- eautopoint
- eautoreconf
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable dbus) \
- $(use_enable pulseaudio sound-pulse) \
- --disable-sound-esound \
- $(use_enable pango) \
- $(use_enable xinerama) \
- $(use_enable xrandr) \
- $(use_enable xcomposite composite) \
- --disable-docs \
- --enable-zoom
-}
-
-src_install() {
- default
- dodoc COMPLIANCE sample-scripts/*
- dohtml docs/e16.html
-}
diff --git a/x11-wm/enlightenment/enlightenment-1.0.14.ebuild b/x11-wm/enlightenment/enlightenment-1.0.14.ebuild
deleted file mode 100644
index e7abb28a9e1f..000000000000
--- a/x11-wm/enlightenment/enlightenment-1.0.14.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-if [[ ${PV} == *9999 ]] ; then
- ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/E16/e"
- inherit subversion autotools
- SRC_URI=""
- #KEYWORDS=""
- S=${WORKDIR}/e16/e
-else
- SRC_URI="mirror://sourceforge/enlightenment/e16-${PV/_/-}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
- S=${WORKDIR}/e16-${PV/_pre?}
-fi
-inherit eutils
-
-DESCRIPTION="Enlightenment Window Manager (e16)"
-HOMEPAGE="https://www.enlightenment.org/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="dbus doc nls pango pulseaudio xcomposite xinerama xrandr"
-
-RDEPEND="pulseaudio? ( media-sound/pulseaudio )
- dbus? ( sys-apps/dbus )
- pango? ( x11-libs/pango )
- =media-libs/freetype-2*
- >=media-libs/imlib2-1.3.0[X]
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXdamage
- x11-libs/libXxf86vm
- x11-libs/libXft
- xrandr? ( x11-libs/libXrandr )
- x11-libs/libXrender
- x11-misc/xbitmaps
- xinerama? ( x11-libs/libXinerama )
- xcomposite? ( x11-libs/libXcomposite )
- nls? ( virtual/libintl )
- virtual/libiconv"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- xinerama? ( x11-proto/xineramaproto )
- xcomposite? ( x11-proto/compositeproto )
- x11-proto/xproto
- nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( app-doc/edox-data )"
-
-src_prepare() {
- if [[ ! -e configure ]] ; then
- eautopoint
- eautoreconf
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable dbus) \
- $(use_enable pulseaudio sound-pulse) \
- --disable-sound-esound \
- $(use_enable pango) \
- $(use_enable xinerama) \
- $(use_enable xrandr) \
- $(use_enable xcomposite composite) \
- --disable-docs \
- --enable-zoom
-}
-
-src_install() {
- default
- dodoc COMPLIANCE sample-scripts/*
- dohtml docs/e16.html
-}
diff --git a/x11-wm/enlightenment/enlightenment-1.0.15.ebuild b/x11-wm/enlightenment/enlightenment-1.0.15.ebuild
deleted file mode 100644
index c1804bae7d28..000000000000
--- a/x11-wm/enlightenment/enlightenment-1.0.15.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-if [[ ${PV} == *9999 ]] ; then
- ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/E16/e"
- inherit subversion autotools
- SRC_URI=""
- #KEYWORDS=""
- S=${WORKDIR}/e16/e
-else
- SRC_URI="mirror://sourceforge/enlightenment/e16-${PV/_/-}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
- S=${WORKDIR}/e16-${PV/_pre?}
-fi
-inherit eutils
-
-DESCRIPTION="Enlightenment Window Manager (e16)"
-HOMEPAGE="https://www.enlightenment.org/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="dbus doc nls pango pulseaudio xcomposite xinerama xrandr"
-
-RDEPEND="pulseaudio? ( media-sound/pulseaudio )
- dbus? ( sys-apps/dbus )
- pango? ( x11-libs/pango )
- =media-libs/freetype-2*
- >=media-libs/imlib2-1.3.0[X]
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXdamage
- x11-libs/libXxf86vm
- x11-libs/libXft
- xrandr? ( x11-libs/libXrandr )
- x11-libs/libXrender
- x11-misc/xbitmaps
- xinerama? ( x11-libs/libXinerama )
- xcomposite? ( x11-libs/libXcomposite )
- nls? ( virtual/libintl )
- virtual/libiconv"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- xinerama? ( x11-proto/xineramaproto )
- xcomposite? ( x11-proto/compositeproto )
- x11-proto/xproto
- nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( app-doc/edox-data )"
-
-src_prepare() {
- if [[ ! -e configure ]] ; then
- eautopoint
- eautoreconf
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable dbus) \
- $(use_enable pulseaudio sound pulse) \
- $(use_enable pango) \
- $(use_enable xinerama) \
- $(use_enable xrandr) \
- $(use_enable xcomposite composite) \
- --disable-docs \
- --enable-zoom
-}
-
-src_install() {
- default
- dodoc COMPLIANCE sample-scripts/*
- dohtml docs/e16.html
-}
diff --git a/x11-wm/enlightenment/enlightenment-1.0.16.ebuild b/x11-wm/enlightenment/enlightenment-1.0.16.ebuild
deleted file mode 100644
index c1804bae7d28..000000000000
--- a/x11-wm/enlightenment/enlightenment-1.0.16.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-if [[ ${PV} == *9999 ]] ; then
- ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/E16/e"
- inherit subversion autotools
- SRC_URI=""
- #KEYWORDS=""
- S=${WORKDIR}/e16/e
-else
- SRC_URI="mirror://sourceforge/enlightenment/e16-${PV/_/-}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
- S=${WORKDIR}/e16-${PV/_pre?}
-fi
-inherit eutils
-
-DESCRIPTION="Enlightenment Window Manager (e16)"
-HOMEPAGE="https://www.enlightenment.org/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="dbus doc nls pango pulseaudio xcomposite xinerama xrandr"
-
-RDEPEND="pulseaudio? ( media-sound/pulseaudio )
- dbus? ( sys-apps/dbus )
- pango? ( x11-libs/pango )
- =media-libs/freetype-2*
- >=media-libs/imlib2-1.3.0[X]
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXdamage
- x11-libs/libXxf86vm
- x11-libs/libXft
- xrandr? ( x11-libs/libXrandr )
- x11-libs/libXrender
- x11-misc/xbitmaps
- xinerama? ( x11-libs/libXinerama )
- xcomposite? ( x11-libs/libXcomposite )
- nls? ( virtual/libintl )
- virtual/libiconv"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- xinerama? ( x11-proto/xineramaproto )
- xcomposite? ( x11-proto/compositeproto )
- x11-proto/xproto
- nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( app-doc/edox-data )"
-
-src_prepare() {
- if [[ ! -e configure ]] ; then
- eautopoint
- eautoreconf
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable dbus) \
- $(use_enable pulseaudio sound pulse) \
- $(use_enable pango) \
- $(use_enable xinerama) \
- $(use_enable xrandr) \
- $(use_enable xcomposite composite) \
- --disable-docs \
- --enable-zoom
-}
-
-src_install() {
- default
- dodoc COMPLIANCE sample-scripts/*
- dohtml docs/e16.html
-}
diff --git a/x11-wm/enlightenment/enlightenment-1.0.17.ebuild b/x11-wm/enlightenment/enlightenment-1.0.17.ebuild
index c1804bae7d28..b19fa232a86d 100644
--- a/x11-wm/enlightenment/enlightenment-1.0.17.ebuild
+++ b/x11-wm/enlightenment/enlightenment-1.0.17.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI="5"
if [[ ${PV} == *9999 ]] ; then
ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/E16/e"
inherit subversion autotools
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
S=${WORKDIR}/e16/e
else
SRC_URI="mirror://sourceforge/enlightenment/e16-${PV/_/-}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
S=${WORKDIR}/e16-${PV/_pre?}
fi
inherit eutils