summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idella4@gentoo.org>2016-01-27 11:27:28 +0800
committerIan Delaney <idella4@gentoo.org>2016-01-27 11:28:33 +0800
commit24ca08cc51f29a44ec02c1f8b348901e378e4254 (patch)
tree6ddb8c2158f0f2afb459ab664f7289186dbcf07b
parentsys-apps/intel-performance-counter-monitor: bump to vn. 2.10 (diff)
parentmedia-tv/xmltv: bump to vn. -0.5.67 (diff)
downloadgentoo-24ca08cc.tar.gz
gentoo-24ca08cc.tar.bz2
gentoo-24ca08cc.zip
Merge remote-tracking branch 'remotes/jasom/master'
Pull request: https://github.com/gentoo/gentoo/pull/725
-rw-r--r--app-admin/mate-system-tools/Manifest1
-rw-r--r--app-admin/mate-system-tools/files/mate-system-tools-1.6.0-Update-POTFILES-skip.patch32
-rw-r--r--app-admin/mate-system-tools/mate-system-tools-1.8.0.ebuild66
-rw-r--r--app-admin/salt/Manifest3
-rw-r--r--app-admin/salt/salt-2015.5.6.ebuild119
-rw-r--r--app-admin/salt/salt-2015.8.1.ebuild121
-rw-r--r--app-arch/engrampa/engrampa-1.8.0-r1.ebuild82
-rw-r--r--app-crypt/gnupg/Manifest3
-rw-r--r--app-crypt/gnupg/gnupg-2.0.27-r1.ebuild167
-rw-r--r--app-crypt/gnupg/gnupg-2.0.27.ebuild163
-rw-r--r--app-crypt/gnupg/gnupg-2.0.29.ebuild167
-rw-r--r--app-crypt/gnupg/gnupg-2.1.11.ebuild (renamed from app-crypt/gnupg/gnupg-2.1.10.ebuild)6
-rw-r--r--app-crypt/gnupg/gnupg-2.1.8.ebuild169
-rw-r--r--app-crypt/gnupg/gnupg-2.1.9.ebuild169
-rw-r--r--app-editors/uemacs-pk/Manifest1
-rw-r--r--app-editors/uemacs-pk/uemacs-pk-4.0.15_p20130222.ebuild43
-rw-r--r--app-editors/uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild4
-rw-r--r--app-emulation/libcacard/libcacard-2.5.1.ebuild2
-rw-r--r--app-emulation/qemu/qemu-2.5.0-r1.ebuild2
-rw-r--r--app-eselect/eselect-maven/eselect-maven-0.2-r2.ebuild30
-rw-r--r--app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild23
-rw-r--r--app-eselect/eselect-pinentry/files/pinentry.eselect-0.713
-rw-r--r--dev-java/geoip-java/Manifest1
-rw-r--r--dev-java/geoip-java/geoip-java-1.3.0.ebuild44
-rw-r--r--dev-java/geoip-java/metadata.xml15
-rw-r--r--dev-java/maven-bin/Manifest3
-rw-r--r--dev-java/maven-bin/maven-bin-1.1-r1.ebuild38
-rw-r--r--dev-java/maven-bin/maven-bin-1.1-r3.ebuild2
-rw-r--r--dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild2
-rw-r--r--dev-java/maven-bin/maven-bin-2.0.11.ebuild49
-rw-r--r--dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild2
-rw-r--r--dev-java/maven-bin/maven-bin-2.2.1.ebuild49
-rw-r--r--dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild2
-rw-r--r--dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild80
-rw-r--r--dev-java/maven-bin/maven-bin-3.1.0.ebuild72
-rw-r--r--dev-java/maven-bin/maven-bin-3.1.1.ebuild4
-rw-r--r--dev-java/maven-bin/maven-bin-3.2.5.ebuild2
-rw-r--r--dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild4
-rw-r--r--dev-java/maven-bin/maven-bin-3.3.3.ebuild88
-rw-r--r--dev-java/maven-bin/maven-bin-3.3.9.ebuild (renamed from dev-java/maven-bin/maven-bin-3.2.3.ebuild)62
-rw-r--r--dev-libs/libindicate/libindicate-12.10.1-r1.ebuild74
-rw-r--r--dev-libs/libinput/Manifest1
-rw-r--r--dev-libs/libinput/libinput-1.1.5.ebuild53
-rw-r--r--dev-python/packaging/packaging-16.0.ebuild3
-rw-r--r--dev-python/pip/pip-8.0.2-r1.ebuild (renamed from dev-python/pip/pip-8.0.2.ebuild)2
-rw-r--r--dev-ruby/facter/facter-3.1.4-r1.ebuild (renamed from dev-ruby/facter/facter-3.1.4.ebuild)11
-rw-r--r--dev-ruby/metasploit-payloads/Manifest5
-rw-r--r--dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild4
-rw-r--r--dev-ruby/metasploit-payloads/metasploit-payloads-1.0.19.ebuild4
-rw-r--r--dev-ruby/metasploit-payloads/metasploit-payloads-1.0.21.ebuild (renamed from dev-ruby/metasploit-payloads/metasploit-payloads-1.0.16.ebuild)4
-rw-r--r--dev-ruby/metasploit-payloads/metasploit-payloads-1.0.22.ebuild (renamed from dev-ruby/metasploit-payloads/metasploit-payloads-1.0.17.ebuild)4
-rw-r--r--dev-ruby/metasploit-payloads/metasploit-payloads-1.0.9-r1.ebuild45
-rw-r--r--dev-ruby/metasploit_data_models/Manifest2
-rw-r--r--dev-ruby/metasploit_data_models/metasploit_data_models-1.2.10.ebuild (renamed from dev-ruby/metasploit_data_models/metasploit_data_models-1.2.5.ebuild)8
-rw-r--r--dev-ruby/metasploit_data_models/metasploit_data_models-1.2.9.ebuild4
-rw-r--r--dev-ruby/openssl-ccm/Manifest1
-rw-r--r--dev-ruby/openssl-ccm/metadata.xml13
-rw-r--r--dev-ruby/openssl-ccm/openssl-ccm-1.2.1.ebuild18
-rw-r--r--dev-util/cmake/Manifest3
-rw-r--r--dev-util/cmake/cmake-3.4.0-r1.ebuild198
-rw-r--r--dev-util/cmake/cmake-3.4.3.ebuild (renamed from dev-util/cmake/cmake-3.4.1.ebuild)2
-rw-r--r--eclass/gnome2-utils.eclass5
-rw-r--r--eclass/kde5-functions.eclass2
-rw-r--r--eclass/kde5.eclass24
-rw-r--r--games-strategy/triplea/Manifest1
-rw-r--r--games-strategy/triplea/triplea-1.7.0.3.ebuild100
-rw-r--r--kde-apps/ark/Manifest1
-rw-r--r--kde-apps/ark/ark-15.12.1.ebuild60
-rw-r--r--kde-apps/filelight/Manifest1
-rw-r--r--kde-apps/filelight/filelight-15.12.1.ebuild30
-rw-r--r--kde-apps/kcalc/Manifest1
-rw-r--r--kde-apps/kcalc/kcalc-15.12.1.ebuild37
-rw-r--r--kde-apps/kcharselect/Manifest1
-rw-r--r--kde-apps/kcharselect/kcharselect-15.12.1.ebuild (renamed from kde-apps/libksane/libksane-15.12.1.ebuild.save)14
-rw-r--r--kde-apps/kdebugsettings/Manifest1
-rw-r--r--kde-apps/kdebugsettings/kdebugsettings-15.12.1.ebuild (renamed from kde-apps/libksane/libksane-15.12.1.ebuild.save.1)17
-rw-r--r--kde-apps/kdebugsettings/metadata.xml8
-rw-r--r--kde-apps/kdeutils-meta/kdeutils-meta-15.12.1.ebuild30
-rw-r--r--kde-apps/kdf/Manifest1
-rw-r--r--kde-apps/kdf/kdf-15.12.1.ebuild13
-rw-r--r--kde-apps/kfloppy/Manifest1
-rw-r--r--kde-apps/kfloppy/kfloppy-15.12.1.ebuild16
-rw-r--r--kde-apps/kgpg/Manifest1
-rw-r--r--kde-apps/kgpg/kgpg-15.12.1.ebuild30
-rw-r--r--kde-apps/kremotecontrol/Manifest1
-rw-r--r--kde-apps/kremotecontrol/kremotecontrol-15.12.1.ebuild18
-rw-r--r--kde-apps/kteatime/Manifest1
-rw-r--r--kde-apps/kteatime/files/kteatime-15.11.80-kcrash-initialise.patch28
-rw-r--r--kde-apps/kteatime/kteatime-15.12.1.ebuild31
-rw-r--r--kde-apps/ktimer/Manifest1
-rw-r--r--kde-apps/ktimer/ktimer-15.12.1.ebuild29
-rw-r--r--kde-apps/kwalletmanager/Manifest1
-rw-r--r--kde-apps/kwalletmanager/kwalletmanager-15.12.1.ebuild42
-rw-r--r--kde-apps/print-manager/Manifest1
-rw-r--r--kde-apps/print-manager/print-manager-15.12.1.ebuild54
-rw-r--r--kde-apps/sweeper/Manifest1
-rw-r--r--kde-apps/sweeper/sweeper-15.12.1.ebuild14
-rw-r--r--kde-misc/rsibreak/Manifest1
-rw-r--r--kde-misc/rsibreak/rsibreak-0.12.1.ebuild43
-rw-r--r--mate-base/mate-desktop/Manifest1
-rw-r--r--mate-base/mate-desktop/mate-desktop-1.8.0-r1.ebuild66
-rw-r--r--mate-base/mate-settings-daemon/Manifest1
-rw-r--r--mate-base/mate-settings-daemon/mate-settings-daemon-1.8.0.ebuild89
-rw-r--r--media-libs/imlib2/imlib2-1.4.7.ebuild2
-rw-r--r--media-libs/virglrenderer/virglrenderer-0.2.0.ebuild2
-rw-r--r--media-sound/seq24/seq24-0.9.3.ebuild2
-rw-r--r--media-sound/yoshimi/yoshimi-1.3.8.2-r1.ebuild (renamed from media-sound/yoshimi/yoshimi-1.3.8.2.ebuild)11
-rw-r--r--media-tv/xmltv/Manifest1
-rw-r--r--media-tv/xmltv/metadata.xml20
-rw-r--r--media-tv/xmltv/xmltv-0.5.67.ebuild211
-rw-r--r--net-analyzer/metasploit/Manifest2
-rw-r--r--net-analyzer/metasploit/metasploit-4.11.7.ebuild (renamed from net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r2.ebuild)20
-rw-r--r--net-analyzer/metasploit/metasploit-9999.ebuild10
-rw-r--r--net-irc/irssi/irssi-0.8.17.ebuild16
-rw-r--r--net-libs/libtorrent/metadata.xml11
-rw-r--r--net-misc/libreswan/Manifest2
-rw-r--r--net-misc/libreswan/libreswan-3.13.ebuild99
-rw-r--r--net-misc/libreswan/libreswan-3.14-r1.ebuild102
-rw-r--r--net-misc/rsync/Manifest1
-rw-r--r--net-misc/rsync/rsync-3.1.1.ebuild75
-rw-r--r--net-p2p/rtorrent/metadata.xml25
-rw-r--r--profiles/package.mask10
-rw-r--r--sci-libs/scikits_learn/Manifest5
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild88
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild112
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild112
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild112
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild111
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.17.ebuild2
-rw-r--r--sci-libs/scipy/scipy-0.16.1.ebuild2
-rw-r--r--sys-fs/dislocker/Manifest1
-rw-r--r--sys-fs/dislocker/dislocker-0.5.2.ebuild48
-rw-r--r--sys-fs/mtd-utils/mtd-utils-99999999.ebuild2
-rw-r--r--www-apps/radicale/Manifest1
-rw-r--r--www-apps/radicale/files/radicale-1.1.1-config.patch34
-rw-r--r--www-apps/radicale/files/radicale.init.d27
-rw-r--r--www-apps/radicale/metadata.xml12
-rw-r--r--www-apps/radicale/radicale-1.1.1.ebuild73
-rw-r--r--x11-misc/spacefm/Manifest1
-rw-r--r--x11-misc/spacefm/metadata.xml4
-rw-r--r--x11-misc/spacefm/spacefm-1.0.5.ebuild88
141 files changed, 1389 insertions, 3250 deletions
diff --git a/app-admin/mate-system-tools/Manifest b/app-admin/mate-system-tools/Manifest
index 72ce641f778b..b31f0acd69a9 100644
--- a/app-admin/mate-system-tools/Manifest
+++ b/app-admin/mate-system-tools/Manifest
@@ -1,2 +1 @@
-DIST mate-system-tools-1.8.0.tar.xz 4338404 SHA256 7cfeec1d0a5c237fa8b67121bf1bfcc26665c54ce040d30d75c542799840dbfd SHA512 deec649a1ea4c37b3bdbf93fe4cdf331685e2c76e0fbf67303ac678bfec733a1fcac01bd578cb93a67df939bc1452a4cc4154b1505edcd6e87a1dbcc328c6c8d WHIRLPOOL 9d0660a2ea2f6ff6aa456af74db21da471e14c4e1215ba49aeb4c0ffa29752a9079ace2e22430ff7058d79a84997e264150d6b797496cc87be24720302f5629e
DIST mate-system-tools-1.8.1.tar.xz 4348304 SHA256 c5f1faee761deb679f7a37607cc7166ea81b7d16a7fbc05951b32f119bcb944e SHA512 a2cda52ebab386ebbf6c01288741f59914c8fe8a672a1220b0a8cc44afb51058e8545f385f4d5dab650bc36c3c18ad9519580ce255b4c607131c2c5dd3ce15ce WHIRLPOOL ba486ffcc9dd25aa10858e3b09a046eadbe99a11d4e98c872dd14b91002e9e62a17d88744707ef8fac80b44e27d6402b4532d77d30f6ce0f905335d0e9eee7d2
diff --git a/app-admin/mate-system-tools/files/mate-system-tools-1.6.0-Update-POTFILES-skip.patch b/app-admin/mate-system-tools/files/mate-system-tools-1.6.0-Update-POTFILES-skip.patch
deleted file mode 100644
index ee89cf57ac8c..000000000000
--- a/app-admin/mate-system-tools/files/mate-system-tools-1.6.0-Update-POTFILES-skip.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0dc126ba76d32a66c73daa5c2a93980efbc1264e Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano@karapetsas.com>
-Date: Sat, 25 Jan 2014 12:29:44 +0100
-Subject: [PATCH] Update POTFILES.skip
-
----
- po/POTFILES.skip | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-index a6a3e9f..d54118d 100644
---- a/po/POTFILES.skip
-+++ b/po/POTFILES.skip
-@@ -6,11 +6,11 @@ interfaces/services.glade
- interfaces/shares.glade
- interfaces/time.glade
- interfaces/users.glade
--src/network/network.desktop.in
--src/services/services.desktop.in
--src/shares/shares.desktop.in
--src/time/time.desktop.in
--src/users/users.desktop.in
-+src/network/mate-network.desktop.in
-+src/services/mate-services.desktop.in
-+src/shares/mate-shares.desktop.in
-+src/time/mate-time.desktop.in
-+src/users/mate-users.desktop.in
- interfaces/disks.glade.in
- src/disks/callbacks.c
- src/disks/disks-cdrom-disc.c
---
-1.8.5.5
diff --git a/app-admin/mate-system-tools/mate-system-tools-1.8.0.ebuild b/app-admin/mate-system-tools/mate-system-tools-1.8.0.ebuild
deleted file mode 100644
index 2fcb75e97826..000000000000
--- a/app-admin/mate-system-tools/mate-system-tools-1.8.0.ebuild
+++ /dev/null
@@ -1,66 +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"
-
-inherit gnome2 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="caja nfs policykit samba"
-
-RDEPEND="app-text/rarian:0
- >=app-admin/system-tools-backends-2.10.1:0
- dev-libs/atk:0
- dev-libs/dbus-glib:0
- >=dev-libs/glib-2.25.3:2
- >=dev-libs/liboobs-1.1:0
- >=sys-apps/dbus-0.32:0
- net-wireless/wireless-tools:0
- sys-libs/cracklib:0
- x11-libs/gdk-pixbuf:2
- x11-libs/pango:0
- >=x11-libs/gtk+-2.19.7:2
- virtual/libintl:0
- caja? ( >=mate-base/caja-1.8:0 )
- nfs? ( net-fs/nfs-utils:0 )
- policykit? (
- >=mate-extra/mate-polkit-1.8:0
- >=sys-auth/polkit-0.92:0
- )
- samba? ( >=net-fs/samba-3:0 )"
-
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- sys-devel/gettext:*
- virtual/pkgconfig:*
- >=dev-util/intltool-0.35.0:*"
-
-src_configure() {
- local myconf
- if ! use nfs && ! use samba; then
- myconf="--disable-shares"
- fi
-
- gnome2_src_configure \
- ${myconf} \
- --disable-static \
- $(use_enable policykit polkit-gtk-mate) \
- $(use_enable caja)
-}
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 830259c23984..1454c3208d4d 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,6 +1,3 @@
-DIST salt-2015.5.6.tar.gz 5564414 SHA256 4fe478132ce84076b3e424cdd217443766d83ac40fa0ec0e914ca46111971c38 SHA512 6f091b2de8d5f949eb8df8d5173bc122b971a3966b3f4fa55209906dba83b744a72b24e40ee1b0b4dc0a51d740bc336e10798a310da3544e36d4d8585934ac11 WHIRLPOOL 2d25cfada4dab07e82dad6542ac8c290d55ca493fe90186af4b1f78b3684dcb7c9d95eab4a0fe22a0c82cb8b31e8176cc750ebab5304927bbbc7f2a2545ebc8b
DIST salt-2015.5.8.tar.gz 5741097 SHA256 07c3eb054ef214c17481fed1262a5e4fd3c429df3058b504eb2cfc36ce4ad2fc SHA512 969cfdfb82f40957d1fa923a4640596cd08529eb9159527365094a3ab0d3e5ad6ff023eea34ad3b1328102f5d03ec8bf7da0958c77dfaee058f5e361a3dc395a WHIRLPOOL bf6960fe18c5181253d428ae678ed3f2e8203cbfcf0d7105d19ac5c6ce1d3c7acdf131062cfca255839c95bfa8f692f6463c9b7d41ad62d80c7a738b758bad71
DIST salt-2015.5.9.tar.gz 5689839 SHA256 71e1c31ebe73edf17b43afcee7de689bb39cc6e97742cd0e110386106fa3fc5b SHA512 389fa09e2e89bb0631f5a2f1d7ef363f8b3a260d466cd7b5fdf7bfc296f5fb64fa355dc56a401df326cefe43e63904061db4fc01a3b5c1cd54fa34ee102a6ad9 WHIRLPOOL 094350e78b96c2633dedb2c4ab0caa959a634e84bf2e92145880eec883ec076765c8b897c873e8f601325a69e7e3fe139163eec45fc6daa109edbd9a884b0dc2
-DIST salt-2015.8.1.tar.gz 6527650 SHA256 04133839b4632859ad696a40261d1d14b62902dbcaf7df2f9e5e926c89401c23 SHA512 d882e3a8e70cf19c64e14c35d4c69fa308b8502d01095ce3f8c383a0ee0b70dbefd4b8eda95205f2cba2fe237279e2a3425daf0d5bf66144fb97ca3be0ec162a WHIRLPOOL a1014b8b2b1f815e2f9981cf3c8696b151a4788afb5525021ad94a6d9da774870290ed94fa159b5e3d8f8c73a682417937a1c48b0431d009a21c1e89a32d61f0
DIST salt-2015.8.3.tar.gz 6757678 SHA256 2e9a262789b018f3443513105c0c6ae98934c9bc105a04cf9e5c073ef706218a SHA512 18a2c63d5e54d09468189450557974e47f87d8b7dde52beaae678120da1da1e7aecfff18cf0fdfb63a11cd5f6bab102c229462f0afe5e3e858c0c467761c7121 WHIRLPOOL 5f1e1562904aecf97027688adbe9a2eb1b910065e52a2e20e7bad67fc4e91660e3e1e04612ee3b18d9632f3ff782837336cf1a5d85d771b67071422a3cea9861
-DIST salt-vim-20141109.tar.gz 3783 SHA256 4989d111ad618ea3f5f7a7046a0ff6ce3ca6bc7f71fca90849f7c38947ab6d9a SHA512 d8d62ee827012e29586cf492f2881ee5870ed058828102f985e8b27300c115e01bb126f89decb15a19a8e206dc54c89856d4c31b3ff5320a36385cb5ed517a63 WHIRLPOOL 98026b2cdcb64665790475e3b20a7de294e5cefb390b414294756cad440bc040d9044ffd37a13f3c93af9be1a1bfd444710ff0df24895db624f49fddd16b5545
diff --git a/app-admin/salt/salt-2015.5.6.ebuild b/app-admin/salt/salt-2015.5.6.ebuild
deleted file mode 100644
index 875bbaa53d70..000000000000
--- a/app-admin/salt/salt-2015.5.6.ebuild
+++ /dev/null
@@ -1,119 +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 eutils systemd vim-plugin distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="http://saltstack.org/"
-SALT_VIM_HASH="20695f68e5895e5ae2b5884b78f5a2cd29897b05"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
- EGIT_BRANCH="develop"
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~x86 ~amd64"
-fi
-
-SRC_URI+=" vim-syntax? ( https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> salt-vim-20141109.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl redis selinux test timelib raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
- dev-python/jinja[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=www-servers/tornado-4.0[${PYTHON_USEDEP}]
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
- mako? ( dev-python/mako[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
- openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
- raet? (
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
- )
- zeromq? (
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
- dev-python/pycrypto[${PYTHON_USEDEP}]
- )
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
- selinux? ( sec-policy/selinux-salt )
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/pip[${PYTHON_USEDEP}]
- dev-python/virtualenv[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/timelib[${PYTHON_USEDEP}]
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
- >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
- ${RDEPEND}
- )"
-
-DOCS=(README.rst AUTHORS)
-
-REQUIRED_USE="|| ( raet zeromq )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch"
- "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
- "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
- "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
-)
-
-python_prepare() {
- # this test fails because it trys to "pip install distribute"
- rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py \
- || die "Failed to remove broken tests"
-}
-
-python_install_all() {
- local svc
- USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
- for svc in minion master syndic api; do
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
- systemd_dounit "${FILESDIR}"/salt-${svc}.service
- done
-
- insinto /etc/${PN}
- doins -r conf/*
-
- use vim-syntax && S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}" \
- vim-plugin_src_install
-}
-
-python_test() {
- # testsuite likes lots of files
- ulimit -n 3072
-
- # using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
- USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
- ${EPYTHON} tests/runtests.py \
- --unit-tests --no-report --verbose || die "testing failed"
-}
diff --git a/app-admin/salt/salt-2015.8.1.ebuild b/app-admin/salt/salt-2015.8.1.ebuild
deleted file mode 100644
index aaf7c84a1f5c..000000000000
--- a/app-admin/salt/salt-2015.8.1.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
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils systemd vim-plugin distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="http://saltstack.org/"
-SALT_VIM_HASH="20695f68e5895e5ae2b5884b78f5a2cd29897b05"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
- EGIT_BRANCH="develop"
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~x86 ~amd64"
-fi
-
-SRC_URI+=" vim-syntax? ( https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> salt-vim-20141109.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl profile redis selinux test timelib raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
- dev-python/jinja[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
- virtual/python-futures[${PYTHON_USEDEP}]
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
- mako? ( dev-python/mako[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
- openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
- raet? (
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
- )
- zeromq? (
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
- )
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
- selinux? ( sec-policy/selinux-salt )
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/pip[${PYTHON_USEDEP}]
- dev-python/virtualenv[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/timelib[${PYTHON_USEDEP}]
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
- >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
- ${RDEPEND}
- )"
-
-DOCS=(README.rst AUTHORS)
-
-REQUIRED_USE="|| ( raet zeromq )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2015.8.0-remove-pydsl-includes-test.patch"
- "${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch"
- "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
- "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
- "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
-)
-
-python_prepare() {
- # this test fails because it trys to "pip install distribute"
- rm tests/unit/{modules,states}/zcbuildout_test.py \
- tests/unit/modules/{rh_ip,win_network,random_org}_test.py
-}
-
-python_install_all() {
- local svc
- USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
- for svc in minion master syndic api; do
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
- systemd_dounit "${FILESDIR}"/salt-${svc}.service
- done
-
- insinto /etc/${PN}
- doins -r conf/*
-
- use vim-syntax && S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}" \
- vim-plugin_src_install
-}
-
-python_test() {
- # testsuite likes lots of files
- ulimit -n 3072
-
- # using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
- USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
- ${EPYTHON} tests/runtests.py \
- --unit-tests --no-report --verbose || die "testing failed"
-}
diff --git a/app-arch/engrampa/engrampa-1.8.0-r1.ebuild b/app-arch/engrampa/engrampa-1.8.0-r1.ebuild
deleted file mode 100644
index 53334556e9e8..000000000000
--- a/app-arch/engrampa/engrampa-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="Engrampa archive manager for MATE"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="caja"
-
-RDEPEND=">=x11-libs/gtk+-2.21.4:2
- >=dev-libs/glib-2.25.5:2
- >=dev-libs/json-glib-0.14:0
- x11-libs/gdk-pixbuf:2
- x11-libs/pango:0
- virtual/libintl:0
- caja? ( >=mate-base/caja-1.8:0 )
- !!app-arch/mate-file-archiver"
-
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.35:*
- dev-util/itstool:0
- >=mate-base/mate-common-1.8:0
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-src_prepare() {
- epatch "${FILESDIR}/engrampa-1.8.0-caja-schema-fix.patch"
- gnome2_src_prepare
-
- # Drop DEPRECATED flags as configure option doesn't do it, bug #385453
- sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
- copy-n-paste/Makefile.am copy-n-paste/Makefile.in || die
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-run-in-place \
- --disable-packagekit \
- --disable-deprecations \
- --with-gtk=2.0 \
- $(use_enable caja caja-actions)
-}
-
-DOCS="AUTHORS HACKING MAINTAINERS NEWS README TODO"
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- elog ""
- elog "${PN} is a frontend for several archiving utilities. If you want a"
- elog "particular achive format supported install the relevant package."
- elog
- elog "For example:"
- elog " 7-zip : emerge app-arch/p7zip"
- elog " ace : emerge app-arch/unace"
- elog " arj : emerge app-arch/arj"
- elog " cpio : emerge app-arch/cpio"
- elog " deb : emerge app-arch/dpkg"
- elog " iso : emerge app-cdr/cdrtools"
- elog " jar,zip : emerge app-arch/zip or emerge app-arch/unzip"
- elog " lha : emerge app-arch/lha"
- elog " lzma : emerge app-arch/xz-utils"
- elog " lzop : emerge app-arch/lzop"
- elog " rar : emerge app-arch/unrar"
- elog " rpm : emerge app-arch/rpm"
- elog " unstuff : emerge app-arch/stuffit"
- elog " zoo : emerge app-arch/zoo"
-}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 5dee812999b2..b874b25352ad 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,9 +1,8 @@
DIST gnupg-1.4.19.tar.bz2 3713811 SHA256 7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86 SHA512 cce2a83efb05f963ad0f8afd04999cc852889d46b4cad4cf399a37fd6e69f0911a5ccaa0192cb891a941cfa93125349b481efa789a127e3c0aa2c5ba53672741 WHIRLPOOL 14eaddca0981f05757aa0751b9563837efd3f5943a422d5f29e0de94eb6233b85b8848a1f4816ab7e897d6e656c7c08705115d53ed89f554604ffd2009c3c39f
DIST gnupg-1.4.20.tar.bz2 3692881 SHA256 04988b1030fa28ddf961ca8ff6f0f8984e0cddcb1eb02859d5d8fe0fe237edcc SHA512 8a66d5a45dcf0508601452061eb1965c3c56c56f0e5ded00b7f54c6104de0a305c1d526abd37be2f55cd9bde79600d9cfaf60536af77ff733d778ace5fcd9dad WHIRLPOOL 26344b6ba0e5f0f11fa411f5af265c922b3b1d62ff030433eb8dc6fef00dbf2ec3370ecb081dd5c6cf85a4a37e7f12aacc83e07b803cc80adda29a11a4a3c715
DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
-DIST gnupg-2.0.27.tar.bz2 4424679 SHA256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041c493a5ebc4b8f2978dbe930f2 SHA512 b05e75f5ef9881df9472818743c175cfe3254088086f36dc0fcf3d34e61f648f1775d90d404f6c622561df5066d972aadbf99ea8ec1290e5d7f7310f4ef2989e WHIRLPOOL abb353b20655002a0957e38d2b889fb5e6a47ba7b7546e1c70fc1f97cf42deeca8f2b061678983f3a160210f4eaf7529441246df1f9f1d875f5cc090456fdfb7
DIST gnupg-2.0.28.tar.bz2 4435779 SHA256 ce092ee4ab58fd19b9fb34a460c07b06c348f4360dd5dd4886d041eb521a534c SHA512 7e786fe0648d5ea453f9c7524fec4bd7d5eec26d28f723acf3cb2f7ec9c400c339f0926a179411876c3f8e08b06942dcec643dc930caf58239bbd4932f4bd3c1 WHIRLPOOL ccf7427e54a545914e89677618055a114b4c9dc4db48669a2fc726fced98475df4ed27c93bd180f1250d147111ee663c736cdf4e1d8afdc40ed967cdffd0eb66
DIST gnupg-2.0.29.tar.bz2 4416251 SHA256 68ed6b386ba78425b05a60e8ee22785ff0fef190bdc6f1c612f19a58819d4ac9 SHA512 23b452c740ab5c1e1e37337ae0583dd3b15df58a5bb5639c0c2aef1fb603e0a7d90a257ac99b0d9dfb68b81fa061c0c64e0bfd256c00d64e2f432192f5052f37 WHIRLPOOL f3d59a9453b4a65c726788c35b065ffc9cde0b746705080cd3491c73439786d791da29cf8f5bf1e5594a0e39cfaec214e346fe18ec3acf0b425dc396aa189f33
DIST gnupg-2.1.10.tar.bz2 5173253 SHA256 93bd58d81771a4fa488566e5d2e13b1fd7afc86789401eb41731882abfd26cf9 SHA512 ceea93a7e7d30e07839bcc52d4246fd5be1ec81a8c4d4d62059e2b0c0e58fab07a1531016f82bcc506340653d66c73541dd3f5897df7691abeb4068d94957003 WHIRLPOOL 01f92f6020b79b373d4d6879cc39913c575c67a52c1bd425770322de0ce5a9fbd796d800cbb41a15553fd30a6c8f85a794e0b4c09420a2b49f6cb0542cdb52fb
-DIST gnupg-2.1.8.tar.bz2 4900705 SHA256 a3b8d01e4690715d42e8f289493c85413766f3fa935e4fe7e5ff5b0f6e2781a3 SHA512 80176fda032c921d3716fba3d3a264f9951464fd578a9d8d60673585efef17e20eec4d026921ab7ab2d7bd4dbf0a2b94a33a58c07acb747eebcb758e42bafd57 WHIRLPOOL 32e2e959363529cfd9ca857f823970b6cdd6497a72515aa9e75c2a680c83acea55a38d8de19b16c7327f92c0ab326e76a37952014b317afe2689c211c0d1965b
+DIST gnupg-2.1.11.tar.bz2 5224007 SHA256 b7b0fb2c8c5d47d7ec916d4a1097c0ddcb94a12bb1c0ac424ad86b1ee316b61a SHA512 b39f3fb461ad879b1909808434c4b03dab4d1d79aa674fbc88e3d50960184c0c25a840206ff32b760672f1b2153253f4d7a88eb726d8662f629fa04b6739ad31 WHIRLPOOL 486d623e73172a6d7dc7a6e4a5b411e70e0002a960f0398833377b8e8d79e5456a73f945db7c8bbca6ff7fd33fbfb49ca587e3a393094ce0a16d86cd906f7f09
DIST gnupg-2.1.9.tar.bz2 4925167 SHA256 1cb7633a57190beb66f9249cb7446603229b273d4d89331b75c652fa4a29f7b6 SHA512 c19b8cac42b7060caada230b77f36a0b0ed0a05efd519818c5b4057ef0fcb16602f2f3ade2409de2ef353a9e2acc3e5fa106a4449c6929a36a599a82194c0ee0 WHIRLPOOL 105b83e82330a00084a0e9f3d96c8788ac2c9e7831beea0ea42786df4e378dc9e8f2c1a31f12af9c53d363aa71810cd231afdf8f20eab424fea5f59b103033a9
diff --git a/app-crypt/gnupg/gnupg-2.0.27-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.27-r1.ebuild
deleted file mode 100644
index 4e5e91e25b3d..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.27-r1.ebuild
+++ /dev/null
@@ -1,167 +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 toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
-
-COMMON_DEPEND_LIBS="
- >=dev-libs/libassuan-2
- >=dev-libs/libgcrypt-1.4:0=
- >=dev-libs/libgpg-error-1.11
- >=dev-libs/libksba-1.0.7
- >=dev-libs/pth-1.3.7
- >=net-misc/curl-7.10
- sys-libs/zlib
- bzip2? ( app-arch/bzip2 )
- readline? ( sys-libs/readline )
- smartcard? ( usb? ( virtual/libusb:0 ) )
- ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="app-crypt/pinentry"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
- ${COMMON_DEPEND_BINS}
- static? (
- >=dev-libs/libassuan-2[static-libs]
- >=dev-libs/libgcrypt-1.4:0=[static-libs]
- >=dev-libs/libgpg-error-1.11[static-libs]
- >=dev-libs/libksba-1.0.7[static-libs]
- >=dev-libs/pth-1.3.7[static-libs]
- >=net-misc/curl-7.10[static-libs]
- sys-libs/zlib[static-libs]
- bzip2? ( app-arch/bzip2[static-libs] )
- )
- nls? ( sys-devel/gettext )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
- ${COMMON_DEPEND_BINS}
- mta? ( virtual/mta )
- !<=app-crypt/gnupg-2.0.1
- selinux? ( sec-policy/selinux-gpg )
- nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # 'USE=static' support was requested:
- # gnupg1: bug #29299
- # gnupg2: bug #159623
- use static && append-ldflags -static
-
- if use smartcard; then
- myconf+=(
- --enable-scdaemon
- $(use_enable usb ccid-driver)
- )
- else
- myconf+=( --disable-scdaemon )
- fi
-
- if use elibc_SunOS || use elibc_AIX; then
- myconf+=( --disable-symcryptrun )
- else
- myconf+=( --enable-symcryptrun )
- fi
-
- # glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --enable-gpg \
- --enable-gpgsm \
- --enable-agent \
- --enable-large-secmem \
- --without-adns \
- "${myconf[@]}" \
- $(use_enable bzip2) \
- $(use_enable nls) \
- $(use_enable mta mailto) \
- $(use_enable ldap) \
- $(use_with readline) \
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
- default
-
- if use doc; then
- cd doc
- emake html
- fi
-}
-
-src_install() {
- default
-
- use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
-
- emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
- rm "${ED}"/usr/share/gnupg/help* || die
-
- dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
- doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
- dosym gpg2 /usr/bin/gpg
- dosym gpgv2 /usr/bin/gpgv
- dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
- dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
- dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
- if use ldap; then
- dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
- fi
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
- if use doc; then
- dohtml doc/gnupg.html/* doc/*.png
- fi
-}
-
-pkg_postinst() {
- elog "If you wish to view images emerge:"
- elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
- elog "Remember to use photo-viewer option in configuration file to activate"
- elog "the right viewer."
- elog
-
- if use smartcard; then
- elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
- use usb && elog " - a CCID-compatible reader, used directly through libusb;"
- elog " - sys-apps/pcsc-lite and a compatible reader device;"
- elog " - dev-libs/openct and a compatible reader device;"
- elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
- elog ""
- elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
- elog "app-crypt/ccid first."
- fi
-
- ewarn "Please remember to restart gpg-agent if a different version"
- ewarn "of the agent is currently used. If you are unsure of the gpg"
- ewarn "agent you are using please run 'killall gpg-agent',"
- ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-}
diff --git a/app-crypt/gnupg/gnupg-2.0.27.ebuild b/app-crypt/gnupg/gnupg-2.0.27.ebuild
deleted file mode 100644
index ffb48b43721d..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.27.ebuild
+++ /dev/null
@@ -1,163 +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 toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
-
-COMMON_DEPEND_LIBS="
- >=dev-libs/libassuan-2
- >=dev-libs/libgcrypt-1.4:0=
- >=dev-libs/libgpg-error-1.11
- >=dev-libs/libksba-1.0.7
- >=dev-libs/pth-1.3.7
- >=net-misc/curl-7.10
- sys-libs/zlib
- bzip2? ( app-arch/bzip2 )
- readline? ( sys-libs/readline )
- smartcard? ( usb? ( virtual/libusb:0 ) )
- ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="app-crypt/pinentry"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
- ${COMMON_DEPEND_BINS}
- static? (
- >=dev-libs/libassuan-2[static-libs]
- >=dev-libs/libgcrypt-1.4:0=[static-libs]
- >=dev-libs/libgpg-error-1.11[static-libs]
- >=dev-libs/libksba-1.0.7[static-libs]
- >=dev-libs/pth-1.3.7[static-libs]
- >=net-misc/curl-7.10[static-libs]
- sys-libs/zlib[static-libs]
- bzip2? ( app-arch/bzip2[static-libs] )
- )
- nls? ( sys-devel/gettext )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
- ${COMMON_DEPEND_BINS}
- mta? ( virtual/mta )
- !<=app-crypt/gnupg-2.0.1
- selinux? ( sec-policy/selinux-gpg )
- nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # 'USE=static' support was requested:
- # gnupg1: bug #29299
- # gnupg2: bug #159623
- use static && append-ldflags -static
-
- if use smartcard; then
- myconf+=(
- --enable-scdaemon
- $(use_enable usb ccid-driver)
- )
- else
- myconf+=( --disable-scdaemon )
- fi
-
- if use elibc_SunOS || use elibc_AIX; then
- myconf+=( --disable-symcryptrun )
- else
- myconf+=( --enable-symcryptrun )
- fi
-
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --enable-gpg \
- --enable-gpgsm \
- --enable-agent \
- --without-adns \
- "${myconf[@]}" \
- $(use_enable bzip2) \
- $(use_enable nls) \
- $(use_enable mta mailto) \
- $(use_enable ldap) \
- $(use_with readline) \
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
- default
-
- if use doc; then
- cd doc
- emake html
- fi
-}
-
-src_install() {
- default
-
- use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
-
- emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
- rm "${ED}"/usr/share/gnupg/help* || die
-
- dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
- doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
- dosym gpg2 /usr/bin/gpg
- dosym gpgv2 /usr/bin/gpgv
- dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
- dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
- dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
- if use ldap; then
- dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
- fi
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
- if use doc; then
- dohtml doc/gnupg.html/* doc/*.png
- fi
-}
-
-pkg_postinst() {
- elog "If you wish to view images emerge:"
- elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
- elog "Remember to use photo-viewer option in configuration file to activate"
- elog "the right viewer."
- elog
-
- if use smartcard; then
- elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
- use usb && elog " - a CCID-compatible reader, used directly through libusb;"
- elog " - sys-apps/pcsc-lite and a compatible reader device;"
- elog " - dev-libs/openct and a compatible reader device;"
- elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
- elog ""
- elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
- elog "app-crypt/ccid first."
- fi
-
- ewarn "Please remember to restart gpg-agent if a different version"
- ewarn "of the agent is currently used. If you are unsure of the gpg"
- ewarn "agent you are using please run 'killall gpg-agent',"
- ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-}
diff --git a/app-crypt/gnupg/gnupg-2.0.29.ebuild b/app-crypt/gnupg/gnupg-2.0.29.ebuild
deleted file mode 100644
index ba5a0c79bb2d..000000000000
--- a/app-crypt/gnupg/gnupg-2.0.29.ebuild
+++ /dev/null
@@ -1,167 +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 toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
-
-COMMON_DEPEND_LIBS="
- >=dev-libs/libassuan-2
- >=dev-libs/libgcrypt-1.5:0=
- >=dev-libs/libgpg-error-1.19
- >=dev-libs/libksba-1.0.7
- >=dev-libs/pth-1.3.7
- >=net-misc/curl-7.10
- sys-libs/zlib
- bzip2? ( app-arch/bzip2 )
- readline? ( sys-libs/readline )
- smartcard? ( usb? ( virtual/libusb:0 ) )
- ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="app-crypt/pinentry"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
- ${COMMON_DEPEND_BINS}
- static? (
- >=dev-libs/libassuan-2[static-libs]
- >=dev-libs/libgcrypt-1.4:0=[static-libs]
- >=dev-libs/libgpg-error-1.11[static-libs]
- >=dev-libs/libksba-1.0.7[static-libs]
- >=dev-libs/pth-1.3.7[static-libs]
- >=net-misc/curl-7.10[static-libs]
- sys-libs/zlib[static-libs]
- bzip2? ( app-arch/bzip2[static-libs] )
- )
- nls? ( sys-devel/gettext )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
- ${COMMON_DEPEND_BINS}
- mta? ( virtual/mta )
- !<=app-crypt/gnupg-2.0.1
- selinux? ( sec-policy/selinux-gpg )
- nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # 'USE=static' support was requested:
- # gnupg1: bug #29299
- # gnupg2: bug #159623
- use static && append-ldflags -static
-
- if use smartcard; then
- myconf+=(
- --enable-scdaemon
- $(use_enable usb ccid-driver)
- )
- else
- myconf+=( --disable-scdaemon )
- fi
-
- if use elibc_SunOS || use elibc_AIX; then
- myconf+=( --disable-symcryptrun )
- else
- myconf+=( --enable-symcryptrun )
- fi
-
- # glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --enable-gpg \
- --enable-gpgsm \
- --enable-agent \
- --enable-large-secmem \
- --without-adns \
- "${myconf[@]}" \
- $(use_enable bzip2) \
- $(use_enable nls) \
- $(use_enable mta mailto) \
- $(use_enable ldap) \
- $(use_with readline) \
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
- default
-
- if use doc; then
- cd doc
- emake html
- fi
-}
-
-src_install() {
- default
-
- use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
-
- emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
- rm "${ED}"/usr/share/gnupg/help* || die
-
- dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
- doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
- dosym gpg2 /usr/bin/gpg
- dosym gpgv2 /usr/bin/gpgv
- dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
- dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
- dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
- if use ldap; then
- dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
- fi
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
- if use doc; then
- dohtml doc/gnupg.html/* doc/*.png
- fi
-}
-
-pkg_postinst() {
- elog "If you wish to view images emerge:"
- elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
- elog "Remember to use photo-viewer option in configuration file to activate"
- elog "the right viewer."
- elog
-
- if use smartcard; then
- elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
- use usb && elog " - a CCID-compatible reader, used directly through libusb;"
- elog " - sys-apps/pcsc-lite and a compatible reader device;"
- elog " - dev-libs/openct and a compatible reader device;"
- elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
- elog ""
- elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
- elog "app-crypt/ccid first."
- fi
-
- ewarn "Please remember to restart gpg-agent if a different version"
- ewarn "of the agent is currently used. If you are unsure of the gpg"
- ewarn "agent you are using please run 'killall gpg-agent',"
- ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-}
diff --git a/app-crypt/gnupg/gnupg-2.1.10.ebuild b/app-crypt/gnupg/gnupg-2.1.11.ebuild
index a1c4aba5291d..4b96da9052d2 100644
--- a/app-crypt/gnupg/gnupg-2.1.10.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,14 +20,14 @@ COMMON_DEPEND_LIBS="
dev-libs/npth
>=dev-libs/libassuan-2.4.1
>=dev-libs/libgcrypt-1.6.2[threads]
- >=dev-libs/libgpg-error-1.17
+ >=dev-libs/libgpg-error-1.21
>=dev-libs/libksba-1.2.0
>=net-misc/curl-7.10
gnutls? ( >=net-libs/gnutls-3.0 )
sys-libs/zlib
ldap? ( net-nds/openldap )
bzip2? ( app-arch/bzip2 )
- readline? ( sys-libs/readline:= )
+ readline? ( sys-libs/readline:0= )
smartcard? ( usb? ( virtual/libusb:0 ) )
tofu? ( >=dev-db/sqlite-3.7 )
"
diff --git a/app-crypt/gnupg/gnupg-2.1.8.ebuild b/app-crypt/gnupg/gnupg-2.1.8.ebuild
deleted file mode 100644
index 4e192a18c3d2..000000000000
--- a/app-crypt/gnupg/gnupg-2.1.8.ebuild
+++ /dev/null
@@ -1,169 +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 toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-MY_P="${P/_/-}"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
-
-COMMON_DEPEND_LIBS="
- dev-libs/npth
- >=dev-libs/libassuan-2
- >=dev-libs/libgcrypt-1.6.2[threads]
- >=dev-libs/libgpg-error-1.17
- >=dev-libs/libksba-1.0.7
- >=net-misc/curl-7.10
- gnutls? ( >=net-libs/gnutls-3.0 )
- sys-libs/zlib
- ldap? ( net-nds/openldap )
- bzip2? ( app-arch/bzip2 )
- readline? ( sys-libs/readline:= )
- smartcard? ( usb? ( virtual/libusb:0 ) )
- "
-COMMON_DEPEND_BINS="app-crypt/pinentry
- !app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
- ${COMMON_DEPEND_BINS}
- static? (
- >=dev-libs/libassuan-2[static-libs]
- >=dev-libs/libgcrypt-1.6.2[static-libs]
- >=dev-libs/libgpg-error-1.17[static-libs]
- >=dev-libs/libksba-1.0.7[static-libs]
- dev-libs/npth[static-libs]
- >=net-misc/curl-7.10[static-libs]
- sys-libs/zlib[static-libs]
- bzip2? ( app-arch/bzip2[static-libs] )
- )
- nls? ( sys-devel/gettext )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
- ${COMMON_DEPEND_BINS}
- selinux? ( sec-policy/selinux-gpg )
- nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # 'USE=static' support was requested:
- # gnupg1: bug #29299
- # gnupg2: bug #159623
- use static && append-ldflags -static
-
- if use smartcard; then
- myconf+=(
- --enable-scdaemon
- $(use_enable usb ccid-driver)
- )
- else
- myconf+=( --disable-scdaemon )
- fi
-
- if use elibc_SunOS || use elibc_AIX; then
- myconf+=( --disable-symcryptrun )
- else
- myconf+=( --enable-symcryptrun )
- fi
-
- # glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --enable-gpg \
- --enable-gpgsm \
- --enable-large-secmem \
- --without-adns \
- "${myconf[@]}" \
- $(use_enable bzip2) \
- $(use_enable gnutls) \
- $(use_with ldap) \
- $(use_enable nls) \
- $(use_with readline) \
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
- default
-
- if use doc; then
- cd doc
- emake html
- fi
-}
-
-src_install() {
- default
-
- use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
-
- emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
- rm "${ED}"/usr/share/gnupg/help* || die
-
- dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
- doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
- dosym gpg2 /usr/bin/gpg
- dosym gpgv2 /usr/bin/gpgv
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
- if use doc; then
- dohtml doc/gnupg.html/* doc/*.png
- fi
-}
-
-pkg_postinst() {
- elog "If you wish to view images emerge:"
- elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
- elog "Remember to use photo-viewer option in configuration file to activate"
- elog "the right viewer."
- elog
-
- if use smartcard; then
- elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
- use usb && elog " - a CCID-compatible reader, used directly through libusb;"
- elog " - sys-apps/pcsc-lite and a compatible reader device;"
- elog " - dev-libs/openct and a compatible reader device;"
- elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
- elog ""
- elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
- elog "app-crypt/ccid first."
- fi
-
- ewarn "Please remember to restart gpg-agent if a different version"
- ewarn "of the agent is currently used. If you are unsure of the gpg"
- ewarn "agent you are using please run 'killall gpg-agent',"
- ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- elog "If upgrading from a version prior than 2.1 you might have to re-import"
- elog "secret keys after restarting the gpg-agent as the new version is using"
- elog "a new storage mechanism."
- elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
- fi
-}
diff --git a/app-crypt/gnupg/gnupg-2.1.9.ebuild b/app-crypt/gnupg/gnupg-2.1.9.ebuild
deleted file mode 100644
index 71d0db3f87ad..000000000000
--- a/app-crypt/gnupg/gnupg-2.1.9.ebuild
+++ /dev/null
@@ -1,169 +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 toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-MY_P="${P/_/-}"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
-
-COMMON_DEPEND_LIBS="
- dev-libs/npth
- >=dev-libs/libassuan-2
- >=dev-libs/libgcrypt-1.6.2[threads]
- >=dev-libs/libgpg-error-1.17
- >=dev-libs/libksba-1.0.7
- >=net-misc/curl-7.10
- gnutls? ( >=net-libs/gnutls-3.0 )
- sys-libs/zlib
- ldap? ( net-nds/openldap )
- bzip2? ( app-arch/bzip2 )
- readline? ( sys-libs/readline:= )
- smartcard? ( usb? ( virtual/libusb:0 ) )
- "
-COMMON_DEPEND_BINS="app-crypt/pinentry
- !app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
- ${COMMON_DEPEND_BINS}
- static? (
- >=dev-libs/libassuan-2[static-libs]
- >=dev-libs/libgcrypt-1.6.2[static-libs]
- >=dev-libs/libgpg-error-1.17[static-libs]
- >=dev-libs/libksba-1.0.7[static-libs]
- dev-libs/npth[static-libs]
- >=net-misc/curl-7.10[static-libs]
- sys-libs/zlib[static-libs]
- bzip2? ( app-arch/bzip2[static-libs] )
- )
- nls? ( sys-devel/gettext )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
- ${COMMON_DEPEND_BINS}
- selinux? ( sec-policy/selinux-gpg )
- nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # 'USE=static' support was requested:
- # gnupg1: bug #29299
- # gnupg2: bug #159623
- use static && append-ldflags -static
-
- if use smartcard; then
- myconf+=(
- --enable-scdaemon
- $(use_enable usb ccid-driver)
- )
- else
- myconf+=( --disable-scdaemon )
- fi
-
- if use elibc_SunOS || use elibc_AIX; then
- myconf+=( --disable-symcryptrun )
- else
- myconf+=( --enable-symcryptrun )
- fi
-
- # glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --enable-gpg \
- --enable-gpgsm \
- --enable-large-secmem \
- --without-adns \
- "${myconf[@]}" \
- $(use_enable bzip2) \
- $(use_enable gnutls) \
- $(use_with ldap) \
- $(use_enable nls) \
- $(use_with readline) \
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
- default
-
- if use doc; then
- cd doc
- emake html
- fi
-}
-
-src_install() {
- default
-
- use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
-
- emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
- rm "${ED}"/usr/share/gnupg/help* || die
-
- dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
- doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
- dosym gpg2 /usr/bin/gpg
- dosym gpgv2 /usr/bin/gpgv
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
- if use doc; then
- dohtml doc/gnupg.html/* doc/*.png
- fi
-}
-
-pkg_postinst() {
- elog "If you wish to view images emerge:"
- elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
- elog "Remember to use photo-viewer option in configuration file to activate"
- elog "the right viewer."
- elog
-
- if use smartcard; then
- elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
- use usb && elog " - a CCID-compatible reader, used directly through libusb;"
- elog " - sys-apps/pcsc-lite and a compatible reader device;"
- elog " - dev-libs/openct and a compatible reader device;"
- elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
- elog ""
- elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
- elog "app-crypt/ccid first."
- fi
-
- ewarn "Please remember to restart gpg-agent if a different version"
- ewarn "of the agent is currently used. If you are unsure of the gpg"
- ewarn "agent you are using please run 'killall gpg-agent',"
- ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- elog "If upgrading from a version prior than 2.1 you might have to re-import"
- elog "secret keys after restarting the gpg-agent as the new version is using"
- elog "a new storage mechanism."
- elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
- fi
-}
diff --git a/app-editors/uemacs-pk/Manifest b/app-editors/uemacs-pk/Manifest
index d8ed12ff9f05..dcbd5437708e 100644
--- a/app-editors/uemacs-pk/Manifest
+++ b/app-editors/uemacs-pk/Manifest
@@ -1,2 +1 @@
-DIST uemacs-4.0.15_p20130222.tar.xz 151928 SHA256 eafab30840c684006876133f5d5042df19fa31ca3cf69a4e38998d950d5ec5ba SHA512 1815acba3b5165c5df0f71d34d687cd0022e7fc812bdd2cdd6778e371dd0e08ede4f670b241cf75c65f16f63f464017b83a113a1db4f0265e81441cc6dec3c0e WHIRLPOOL 5767f13984e61c82e41e68c034d48dd11aeef67433be4918e7eaf2c6e2870b52a43d71994b106287d3fddbcbf78ad2dd4d9e5807384a1712930161f6f46d74fe
DIST uemacs-4.0.15_p20141208.tar.xz 151500 SHA256 271cf8afde5e069d5b22dfdb93ace83367a89ab9ebfb753e62219d3003633a62 SHA512 a632c82275ee652412aec7d8f3549d80c5fd5bb1211675828ec4c58365bb7819927ff4e92f6fb7b5b9030b681062773ea19f1af345d4d3ddb652c3d68507bdbb WHIRLPOOL aba112d6142a40b439300ab78c206d2cd4271486d45530c9a1500705ba46cbca03df11f1d0242bed1dd7701394c86a8349eb5661f3145ddd01a8f45ae5e478e7
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20130222.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20130222.ebuild
deleted file mode 100644
index f7b2cb2aee95..000000000000
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20130222.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="uEmacs/PK is an enhanced version of MicroEMACS"
-HOMEPAGE="https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary
- ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK"
-# snapshot from git repo
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/uemacs"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.0.15_p20110825-gentoo.patch
-}
-
-src_compile() {
- emake V=1 \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_install() {
- dobin em
- insinto /usr/share/${PN}
- doins emacs.hlp
- newins emacs.rc .emacsrc
- dodoc README readme.39e emacs.ps UTF-8-demo.txt
-}
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild
index c3b07b67089e..d08f6e28e867 100644
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild
+++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ LICENSE="free-noncomm"
SLOT="0"
KEYWORDS="amd64 x86 ~x86-fbsd"
-RDEPEND="sys-libs/ncurses"
+RDEPEND="sys-libs/ncurses:0"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/app-emulation/libcacard/libcacard-2.5.1.ebuild b/app-emulation/libcacard/libcacard-2.5.1.ebuild
index b4994a56273a..f24df6c1c5ac 100644
--- a/app-emulation/libcacard/libcacard-2.5.1.ebuild
+++ b/app-emulation/libcacard/libcacard-2.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://spice-space.org/download/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="static-libs"
RDEPEND=">=dev-libs/nss-3.13
diff --git a/app-emulation/qemu/qemu-2.5.0-r1.ebuild b/app-emulation/qemu/qemu-2.5.0-r1.ebuild
index 9f61eb31b458..8c353391966b 100644
--- a/app-emulation/qemu/qemu-2.5.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.5.0-r1.ebuild
@@ -20,7 +20,7 @@ else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
${BACKPORTS:+
https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+ KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-eselect/eselect-maven/eselect-maven-0.2-r2.ebuild b/app-eselect/eselect-maven/eselect-maven-0.2-r2.ebuild
deleted file mode 100644
index e3d3e53bc2ff..000000000000
--- a/app-eselect/eselect-maven/eselect-maven-0.2-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Manages Maven symlinks"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.8
- !<dev-java/maven-bin-2.0.10-r1:2.1
- !app-eselect/eselect-java"
-PDEPEND="
-|| (
- dev-java/maven-bin:3.0
- dev-java/maven-bin:2.2
- dev-java/maven-bin:2.0
-)"
-
-src_install() {
- insinto /usr/share/eselect/modules
- newins "${FILESDIR}/maven-${PV}.eselect" maven.eselect \
- || die "newins failed"
-}
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
new file mode 100644
index 000000000000..f5d475a77606
--- /dev/null
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Manage /usr/bin/pinentry symlink"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
+
+S=${FILESDIR}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins pinentry.eselect-${PV} pinentry.eselect
+}
diff --git a/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7 b/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7
new file mode 100644
index 000000000000..37db8691804f
--- /dev/null
+++ b/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Manage /usr/bin/pinentry implementation"
+MAINTAINER="ssuominen@gentoo.org"
+VERSION="0.7"
+
+SYMLINK_PATH=/usr/bin/pinentry
+SYMLINK_TARGETS=( pinentry-gnome3 pinentry-qt pinentry-gtk-2 pinentry-qt4 pinentry-curses pinentry-tty )
+SYMLINK_DESCRIPTION='pinentry binary'
+
+inherit bin-symlink
diff --git a/dev-java/geoip-java/Manifest b/dev-java/geoip-java/Manifest
new file mode 100644
index 000000000000..ef1ccb48761c
--- /dev/null
+++ b/dev-java/geoip-java/Manifest
@@ -0,0 +1 @@
+DIST geoip-java-1.3.0.zip 138673 SHA256 be987fd9ca10d1288660a09dac28a1402a89d1f8abb557ca54eeea4f552fd60e SHA512 3925a94072a97dac732f4a77f4f141e1484c630b2122b4322cb487c209adbbb30936b782579943c1c766b43ef4ad0db3e264c738ad777656706272ca53ccf85b WHIRLPOOL 614fd9c0de213bd970c7d1d10223a6767d218ae911bf534a35c350af03518adc5d0cf134fbc33e6a7fe280ff9cbc376961868451f82dbdb158d4185b7bfbb80e
diff --git a/dev-java/geoip-java/geoip-java-1.3.0.ebuild b/dev-java/geoip-java/geoip-java-1.3.0.ebuild
new file mode 100644
index 000000000000..377a2b7b7be9
--- /dev/null
+++ b/dev-java/geoip-java/geoip-java-1.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="source doc examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="geoip-api-java"
+
+DESCRIPTION="Java library for lookup countries by IP addresses."
+HOMEPAGE="https://github.com/maxmind"
+SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+ rm -rf src/test || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+
+ dodoc README.md Changes.md || die
+
+ use examples && java-pkg_doexamples examples/*
+}
+
+pkg_postinst() {
+ einfo "Country and City data files can be downloaded here:"
+ einfo " http://www.maxmind.com/app/geolitecountry"
+ einfo " http://www.maxmind.com/app/geolitecity"
+}
diff --git a/dev-java/geoip-java/metadata.xml b/dev-java/geoip-java/metadata.xml
new file mode 100644
index 000000000000..16b146cb66aa
--- /dev/null
+++ b/dev-java/geoip-java/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <upstream>
+ <remote-id type="github">maxmind/geoip-api-java</remote-id>
+ </upstream>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 3a51904910dc..f21f5e746ca6 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,9 +1,8 @@
DIST apache-maven-2.0.11-bin.tar.bz2 2104711 SHA256 f8e91b43def9b78d01f0ad8374644aa737365144dea04a97f9503ac0011ad39c SHA512 829a583e44ea997576cb0949d74f95e6557069489329523c28c44b546f07cd9487a75f4326d7dc0a098a9755fd52630f2ee27a60daf35006eb48d6af250f84de WHIRLPOOL 5e467ee3f35ea7bb4a7d396e61c3f163702d1cc02d7daf4208b475e3d28be5e0d6d6e0a15ebc1a6d2d6d9697047562064c5309eec1491a3837067a71bcf81b42
DIST apache-maven-2.2.1-bin.tar.bz2 2839688 SHA256 a8d819f78bec0505f5773962fc50117f0c5db4a69c7207d0c27cabffc950939f SHA512 ffbf74b6b51616dcd87252973ddd776f13861fece7cd25df9cfba4bda1d8dd574772cb5d37ac7ed97ef8b93b507939d428d47b9b81742c801c7958b9fd6188e7 WHIRLPOOL 17cdba09856646acf5a37c252c6dcc200bae6eb16ee07ee6620bdee832b452a3a1db8d61289cff3f849f5c0d57c673cfc4749e220dc52b2b5ec50d4d9cd1062a
DIST apache-maven-3.0.4-bin.tar.gz 4873043 SHA256 d35a876034c08cb7e20ea2fbcf168bcad4dff5801abad82d48055517513faa2f SHA512 d6935daff3b80ed6e40ee0acb4f269b4b16e63bc29b792316599a9847f1b33d9309d3c399cdb170710714a1d150957eedc909754de8f8a77d87bd20a0abcb36c WHIRLPOOL f1e15af0bc0f942a8c4e435fa2cde57221e3ef8f86d43197dd4486812b115b684ad8e0ebf5ba3f2f0ad9d0ae0c5f0b0ac26a10e5e170fffe2d47bb77522c4e68
-DIST apache-maven-3.1.0-bin.tar.gz 5439122 SHA256 59088c62c14b996d597bbd55e720866b0e13e36daed8a46a81c01058ee74bd54 SHA512 8c6b13c680de2f9cddb1dffd15ae44a8866a29e56c92ccd905fba1a656d2cab26c40b10c4168ffe11dd3bd4e5161c6d9ea01f450e7c89aba532b2a20f9fd2b07 WHIRLPOOL 9b80b5e5d49a27784bd9760dd326677809fd5bcc8872bc2ee356bde92a6523d6cf1ad0ddcfc3aff96b07fb315af5f3c04b2278f5fd11964c76f179329dca8c8e
DIST apache-maven-3.1.1-bin.tar.gz 5494427 SHA256 077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1 WHIRLPOOL 60aa84a2f6441deb005c41e00b4dbc790f8679d5387ffd6602d8008206718655784822816c9a9898cb9b09c75bb3b3d824c71150e4ac747bd0eb1dabe2bacdcd
-DIST apache-maven-3.2.3-bin.tar.gz 6956162 SHA256 bf3f04aadee3a67158aebdfb0b4cb022063329d459d10fd6b4b02223e10aa8ed SHA512 9c211b17a8109939a776a4ad0e833ce9b301941eb0cfd4e8978634589ea48227cb979b5819c4b151184cff46bb44139c09477e904daa00ac769b0c756859f6f0 WHIRLPOOL 6a254dc8beb6d1d42299dd563da1eaeccff11bbfd18a122cb015ee28e55f59ae0b4e512a48b697fa09004edd8bae7dbef32bce24dbc9f5913b7cdd311a6ec6b3
DIST apache-maven-3.2.5-bin.tar.gz 7956528 SHA256 8c190264bdf591ff9f1268dc0ad940a2726f9e958e367716a09b8aaa7e74a755 SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5 WHIRLPOOL 79feb96c42dfd2235b0513ce50cf3d684224dcbccb290d2d80565648a6b30af8961b2e3d02d38818ca5c89386c5a25f2a8025e696279a339844535c2d2733f96
DIST apache-maven-3.3.3-bin.tar.gz 8042383 SHA256 3a8dc4a12ab9f3607a1a2097bbab0150c947ad6719d8f1bb6d5b47d0fb0c4779 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5 WHIRLPOOL a3bbce5c92878dbf58f9e63a18cefbb8de90fa4d91ec6ac60cee01b684891a9f757ece5f62659b7838ea347e0d27b8801c10b0e4bf1384446607b60d46a1bf9e
+DIST apache-maven-3.3.9-bin.tar.gz 8491533 SHA256 6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0 WHIRLPOOL a17d87711a925d502bb05d09166708b50304942aace82a6ed69dd9f73938590f1cf488eb4b9fb10f94250d804e6342d264f6a9407218fe9b38c242c06375b28b
DIST maven-1.1.tar.gz 7625074 SHA256 6913083d2db1d32ee5e18db7280be0f8ce36224aba3595690e85054f2ad5e731 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0 WHIRLPOOL 2137afc57306d840d04a38a09f5b40d946d10f8216ebff4a3a0a385f475316266339f4b8d07b461a2004d487c6b74a68fc2db5f38cb831ed0947259f1cd08d48
diff --git a/dev-java/maven-bin/maven-bin-1.1-r1.ebuild b/dev-java/maven-bin/maven-bin-1.1-r1.ebuild
deleted file mode 100644
index 540bf09c6099..000000000000
--- a/dev-java/maven-bin/maven-bin-1.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-MY_PN=${PN/-bin}
-MY_PV=${PV/_/-}
-MY_P=${MY_PN}-${MY_PV}
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-LICENSE="Apache-2.0"
-SLOT="1.1"
-KEYWORDS="amd64 x86"
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jdk-1.5"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-MAVEN=${PN}-${SLOT}
-MAVEN_HOME="/usr/share/${MAVEN}"
-MAVEN_BIN="${MAVEN_HOME}/bin"
-
-src_compile() { :; }
-
-src_install() {
- dodir ${MAVEN_HOME}
- insinto ${MAVEN_HOME}
- doins -r bin lib *.xsd plugins
-
- dodir ${MAVEN_BIN}
- exeinto ${MAVEN_BIN}
- doexe "${FILESDIR}/${MY_PN}"
-
- dodir /usr/bin
- dosym ${MAVEN_BIN}/${MY_PN} /usr/bin/${MY_PN}-${SLOT} || die sym failed
-}
diff --git a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
index accade5574ea..19ff180b0984 100644
--- a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
+++ b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
@@ -18,7 +18,7 @@ SLOT="1.1"
KEYWORDS="amd64 x86"
IUSE=""
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
+DEPEND="app-eselect/eselect-java"
RDEPEND=">=virtual/jdk-1.5
${DEPEND}"
diff --git a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
index 12e3c93e731b..b54e5a95e347 100644
--- a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
@@ -19,7 +19,7 @@ SLOT="2.0"
KEYWORDS="amd64 x86"
IUSE=""
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
+DEPEND="app-eselect/eselect-java"
RDEPEND=">=virtual/jdk-1.4
${DEPEND}"
diff --git a/dev-java/maven-bin/maven-bin-2.0.11.ebuild b/dev-java/maven-bin/maven-bin-2.0.11.ebuild
deleted file mode 100644
index f8adcfba4e5c..000000000000
--- a/dev-java/maven-bin/maven-bin-2.0.11.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.bz2"
-HOMEPAGE="http://maven.apache.org/"
-LICENSE="Apache-2.0"
-SLOT="2.0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jdk-1.4
- app-eselect/eselect-maven"
-
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
- rm -v "${S}"/bin/*.bat || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
- dodir "${MAVEN_SHARE}"
- cp -Rp bin boot conf lib "${D}/${MAVEN_SHARE}" || die "failed to copy"
-
- java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
-
- dodoc NOTICE.txt README.txt || die
-
- dodir /usr/bin
- dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
- # bug #342901
- echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
- doenvd "${T}/25${MAVEN}"
-}
diff --git a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
index 518e15416594..821d9e4ca160 100644
--- a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
@@ -19,7 +19,7 @@ SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE=""
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
+DEPEND="app-eselect/eselect-java"
RDEPEND=">=virtual/jdk-1.5
${DEPEND}"
diff --git a/dev-java/maven-bin/maven-bin-2.2.1.ebuild b/dev-java/maven-bin/maven-bin-2.2.1.ebuild
deleted file mode 100644
index 01c1d03000d9..000000000000
--- a/dev-java/maven-bin/maven-bin-2.2.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.bz2"
-HOMEPAGE="http://maven.apache.org/"
-LICENSE="Apache-2.0"
-SLOT="2.2"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jdk-1.5
- app-eselect/eselect-maven"
-
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-src_unpack() {
- unpack ${A}
-
- rm -v "${S}"/bin/*.bat || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
- dodir "${MAVEN_SHARE}"
- cp -Rp bin boot conf lib "${D}/${MAVEN_SHARE}" || die "failed to copy"
-
- java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
-
- dodoc NOTICE.txt README.txt || die
-
- dodir /usr/bin
- dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
- # bug #342901
- echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
- doenvd "${T}/25${MAVEN}"
-}
diff --git a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
index ccd267a2d11b..c8fe40d4c39a 100644
--- a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
@@ -19,7 +19,7 @@ SLOT="3.0"
KEYWORDS="amd64 x86"
IUSE=""
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
+DEPEND="app-eselect/eselect-java"
RDEPEND=">=virtual/jdk-1.5
${DEPEND}"
diff --git a/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild b/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild
deleted file mode 100644
index 10157f672493..000000000000
--- a/dev-java/maven-bin/maven-bin-3.1.0-r1.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="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="~amd64 ~x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )
- || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
- dev-java/avalon-framework:4.1
- dev-java/commons-io:1
- dev-java/juel:0
- dev-java/osgi-core-api:0
- java-virtuals/servlet-api:2.4"
-
-RDEPEND=">=virtual/jdk-1.5
- ${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
- rm -v "${S}"/bin/*.bat || die
-
- chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-
- # Register jars.
- java-pkg_getjars avalon-framework-4.1,commons-io-1,juel,osgi-core-api,servlet-api-2.4 > /dev/null
- has_version dev-java/commons-logging:0 && java-pkg_getjars commons-logging > /dev/null
- has_version dev-java/avalon-logkit:2.0 && java-pkg_getjars avalon-logkit-2.0 > /dev/null
- has_version dev-java/log4j:0 && java-pkg_getjars log4j > /dev/null
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
- dodir "${MAVEN_SHARE}"
-
- cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
- dodoc NOTICE.txt README.txt
-
- dodir /usr/bin
- dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
- # See bug #342901.
- echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
- doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
- eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
- eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.1.0.ebuild b/dev-java/maven-bin/maven-bin-3.1.0.ebuild
deleted file mode 100644
index 35cef940a0d1..000000000000
--- a/dev-java/maven-bin/maven-bin-3.1.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )
- dev-java/avalon-framework:4.1
- dev-java/avalon-logkit:2.0
- dev-java/commons-io:1
- dev-java/juel:0
- dev-java/log4j:0
- dev-java/osgi-core-api:0
- java-virtuals/servlet-api:2.4"
-
-RDEPEND=">=virtual/jdk-1.5
- ${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
- rm -v "${S}"/bin/*.bat || die
-
- chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-
- java-pkg_getjars avalon-framework-4.1,avalon-logkit-2.0,commons-io-1,juel,log4j,osgi-core-api,servlet-api-2.4 > /dev/null
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
- dodir "${MAVEN_SHARE}"
-
- cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
- dodoc NOTICE.txt README.txt
-
- dodir /usr/bin
- dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
- # See bug #342901.
- echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
- doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
- eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
- eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.1.1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
index a2c003fd5f9a..231722f3efdc 100644
--- a/dev-java/maven-bin/maven-bin-3.1.1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
@@ -17,14 +17,14 @@ HOMEPAGE="http://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="3.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
# TODO: Needs further resolution:
#
# - https://bugs.gentoo.org/show_bug.cgi?id=472850
# - https://bugs.gentoo.org/show_bug.cgi?id=477436
#
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )
+DEPEND="app-eselect/eselect-java
|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
dev-java/aopalliance:1
dev-java/avalon-framework:4.1
diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
index 601fe9bf10e4..cb45379825de 100644
--- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
@@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~x86"
# - https://bugs.gentoo.org/show_bug.cgi?id=472850
# - https://bugs.gentoo.org/show_bug.cgi?id=477436
#
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )
+DEPEND="app-eselect/eselect-java
|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
dev-java/aopalliance:1
dev-java/avalon-framework:4.1
diff --git a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
index 10196859c5b8..c65d45a716dd 100644
--- a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="3.3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
# TODO: Needs further resolution:
#
@@ -40,7 +40,7 @@ CDEPEND="
DEPEND="
${CDEPEND}
- || ( app-eselect/eselect-java app-eselect/eselect-maven )
+ app-eselect/eselect-java
|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
>=virtual/jdk-1.7"
diff --git a/dev-java/maven-bin/maven-bin-3.3.3.ebuild b/dev-java/maven-bin/maven-bin-3.3.3.ebuild
deleted file mode 100644
index f304b7ee4aaa..000000000000
--- a/dev-java/maven-bin/maven-bin-3.3.3.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"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.3"
-KEYWORDS="~amd64 ~x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )
-|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
-dev-java/aopalliance:1
-dev-java/avalon-framework:4.1
-dev-java/commons-cli:1
-dev-java/commons-io:1
-dev-java/javax-inject:0
-dev-java/jsoup:0
-dev-java/jsr250:0
-dev-java/juel:0
-dev-java/osgi-core-api:0
-java-virtuals/interceptor-api:0
-java-virtuals/servlet-api:2.4"
-
-RDEPEND=">=virtual/jdk-1.8
->=virtual/jre-1.8
-${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
- rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
- chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
- # Symlink jars.
- cd lib || die
- java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
- has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
- has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
- has_version dev-java/log4j:0 && java-pkg_jar-from log4j
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
- dodir "${MAVEN_SHARE}"
-
- cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
- java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
- dodoc NOTICE README.txt
-
- dodir /usr/bin
- dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
- # See bug #342901.
- echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
- doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
- eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
- eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.2.3.ebuild b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
index 40c967e8112c..817aa3298caf 100644
--- a/dev-java/maven-bin/maven-bin-3.2.3.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
HOMEPAGE="http://maven.apache.org/"
LICENSE="Apache-2.0"
-SLOT="3.2"
+SLOT="3.3"
KEYWORDS="~amd64 ~x86"
# TODO: Needs further resolution:
@@ -24,42 +24,62 @@ KEYWORDS="~amd64 ~x86"
# - https://bugs.gentoo.org/show_bug.cgi?id=472850
# - https://bugs.gentoo.org/show_bug.cgi?id=477436
#
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )
- || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
+CDEPEND="
+ dev-java/juel:0
+ dev-java/log4j:0
+ dev-java/jsoup:0
+ dev-java/jsr250:0
+ dev-java/commons-io:1
dev-java/aopalliance:1
- dev-java/avalon-framework:4.1
dev-java/commons-cli:1
- dev-java/commons-io:1
- dev-java/guava:14
dev-java/javax-inject:0
- dev-java/jsoup:0
- dev-java/jsr250:0
- dev-java/juel:0
dev-java/osgi-core-api:0
+ dev-java/commons-logging:0
java-virtuals/interceptor-api:0
- java-virtuals/servlet-api:2.4"
+ java-virtuals/servlet-api:3.0"
+
+DEPEND="
+ ${CDEPEND}
+ app-eselect/eselect-java
+ || ( dev-java/commons-logging:0 dev-java/log4j:0 )
+ >=virtual/jdk-1.7"
-RDEPEND=">=virtual/jdk-1.6
- ${DEPEND}"
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.7"
S="${WORKDIR}/${MY_P}"
-MAVEN=${PN}-${SLOT}
+MAVEN="${PN}-${SLOT}"
MAVEN_SHARE="/usr/share/${MAVEN}"
+MAVEN_DEPENDENCIES=(
+ juel
+ jsoup
+ log4j
+ jsr250
+ javax-inject
+ commons-io-1
+ osgi-core-api
+ aopalliance-1
+ commons-cli-1
+ commons-logging
+ interceptor-api
+ servlet-api-3.0
+)
+
java_prepare() {
- rm -fv \
- bin/*.bat \
- lib/{aopalliance,commons-cli,commons-io,guava,jsoup,javax.inject,jsr250}-*.jar || die
+ rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
# Symlink jars.
cd lib || die
- java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,guava-14,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
- has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
- has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
- has_version dev-java/log4j:0 && java-pkg_jar-from log4j
+
+ # Link deps.
+ for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
+ java-pkg_jar-from "${mvn_dep}"
+ done
}
# TODO: We should use jars from packages, instead of what is bundled.
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r1.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r1.ebuild
deleted file mode 100644
index 0a20825bd02e..000000000000
--- a/dev-libs/libindicate/libindicate-12.10.1-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
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils flag-o-matic vala
-
-DESCRIPTION="A library to raise flags on DBus for other components of the desktop to pick up and visualize"
-HOMEPAGE="https://launchpad.net/libindicate"
-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"
-IUSE="gtk +introspection"
-
-RESTRICT="test" # consequence of the -no-mono.patch
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
- >=dev-libs/glib-2.30
- >=dev-libs/libdbusmenu-0.6.2[introspection?]
- dev-libs/libxml2
- gtk? (
- dev-libs/libdbusmenu[gtk3]
- >=x11-libs/gtk+-3.2:3
- )
- introspection? ( >=dev-libs/gobject-introspection-1 )
- !<${CATEGORY}/${PN}-0.6.1-r201"
-EAUTORECONF_DEPEND="dev-util/gtk-doc-am
- gnome-base/gnome-common"
-DEPEND="${RDEPEND}
- ${EAUTORECONF_DEPEND}
- $(vala_depend)
- app-text/gnome-doc-utils
- virtual/pkgconfig"
-
-src_prepare() {
- vala_src_prepare
-
- epatch "${FILESDIR}"/${PN}-0.6.1-no-mono.patch
-
- sed -i -e "s:vapigen:vapigen-$(vala_best_api_version):" configure.ac || die
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- append-flags -Wno-error
-
- # python bindings are only for GTK+-2.x
- econf \
- --docdir=/usr/share/doc/${PF} \
- --disable-silent-rules \
- --disable-static \
- $(use_enable gtk) \
- $(use_enable introspection) \
- --disable-python \
- --disable-scrollkeeper \
- --with-gtk=3 \
- --with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog NEWS
-
- nonfatal dosym /usr/share/doc/${PF}/html/${PN} /usr/share/gtk-doc/html/${PN}
-
- prune_libtool_files
-}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index df0196e279a6..0f7d21ebe853 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,3 +3,4 @@ DIST libinput-1.0.1.tar.xz 800244 SHA256 482fb35119b457ba65a8bebaa47e4f6b4dbd77e
DIST libinput-1.1.0.tar.xz 802348 SHA256 673186ea2a0d2b695afaa9758834f9217b175774d9ae222e1b43ff63c663f582 SHA512 7f014eabed120c00fcd2d8748aed44a8ca31fd30bdda8b289ca63f7d1bebb9c49f1d508707fb0c4a5c7c4a37b58548efdff0e9b7761475f18e1cf787a80520e6 WHIRLPOOL 028518c20cfc6daa442dd92d04183a6575b95b1f4792a646ce42c09a7bc75e5bb469ca88b8cad89919c0814e00aa65178cc49c9dca6e9aad4ce997a94f9ba645
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
+DIST libinput-1.1.5.tar.xz 806960 SHA256 5e08c45dbb8bf32490cc6cd626da098564d646d161a07cba2e3adbd9745c0622 SHA512 031663c46b556048224aab018eb8ea76e34aace77508e52e6ef382a452585fafd4c91b427c0892aab3c624c0cfedc15c388922ae7166248e5da65575ff900c31 WHIRLPOOL 760cc1cf0c6657efbdadadd2f50e188d86465e1aa3f287275323d6fad9156b684de0d3b6dbf6e3fd5213018770726087ee282833f25ba5ef67918c0284b885a1
diff --git a/dev-libs/libinput/libinput-1.1.5.ebuild b/dev-libs/libinput/libinput-1.1.5.ebuild
new file mode 100644
index 000000000000..c1d8674d12ab
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.1.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 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-python/packaging/packaging-16.0.ebuild b/dev-python/packaging/packaging-16.0.ebuild
index 5bbc7fa32eb8..aa01c022d016 100644
--- a/dev-python/packaging/packaging-16.0.ebuild
+++ b/dev-python/packaging/packaging-16.0.ebuild
@@ -17,13 +17,14 @@ LICENSE="|| ( Apache-2.0 BSD-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"
IUSE="test"
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]"
+RDEPEND=""
DEPEND="${RDEPEND}
test? (
dev-python/pretend[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
)
"
+PDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]"
python_test() {
py.test --capture=no --strict -v || die
diff --git a/dev-python/pip/pip-8.0.2.ebuild b/dev-python/pip/pip-8.0.2-r1.ebuild
index 2dd8aa7ac4c9..f594034a97bf 100644
--- a/dev-python/pip/pip-8.0.2.ebuild
+++ b/dev-python/pip/pip-8.0.2-r1.ebuild
@@ -23,7 +23,7 @@ VENDOR_DEPEND="
>=dev-python/html5lib-0.9999999[${PYTHON_USEDEP}]
>=dev-python/six-1.9[${PYTHON_USEDEP}]
>=dev-python/colorama-0.3.6[${PYTHON_USEDEP}]
- >=dev-python/requests-2.9.1-r1[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.9.1-r2[${PYTHON_USEDEP}]
>=dev-python/CacheControl-0.11.5[${PYTHON_USEDEP}]
>=dev-python/lockfile-0.12.2[${PYTHON_USEDEP}]
>=dev-python/progress-1.2[${PYTHON_USEDEP}]
diff --git a/dev-ruby/facter/facter-3.1.4.ebuild b/dev-ruby/facter/facter-3.1.4-r1.ebuild
index 8034d1e107ed..53f9a1416e0a 100644
--- a/dev-ruby/facter/facter-3.1.4.ebuild
+++ b/dev-ruby/facter/facter-3.1.4-r1.ebuild
@@ -5,7 +5,7 @@
EAPI=5
USE_RUBY="ruby20 ruby21 ruby22"
-inherit cmake-utils ruby-ng
+inherit cmake-utils multilib ruby-ng
DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
@@ -36,7 +36,8 @@ src_prepare() {
sed -i 's/if(RUBY_VENDORDIR)/if(False)/g' lib/CMakeLists.txt || die
sed -i '/RUBY_VENDORDIR/d' lib/CMakeLists.txt || die
# make it support multilib
- sed -i 's/\ lib)/\ lib${LIB_SUFFIX})/g' lib/CMakeLists.txt || die
+ sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
+ sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
}
src_configure() {
@@ -47,6 +48,7 @@ src_configure() {
-DCMAKE_INSTALL_SYSCONFDIR=/etc
-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-DUSE_JRUBY_SUPPORT=FALSE
+ -DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
)
if use debug; then
mycmakeargs+=(
@@ -63,4 +65,9 @@ each_ruby_install() {
src_install() {
cmake-utils_src_install
ruby-ng_src_install
+ if [[ $(get_libdir) == lib64 ]]; then
+ dodir /usr/lib64
+ mv "${D}/usr/lib/"* "${D}/usr/lib64/"
+ rmdir "${D}/usr/lib"
+ fi
}
diff --git a/dev-ruby/metasploit-payloads/Manifest b/dev-ruby/metasploit-payloads/Manifest
index 90727a1d70f4..5216b758352c 100644
--- a/dev-ruby/metasploit-payloads/Manifest
+++ b/dev-ruby/metasploit-payloads/Manifest
@@ -1,5 +1,4 @@
DIST metasploit-payloads-1.0.15.gem 5249536 SHA256 8d186c3bcf8a4537b9a96301e8cc0d847335d3cfa87ca5b2e88a6b2980eab240 SHA512 58afa5c4bc191a05e3ec009d94d40f2d9fc5a025962088845db14aefc410340fdc7b1e30f17c75936495a43fc99576d188960bc5755dbec434d7428fbbdd495a WHIRLPOOL d136642c1de9b18e652c421ad3b9fd859b8d8850dd539d66d4c8b410e09064d7872bc06c505b01d5389d1e2ebe22ed6b3c88aa3a0f08a1578f204201c24b3438
-DIST metasploit-payloads-1.0.16.gem 11805696 SHA256 e127930c2b6cf09c91f2a2d7ef2a215aae2dee00172606c6b8644886b932301f SHA512 27f51db437f49d5685007e8a8762123890e6cce46b7465b2db3c070298e23bc4c440583c37da59b841a91deb100d47aa86db2d634f07ed212fbba11134c3fe47 WHIRLPOOL de81c9bbc1350621c8d3711fe29056a9116b7ffc63205f336d3efe22655777264c86790aec95d26af6858e516c0a667e368c021713ac87d8d20ff08b65e2bfd2
-DIST metasploit-payloads-1.0.17.gem 11816448 SHA256 a7dbdbe04a0af1e4ff709ddd4d5eaef71ba9b11cdaafa7f599d6f1f6c9990740 SHA512 1158bad67ffcaa9e1664cd074e5a2db7a342a20faf687eb069ef0737e55c7b84ebe7cc3ed30fe0d6b113a039ecad0ba1102100d5d3e2cdce63dfbc6bb0277d93 WHIRLPOOL 5012027a4a8956a4c009798066d1166b149368715cb55259c465578df37cea53491b89ada67e452768252afd7ac48f275aafb2237a2f53e9093fd9a958314c7c
DIST metasploit-payloads-1.0.19.gem 11816448 SHA256 ba5d9fa68f0efe13c52b20e2ce267099e788a446be2b275438910d666afc8633 SHA512 7551501619eb24ac38c7e8ecb4f037026ca360621f52d98703c3953cbfcd78192b6183c5c2cb3ae4b3a13484354b8652b9976ea2d9274278f9be23ac4f0aebd2 WHIRLPOOL 554fd259db13df063a884fce342275eb21b4d2843526e15de07e9466158606602fa83e3a9169ec06118f4b6a22013ebf522605708c48dcdf96648653bfbe0794
-DIST metasploit-payloads-1.0.9.gem 5248000 SHA256 bd9eec335158dd25e579c680856f8c48aa9ba081a5d51d87a05dbb1e511087a3 SHA512 4c08284d4b1d667f545d97e879b2581830f34d42560ba6d6ed7adf32312adc841d5fdd8b55ab4e06a196d1e313fb44fbb861ccac7790e50f88260e2def0a76ed WHIRLPOOL a398dcad94b38626d4bd3d9980d05a24ccdbc12bbd2e902dd4f78c9bcd2cf4a26c76645d989a00aec69d041d9203c5ff31e0b0f948028ac6cd06ae724d573950
+DIST metasploit-payloads-1.0.21.gem 11830784 SHA256 0489f9abe13d367098061639dfc2585d975d8373a9f2be78bbaef0b363f24b2c SHA512 2d505e9d60a2080d2ceaf46c13369d45d4b746008629d132096e4c0a427d2d4acd99f50fc4b1f22e51b3f146de961fd570678f4356199e4bf3669f2e1d36686c WHIRLPOOL 2aa30fd80bfe7be6213438635c736591ad6e0f030a020226e8d49e4773028c158aa88aa2e1a8660851285d8ad1e1e8b7c39dab709ff4384373cf670f6ac948fe
+DIST metasploit-payloads-1.0.22.gem 11831296 SHA256 812ee8df875940be9b3740fb87e6af0c0a1b545aba9c11334ad913cda275ddfb SHA512 d15eeec398d17332b4123a1028ba072f735a655d8e071df783c8bddc665df017920c49466036abb9d78c49373507a3fbca9df8fdd3c950894a9c2b43b07f8e14 WHIRLPOOL 31adb5ea479782bf9028b45f9d74a51778a940318f17cc39cdaab8588a8249f88d5a0892b083252ae615ab22a037b8a67b5a4f3848529e2a7c75e61b6f42dd05
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
index 8360c06db03f..cdc773d5c325 100644
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
+++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.19.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.19.ebuild
index 8360c06db03f..cdc773d5c325 100644
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.19.ebuild
+++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.19.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.16.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.21.ebuild
index 8360c06db03f..cdc773d5c325 100644
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.16.ebuild
+++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.21.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.17.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.22.ebuild
index 8360c06db03f..cdc773d5c325 100644
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.17.ebuild
+++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.22.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.9-r1.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.9-r1.ebuild
deleted file mode 100644
index 8360c06db03f..000000000000
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,45 +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_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
-HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
-
-LICENSE="BSD"
-
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-#no tests
-RESTRICT="test strip"
-
-QA_PREBUILT="
- usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
- usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
- usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
- usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
- usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
- usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
- usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
- "
-
-src_install() {
- ruby-ng_src_install
- #tell revdep-rebuild to ignore binaries meant for the target
- dodir /etc/revdep-rebuild
- cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
- #These dirs contain prebuilt binaries for running on the TARGET not the HOST
- SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
- EOF
-}
diff --git a/dev-ruby/metasploit_data_models/Manifest b/dev-ruby/metasploit_data_models/Manifest
index 8fbc3f16ae1d..abaf0e82e1da 100644
--- a/dev-ruby/metasploit_data_models/Manifest
+++ b/dev-ruby/metasploit_data_models/Manifest
@@ -1,2 +1,2 @@
-DIST metasploit_data_models-1.2.5.gem 170496 SHA256 7aa426e8f0d69c7a2c00f916dfbbbd19817ec0fe5e55e2d1260fb37ff8b32e29 SHA512 b7bb1f12da67b0a052cba68e5f870bc7512baba884573a79095abd4d55539c18956615bd7097f1c1260507222f80644a2d0a65bb9f3ca7cc4c45e275ee5c9500 WHIRLPOOL d6702bdeb59e8dcac3516f2ba8be3a319348e6a08803bcc93a8beba6a76a6e3ca5ce8e46263f9e30c37f01c745ab4badd3665a3984f7ea6ae015bb4b8c3330ec
+DIST metasploit_data_models-1.2.10.gem 171008 SHA256 9360ed8701d22eef77a819f1ca81daf03aae6d604e7f98efe097dc907e6f0e4a SHA512 f6f7e53a83b8e30df3dfd2f926e5d3df3f007a136f60abe58e1d683918c6cf1b17eba7e3172d83161858e8a9f1ad9d62c17e8769e543140e0286c809e6dcb60c WHIRLPOOL 013f53d51c717f0176da89613cae91de2c10847e91e83304b462c9d130117230c4db5112501f1c6ce959e8804931963a418cc338eb6f4f2a9eda970d9778ad31
DIST metasploit_data_models-1.2.9.gem 171008 SHA256 77f7e49fa88b7f3e98cfc651e4434ee3138357ab9501b002a2ac56d10977fecc SHA512 aa8edbb29336a2a2c606866476d9e9bd8235ef86d3598b4cc15f2b929c5f499586e61b6c3ae8c2d64d4c22c07d2b37545b2f7f9483bf58f983c16cd1f851cf02 WHIRLPOOL 1372139c5c7f391ae670d7ca83d5ea78aaacd9ad7ea2bd19bb17ca2830413a8e43e64c5839342eb1ac9e7ab0df1d997fee2be8a4a7ffb09075ec4176a15f6f3e
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.5.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.10.ebuild
index 7801599d2a6d..6a0cb28c67a4 100644
--- a/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.5.ebuild
+++ b/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.10.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 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"
-inherit ruby-fakegem versionator
+inherit ruby-fakegem
RUBY_FAKEGEM_EXTRAINSTALL="app config db script spec"
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rapid7/metasploit_data_models"
SRC_URI="mirror://rubygems/${P}.gem"
LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="${PV}"
KEYWORDS="~amd64 ~arm ~x86"
RESTRICT=test
#IUSE="development test"
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.9.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.9.ebuild
index 3ed4067b5d11..6a0cb28c67a4 100644
--- a/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.9.ebuild
+++ b/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 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"
inherit ruby-fakegem
diff --git a/dev-ruby/openssl-ccm/Manifest b/dev-ruby/openssl-ccm/Manifest
new file mode 100644
index 000000000000..438df6931848
--- /dev/null
+++ b/dev-ruby/openssl-ccm/Manifest
@@ -0,0 +1 @@
+DIST openssl-ccm-1.2.1.gem 24576 SHA256 2cc989e04018e43fcda72c4c81d75f5b803ecc77b541cb811392c00f76a705a2 SHA512 9cb2d7d0bc97b41f217f79b8488c5b4381754cf429dc07fe89bd51aea432c5eb19a1992b7bf9c7a402308949a734599f07dbf818e72550cbd584849946e4b0ba WHIRLPOOL 52de661205b0ce5322dcdcfabf3b9a3db2ad752067b782eeaa9bb2adb3e4e5f02855235e0e473fb69fcd17afeeb9fec6f63188856eed0f9b56a95997f673e3da
diff --git a/dev-ruby/openssl-ccm/metadata.xml b/dev-ruby/openssl-ccm/metadata.xml
new file mode 100644
index 000000000000..35e32e8a2205
--- /dev/null
+++ b/dev-ruby/openssl-ccm/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>zerochaos@gentoo.org</email>
+ <name>Rick Farina</name>
+ </maintainer>
+ <longdescription lang="en">
+</longdescription>
+ <upstream>
+ <remote-id type="github">SmallLars/openssl-ccm</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/openssl-ccm/openssl-ccm-1.2.1.ebuild b/dev-ruby/openssl-ccm/openssl-ccm-1.2.1.ebuild
new file mode 100644
index 000000000000..7f2610ba9b10
--- /dev/null
+++ b/dev-ruby/openssl-ccm/openssl-ccm-1.2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+inherit ruby-fakegem
+
+DESCRIPTION="OpenSSL CBC-MAC (CCM) ruby gem"
+HOMEPAGE="https://github.com/SmallLars/openssl-ccm"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT=test
+IUSE=""
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index c34c49584bd3..2e48950c0acd 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -3,6 +3,5 @@ DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a
DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f
DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
DIST cmake-3.3.2.tar.gz 6578184 SHA256 e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 SHA512 01bc0e6ca52a6836ef57360fb38dd92a4575bfa37bfe9625645db77fefd0c170383cfb07b61c6283bde96738ce1a5e18cb7569e7e0b7c98d4b99e86305c50180 WHIRLPOOL 7951dc18d695ca4554b287f91becd8ecb05324e10f9e2c9e34427d26db0d664ee7ab8a226eabed87d93087e41635059f96b1aaea503480f46a555cf3baae3ce7
-DIST cmake-3.4.0.tar.gz 6719859 SHA256 a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea SHA512 3600faa8475840e350954c8273829c1fb6dc63984860455b792b520e20a8fd9864c96d7afd6b42a6937624edf49b73c8807aa230a3ee9c24aa7aec136022bc90 WHIRLPOOL c9553caa44e90fb84702f7f361f59f25793cc93b8e288209eea531b77ece47ff820c82210dd60a3f42ead1f1c2998f5368554655dd383af60457efbe842e6ee4
-DIST cmake-3.4.1.tar.gz 6721965 SHA256 d41462bdd80dc37f0d5608167b354bb3af8c068eee640be04c907154c5c113e2 SHA512 072bbfc3ffe3a838945ce6e7c4bbce267362673c3b870886accdc5a5ee01dbd071604fca6aa519d077676423d37bfe987b71f22f14a194f8d6ec8fb9de0a6049 WHIRLPOOL daa399d922de6be05ed2189630fcddf9e15e295b39c1da47d0e7e7c4d5b290b2fd569c2a65da69f399d4e233f4c0349d313eb78df961013598b481e0fb577a21
DIST cmake-3.4.2.tar.gz 6722152 SHA256 da7cc34e1ce1d82e67a32ab081c02c2845534cd8bf2e09d88077a1b282e97392 SHA512 a06a3f1d2d2dcbc3c1d432bd7416632393b4f5219b89dc0ba000acefe6f0d713c35878344884ea9d9e595a6387b362c97a2432acd92c385cbddb4e7b916723bb WHIRLPOOL 42f66e4273367e821b4b06b630f84919a68bc0d4a2be2085a0f24fb79e1b20fb208abe78a1806570401ba6ca24ad1077b1be27c3e7a774491c8beb63f7d501af
+DIST cmake-3.4.3.tar.gz 6722311 SHA256 b73f8c1029611df7ed81796bf5ca8ba0ef41c6761132340c73ffe42704f980fa SHA512 a326c39cfe9f5408b4586ddd291cabfa400a2442947fb46d94dd6c44db3087c48c84a9a22ca5ed38707467448150383935ed59c669fbbfb20a968d4031eaaa11 WHIRLPOOL fdb3b47a242523919a56a63bf8e778e875f5721c997cdc1a6098f24eec57dadecc44d13b35d74ef1276aebf6f5299c89d4c91ce03c282d081b03ebba29c1ddad
diff --git a/dev-util/cmake/cmake-3.4.0-r1.ebuild b/dev-util/cmake/cmake-3.4.0-r1.ebuild
deleted file mode 100644
index bf3ff3840222..000000000000
--- a/dev-util/cmake/cmake-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
-
-RDEPEND="
- >=app-arch/libarchive-3.0.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- # prefix
- "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
- "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
- # handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
- "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch
-
- # respect python eclasses
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-
- # upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # BundleUtilities: bundle creation broken
- # CTest.updatecvs: which fails to commit as root
- # Fortran: requires fortran
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-3.4.1.ebuild b/dev-util/cmake/cmake-3.4.3.ebuild
index 90aced83be73..acd76b8aefe6 100644
--- a/dev-util/cmake/cmake-3.4.1.ebuild
+++ b/dev-util/cmake/cmake-3.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 05ddf24c27fa..977ba908a23a 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -15,10 +15,11 @@
# * GConf schemas management
# * scrollkeeper (old Gnome help system) management
-inherit eutils multilib xdg-utils
+[[ ${EAPI:-0} == [012345] ]] && inherit multilib
+inherit eutils xdg-utils
case "${EAPI:-0}" in
- 0|1|2|3|4|5) ;;
+ 0|1|2|3|4|5|6) ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 709ca980a2f2..7b021d298b1b 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -19,7 +19,7 @@ inherit toolchain-funcs versionator
# @DESCRIPTION:
# Currently EAPI 5 is supported.
case ${EAPI} in
- 5) ;;
+ 5|6) ;;
*) die "EAPI=${EAPI:-0} is not supported" ;;
esac
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 9aede6d6f79b..e75f20cf60b7 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -400,12 +400,12 @@ kde5_src_prepare() {
# only build examples when required
if ! use_if_iuse examples || ! use examples ; then
- comment_add_subdirectory examples
+ cmake_comment_add_subdirectory examples
fi
# only enable handbook when required
if ! use_if_iuse handbook ; then
- comment_add_subdirectory ${KDE_DOC_DIR}
+ cmake_comment_add_subdirectory ${KDE_DOC_DIR}
if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
punt_bogus_dep KF5 DocTools
@@ -423,7 +423,7 @@ kde5_src_prepare() {
rm -rf ${lang}
fi
if [[ -e CMakeLists.txt ]] ; then
- comment_add_subdirectory ${lang}
+ cmake_comment_add_subdirectory ${lang}
fi
fi
done
@@ -434,7 +434,7 @@ kde5_src_prepare() {
pushd ${KDE_DOC_DIR} > /dev/null || die
for lang in *; do
if ! has ${lang} ${LINGUAS} ; then
- comment_add_subdirectory ${lang}
+ cmake_comment_add_subdirectory ${lang}
fi
done
popd > /dev/null || die
@@ -445,7 +445,7 @@ kde5_src_prepare() {
# in frameworks, tests = manual tests so never build them
if [[ ${CATEGORY} = kde-frameworks ]]; then
- comment_add_subdirectory tests
+ cmake_comment_add_subdirectory tests
fi
case ${KDE_PUNT_BOGUS_DEPS} in
@@ -465,13 +465,13 @@ kde5_src_prepare() {
if [[ ${KDE_TEST} = forceoptional ]] ; then
punt_bogus_dep Qt5 Test
# if forceoptional, also cover non-kde categories
- comment_add_subdirectory autotests
- comment_add_subdirectory test
- comment_add_subdirectory tests
+ cmake_comment_add_subdirectory autotests
+ cmake_comment_add_subdirectory test
+ cmake_comment_add_subdirectory tests
elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
- comment_add_subdirectory autotests
- comment_add_subdirectory test
- comment_add_subdirectory tests
+ cmake_comment_add_subdirectory autotests
+ cmake_comment_add_subdirectory test
+ cmake_comment_add_subdirectory tests
fi
fi
}
@@ -537,7 +537,7 @@ kde5_src_test() {
unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID
if [[ ${VIRTUALX_REQUIRED} = always || ${VIRTUALX_REQUIRED} = test ]]; then
- VIRTUALX_COMMAND="_test_runner" virtualmake
+ virtx _test_runner
else
_test_runner
fi
diff --git a/games-strategy/triplea/Manifest b/games-strategy/triplea/Manifest
index 07a106dc7f2d..48d899135c55 100644
--- a/games-strategy/triplea/Manifest
+++ b/games-strategy/triplea/Manifest
@@ -1,2 +1 @@
-DIST triplea_1_7_0_3_source_code_only.zip 238479931 SHA256 4cd3a0596bfe4f81cc61e5eab02a5ccd96226a291c5afb8441df5bf9898829e5 SHA512 6d6ddff0a630e1ce357c00205636b3c7586159daf8a1c66fea371c0cd053aaa75814131267cb937d9e1dc313aa2eef99dd6c73fcd4275e82ac7a2250332a8a49 WHIRLPOOL da0b259ffaedecd425cd6ddecfef3d51bd35e0274dbd996298a4de299b1a4f8f8e0c74365af8fcaf21f49ab480b282562a6867c36b4918fcb6b4815b773308c2
DIST triplea_1_8_0_5_source_code_only.zip 377607369 SHA256 7d43d8936650ee5ce8b215c7bb6c5ac611f3a232559c0cbb48dba910f63643f5 SHA512 76275121e71b727d05c47612c3a27431beb3e610f1953c8aea4cef878bac4f0a4309794c805462b75fff71d875bc92395108f196f1e04544bb4ef0b8e298904c WHIRLPOOL be06d9c6c4af75ca3ab221b69c13e8e3139569f7108cb4c5de510397a888da7e21822dd1a2e1b5ee63ce5e2e36153d3651088d036089e6f1e08beb5a473f015c
diff --git a/games-strategy/triplea/triplea-1.7.0.3.ebuild b/games-strategy/triplea/triplea-1.7.0.3.ebuild
deleted file mode 100644
index e31734ae5e45..000000000000
--- a/games-strategy/triplea/triplea-1.7.0.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils java-pkg-2 java-ant-2 versionator games
-
-MY_PV=$(replace_all_version_separators _)
-DESCRIPTION="An open source clone of the popular Axis and Allies boardgame"
-HOMEPAGE="http://triplea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/triplea/${PN}_${MY_PV}_source_code_only.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="test" # Needs X11 maybe use virtualx.eclass
-
-RDEPEND="dev-java/commons-httpclient:3
- dev-java/apple-java-extensions-bin
- dev-java/commons-logging
- dev-java/commons-codec
- =dev-java/junit-3.8*"
-DEPEND="${RDEPEND}
- >=virtual/jdk-1.6
- app-arch/unzip"
-RDEPEND="${RDEPEND}
- >=virtual/jre-1.6"
-
-S=${WORKDIR}/${PN}_${MY_PV}
-
-pkg_setup() {
- games_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_prepare() {
- sed -i \
- -e 's:"triplea":".triplea":g' \
- src/games/strategy/engine/framework/GameRunner.java || die
-
- rm lib/derby_10_1_2.jar || die
- rm -r old/ || die
- java-pkg_jar-from apple-java-extensions-bin AppleJavaExtensions.jar \
- lib/AppleJavaExtensions.jar
- java-pkg_jar-from commons-httpclient-3 commons-httpclient.jar \
- lib/commons-httpclient-3.0.1.jar
- java-pkg_jar-from commons-logging commons-logging.jar \
- lib/commons-logging-1.1.jar
- java-pkg_jar-from commons-codec commons-codec.jar \
- lib/commons-codec-1.3.jar
- # installs the test files
- java-pkg_jar-from --into lib junit
- # Needs the substance package
- #java-pkg_jar-from substance substance.jar \
- # lib/substance_5_3.jar
-
- # also these from some other java package...
- #lib/mailapi.jar
- #lib/upnp.jar
- #lib/activation.jar
- #lib/smtp.jar
-
- #java-pkg_ensure-no-bundled-jars
-}
-
-src_compile() {
- eant || die
- echo "triplea.saveGamesInHomeDir=true" > data/triplea.properties
- # The only target creating this is zip which does unjar etc
- cd classes || die
- jar cf ../bin/triplea.jar * || die
- rm -r * || die
-}
-
-src_test() {
- ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r assets bin data dice_servers maps
-
- java-pkg_regjar "${D}/${GAMES_DATADIR}"/${PN}/bin/*.jar
- java-pkg_dolauncher ${PN} -into "${GAMES_PREFIX}" \
- --java_args "-Xmx256m" --main \
- games.strategy.engine.framework.GameRunner
- java-pkg_dolauncher ${PN}-server -into "${GAMES_PREFIX}" \
- --java_args "-server -Xmx64m -Dtriplea.lobby.port=3303 -Dtriplea.lobby.console=true" \
- --main games.strategy.engine.lobby.server.LobbyServer
-
- newicon icons/triplea_icon.png ${PN}.png
- newicon icons/triplea_icon.png ${PN}-server.png
- make_desktop_entry ${PN} TripleA
- make_desktop_entry ${PN}-server TripleA-server
-
- dodoc changelog.txt TripleA_RuleBook.pdf
- dohtml -r doc/* readme.html
- prepgamesdirs
-}
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 8d7d70f1fe8d..95111cfe2126 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,2 +1,3 @@
DIST ark-15.08.3.tar.xz 224880 SHA256 417057004e4f6c4a46178cc83f3891128172d4245f639fbbcdd76cc89b8bc170 SHA512 be7eee44ffe913187f3a7059e2e06f88973e34803ccb513c319f2f95cd9fef154725ca9085c123a9aa6f63e50c4f95b0885dad333348bdb1daf9047e58fb2e42 WHIRLPOOL 98ce7bcec7183dc168a7af0239b47319f5f8343098e472ba636cffe70573da1c277537d938b52de0deb99aec4bb4ad866f861e280ad8135f17ac99de31e9ab6e
+DIST ark-15.12.1.tar.xz 252940 SHA256 ca24cede837c4b3a9b84604651a2d4d5cf548aeaa27cb1c897ac79998398c174 SHA512 858c5e75fd5c441c11fe50fe16acf406e693231855ae75e3e890961490181cdc7813c3eca2009071d6bfdb982c8b8cebeef1ea9794e3d8339f2f599045d9d8ee WHIRLPOOL db1917b19f6edc3b69a522e202d101beb47b2e61d73265c5dfe49d6c11785909a5dfabf71d75703358d32a1a2cba0df65869da2692003c294ec279699c2638fb
DIST ark-4.14.3.tar.xz 236116 SHA256 cb2ef7ea9bbfccf3b16a1242681b33c1e6c17a7458f50f0703e87678a249b8dc SHA512 86cc44d26ac145797b3727f9b6195b6059f7163cf8abcd39313f9ee06fd86770a2e09c15bee9605968ebad07346dc116dd82b22b713db361a90c53c51dd325f7 WHIRLPOOL 7815d6f3f9af78e6a3327c8ab0f58b8bcd6253ffa794b114a8a7665d47758aed2991b59a1cd257b47fb8edea97ccac250c0b0ccac7289e554f08b20864030805
diff --git a/kde-apps/ark/ark-15.12.1.ebuild b/kde-apps/ark/ark-15.12.1.ebuild
new file mode 100644
index 000000000000..b25d88866e33
--- /dev/null
+++ b/kde-apps/ark/ark-15.12.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE Archiving tool"
+HOMEPAGE="https://www.kde.org/applications/utilities/ark
+https://utils.kde.org/projects/ark"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="bzip2 lzma zlib"
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kpty)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ >=app-arch/libarchive-3.0.0[bzip2?,lzma?,zlib?]
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package bzip2 BZip2)
+ $(cmake-utils_use_find_package lzma LibLZMA)
+ $(cmake-utils_use_find_package test Qt5Test)
+ $(cmake-utils_use_find_package zlib ZLIB)
+ )
+
+ kde5_src_configure
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ if ! has_version app-arch/rar ; then
+ elog "For creating rar archives, install app-arch/rar"
+ fi
+}
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 0148e07bcc83..8b1c141188d9 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,2 +1,3 @@
DIST filelight-15.08.3.tar.xz 287588 SHA256 428c4c3d8b422edfa5af3025d5b5d1fbc1a27a4c0c6111b8f0c1b1e5fbddcb50 SHA512 6b7dd553a8788ce5fc105f058ad56f58667dde78ad5d53c598a0fa91f923de44f030f11629e8effcad194028e553dacb6e98f0e38be9e4dc8f02a7b2fc19a165 WHIRLPOOL 792b37cf7e6f46ae8037173653f2be57bd384d1a9be0b5721a49072a13809787faf9032c66b5273ca17370423c269226b7ae211eef155ea30caa49e9bd7b1c46
+DIST filelight-15.12.1.tar.xz 287708 SHA256 60143f362715e8fc38b6cf3e81371fce679416b1c9b7c63eeb13ba1e9712447d SHA512 e6c40f4b8e0f5b6c7dea516ea3fcb40136173219e2dd86fe514eddfb5cc5f4372e5a192c71da0c6e92184bb6aaf855060a7436eecce7f8c7320e6fe0f4aef93a WHIRLPOOL 452e19d6e43433911ca885fd16e4aab8bbe9b52e3df4b369cdce3f45ef576e3e56001e8bf9c93f7861d5a4c22f5b509cb897b8b65d291c932217072c79d02ab1
DIST filelight-4.14.3.tar.xz 286976 SHA256 81d59038b6d748bb874ece861943e6cf0576ebde0c48ee953214d5ddbe09f79a SHA512 78c81f7b7598488d396cbda9e8281f21b53e20dd2c2793eb0fdb890913fec7ee65cfe4aa6bc8c782c00925c114fc9b9cf669975e6fad0722aeb9b57ec79b710b WHIRLPOOL 4fdb00b5e2278bfe49db1734bbdeade2cc690dca422a941266961928d6cd4be85aca0d23dc3d0c6ffcc4db814d6eb4c5a986cc790c2cabf956cefc8e8f984d9b
diff --git a/kde-apps/filelight/filelight-15.12.1.ebuild b/kde-apps/filelight/filelight-15.12.1.ebuild
new file mode 100644
index 000000000000..d250021fc227
--- /dev/null
+++ b/kde-apps/filelight/filelight-15.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
+HOMEPAGE="https://utils.kde.org/projects/filelight"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index 94e9cace095f..5a135987dfb2 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,2 +1,3 @@
DIST kcalc-15.08.3.tar.xz 83624 SHA256 01144c7d77f04fc1f6578fe0cab31aa301bfbac26bfcf49dd9da6854a258c0c6 SHA512 69159665d02de4c65a7a1ee0c451754a0b11f775f058357e4569691abfc009a49175570c69ad9331668ac85378484153eeb740208a9ec5f83b2279db95e95181 WHIRLPOOL 8c01558e7d75165a1baf290d1d7680ef57d947702b4d8a6fd6c90fc06d0e8b898f5866f766c040a92659c1adcb30497950b0d7eb1c7e408fd2009a7be9a311d6
+DIST kcalc-15.12.1.tar.xz 83544 SHA256 7c36817a8765170a2644d7503ea9483189634226d5ecf54a2acd083ea48bf7b5 SHA512 a2a5a4736405402f5748af2a799c6a96afb721e16c27c941465de2a562d89f3938abd2778a11e66da37decda8d7039e5253df3c6dc07f99aa4f17387a70726df WHIRLPOOL d6a3e5dc6628487b89c8641d5db9406d921dd6624ce120d7d1c862a716b98d8b7d9d3c0d0570a937f348961915d8e92e57624fef060a4963142ed4ab1390b5ab
DIST kcalc-4.14.3.tar.xz 81392 SHA256 9f072c3e97d3ad467b069a423c2759bc4bc2195443aebe8ca26b19f58044fd0e SHA512 ec8090b6bc8c78e7a63286c797e67617e4d9e335f6b29dce1dcbd41073465e6cf313d485f27f84a06d7cd04acc024051709b00f7be1dc8170e9531281d2deb16 WHIRLPOOL 2cbf7c2c52ab0868955ecaa422a1b90656eed6faf564af218075a9e6761ecde951af1ed6816a49777ac794f97ecff8e73388b270e91607c2644e764ad35f7b44
diff --git a/kde-apps/kcalc/kcalc-15.12.1.ebuild b/kde-apps/kcalc/kcalc-15.12.1.ebuild
new file mode 100644
index 000000000000..bc2de33be01e
--- /dev/null
+++ b/kde-apps/kcalc/kcalc-15.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_DOXYGEN="true"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE calculator"
+HOMEPAGE="https://www.kde.org/applications/utilities/kcalc
+https://utils.kde.org/projects/kcalc"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-libs/gmp:0
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kinit)
+ dev-libs/mpfr:0
+ sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}"
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 3891a53d3b86..17c659fd1517 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,2 +1,3 @@
DIST kcharselect-15.08.3.tar.xz 84632 SHA256 b665f51e67a0c5c1b94411f095f426b33074c4bcb82ff8835446f5b22eb2c347 SHA512 755dcc8675a4ec4d86f757d089d2e3c592624d04f35ef9407992eced03ee18b6a98d3ab7a3d451f1715c39d5af41f1770d1862e509d4940449c65c8f61936a12 WHIRLPOOL f1b0da2fae8777e652692a48d53ddcf9cde1a6d782e4661736efadc0ddac280101aa4170cfe9df2ff5f6bbe70e5da67df215a9d174e089d63338bd4c898da15d
+DIST kcharselect-15.12.1.tar.xz 72260 SHA256 2d156773e1e449c441dbac66a6b3e5d39c5fd763290216b980d1d9a4bb5a4fc9 SHA512 297da94eebcb0af863877be1e362199e8bb9d9ec1de2b9f453cd5fd94645cca39d569066453166b3378bbc6641cf77f3564c3b00839782c14f765cca0df0e03e WHIRLPOOL a723490483c636510c3b30e49b8aed243f9c2420460b8fb59b41a742592284b7886ae41bed2c4effb622265d3109501e234abeffc62b76a8237aa4ee145635b4
DIST kcharselect-4.14.3.tar.xz 84708 SHA256 e7579ee211831030354c0d41c8f40a8bcb56138d77823a10f6e2fd2a5be7454b SHA512 579e805fe62f89968432a0c56151d30a39308f18bbe42b55ea86a00e5e1960df5e16617e15159f4751db7e8324d32b87ad8a1011bc1dca087c7921e266815728 WHIRLPOOL 3861aab4656db7b1b8b095c74d0ce459b3742db1df7620ef7468f0818ee40ac9fc6df14df1a62409dac65f0d345611ed826bbfb933971a1589938b205d01733e
diff --git a/kde-apps/libksane/libksane-15.12.1.ebuild.save b/kde-apps/kcharselect/kcharselect-15.12.1.ebuild
index ee8ae6fd844c..50d7633527c4 100644
--- a/kde-apps/libksane/libksane-15.12.1.ebuild.save
+++ b/kde-apps/kcharselect/kcharselect-15.12.1.ebuild
@@ -4,22 +4,24 @@
EAPI=5
-KDE_BLOCK_SLOT4="false"
+KDE_DOXYGEN="true"
+KDE_HANDBOOK="forceoptional"
inherit kde5
-DESCRIPTION="SANE Library interface for KDE"
+DESCRIPTION="KDE character selection utility"
+HOMEPAGE="https://www.kde.org/applications/utilities/kcharselect
+https://utils.kde.org/projects/kcharselect"
KEYWORDS=" ~amd64 ~x86"
IUSE=""
-LICENSE="LGPL-2"
DEPEND="
$(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep ki18n)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwallet)
$(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
dev-qt/qtgui:5
dev-qt/qtwidgets:5
- media-gfx/sane-backends
"
RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
new file mode 100644
index 000000000000..9502f9861238
--- /dev/null
+++ b/kde-apps/kdebugsettings/Manifest
@@ -0,0 +1 @@
+DIST kdebugsettings-15.12.1.tar.xz 22884 SHA256 60ae7e88a19ae586f3eebbd42242a11d70b26f0c4d479a692715bcbe6c2efcac SHA512 9efb7bd6586311067ad7ba88c931bb60a74c7fe3b770953eb235f8a99bf60d412f359e62382f6b9a1d30fbe16bfa27005376ad227dd4b3705a8b8b2273e8ee00 WHIRLPOOL 1065f1d89fd414b4f88cb6df4e1531e5b88f0124705a197cebc9605a363ed6a9ea02f0d517c934658d88a4da116b880b70bc92b735926a0f537208ce0e5000e8
diff --git a/kde-apps/libksane/libksane-15.12.1.ebuild.save.1 b/kde-apps/kdebugsettings/kdebugsettings-15.12.1.ebuild
index ee8ae6fd844c..49f86e749aff 100644
--- a/kde-apps/libksane/libksane-15.12.1.ebuild.save.1
+++ b/kde-apps/kdebugsettings/kdebugsettings-15.12.1.ebuild
@@ -4,22 +4,25 @@
EAPI=5
-KDE_BLOCK_SLOT4="false"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
inherit kde5
-DESCRIPTION="SANE Library interface for KDE"
-KEYWORDS=" ~amd64 ~x86"
+DESCRIPTION="Application to enable/disable qCDebug"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-LICENSE="LGPL-2"
DEPEND="
+ $(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep ki18n)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kitemviews)
$(add_frameworks_dep kwidgetsaddons)
dev-qt/qtgui:5
dev-qt/qtwidgets:5
- media-gfx/sane-backends
"
RDEPEND="${DEPEND}"
+
+RESTRICT="test"
diff --git a/kde-apps/kdebugsettings/metadata.xml b/kde-apps/kdebugsettings/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-apps/kdebugsettings/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 type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-15.12.1.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-15.12.1.ebuild
new file mode 100644
index 000000000000..35ab8bb407ed
--- /dev/null
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-15.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
+HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="cups floppy lirc"
+
+# FIXME: Add back when ported
+# $(add_kdeapps_dep kgpg)
+RDEPEND="
+ $(add_kdeapps_dep ark)
+ $(add_kdeapps_dep filelight)
+ $(add_kdeapps_dep kcalc)
+ $(add_kdeapps_dep kcharselect)
+ $(add_kdeapps_dep kdebugsettings)
+ $(add_kdeapps_dep kdf)
+ $(add_kdeapps_dep kteatime)
+ $(add_kdeapps_dep ktimer)
+ $(add_kdeapps_dep kwalletmanager)
+ $(add_kdeapps_dep sweeper)
+ cups? ( $(add_kdeapps_dep print-manager) )
+ floppy? ( $(add_kdeapps_dep kfloppy) )
+ lirc? ( $(add_kdeapps_dep kremotecontrol) )
+"
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 94d0cf79e29d..d93660ddf591 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,2 +1,3 @@
DIST kdf-15.08.3.tar.xz 149156 SHA256 829069faf605d4fa108bb1a9fef7145b374d9d04f50e90d7a9620c6977848e16 SHA512 994b94341db6b1d9ef36b95f22cb8f050bad4662cd5bed75c1b95edbd7102ee7ae44506dc671d0d983ed74a4d1876193ef5ce775134a9354ade8502cd5a14183 WHIRLPOOL 2af66a093295819386dc709c3c7148456625c6a364e600cc6da8c7bbd733a07f08a82b3b8e15e79fd8b407132618101d56390d0163e81f1b960e60ac3a157b39
+DIST kdf-15.12.1.tar.xz 149140 SHA256 e208a44c95f70eb3f3727c250d41d65f138846351b1d8933cf1669aa31140b3c SHA512 2f366ec781539e000853cf51a776aaaa4a1d1623e0aaeaaa508f708d6eef828a1c799974eef491dcdffe097750d951fd4f9a23ae9b2c5633b7829e86b33e6ad4 WHIRLPOOL 28a50b0bff4d29703212733d8b02732272afd64e51459c3ea35518c92924248cb7006419ea95d6373a366e3267ff57666fd0fe34f32a9920aab80f09d1085256
DIST kdf-4.14.3.tar.xz 148708 SHA256 a02a38d67196e014d1a04f1bb2ac3c472e19c060fccdcc35abcc17ca4d33ad78 SHA512 6dcf12fc1eca7fe1b46e5bfb49ee1391c1f54c477dbd3f04e8c1bc5fb7e2262d210fa1c150c4c76a9281af9920afdf75050c4cf085d9e590c6bd61852b4ce8f8 WHIRLPOOL 80dc929c6aa1d51f61b3c874592e89d6040c716d08e7d210e719505034b54b44d1fbf04d82aeebde00acddde88e90ff8e6c3089aee97c8985ddcfe73735c4ad4
diff --git a/kde-apps/kdf/kdf-15.12.1.ebuild b/kde-apps/kdf/kdf-15.12.1.ebuild
new file mode 100644
index 000000000000..a6d2507b3c51
--- /dev/null
+++ b/kde-apps/kdf/kdf-15.12.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE free disk space utility"
+HOMEPAGE="https://utils.kde.org/projects/kdf"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="debug"
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index f3442d736573..36059931a8e6 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,2 +1,3 @@
DIST kfloppy-15.08.3.tar.xz 53308 SHA256 501ed8886b5cd1f7f31ce3f80ccf59e5da619f7d522b806f7d44ca294d7d6a3d SHA512 addf2064dba10d884d58d00f7f6864b91ca72ffade3c39827eb05b0a375cac0c13054a67763f2dc762d7269b0dfcd8a673af8ef6ac281de48d26911013b74e5c WHIRLPOOL 79b33ae0e6594fc4d078089a2412efee99a14429ca9b6bb11f8a00a4827ef6e5bf8753052b611c7cec4812dc6fb4d8079ae7eec5734dbd1db64fbcff9598505a
+DIST kfloppy-15.12.1.tar.xz 53312 SHA256 179a8f1469185f5299e9dbe240b02c9555c54cb2d660bce8c9040f335d2639c3 SHA512 6c0b99737cc7ded2a6de3dc68d0e9dd574de881403bb619cb147202b39b76129f472a1442e8680c79a1ca15b2e706da08fbbce196e3c3a5665476dd3b7030d04 WHIRLPOOL 715a20cf564f85e47c711d51897c6f35fd492b23e0419bcd7dfaaf772b319fd08d59488f793e53269dc6895afddce81f3dbe4abc855fbc1db95788186a7644c7
DIST kfloppy-4.14.3.tar.xz 52728 SHA256 803be413b98f09b396735187375de95cc941cd7a5d6a0e8ffba96dcccc045b0b SHA512 dce53dedc98f497e879f13086604edf8a1f3d2d2b922806b7fcdc9b08fa9b5aa7563eca3d8e38da489f0ac90da90b090ed1a037f277e05166044c7ab9b66007e WHIRLPOOL 1402e2f5c5f5799042f89c8b1dff8afaab141d62276261d45f4d8de7de53bfd2b16210c5715a692a2bab3a96f7e38e63bc0e25e453dc5fa6305b792602a11525
diff --git a/kde-apps/kfloppy/kfloppy-15.12.1.ebuild b/kde-apps/kfloppy/kfloppy-15.12.1.ebuild
new file mode 100644
index 000000000000..327b3c676c56
--- /dev/null
+++ b/kde-apps/kfloppy/kfloppy-15.12.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them"
+HOMEPAGE="
+ https://www.kde.org/applications/utilities/kfloppy/
+ https://utils.kde.org/projects/kfloppy/
+"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="debug"
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 49ae22daf612..5788c8790a49 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,2 +1,3 @@
DIST kgpg-15.08.3.tar.xz 810136 SHA256 82b4a50ab38f3801aabffbf1822cb3f177bd744689d66bc72742c3b12e395525 SHA512 264995b502a806004044e4fc6e5acb85db8d99906230d73bf7279071c01b0f55380e64c70d0a7285ace157d8a81e5d8bec96e334770cd00dee5ed1e6127d492d WHIRLPOOL 13b7152abce0ccd5958b3099e008e6deee4bed55a088c060fabe89044a1cefa22361fa09b635cbb866f462c732f5f30e9425e4d6f9acc7f57288bc60d3464306
+DIST kgpg-15.12.1.tar.xz 810384 SHA256 8312254100321a2f57d50948625a0bd6541cc61ed698989c1a199f2140d196fa SHA512 18d68acb9d8ff332446231d128261e935e93a3205efe9eef5cb0622adb45a72eb9de8ec6134c63f9dd46f5d757146d80c8409a63503da43db8e7fffcdc79a72d WHIRLPOOL 383ff6c3194fc2e684e280486d2cd2ad221ea071b4d93bf829af5f219978ceb8845bc8d52c75d3d601782f9b62c5b1bc94b972ab4d1b00af3bff3a76e0802ddb
DIST kgpg-4.14.3.tar.xz 807076 SHA256 bc7d37a935c5b1bb6b0f32abc62635d17ac8fbadc2ed6cfd314af71aee2d0c46 SHA512 692b713cc307da9de20d3e2f249271a33d87386e44feeab89e29c419f8cb66aa20717ac296678006f2f1a48d444fa300be1a15a3d810f3541bc54c10836a1a1d WHIRLPOOL 2ebb68847e4af57fccb4f8c85690a74fef2a23bdf7407044abb28c4de18542bb4a4ad2fa817dbde8f497f5c6f2d3a701052bb9e63b0a8a7bd8fe166e1f3c77a5
diff --git a/kde-apps/kgpg/kgpg-15.12.1.ebuild b/kde-apps/kgpg/kgpg-15.12.1.ebuild
new file mode 100644
index 000000000000..629e1d00e939
--- /dev/null
+++ b/kde-apps/kgpg/kgpg-15.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="gpg"
+inherit kde4-base
+
+DESCRIPTION="KDE gpg keyring manager"
+HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
+https://utils.kde.org/projects/kgpg"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdeapps_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}
+ app-crypt/gnupg
+"
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ if ! has_version 'app-crypt/dirmngr' && ! has_version '>=app-crypt/gnupg-2.1'; then
+ elog "For improved key search functionality, install app-crypt/dirmngr."
+ fi
+}
diff --git a/kde-apps/kremotecontrol/Manifest b/kde-apps/kremotecontrol/Manifest
index 8adb313b62f8..6d133c039fa3 100644
--- a/kde-apps/kremotecontrol/Manifest
+++ b/kde-apps/kremotecontrol/Manifest
@@ -1,2 +1,3 @@
DIST kremotecontrol-15.08.3.tar.xz 1074124 SHA256 36b2debe92d5c8e318d3f17459519571195ceaf955b522b74d8c51447fe0ab5b SHA512 f9fdbb3a3486e717f25ea79a37f73c27efde014fd1d7f6c895340c1fc7e93e29d1c500283f6e9a9c3bfc5b25ddf5a24f5ba01912ddf6e0ec9a0d09c75360db13 WHIRLPOOL d8ce0da9a1adf08fce3a92c359b2f8fa85cf9c93bbd2ae2e6ec7b19f62e9ba34eabdea386c51cdb5b1d38ae3e9e309d2b60c862e2396918b622f43299cf85a9c
+DIST kremotecontrol-15.12.1.tar.xz 1074132 SHA256 21a0ae9ee88dd1247b41a9f174458c273ff0836845387cc4a0d2fb4723f2a96c SHA512 9044d7814b2441e8eec3468217e50defd7d4d549e8db7b169ee3606147da54e2016cfd8114a38d0adbb5a85afd552afc5187f2b09ca0f3bad00df1f3d3352a37 WHIRLPOOL 4379a0043f07499ba0abb9b542e55cf9db728413b4a3ca0ea02e7a7abc935d130c52da762bccba8781235aa83aede5e3d8558363224b548cf22f49528d8d1b57
DIST kremotecontrol-4.14.3.tar.xz 1074704 SHA256 1991a697f3c198c7ec327cca53c2f06b45ade9eb4b03ce83feb5c609597ad31a SHA512 77f393e5a0b01cb2d5d54fbd760317f59df73d3d9f9c81e161f21c259b23a7c35ecaba04e08625685e8811daa5b2ae7bd83f60ac4cf0de50e7636b333a7b337c WHIRLPOOL 4899a2d7bef173a33695e1482ab36d938219725ae7d9ad66dde89308306c42ab503227b415812e98845bef46bf32e5dbc392f941fd1cdf91ef76215c554e0573
diff --git a/kde-apps/kremotecontrol/kremotecontrol-15.12.1.ebuild b/kde-apps/kremotecontrol/kremotecontrol-15.12.1.ebuild
new file mode 100644
index 000000000000..efb796196571
--- /dev/null
+++ b/kde-apps/kremotecontrol/kremotecontrol-15.12.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE frontend for the Linux Infrared Remote Control system"
+HOMEPAGE="https://www.kde.org/applications/utilities/kremotecontrol
+https://utils.kde.org/projects/kremotecontrol"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+ app-misc/lirc
+"
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index b42abb6dc883..4891e300f084 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,2 +1,3 @@
DIST kteatime-15.08.3.tar.xz 104624 SHA256 9df2aad860814752d49d409ef22d6bfda42da5a96a16f97962f8300e862032fa SHA512 71184c6d3e1be718ad1a34b8ccb4174a893a6e4c223c2fdf89ad0dc8646e8013a0967e6e9820d0dfc84a153d4e4372ffd50fbdb541bf192e617cdea7344bf0f8 WHIRLPOOL 70a3633d06921e22af2551ef9c835b53e1ba040b90abaa1299e4438a0bcd5443e687ceea5cfaf9841ed31ab182c0df2f4c5676006efd737b3aa8dd46aad45a7f
+DIST kteatime-15.12.1.tar.xz 104800 SHA256 2c28dee1154f3a0fa292d3f349ad97a6a883f9a40117b00610050c630bc6d289 SHA512 f15f58a1289d0c787a544be68c33725a1eb56a8758469e08d426b036ed0ffcca293e66a5545414ba13b4074f082a97609f7c424aa9e7082f76022aef505ac3a8 WHIRLPOOL d606a6f507c3c8e3d951319cfba2c2cd8a606bf7ffb1fbe3f0fcf94e0a6b30da9050eab3a94d9b48d21a2de78cb7a21db075ba961ee4e7aa268ccc970d1bb6cd
DIST kteatime-4.14.3.tar.xz 100472 SHA256 91637f39a7b1e5dc2e314a6ad70212e29f4c5bd2c135a7868dd3a96358a7399b SHA512 ef705dde345bded414b0edf4a25dc9a0b47eb5c55d6dbcec33ebb350c7fae3c82f81bf2e5f0c46993a026553551ccd32ea1cb9a6d5b644a8ef2d6f8b160f58ce WHIRLPOOL d33d00deb90850bad2511676c7c029ed21f72cf3ba4249c51473b24ada04a1edee29b7672abd15639a4178342416210d2b16e53d4c174f68f6729fe6a47d6872
diff --git a/kde-apps/kteatime/files/kteatime-15.11.80-kcrash-initialise.patch b/kde-apps/kteatime/files/kteatime-15.11.80-kcrash-initialise.patch
new file mode 100644
index 000000000000..3a67bb2d4b47
--- /dev/null
+++ b/kde-apps/kteatime/files/kteatime-15.11.80-kcrash-initialise.patch
@@ -0,0 +1,28 @@
+commit 8edb1db4016fc90a8406e4e0c5d1a04378f72e5f
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue Dec 1 23:47:36 2015 +0100
+
+ Initialise KCrash for DrKonqui integration.
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 2b5d8cc..665a92d 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -22,6 +22,7 @@
+ #include <QCommandLineParser>
+
+ #include <KAboutData>
++#include <KCrash>
+ #include <KLocalizedString>
+
+
+@@ -44,6 +45,9 @@ int main (int argc, char *argv[])
+ )
+ );
+
++ // TODO: for >=KF5.15 use KCrash::initialize();
++ KCrash::setCrashHandler(KCrash::defaultCrashHandler);
++
+ aboutData.addAuthor(i18n("Stefan Böhmann"), i18n("Current maintainer"), QStringLiteral("kde@hilefoks.org"), QStringLiteral("http://www.hilefoks.org"), QStringLiteral("hilefoks"));
+ aboutData.addAuthor(i18n("Matthias Hoelzer-Kluepfel"), QString(), QStringLiteral("hoelzer@kde.org"));
+ aboutData.addAuthor(i18n("Martin Willers"), QString(), QStringLiteral("willers@xm-arts.de"));
diff --git a/kde-apps/kteatime/kteatime-15.12.1.ebuild b/kde-apps/kteatime/kteatime-15.12.1.ebuild
new file mode 100644
index 000000000000..347f05bd9a37
--- /dev/null
+++ b/kde-apps/kteatime/kteatime-15.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE timer for making a fine cup of tea"
+HOMEPAGE="https://www.kde.org/applications/games/kteatime"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-15.11.80-kcrash-initialise.patch" )
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 6d4b675b4089..a871e431e160 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,2 +1,3 @@
DIST ktimer-15.08.3.tar.xz 147188 SHA256 a05894fe666dec3f2f8636576accd322e13e9dd5fdda20eccc9df88cb26ae21a SHA512 7af0d29404e17289e755950c9dd426ee6d7f694659a966b207b5e4e2518cf839112c98f30d8661dc290a50dae329712359fe8dcb135c60d7714e66b5ce1ffd92 WHIRLPOOL 40a39ecfc31a1943fd803c0876bdbaa78e33725350e6621d7415f1e2f3d0278feda108278d67b100a308e37593f21899b2d3b2dcacb0b1e4511a5553951d32bf
+DIST ktimer-15.12.1.tar.xz 161016 SHA256 96477298b1d8222ad11f4561c2aa517b516bca5018141e9228e43ff34ff3925b SHA512 7a2f1f1885a49ab9fe170d17c595a3744647c35cd46647aa7e80ec322c63533e7cf142733c60616d863c6f0b791250dcdc8121c7b26cd8ecf7e327516ca5b7a8 WHIRLPOOL c24a6c622f8cacfc555da382198294cc268a2b1b890e61d3beb03fb72a2f03749d89f8ed7fd3b4b57da906f80cfa81a0f74fef09a59c94fd125135ed6ba270f9
DIST ktimer-4.14.3.tar.xz 146864 SHA256 c49aff35757b6a5fe16d36930f59324c5e5c91b5ab2934f0766ff172df37dc0b SHA512 7de6403f5391f21168c1dd2ac199c70f2cd788d7aff824d7f8d3fde84c61c2b1c39d06a924fb685f841ae799298ec6a3975ec4737950ec90fb946327a46f4c29 WHIRLPOOL a12693e77378210d863ac59e3cc4f988c2ff452500bb459ec61063dc5c03908f9517823ff0352bdd0242d8f08976c1df84c0d5fca6aac904a100639941b5deb0
diff --git a/kde-apps/ktimer/ktimer-15.12.1.ebuild b/kde-apps/ktimer/ktimer-15.12.1.ebuild
new file mode 100644
index 000000000000..f5cf734d6bee
--- /dev/null
+++ b/kde-apps/ktimer/ktimer-15.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_DOXYGEN="true"
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Timer"
+HOMEPAGE="https://www.kde.org/applications/utilities/ktimer
+https://utils.kde.org/projects/ktimer"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index 4db673c41103..562d32059005 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,3 +1,4 @@
DIST kwalletmanager-15.04.3.tar.xz 457256 SHA256 34c20801d17bb0e16111556539e90776cc33dbed8a53dc814c82ffabe526acc0 SHA512 6763afb19488b211699dc2b35f89ff4d24a8c2dc3d0e505722424fb3c821f9e6d232c9bfc8e406730563d93da432d21b4ad7f488d448d840017bf04e08b9f28b WHIRLPOOL d8a094ff8bf27026aeb448eeb5e93b6356ed0c605c81c4368755bd5a19bab03ea1cc2c7b6d5fe6564d4eecd7240b6190a41ed7c2455268ac9cbf995d5068a4ee
DIST kwalletmanager-15.08.3.tar.xz 456992 SHA256 50ab15b0d7c0fce52b8e30bc6b018272a97c502aa3120c4ac70380eff17c04f2 SHA512 59329fdadaf73640506f4ace54a118faa090acb562588e71da4e3c68bad8efa30cc4fc2b2f0c12fd1b518297fb2c5b5b44af5caa26cde3a1498b7b089c50cec6 WHIRLPOOL e97cf3d24839077b913eacdc905450522440200113bfa2f60ddc6237ba71a01c4c2080936cbd91a795f0c75c249ac1058cb8295ea259d01909ca403064cd4cd7
+DIST kwalletmanager-15.12.1.tar.xz 457344 SHA256 2ef93e31a10cc123b8736d79e5a9f174d7c55b73c83cee41c04c3083ed0e0025 SHA512 565e27af0e85f118721b9a1d1cc7c07f3e5dc69846b0f13b5f6a90e202e45f0fcf44cc27247f30749eeb39bb3dd65680ca7c6a14ad38399a5611bd894495024b WHIRLPOOL 36c85d694d3d5dabf2cbe9d62d31dd3fbee71be81b28d32dcbade2b97af5092cd6b301ab18ac4365f1381e23ff6e788a4b3211180d2e67da37a1f30a4b737a9c
DIST kwalletmanager-4.14.3.tar.xz 456176 SHA256 4bc96efafd4caacac7a7a9e38dea0fcd40ce054042917de8b1ffb6c6aed26cf0 SHA512 1f77dfaa66e386ed665c46361d5d99748c03f004b8282b62e02eb5fede15773d6a953b88ea94dfd529dc70a415a32384c26670876f6b6fa6e2ece2adb0594ecf WHIRLPOOL a872ba337638cc6802d29befae67615badc267d04e8a23958bb7a2cea61a78c0aff7bb149efdec266b66dffc911b506aba12dd6e3fd54ae5509f072f17060595
diff --git a/kde-apps/kwalletmanager/kwalletmanager-15.12.1.ebuild b/kde-apps/kwalletmanager/kwalletmanager-15.12.1.ebuild
new file mode 100644
index 000000000000..7cb1286e631f
--- /dev/null
+++ b/kde-apps/kwalletmanager/kwalletmanager-15.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_BLOCK_SLOT4="false"
+KDE_DOXYGEN="true"
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Wallet management tool"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}
+ !kde-apps/kwalletmanager:4[-minimal(-)]
+"
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 2a48ad34bf8b..5e73d4ef9453 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,2 +1,3 @@
DIST print-manager-15.08.3.tar.xz 93884 SHA256 5560d7a4a32cd29f3fb2ad4676b0c215dfe179b4cdb81960739d2ec86f2f5ca6 SHA512 624f2790f9dc32a59776403c875a657ef50d0b9b5fb66e8116bfbdc21f9b76dbbdcc6a3b4dce997465769c5253202a16280945cf3514811b5b2af4b23043700c WHIRLPOOL 0595cb8cd12cc4c0a0e0f3987481d7eb8ae1ff3de39d9b8d41f99f0e5c71069815957767da3439f93af98ba1ff0c457d5e2b9836cdc0730fc952fcc5bd69324f
+DIST print-manager-15.12.1.tar.xz 93888 SHA256 3089decefd58cdcdb63f05d2cb31a18c00af662b8fcb00d2fac8cc6fb4ca2158 SHA512 ee90e6091244c19f2a7d32e7a8843fa1de4147ba15a5c89ff5f17a07ab86fd1a02812688dbe6ab2abf4e380dcbd1c1cb9ce3d4625563f31393db76d0270e4ea4 WHIRLPOOL cc060139dabec8b360d91e85aae234fa4db169a17a8a4d109d589342d4d5033941f0b3b8dddea5697b45f70575a38d220cc5a35eb7a83bdc427befbf7aa1da8e
DIST print-manager-4.14.3.tar.xz 92484 SHA256 081736f273c7f13806828497caddf83d36d5e083d56b277dc363360614fbc135 SHA512 2cddb8b254125fc095fe0ea87f37a07c99edab8fd2dd115c4cc91a766e2e69b5c2e2061c7fa6eac64aa7d5bb3ba9c23db93ee78dcc898050496c553f41ff02f4 WHIRLPOOL 5cc136bcda948541089d2487e69b5bf8b8b874110d3f653d8844f586566296e5594b91ed2d06670d63115670c65e5f38ce79c6df1b4205438b1f7f260c268622
diff --git a/kde-apps/print-manager/print-manager-15.12.1.ebuild b/kde-apps/print-manager/print-manager-15.12.1.ebuild
new file mode 100644
index 000000000000..511d068368dd
--- /dev/null
+++ b/kde-apps/print-manager/print-manager-15.12.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Manage print jobs and printers in Plasma"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+gtk"
+
+DEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep plasma)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ net-print/cups
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ gtk? ( app-admin/system-config-printer )
+"
+
+pkg_postinst(){
+ if ! use gtk ; then
+ ewarn
+ ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
+ ewarn "an important, though optional, runtime dependency:"
+ ewarn
+ ewarn "app-admin/system-config-printer"
+ ewarn
+ ewarn "${PN} will work nevertheless, but is going to be less comfortable"
+ ewarn "and will show the following error status during runtime:"
+ ewarn
+ ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
+ ewarn "was not provided by any .service files'\""
+ ewarn
+ fi
+}
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 965d614a4010..d763c17ec43f 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,2 +1,3 @@
DIST sweeper-15.08.3.tar.xz 82268 SHA256 05cfe35fe321f964aac5d15c38277004d41eaef54d6c9e3a4275ac611ae0b056 SHA512 3b23228d7c8a5031fc1df72152ad479c06e3c7f3287bc76cbe55286dbfdea0c558638d207eb9d6d4628dd1372ff38b953586cc8ab0d3a0efdbdea52b6a4ba491 WHIRLPOOL aa4887b4d01fbc20af8ec8e342037243613796f68d54f53c68b81b132cad56e12ba12ec58201f3be2ac9f661ec5f0d26c13a3bf0f2d2800e3489c30fa8a031c9
+DIST sweeper-15.12.1.tar.xz 82248 SHA256 4d357d9188e2e16f055d60c199b6935f8f9d1b2c23189feeb8e13816751d73fa SHA512 1ac070d1357aea071bcb9ce1f25f51f0c90a8a84c1cb7c7c0a113a502daa95b33185a5f764d4c9901df2431b4971dac21b6b10c44e847cda779b8191b9a50348 WHIRLPOOL fcf33564831e9840b80388ebf65ff1b6cffa2c93961218d04105307175de156d0466d8e7060be6ad60a063cc0d9fb17e696beefcbeb411bbf230d957cb6f0bd8
DIST sweeper-4.14.3.tar.xz 82336 SHA256 bdabe8683980bfcbd336865a7aacfb0de8de32d02f5523cf509341e7824d183a SHA512 bd742f2076614a1ded8c411a37bd5a05a012b95e8bb0d720b03856a33ce86dec1416cb763bbad7d029c6e628f6ea1bacf56d072db5d6760e5eadc35505172edb WHIRLPOOL d370f3148d18349022f06b01f965d258866abc20739c0d65894ebc04ce3416f113f3dbdbd0105a615e233b89b26456fa7447d8e796c9f060d8321e6cd1a30c27
diff --git a/kde-apps/sweeper/sweeper-15.12.1.ebuild b/kde-apps/sweeper/sweeper-15.12.1.ebuild
new file mode 100644
index 000000000000..e2089788c846
--- /dev/null
+++ b/kde-apps/sweeper/sweeper-15.12.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Privacy Settings Widget"
+HOMEPAGE="https://www.kde.org/applications/utilities/sweeper
+https://utils.kde.org/projects/sweeper"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="debug"
diff --git a/kde-misc/rsibreak/Manifest b/kde-misc/rsibreak/Manifest
index 61152cccbcd2..3cd7963f3d66 100644
--- a/kde-misc/rsibreak/Manifest
+++ b/kde-misc/rsibreak/Manifest
@@ -1,2 +1,3 @@
DIST rsibreak-0.11.tar.bz2 463748 SHA256 bc224812c4554209a9cbba830078cee727ed1a5a3c8cb2109cbac78af2382efb SHA512 50e15f45b93c79e4b7785a25dc41c60e40d52a0a777fbb01b57acacfb3c623b6d84cb11c75482c3ab75621644130e508618aaf354b2c526d6a4feda1aa80f2ff WHIRLPOOL 6a8ec8a047e31fdbec73712c2d4e457d447523246c0cecc313468a666ade52a81feb6515adcef93e6e30410df55e30b41a57b85c5b4eedd4bd122815ed1b3af1
+DIST rsibreak-0.12.1.tar.xz 390804 SHA256 ce99be0acdfee0407822db8e404b19516c972022962688deac13236028e85d21 SHA512 4fc831d19f61fbdd620e8f124acb3e51d5400026c40aa42f9415649613e0910d021ed9f80379e849ccaeb2305ac37c3aad067d0848d82ad6a7bf47b1f321065c WHIRLPOOL 96af19f96143b978368a9be54ec52378b6fcffc7c6a5967b98ec06545f7b057ab6134a832a71ac7178c310f3d53a026c04cab13bab086e38d13033e3f9efa979
DIST rsibreak-0.12.tar.xz 388204 SHA256 5c6b579e4287dced4b56d81fcb28f6f12130522fdd4358d36ed5ac24f0848ce1 SHA512 ae8da9acf4f501f590165916182a00f43deab79a4003df56d1fcd08cedf7387ff178f0bf88dbe57fa10ae67da0bc94e4239827d0acc36097e1546ae1771fbd84 WHIRLPOOL 6e2e637d49b0ac7dac6ee7fde46c1e3f0136c0e1d7c1d70ed35b238ab29193c6e7ff2043e4b72108eb09837fbf89832a2c11eee079a47be5da0a16c367e93d2b
diff --git a/kde-misc/rsibreak/rsibreak-0.12.1.ebuild b/kde-misc/rsibreak/rsibreak-0.12.1.ebuild
new file mode 100644
index 000000000000..c9bfa9d4e453
--- /dev/null
+++ b/kde-misc/rsibreak/rsibreak-0.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5 versionator
+
+DESCRIPTION="Small utility which bothers you at certain intervals"
+HOMEPAGE="https://userbase.kde.org/RSIBreak"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-misc/rsibreak:4
+"
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index bcdbcff67673..c374cef6700f 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -1,2 +1 @@
-DIST mate-desktop-1.8.0.tar.xz 7951460 SHA256 482e7bc4d77e45c03505a899a07b8107f33832b22d59c40f342d5695f789bd17 SHA512 2cf4dbfc0d628ebb48a92c06fc66ac021eb280031305f3c01725dcb5a4357f07a7a33fb2e6d017c5d5081902a68c82d93471530b0bb3415653657366ae8759cf WHIRLPOOL 3db86fa7385e33e97bd5c2388f2abf5e4e87e9177b636da5843aed257062eec1f9bc4bd097ce3f101c04e2128811e5ec39a22f08fa6523cc78200c0362e5e55f
DIST mate-desktop-1.8.1.tar.xz 8027312 SHA256 a4e1316f9468150e30495b54024fbc9f98e12cc7f9750d972f5457f13ca908f3 SHA512 64c32ea32a0e0e88df314297b2b45c5a6da2747a3bed41437eb17bf282511a4d01bd678728005a6301f93ae2b3c09a38039af85a8666d18e51958d6ffa091d9b WHIRLPOOL f5ed8a0b338b453ccbf7fcb560dd2490f43edceff21c8b6104eb91e8df6e016890174d34a1be3eec2b20322fd34a5c9ce553d0450a533407d4ef8269ff1aa4f8
diff --git a/mate-base/mate-desktop/mate-desktop-1.8.0-r1.ebuild b/mate-base/mate-desktop/mate-desktop-1.8.0-r1.ebuild
deleted file mode 100644
index f06264ab24d7..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 multilib python-r1 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="X startup-notification"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.34:2
- >=dev-libs/libunique-1:1
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2
- >=x11-libs/gtk+-2.24:2
- x11-libs/libX11:0
- >=x11-libs/libXrandr-1.2:0
- virtual/libintl:0
- startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/yelp-tools:0
- >=dev-util/intltool-0.40:*
- >=gnome-base/dconf-0.10:0
- sys-devel/gettext:*
- >=x11-proto/randrproto-1.2:0
- x11-proto/xproto:0
- virtual/pkgconfig:*"
-
-src_configure() {
- gnome2_src_configure \
- --enable-mate-about \
- --enable-mate-conf-import \
- --disable-desktop-docs \
- --with-gtk=2.0 \
- $(use_with X x) \
- $(use_enable startup-notification)
-}
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_install() {
- gnome2_src_install
-
- python_replicate_script "${ED}"/usr/bin/mate-conf-import
-
- # Remove installed files that cause collissions.
- rm -rf "${ED}"/usr/share/help/C/{lgpl,gpl,fdl}
-}
diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index ca23907af5e8..761a5019c126 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1,3 +1,2 @@
-DIST mate-settings-daemon-1.8.0.tar.xz 781648 SHA256 dfe3b86835a099223a6a93e1c367f48fcbbcc4fbc56da193218c71049e7d39b7 SHA512 405fc70b99ab65f70df4ae8a1390f2585d888c8668c620b977577498d3acce4462506be8e57ae2f6a3f61aad041d709429d5f6cd041a69944920ef0300c00f5a WHIRLPOOL 3234d9b523d90397400c7d0e0c21d4e6c96fc11132ddfe144518f0fd13f50e2a222e377f8bdbc53c352bcbb013234296cea152078059a5a0c7a33a8a5f24fa75
DIST mate-settings-daemon-1.8.1.tar.xz 782508 SHA256 231bc408ea1a3305aeca621a278930ddba032201a1001da2ae239f6324da1106 SHA512 a7b2612719b21f77338e912f3eff52d86daf4f0cedc5854d8e161f74062d4218c5609c3f5885e4428b3fa3247e48830b74422bd991a994d5a7fa088d04f0e745 WHIRLPOOL 90807e0e1932db76bacfef45266d00f37b3881e46515147def9d83c805e8f87b99d6b2fb254c683fd75ce4056b18b1c2fc2678c18eb0bea46bbccc3ecef7d94a
DIST mate-settings-daemon-1.8.2.tar.xz 782780 SHA256 2d38c9eff00a7ad239613b5f59e95a08705601a64f3a660b34919a4818da9d87 SHA512 46fd2009463c5f4f46ad6941444b42e0146caea0daec8d6ccd253adb08fc8b905419c5763756c05c4ab1404b2eb9b775f7730babe790194e145e5c0a6829f1d1 WHIRLPOOL 09d908b098a7e469c2eb9eecafc5551fd5986d4c0967da62ad2924d5cc309e856ebe4c523a22ef2d844bfeab829049c6f36f6275cb4d82ad48ed4fdd5ce972b5
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.0.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.0.ebuild
deleted file mode 100644
index 14032e87f6ea..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.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"
-
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="MATE Settings Daemon"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="X debug libnotify policykit pulseaudio smartcard"
-
-RDEPEND=">=dev-libs/dbus-glib-0.74:0
- >=dev-libs/glib-2.17.3:2
- >=mate-base/libmatekbd-1.8:0
- >=mate-base/mate-desktop-1.8:0
- media-libs/fontconfig:1.0
- >=gnome-base/dconf-0.13.4:0
- x11-libs/cairo:0
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.24:2
- x11-libs/libX11:0
- x11-libs/libXi:0
- x11-libs/libXext:0
- x11-libs/libXxf86misc:0
- >=x11-libs/libxklavier-5:0
- virtual/libintl:0
- libnotify? ( >=x11-libs/libnotify-0.7:0 )
- policykit? (
- >=dev-libs/dbus-glib-0.71:0
- >=sys-apps/dbus-1.1.2:0
- >=sys-auth/polkit-0.97:0
- )
- pulseaudio? (
- media-libs/libcanberra:0[gtk]
- >=media-sound/pulseaudio-0.9.15:0
- )
- !pulseaudio? (
- >=media-libs/gstreamer-0.10.1.2:0.10
- >=media-libs/gst-plugins-base-0.10.1.2:0.10
- )
- smartcard? ( >=dev-libs/nss-3.11.2:0 )"
-
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.37.1:0
- sys-devel/gettext:0
- virtual/pkgconfig:0
- x11-proto/inputproto:0
- x11-proto/xproto:0"
-
-src_prepare() {
- # More network filesystems not to monitor, upstream bug #606421
- epatch "${FILESDIR}/${PN}-1.4.0-netfs-monitor.patch"
-
- # mouse: Use event driven mode for syndaemon
- epatch "${FILESDIR}/${PN}-1.2.0-syndaemon-mode.patch"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- $(use_with libnotify) \
- $(use_enable debug) \
- $(use_enable policykit polkit) \
- $(use_enable pulseaudio pulse) \
- $(use_enable !pulseaudio gstreamer) \
- $(use_enable smartcard smartcard-support) \
- $(use_with X x)
-
- if use pulseaudio; then
- elog "Building volume media keys using Pulseaudio"
- else
- elog "Building volume media keys using GStreamer"
- fi
-}
-
-DOCS="AUTHORS NEWS ChangeLog"
diff --git a/media-libs/imlib2/imlib2-1.4.7.ebuild b/media-libs/imlib2/imlib2-1.4.7.ebuild
index 913c5e37d574..5fa1582e109b 100644
--- a/media-libs/imlib2/imlib2-1.4.7.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.7.ebuild
@@ -16,7 +16,7 @@ inherit enlightenment toolchain-funcs multilib-minimal eutils
DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
HOMEPAGE="https://www.enlightenment.org/"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib"
diff --git a/media-libs/virglrenderer/virglrenderer-0.2.0.ebuild b/media-libs/virglrenderer/virglrenderer-0.2.0.ebuild
index 507a47aaf4bd..cf15af3545d9 100644
--- a/media-libs/virglrenderer/virglrenderer-0.2.0.ebuild
+++ b/media-libs/virglrenderer/virglrenderer-0.2.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2
else
SRC_URI="mirror://gentoo/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="library used implement a virtual 3D GPU used by qemu"
diff --git a/media-sound/seq24/seq24-0.9.3.ebuild b/media-sound/seq24/seq24-0.9.3.ebuild
index 6173edaf76f8..688d74a51cd4 100644
--- a/media-sound/seq24/seq24-0.9.3.ebuild
+++ b/media-sound/seq24/seq24-0.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://edge.launchpad.net/seq24/trunk/${PV}/+download/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="jack lash"
RDEPEND="media-libs/alsa-lib
diff --git a/media-sound/yoshimi/yoshimi-1.3.8.2.ebuild b/media-sound/yoshimi/yoshimi-1.3.8.2-r1.ebuild
index 68b5a5fd0c34..a5ae15ce05e7 100644
--- a/media-sound/yoshimi/yoshimi-1.3.8.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.3.8.2-r1.ebuild
@@ -37,23 +37,20 @@ PATCHES=(
"${FILESDIR}/${P}-underlinking.patch"
"${FILESDIR}/${PN}-1.1.0-desktop-version.patch"
)
-DOCS="../Changelog"
-
-S=${WORKDIR}/${P}/src
+CMAKE_USE_DIR="${WORKDIR}/${P}/src"
src_prepare() {
- cd .. || die
- default
-
+ mv Change{l,L}og || die
sed -i \
-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
-e "s:lib/lv2:$(get_libdir)/lv2:" \
src/CMakeLists.txt || die
+ cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
- -DBuildLV2Plugin=$(usex lv2 ON OFF)
+ -DBuildLV2Plugin=$(usex lv2)
)
cmake-utils_src_configure
}
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 440bd5ea5afc..81c2af2d79df 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1 +1,2 @@
DIST xmltv-0.5.57.tar.bz2 778254 SHA256 4a42a1d239caa988fc6d25414ff0104aa831ffa273d4a571cff8c76c05e0afd3 SHA512 78e79b75b23cd8815403a0a5835036c67c80ff45fba79fae68e50a041ae384f427e18717d6122ea2d5eb57163370acac115946e24a8934a94b1cc72cb24314cc WHIRLPOOL 86624127ed922886d3c291358acdbd29a0b70d591baff83ed491345d5ec119de8ef486e0341499e1fa985fa38b85da9a6989e7e4159675da8876ec870b6cc433
+DIST xmltv-0.5.67.tar.bz2 1188778 SHA256 f5ee784961be2a35035d55ef39bcba0ccfd7aecfa5359c1a890cb411c1c7a694 SHA512 2451634bf63ed8f5ee1ef4eff23fa5cfe2a98422e8ae75bf055951d5139d8b7ff03ece6aeee9b3ae81abba5a3edd66e64bd9ae8f610f92cb97ec017b839eee1f WHIRLPOOL c500e8b61a59fd0507c66fbdd0401304321cfae837255085cd373ea0bb26133ebf16b2854cb0715ddd2783ed44c603dc7bb61d40a30552cea3691315c1bfc2eb
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index 722fc9ef8605..d5626122492f 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -1,17 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>proxy-mintainers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>Aidenn0@geocities.com</email>
+ <name>Jason Miller</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
<use>
<flag name="ar">Argentina tv listing grabber</flag>
<flag name="ch">Switzerland bluewin tv listing grabber</flag>
+ <flag name="ch_search">Grabber for Switzerland</flag>
<flag name="dk">Denmark tv listing grabber</flag>
<flag name="dtvla">Latin America digital tv listing grabber</flag>
<flag name="ee">Estonia tv listing grabber</flag>
<flag name="es_laguiatv">Spain alternative grabber</flag>
<flag name="es_miguiatv">Spain alternative grabber</flag>
+ <flag name="eu_dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag>
+ <flag name="eu_egon">Grabber for german speaking area (Egon zappt)</flag>
<flag name="eu_epg">EPG grabber for some European countries.</flag>
<flag name="fi">Finland tv listing grabber</flag>
+ <flag name="fi_sv">Grabber for Finland (Swedish)</flag>
<flag name="fr">France tv listing grabber</flag>
+ <flag name="fr_kazer">France (Kazer) tv listing grabber</flag>
<flag name="hr">Croatia tv listing grabber</flag>
<flag name="huro">Hungarian tv listing grabber</flag>
<flag name="in">India tv listing grabber</flag>
@@ -20,17 +34,23 @@
<flag name="it">Italy tv listing grabber</flag>
<flag name="na_dd">North America tv listing grabber</flag>
<flag name="na_dtv">North America Direct TV grabber</flag>
+ <flag name="na_tvmedia">Grabber for North America (TVMedia)</flag>
<flag name="na_icons">option for na_dd to download icons</flag>
<flag name="nl">Netherlands tv listing grabber</flag>
<flag name="no_gf">Norway Gfeed tv listing grabber</flag>
<flag name="pt">Portugal tv listing grabber</flag>
+ <flag name="pt_meo">Grabber for Portugal (MEO)</flag>
<flag name="re">Reunion Island (France) tv listing grabber</flag>
<flag name="se_swedb">Sweden tv listing grabber</flag>
+ <flag name="se_tvzon">Sweden (tvzon.se) tv listing grabber</flag>
+ <flag name="tr">Turkey (Digiturk) tv listing grabber</flag>
<flag name="tv_check">enable GUI checking</flag>
<flag name="tv_combiner">enable grabbers combiner</flag>
<flag name="tv_pick_cgi">enable CGI support</flag>
+ <flag name="uk_atlas">Fast UK and Ireland tv listing grabber</flag>
<flag name="uk_bleb">Britain tv listing grabber</flag>
<flag name="uk_rt">Britain alternative tv listing grabber</flag>
+ <flag name="uk_tvguide">UK and Ireland tv listing grabber using TV Guide website</flag>
<flag name="za">South Africa tv listing grabber</flag>
</use>
<upstream>
diff --git a/media-tv/xmltv/xmltv-0.5.67.ebuild b/media-tv/xmltv/xmltv-0.5.67.ebuild
new file mode 100644
index 000000000000..e083257d5875
--- /dev/null
+++ b/media-tv/xmltv/xmltv-0.5.67.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils perl-module
+
+DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format"
+HOMEPAGE="http://xmltv.org"
+SRC_URI="mirror://sourceforge/xmltv/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
+
+IUSE="ar ch_search dk dtvla es_laguiatv eu_dotmedia eu_egon eu_epg fi fi_sv
+fr fr_kazer hr huro il is it na_dd na_dtv na_tvmedia nl no_gf pt pt_meo se_swedb
+se_tvzon tr uk_atlas uk_bleb uk_rt uk_tvguide tv_check tv_combiner tv_pick_cgi"
+
+# NOTE: you can customize the xmltv installation by
+# defining USE FLAGS (custom ones in
+# /etc/portage/package.use for example).
+#
+# Do "equery u media-tv/xmltv" for the complete
+# list of the flags you can set, with description.
+
+# EXAMPLES:
+# enable just North American grabber
+# in /etc/portage/package.use : media-tv/xmltv na_dd
+#
+# enable graphical front-end, Italy grabber
+# in /etc/portage/package.use : media-tv/xmltv tv_check it
+
+RDEPEND=">=dev-perl/libwww-perl-5.65
+ >=dev-perl/XML-Parser-2.34
+ >=dev-perl/XML-Twig-3.10
+ >=dev-perl/DateManip-5.42
+ >=dev-perl/XML-Writer-0.6
+ virtual/perl-Memoize
+ virtual/perl-Storable
+ >=dev-perl/Lingua-Preferred-0.2.4
+ >=dev-perl/Term-ProgressBar-2.03
+ virtual/perl-IO-Compress
+ dev-perl/Unicode-String
+ dev-perl/TermReadKey
+ dev-perl/File-Slurp
+ >=dev-lang/perl-5.6.1
+ dev-perl/XML-LibXML"
+DEPEND="${RDEPEND}
+ ar? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 dev-perl/HTTP-Cookies dev-perl/TimeDate )
+ ch_search? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 )
+ dk? ( dev-perl/JSON dev-perl/IO-stringy dev-perl/DateTime )
+ dtvla? ( dev-perl/HTML-Tree dev-perl/HTTP-Cookies dev-perl/TimeDate )
+ es_laguiatv? ( dev-perl/HTML-Tree )
+ eu_dotmedia? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+ eu_egon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+ eu_epg? ( dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime >=dev-perl/HTML-Parser-3.34 )
+ fi? ( dev-perl/HTML-Tree )
+ fi_sv? ( dev-perl/IO-stringy dev-perl/HTML-Tree dev-perl/DateTime )
+ fr? ( dev-perl/DateTime-TimeZone dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 )
+ hr? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+ huro? ( dev-perl/HTML-Tree )
+ is? ( dev-perl/XML-DOM dev-perl/XML-LibXSLT )
+ na_dd? ( dev-perl/SOAP-Lite )
+ na_dtv? ( >=dev-perl/HTML-Parser-3.34 dev-perl/DateTime dev-perl/HTTP-Cookies )
+ na_tvmedia? ( dev-perl/XML-LibXML )
+ nl? ( dev-perl/HTTP-Cache-Transparent dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 dev-perl/TimeDate )
+ no_gf? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+ pt? ( dev-perl/HTML-Tree dev-perl/HTTP-Cache-Transparent >=dev-perl/HTML-Parser-3.34 dev-perl/DateTime )
+ pt_meo? ( dev-perl/XML-LibXML dev-perl/DateTime )
+ se_swedb? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+ se_tvzon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
+ tr? ( dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/TimeDate )
+ uk_atlas? ( dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/TimeDate )
+ uk_bleb? ( dev-perl/IO-stringy dev-perl/Archive-Zip )
+ uk_rt? ( dev-perl/DateTime-TimeZone dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 )
+ uk_tvguide? ( dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/TimeDate )
+ tv_check? ( dev-perl/perl-tk dev-perl/Tk-TableMatrix )
+ tv_combiner? ( dev-perl/XML-LibXML )
+"
+
+PREFIX="/usr"
+
+src_prepare() {
+ sed -i \
+ -e "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" \
+ -e "/^@docs/s:doc/COPYING ::" \
+ Makefile.PL || die
+
+ epatch_user
+}
+
+src_configure() {
+ make_config() {
+ # Never except default configuration
+ echo "no"
+
+ # Enable Australian
+ #use au && echo "yes" || echo "no"
+ # Enable Agentina
+ usex ar
+ # Enable Brazil
+ #use br && echo "yes" || echo "no"
+ # Enable Brazil Cable
+ #use brnet && echo "yes" || echo "no"
+ # Enable Switzerland Search
+ usex ch_search
+ # Enable Denmark
+ usex dk
+ # Enable Latin America
+ usex dtvla
+ # Enable Spain
+ usex es_laguiatv
+ # Enable EU xmltv.se
+ usex eu_dotmedia
+ # Enable EU German speaking area
+ usex eu_egon
+ # Enable EU epgdata.com
+ usex eu_epg
+ # Enable Finland
+ usex fi
+ # Enable Swedish listings in Finland
+ usex fi_sv
+ # Enable France
+ usex fr
+ # Enable France EPG from kazer.org
+ usex fr_kazer
+ # Enable Belgium and Luxemburg
+ #use be && echo "yes" || echo "no"
+ #Enable Croatia
+ usex hr
+ # Enable Hungary and Romania
+ usex huro
+ # Enable Israel
+ usex il
+ # Enable Norway Gfeed
+ usex is
+ # Enable Italy
+ usex it
+ # Enable Italy from DVB-S stream
+ echo "no" # missing Linux::DVB
+ # Enable India (experimental)
+ # Disabled upstream
+ # usex in
+ # Enable North America using DataDirect
+ usex na_dd
+ # Enable North America from directv.com
+ usex na_dtv
+ # Enable North America XMLTVListings.com
+ usex na_tvmedia
+ # Enable Netherlands
+ usex nl
+ # Enable Norway
+ usex no_gf
+ # Enable Portugal
+ usex pt
+ # Enable Portugal EPG from sappo.pt
+ usex pt_meo
+ # Enable Sweden
+ usex se_swedb
+ # Enable Sweeden Alternative
+ usex se_tvzon
+ # Enable Turkey
+ usex tr
+ # Enable UK/Ireland Fast grabber
+ usex uk_atlas
+ # Enable UK fast alternative grabber
+ usex uk_bleb
+ # Enable UK/Ireland Radio Times
+ usex uk_rt
+ # Enable UK/Ireland TV Guide
+ usex uk_tvguide
+ # Enable GUI checking.
+ usex tv_check
+ # Enable combiner
+ usex tv_combiner
+ # Enable CGI support
+ usex tv_pick_cgi
+ }
+
+ pm_echovar=`make_config`
+ perl-module_src_configure
+}
+
+src_install() {
+ # actually make test should be unneeded, but if non na grabbers
+ # start to not install remove comment below
+ #make test
+ #make
+
+ # to bypass build issue
+ #make DESTDIR=${D} install || die "error installing"
+
+ perl-module_src_install
+
+ for i in `grep -rl "${D}" "${D}"` ; do
+ sed -e "s:${D}::g" -i "${i}" || die
+ done
+
+ if use tv_pick_cgi ; then
+ dobin choose/tv_pick/tv_pick_cgi
+ fi
+}
+
+pkg_postinst() {
+ if use tv_pick_cgi ; then
+ elog "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
+ elog "to where the ScriptAlias directive is configured."
+ fi
+}
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index a9e8035f09e4..8d977c2b3955 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,2 +1,2 @@
-DIST metasploit-4.11.4_p2015090201.tar.gz 35211994 SHA256 1254dbb3e8cf33c7a6c8c701a0be13f78bbd2234503e636f1afacf88676aeea2 SHA512 b96c9735ef579b5f98d1fd7176f91bb1710d263a19d3ff891877df8e341baa1749d5fdce9825a19d9ecbe162b72ebcd11336d4d7884e066f4e199baaff8b4085 WHIRLPOOL 875db5df25112736dd62ec1195080d2567a670cf3a770e787b70c364c6b30b43bf906f7ba35901ff367ce940b02af7b17ae135693a28ff5fca9fc05038132ae2
DIST metasploit-4.11.5_p2015110401.tar.gz 35426390 SHA256 fd8ef85a1d935245892c618001d1f992d6be16baa449a61c358b64a306ec249c SHA512 57e6d09546b219023a2f0c5920f143cbda1736c274004e16533693bc25d4f3fc35458c0ddecc1d552e0db575a41a7c7dab5db0dd1fa14d48e8fd66dbf6c9a94c WHIRLPOOL 1c3e2683598f25ce89904c5d0e9e3cf85820a6f09a06ef6e62207cdd30fe48e793012391b44c82131bacf05fce62f0093704d193769ab86ea40b9577543980f1
+DIST metasploit-4.11.7.tar.gz 23163701 SHA256 1dbfc027dbcbb746858d36dda5ba9321cdc7d5dbc7538ceb20730a9de56d026b SHA512 cd84a4ba253e8ae38f93ba20316f0cb0aa5aeabfb345f07cb96791c5b7589572920b1723df624e26b4e07968fe8be55b04e1abc3c8828b5588bec62aca100d55 WHIRLPOOL c054e19f1c994c43230777a5f72d74b468f9de97b0f64edd17f4e9ef68fff3546d1311d9f80036d5aeccb6381c3c7f0200d5e3e33ce567e36f6ce58a9b97d4b3
diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r2.ebuild b/net-analyzer/metasploit/metasploit-4.11.7.ebuild
index 3756f9862e74..2fb25d322361 100644
--- a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r2.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -43,22 +43,25 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
dev-ruby/bcrypt-ruby
dev-ruby/builder:3
dev-ruby/bundler
- dev-ruby/jsobfu:0.2.1
+ dev-ruby/filesize
+ dev-ruby/jsobfu:0.3.0
dev-ruby/json
dev-ruby/kissfft
- =dev-ruby/metasploit_data_models-1.2.5
+ dev-ruby/metasm:1.0.2
+ dev-ruby/metasploit_data_models:1.2.10
dev-ruby/meterpreter_bins:0.0.22
- dev-ruby/metasploit-payloads:1.0.9
- =dev-ruby/metasploit-credential-1.0.0:1.0
+ dev-ruby/metasploit-payloads:1.0.21
+ dev-ruby/metasploit-credential:1.0.1
>=dev-ruby/metasploit-concern-1.0.0:1.0
>=dev-ruby/metasploit-model-1.0.0:1.0
dev-ruby/msgpack
dev-ruby/nokogiri
- dev-ruby/recog:2.0.6
+ dev-ruby/openssl-ccm:1.2.1
+ dev-ruby/recog:2.0.14
=dev-ruby/rkelly-remix-0.0.6
dev-ruby/sqlite3
>=dev-ruby/pg-0.11
- dev-ruby/packetfu:1.1.9
+ dev-ruby/packetfu:1.1.11
>=dev-ruby/rubyzip-1.1
dev-ruby/rb-readline-r7
dev-ruby/robots
@@ -143,9 +146,6 @@ all_ruby_prepare() {
#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
epatch_user
- #unbundle johntheripper, at least it now defaults to running the system version
- rm -r data/john/run.*
- rm -r data/john/src.tar.bz2
#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
rm -r data/cpuinfo
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 41df423a45bc..ac969a0657c9 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -48,14 +48,15 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
dev-ruby/json
dev-ruby/kissfft
dev-ruby/metasm:1.0.2
- dev-ruby/metasploit_data_models:1.2.9
+ dev-ruby/metasploit_data_models:1.2.10
dev-ruby/meterpreter_bins:0.0.22
- dev-ruby/metasploit-payloads:1.0.19
+ dev-ruby/metasploit-payloads:1.0.22
dev-ruby/metasploit-credential:1.0.1
>=dev-ruby/metasploit-concern-1.0.0:1.0
>=dev-ruby/metasploit-model-1.0.0:1.0
dev-ruby/msgpack
dev-ruby/nokogiri
+ dev-ruby/openssl-ccm:1.2.1
dev-ruby/recog:2.0.14
=dev-ruby/rkelly-remix-0.0.6
dev-ruby/sqlite3
@@ -145,9 +146,6 @@ all_ruby_prepare() {
#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
epatch_user
- #unbundle johntheripper, at least it now defaults to running the system version
- rm -r data/john/run.*
- rm -r data/john/src.tar.bz2
#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
rm -r data/cpuinfo
diff --git a/net-irc/irssi/irssi-0.8.17.ebuild b/net-irc/irssi/irssi-0.8.17.ebuild
index 91dc12b99dc7..2663f3364be4 100644
--- a/net-irc/irssi/irssi-0.8.17.ebuild
+++ b/net-irc/irssi/irssi-0.8.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,23 +20,27 @@ SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6 +perl selinux ssl socks5 +proxy"
-CDEPEND="sys-libs/ncurses
+CDEPEND="sys-libs/ncurses:0=
>=dev-libs/glib-2.6.0
ssl? ( dev-libs/openssl:= )
perl? ( dev-lang/perl )
socks5? ( >=net-proxy/dante-1.1.18 )"
-DEPEND="${CDEPEND}
+
+DEPEND="
+ ${CDEPEND}
virtual/pkgconfig"
-RDEPEND="${CDEPEND}
+
+RDEPEND="
+ ${CDEPEND}
selinux? ( sec-policy/selinux-irc )
perl? ( !net-im/silc-client )"
S=${WORKDIR}/${MY_P}
src_prepare() {
- cd m4
+ pushd m4 > /dev/null || die
epatch "${FILESDIR}/${PN}-0.8.15-tinfo.patch"
- cd ..
+ popd > /dev/null || die
autotools-utils_src_prepare
}
diff --git a/net-libs/libtorrent/metadata.xml b/net-libs/libtorrent/metadata.xml
index 5042e870e682..0cdfd4647aee 100644
--- a/net-libs/libtorrent/metadata.xml
+++ b/net-libs/libtorrent/metadata.xml
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <upstream>
- <remote-id type="github">rakshasa/libtorrent</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>perfinion@gentoo.org</email>
+ <name>Jason Zaman</name>
+ </maintainer>
+
+ <upstream>
+ <remote-id type="github">rakshasa/libtorrent</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-misc/libreswan/Manifest b/net-misc/libreswan/Manifest
index ea512bd2a8cb..a3f98f051140 100644
--- a/net-misc/libreswan/Manifest
+++ b/net-misc/libreswan/Manifest
@@ -1,3 +1 @@
-DIST libreswan-3.13.tar.gz 9797529 SHA256 25a6888f850a83eb17d7f041783babb316b07f88a4a327f276d760a273b86f32 SHA512 81385a566b736a97836e70fb4e7827864f6bd27387d29aaaf49c126af305fd8b82c92021186eecceb830418e27ed1d775d70b47a1d1cfe159bc9f2b9c2430e2d WHIRLPOOL 805f9b3adef86367fe9de44908705254693bc1036bac2dca2addd4fb9c661efeb84334d1b77f25612ade5e5a203b33c9cc78b5c117a8b12c3e530b1e01f5600a
-DIST libreswan-3.14.tar.gz 9245651 SHA256 0a9d1d59936884a4c072004bee6c51e4034b97dd02edea53620ee6e5c9cf2c21 SHA512 2f9eb8dde8677b9dd94ca3471858975b8fad441f78345e242629d4e8a7cb33df5b86968e4dae385f9450ed106abd5305610a548658313682fa0485e40737cadf WHIRLPOOL 99a1fc7220404f5d6399a74b79ba63ddae1260b4bc99cb3720aaba913064eb61d1062f1562be38a52804d8521b3a730c8ee3070b15452e198f4474364d9e6c8c
DIST libreswan-3.15.tar.gz 9256911 SHA256 1ca370105a2a619eb4dc34626cb53cd391391e953fce3761a83f0e3a4d5aec4c SHA512 6472906d2507b7f4a06bf608b701e5982d5987b47d9ef88e5c8e63284f8d4d1a7155dd732d6daf8312d53c159bc344a54b2be173339a57aedea19caa79a13fb9 WHIRLPOOL 7fb86556e6b661523966eafdcde6796477f7173c573aece840f0f1f6a6dbfbda132a0723567334944ef5e23815150aef968f2761f842932228dca8c74ede1377
diff --git a/net-misc/libreswan/libreswan-3.13.ebuild b/net-misc/libreswan/libreswan-3.13.ebuild
deleted file mode 100644
index 1f36ee572908..000000000000
--- a/net-misc/libreswan/libreswan-3.13.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd toolchain-funcs
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.libreswan.org/${P}.tar.gz"
- KEYWORDS="amd64 ~ppc x86"
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/libreswan/libreswan.git"
-fi
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-IUSE="caps curl dnssec ldap pam"
-
-COMMON_DEPEND="
- dev-libs/gmp:0=
- dev-libs/nspr
- caps? ( sys-libs/libcap-ng )
- curl? ( net-misc/curl )
- dnssec? ( net-dns/unbound net-libs/ldns )
- ldap? ( net-nds/openldap )
- pam? ( sys-libs/pam )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto
- dev-libs/nss
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- dev-libs/nss[utils(+)]
- sys-apps/iproute2
- !net-misc/openswan
- !net-misc/strongswan
-"
-
-src_prepare() {
- epatch_user
-}
-
-usetf() {
- usex "$1" true false
-}
-
-src_configure() {
- tc-export AR CC
- export INC_USRLOCAL=/usr
- export INC_MANDIR=share/man
- export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
- export FINALDOCDIR=/usr/share/doc/${PF}/html
- export INITSYSTEM=openrc
- export INC_RCDIRS=
- export INC_RCDEFAULT=/etc/init.d
- export USERCOMPILE=
- export USERLINK=
- export USE_DNSSEC=$(usetf dnssec)
- export USE_LIBCAP_NG=$(usetf caps)
- export USE_LIBCURL=$(usetf curl)
- export USE_LDAP=$(usetf ldap)
- export USE_XAUTHPAM=$(usetf pam)
-}
-
-src_compile() {
- emake programs
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
- fperms 0600 /etc/ipsec.secrets
-
- systemd_dounit "${FILESDIR}/ipsec.service"
-
- dodoc CHANGES README
- dodoc -r docs
-
- find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
- local IPSEC_CONFDIR=${ROOT%/}/etc/ipsec.d
- if [[ ! -f ${IPSEC_CONFDIR}/cert8.db ]]; then
- ebegin "Setting up NSS database in ${IPSEC_CONFDIR}"
- certutil -N -d "${IPSEC_CONFDIR}" -f <(echo)
- eend $?
- fi
-}
diff --git a/net-misc/libreswan/libreswan-3.14-r1.ebuild b/net-misc/libreswan/libreswan-3.14-r1.ebuild
deleted file mode 100644
index 732f27d72b61..000000000000
--- a/net-misc/libreswan/libreswan-3.14-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils systemd toolchain-funcs
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.libreswan.org/${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc ~x86"
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/libreswan/libreswan.git"
-fi
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-IUSE="caps curl dnssec ldap pam"
-
-COMMON_DEPEND="
- dev-libs/gmp:0=
- dev-libs/libevent
- dev-libs/nspr
- caps? ( sys-libs/libcap-ng )
- curl? ( net-misc/curl )
- dnssec? ( net-dns/unbound net-libs/ldns )
- ldap? ( net-nds/openldap )
- pam? ( sys-libs/pam )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto
- dev-libs/nss
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- dev-libs/nss[utils(+)]
- sys-apps/iproute2
- !net-misc/openswan
- !net-misc/strongswan
-"
-
-src_prepare() {
- epatch_user
-}
-
-usetf() {
- usex "$1" true false
-}
-
-src_configure() {
- tc-export AR CC
- export INC_USRLOCAL=/usr
- export INC_MANDIR=share/man
- export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
- export FINALDOCDIR=/usr/share/doc/${PF}/html
- export INITSYSTEM=openrc
- export INC_RCDIRS=
- export INC_RCDEFAULT=/etc/init.d
- export USERCOMPILE=
- export USERLINK=
- export USE_DNSSEC=$(usetf dnssec)
- export USE_LIBCAP_NG=$(usetf caps)
- export USE_LIBCURL=$(usetf curl)
- export USE_LDAP=$(usetf ldap)
- export USE_XAUTHPAM=$(usetf pam)
- export DEBUG_CFLAGS=
- export OPTIMIZE_CFLAGS=
-}
-
-src_compile() {
- emake all
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
- fperms 0600 /etc/ipsec.secrets
-
- systemd_dounit "${FILESDIR}/ipsec.service"
-
- dodoc CHANGES README
- dodoc -r docs
-
- find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
- local IPSEC_CONFDIR=${ROOT%/}/etc/ipsec.d
- if [[ ! -f ${IPSEC_CONFDIR}/cert8.db ]]; then
- ebegin "Setting up NSS database in ${IPSEC_CONFDIR}"
- certutil -N -d "${IPSEC_CONFDIR}" -f <(echo)
- eend $?
- fi
-}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 4774bc20da19..f6908d693f9f 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,2 +1 @@
-DIST rsync-3.1.1.tar.gz 890124 SHA256 7de4364fcf5fe42f3bdb514417f1c40d10bbca896abe7e7f2c581c6ea08a2621 SHA512 ec0e46ff532a09a711282aaa822f5f1c133593ee6c1c474acd67284619236e6a202f0f369d3e67a95ceb3a3b1c39ea7fb609d6d6fb950f3be6e0f6372e903e21 WHIRLPOOL 0622646c10a0b4553fddbc0c3c48e6a87f78eaa56dc0cc0f0db86ed45e2c6572d23e4c379fae50ced012c2c0e75a364cae55f7c49f88918a9d62fb9ae17805b9
DIST rsync-3.1.2.tar.gz 892724 SHA256 ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b WHIRLPOOL ba793bfc7f0bdd70dba812a4a782c6ed703c7e83e2d04ca714e67e6153b31f6fc49e224ef7622bf5abb1e0ba0f633bc88b2640548028944b5dfa0443ae8c585e
diff --git a/net-misc/rsync/rsync-3.1.1.ebuild b/net-misc/rsync/rsync-3.1.1.ebuild
deleted file mode 100644
index 15206a010a7a..000000000000
--- a/net-misc/rsync/rsync-3.1.1.ebuild
+++ /dev/null
@@ -1,75 +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 prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="http://rsync.samba.org/"
-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"
-IUSE="acl iconv ipv6 static xattr"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
- xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
- >=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-S=${WORKDIR}/${P/_/}
-
-src_prepare() {
- epatch_user
-}
-
-src_configure() {
- use static && append-ldflags -static
- econf \
- --without-included-popt \
- $(use_enable acl acl-support) \
- $(use_enable xattr xattr-support) \
- $(use_enable ipv6) \
- $(use_enable iconv) \
- --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
- touch proto.h-tstamp #421625
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
- newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
- dodoc NEWS OLDNEWS README TODO tech_report.tex
- insinto /etc
- newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
- # Install the useful contrib scripts
- exeinto /usr/share/rsync
- doexe support/*
- rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
-
- eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
- systemd_dounit "${FILESDIR}/rsyncd.service"
-}
-
-pkg_postinst() {
- if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
- "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
- ewarn "You have disabled chroot support in your rsyncd.conf. This"
- ewarn "is a security risk which you should fix. Please check your"
- ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
- fi
-}
diff --git a/net-p2p/rtorrent/metadata.xml b/net-p2p/rtorrent/metadata.xml
index 332f4dab22ac..4038cab8495c 100644
--- a/net-p2p/rtorrent/metadata.xml
+++ b/net-p2p/rtorrent/metadata.xml
@@ -1,13 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <longdescription lang="en">
- Console BitTorrent client using ncurses based on libtorrent written in C++.
- </longdescription>
- <use>
- <flag name="daemon">Uses <pkg>app-misc/screen</pkg> to daemonize this application</flag>
- </use>
- <upstream>
- <remote-id type="github">rakshasa/rtorrent</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>perfinion@gentoo.org</email>
+ <name>Jason Zaman</name>
+ </maintainer>
+
+ <longdescription lang="en">
+ Console BitTorrent client using ncurses based on libtorrent written in C++.
+ </longdescription>
+
+ <use>
+ <flag name="daemon">Uses <pkg>app-misc/screen</pkg> to daemonize this application</flag>
+ </use>
+
+ <upstream>
+ <remote-id type="github">rakshasa/rtorrent</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index b3bbb909a8ff..c1fccb9e059b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,9 +30,13 @@
#--- END OF EXAMPLES ---
-# Michael Orlitzky <mjo@gentoo.org> (22 Jan 2016)
-# Masked for testing of new build system.
->=app-eselect/eselect-php-0.9.0
+# James Le Cuirot <chewi@gentoo.org> (26 Jan 2016)
+# No new release since 2008. Removal in 30 days.
+app-cdr/webcdwriter
+
+# James Le Cuirot <chewi@gentoo.org> (26 Jan 2016)
+# Now part of eselect-java. Removal in 30 days.
+app-eselect/eselect-maven
# Alexis Ballier <aballier@gentoo.org> (22 Jan 2016)
# Breaks some of its revdeps
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index f395149f1c5f..2e18c12e6c0e 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -1,6 +1 @@
-DIST scikit-learn-0.13.1.tar.gz 3477412 SHA256 a6e4759a779ba792435d096c882a0d66ee29d369755c09209f1a4e50877bdc94 SHA512 945475bf6e5600da63d26217ae6966f8f5e3a8d9c7645363ba9e9d8d4c475e2ebcfa45e75f8988537716b7a9c16980c52df4310b924eec4da9433d1fc98cc34b WHIRLPOOL 0af58429d604eb1fb22f24e155daaa67831d16d49ff414b29a150f03617be1811796d653afb0f7b4eac9f03cf318910dd9544dc3a58543a333fccd8580a59d4b
-DIST scikit-learn-0.14.1.tar.gz 23228378 SHA256 4c317cabb56c61f4c574879b53aa6bbea0132bb630678229bce98638f4b000e0 SHA512 4d094a698f73c458f2f8c03240fab070854bcb5871acfc4f1aaf1a6f19f28a70bc6aeadb89bf6c586d2b39b81f57175dbb7d64ac4c3693a3be1b407f78e44c52 WHIRLPOOL 39f317721f278037b779001f3cb5e117b6d9da5996df78a53440d68bc860eccbf462a1d48890246624d8e256a6301fb8195199a2ff387bb60179fb11bda9aea6
-DIST scikit-learn-0.15.1.tar.gz 7034220 SHA256 4b13456727b9310857f12cc7b9d1c62d59f3ef602fea9d391afc0c8c847ed17d SHA512 4c2e68b1bb75c85c2a83605a32ba5adbd224bc25b19fca85e18dbe24f20cbe51cbfb02be546a4f05fc190f77e438cb17c6a5d69026455e8c11907599462f9984 WHIRLPOOL e1bc387b013abcab18d8ee0545dda543bb098b9d7636229880dea667fc4627d1822fe8a430a2d26dbafcc0b0e90326d5529245e6eff1345b73fc5a24b7a51096
-DIST scikit-learn-0.15.2.tar.gz 7007922 SHA256 1a8a881f6f13edc0ac58931ce21f899eb7920af50aa08802413d1239e2aa5fa6 SHA512 ca2470df73be1b735f756f641fdbb4dc59a54b67d12f61c54542f0928ce9242665d1b8793673a9d989a41f2c2945c2ba92ed54fc9914fbe030a5c8af289c6523 WHIRLPOOL 9043bf653f8d866f98e5a2342fbacf51fafefd5096e70989ebeb4b580c38b5468c3a2eb598d4d5492ba1413378b8c133938baa20d4a292c9f94c5596dbf1d405
-DIST scikit-learn-0.16.1.tar.gz 7267115 SHA256 c0721e295056c95c7002e05726f2bd271a7923e88bdeab34a2b60aac2b0ee6e4 SHA512 18ea7420a4a7f23f030ad1e20cf29dd7d6183872ed4aa3daf4bfb5106728de21775461b90a917f231e56fee78eea5927ff8c3160c1da1473f34315b00994461b WHIRLPOOL 15eba05ba0d9ac62ed30636ece9091cb9930e432e5726b67be3de0ae5b81a187eac8cac69184106b4a5a1c4393801fb6a375b6f025c3562223ad5ed0e508ad8c
DIST scikit-learn-0.17.tar.gz 7834903 SHA256 23a5b6804524cb2cd54d8310010169511c7633dcf69af7439747eec02677f314 SHA512 53a76e2f90e27967bf216cd9d7e8051ed847a3381e3b7b7b8236511b4105eef41bd4d3c9f7f71a51db4b0bf99cbd571d7c1b26803757cff04424b70cb834b555 WHIRLPOOL 3a1ef13dafe6eb38389f68bc75dee10bfe141bac6d2782cd11be27ffcb8fe7efdf113b6911a238c6cd141bfe3b69960f47cf0725d0ea033129dff8fb5c57bef4
diff --git a/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild
deleted file mode 100644
index 0554e1cf5db8..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.13.1.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
-SRC_URI="mirror://sourceforge/${MYPN}/${MYPN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
- sci-libs/scikits[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-
-python_prepare_all() {
- # bug #397605
- [[ ${CHOST} == *-darwin* ]] \
- && append-ldflags -bundle "-undefined dynamic_lookup" \
- || append-ldflags -shared
-
- # scikits-learn now uses the horrible numpy.distutils automagic
- export SCIPY_FCONFIG="config_fc --noopt --noarch"
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
- if use doc; then
- cd "${S}/doc"
- local d="${BUILD_DIR}"/lib
- ln -s "${S}"/sklearn/datasets/{data,descr,images} \
- "${d}"/sklearn/datasets
- VARTEXFONTS="${T}"/fonts \
- MPLCONFIGDIR="${BUILD_DIR}" \
- PYTHONPATH="${d}" \
- emake html
- rm -r "${d}"/sklearn/datasets/{data,desr,images}
- fi
-}
-
-python_test() {
- # doc builds and runs tests
- use doc && return
- esetup.py \
- install --root="${T}/test-${EPYTHON}" \
- --no-compile ${SCIPY_FCONFIG}
- pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
- nosetests -v sklearn --exe || die
- popd > /dev/null
-}
-
-python_install() {
- distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
- find "${S}" -name \*LICENSE.txt -delete
- use doc && HTML_DOCS=( doc/_build/html/. )
- distutils-r1_python_install_all
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
deleted file mode 100644
index 0b2c98365ec2..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1 eutils multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
- dev-python/joblib[${PYTHON_USEDEP}]
- sci-libs/scikits[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas"
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}] )
- test? (
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
- # bug #397605
- [[ ${CHOST} == *-darwin* ]] \
- && append-ldflags -bundle "-undefined dynamic_lookup" \
- || append-ldflags -shared
-
- # scikits-learn now uses the horrible numpy.distutils automagic
- export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
- # use system joblib
- rm -r sklearn/externals/joblib/* || die
- echo "from joblib import *" > sklearn/externals/joblib/__init__.py
- sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
- sed -i -e 's/..externals.joblib/joblib/g' \
- sklearn/decomposition/tests/test_sparse_pca.py \
- sklearn/metrics/pairwise.py || die
-
- # use gentoo cblas infrastructure
- epatch "${FILESDIR}"/${P}-system-cblas.patch
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
- if use doc; then
- cd "${S}/doc" || die
- local d="${BUILD_DIR}"/lib
- ln -s "${S}"/sklearn/datasets/{data,descr,images} \
- "${d}"/sklearn/datasets || die
- VARTEXFONTS="${T}"/fonts \
- MPLCONFIGDIR="${BUILD_DIR}" \
- PYTHONPATH="${d}" \
- emake html
- rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
- fi
-}
-
-python_test() {
- # doc builds and runs tests
- use doc && return
- distutils_install_for_testing ${SCIPY_FCONFIG}
- esetup.py \
- install --root="${T}/test-${EPYTHON}" \
- --no-compile ${SCIPY_FCONFIG}
- pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
- nosetests -v sklearn --exe || die
- popd > /dev/null
-}
-
-python_install() {
- distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
- find "${S}" -name \*LICENSE.txt -delete
- use doc && HTML_DOCS=( doc/_build/html/. )
- distutils-r1_python_install_all
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
deleted file mode 100644
index c50ed8aa6c91..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2016 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 eutils multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- sci-libs/scikits[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas"
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas
- doc? (
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
- # bug #397605
- [[ ${CHOST} == *-darwin* ]] \
- && append-ldflags -bundle "-undefined dynamic_lookup" \
- || append-ldflags -shared
-
- # scikits-learn now uses the horrible numpy.distutils automagic
- export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
- # use system joblib
- rm -r sklearn/externals/joblib/* || die
- echo "from joblib import *" > sklearn/externals/joblib/__init__.py
- sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
- sed -i -e 's/..externals.joblib/joblib/g' \
- sklearn/decomposition/tests/test_sparse_pca.py \
- sklearn/metrics/pairwise.py || die
-
- # use gentoo cblas infrastructure
- epatch "${FILESDIR}"/${PN}-0.14.1-system-cblas.patch
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
- if use doc; then
- cd "${S}/doc" || die
- local d="${BUILD_DIR}"/lib
- ln -s "${S}"/sklearn/datasets/{data,descr,images} \
- "${d}"/sklearn/datasets || die
- VARTEXFONTS="${T}"/fonts \
- MPLCONFIGDIR="${BUILD_DIR}" \
- PYTHONPATH="${d}" \
- emake html
- rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
- fi
-}
-
-python_test() {
- # doc builds and runs tests
- use doc && return
- distutils_install_for_testing ${SCIPY_FCONFIG}
- esetup.py \
- install --root="${T}/test-${EPYTHON}" \
- --no-compile ${SCIPY_FCONFIG}
- pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
- nosetests -v sklearn --exe || die
- popd > /dev/null
-}
-
-python_install() {
- distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
- find "${S}" -name \*LICENSE.txt -delete
- use doc && HTML_DOCS=( doc/_build/html/. )
- distutils-r1_python_install_all
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
deleted file mode 100644
index c50ed8aa6c91..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2016 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 eutils multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- sci-libs/scikits[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas"
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas
- doc? (
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
- # bug #397605
- [[ ${CHOST} == *-darwin* ]] \
- && append-ldflags -bundle "-undefined dynamic_lookup" \
- || append-ldflags -shared
-
- # scikits-learn now uses the horrible numpy.distutils automagic
- export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
- # use system joblib
- rm -r sklearn/externals/joblib/* || die
- echo "from joblib import *" > sklearn/externals/joblib/__init__.py
- sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
- sed -i -e 's/..externals.joblib/joblib/g' \
- sklearn/decomposition/tests/test_sparse_pca.py \
- sklearn/metrics/pairwise.py || die
-
- # use gentoo cblas infrastructure
- epatch "${FILESDIR}"/${PN}-0.14.1-system-cblas.patch
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
- if use doc; then
- cd "${S}/doc" || die
- local d="${BUILD_DIR}"/lib
- ln -s "${S}"/sklearn/datasets/{data,descr,images} \
- "${d}"/sklearn/datasets || die
- VARTEXFONTS="${T}"/fonts \
- MPLCONFIGDIR="${BUILD_DIR}" \
- PYTHONPATH="${d}" \
- emake html
- rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
- fi
-}
-
-python_test() {
- # doc builds and runs tests
- use doc && return
- distutils_install_for_testing ${SCIPY_FCONFIG}
- esetup.py \
- install --root="${T}/test-${EPYTHON}" \
- --no-compile ${SCIPY_FCONFIG}
- pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
- nosetests -v sklearn --exe || die
- popd > /dev/null
-}
-
-python_install() {
- distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
- find "${S}" -name \*LICENSE.txt -delete
- use doc && HTML_DOCS=( doc/_build/html/. )
- distutils-r1_python_install_all
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
deleted file mode 100644
index 46432a12aa6e..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1 eutils multilib flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="http://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- sci-libs/scikits[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- virtual/blas
- virtual/cblas"
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[lapack,${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- virtual/cblas
- doc? (
- dev-python/joblib[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/${MYP}"
-
-python_prepare_all() {
- # bug #397605
- [[ ${CHOST} == *-darwin* ]] \
- && append-ldflags -bundle "-undefined dynamic_lookup" \
- || append-ldflags -shared
-
- # scikits-learn now uses the horrible numpy.distutils automagic
- export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
- # use system joblib
- rm -r sklearn/externals/joblib/* || die
- echo "from joblib import *" > sklearn/externals/joblib/__init__.py
- sed -i -e '/joblib\/test/d' sklearn/externals/setup.py || die
- sed -i -e 's/..externals.joblib/joblib/g' \
- sklearn/decomposition/tests/test_sparse_pca.py \
- sklearn/metrics/pairwise.py || die
-
- # use gentoo cblas infrastructure
- epatch "${FILESDIR}"/${PN}-0.14.1-system-cblas.patch
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_compile_all() {
- if use doc; then
- cd "${S}/doc" || die
- local d="${BUILD_DIR}"/lib
- ln -s "${S}"/sklearn/datasets/{data,descr,images} \
- "${d}"/sklearn/datasets
- VARTEXFONTS="${T}"/fonts \
- MPLCONFIGDIR="${BUILD_DIR}" \
- PYTHONPATH="${d}" \
- emake html
- rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
- fi
-}
-
-python_test() {
- # doc builds and runs tests
- use doc && return
- distutils_install_for_testing ${SCIPY_FCONFIG}
- esetup.py \
- install --root="${T}/test-${EPYTHON}" \
- --no-compile ${SCIPY_FCONFIG}
- pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
- nosetests -v sklearn --exe || die
- popd > /dev/null
-}
-
-python_install() {
- distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-python_install_all() {
- find "${S}" -name \*LICENSE.txt -delete
- use doc && HTML_DOCS=( doc/_build/html/. )
- distutils-r1_python_install_all
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
index b7c3bcdde597..304b625af52d 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
@@ -89,7 +89,7 @@ python_compile_all() {
MPLCONFIGDIR="${BUILD_DIR}" \
PYTHONPATH="${d}" \
emake html
- rm -r "${d}"/sklearn/datasets/{data,desr,images} || die
+ rm -r "${d}"/sklearn/datasets/{data,descr,images} || die
fi
}
diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild b/sci-libs/scipy/scipy-0.16.1.ebuild
index 289f4625cc1f..ba2669243c9f 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
LICENSE="BSD LGPL-2"
SLOT="0"
IUSE="doc sparse test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
CDEPEND="
>=dev-python/numpy-1.6.2[lapack,${PYTHON_USEDEP}]
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
new file mode 100644
index 000000000000..ffe4d7bd8c99
--- /dev/null
+++ b/sys-fs/dislocker/Manifest
@@ -0,0 +1 @@
+DIST dislocker-0.5.2.tar.gz 97928 SHA256 469a6a623c9477399c2b9ca5116724c03df4ce1889bbcfe3d5f57956b15c0643 SHA512 023145313417befa2b3b26ce158cce3b356e9533d2fb8ad8576e63a0b1e07b78de3a68d86999ab26984aac4f634bef13310cd5c4954bc994971a9e64c5508e61 WHIRLPOOL 751a49343e0dd53f0ae3e6424dba39a43e7780bddbebc39192ed1f6f09b351352aba253ac858aaff0db6fbdf1cdf8c28fb9f6511d38b9ccbeceee61c4412e43d
diff --git a/sys-fs/dislocker/dislocker-0.5.2.ebuild b/sys-fs/dislocker/dislocker-0.5.2.ebuild
new file mode 100644
index 000000000000..e4497f2fa087
--- /dev/null
+++ b/sys-fs/dislocker/dislocker-0.5.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
+HOMEPAGE="https://github.com/Aorimn/dislocker"
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/Aorimn/dislocker.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ruby"
+
+DEPEND="sys-fs/fuse
+ || ( net-libs/polarssl net-libs/mbedtls )
+ ruby? ( dev-lang/ruby:2.1 )"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+# We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE
+# sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" || die
+ sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" || die
+
+ sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_find_package ruby Ruby)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ find "${S}/man/linux" -name '*.1' -exec doman '{}' +
+ cmake-utils_src_install
+}
diff --git a/sys-fs/mtd-utils/mtd-utils-99999999.ebuild b/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
index 4380caf19725..e956d50c6697 100644
--- a/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
@@ -57,6 +57,6 @@ src_compile() {
src_install() {
emake $(makeopts) install DESTDIR="${ED}"
dodoc *.txt
- newdoc mkfs.ubifs/README README.mkfs.ubifs
+ newdoc ubifs-utils/mkfs.ubifs/README README.mkfs.ubifs
# TODO: check ubi-utils for docs+scripts
}
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
new file mode 100644
index 000000000000..ab96babf8e4f
--- /dev/null
+++ b/www-apps/radicale/Manifest
@@ -0,0 +1 @@
+DIST Radicale-1.1.1.tar.gz 47174 SHA256 e2c9812913c464ab88ae1f66b29e81f87a4cc6ee1c94d167b33508c530dab4b0 SHA512 dc251d8fa4d347c2bbcf472b7a2da94d674f858a007fec1d74774cd1f3ae43eb2d5902ed45762638ec49546b8ee1f66446d07b50fc0ff6595deb67ea07f87af2 WHIRLPOOL 315977a0bed6c1d5bfac24617b23e791d6c306658a14a478364dde61b5df5ac4136be18139d3edb7ab554f40a1d3cfce367770dab4c023868bb476f34e28a3b6
diff --git a/www-apps/radicale/files/radicale-1.1.1-config.patch b/www-apps/radicale/files/radicale-1.1.1-config.patch
new file mode 100644
index 000000000000..4eb286f8d400
--- /dev/null
+++ b/www-apps/radicale/files/radicale-1.1.1-config.patch
@@ -0,0 +1,34 @@
+diff --git a/config b/config
+index 453a45e..10c1595 100644
+--- a/config
++++ b/config
+@@ -146,7 +146,7 @@ http_password_parameter =
+ #custom_handler =
+
+ # File for rights management from_file
+-#file = ~/.config/radicale/rights
++file = /etc/radicale/rights
+
+
+ [storage]
+@@ -163,7 +163,7 @@ file = ~/.config/radicale/rights
+ #custom_handler =
+
+ # Folder for storing local collections, created if not present
+-#filesystem_folder = ~/.config/radicale/collections
++filesystem_folder = /var/lib/radicale/
+
+ # Database URL for SQLAlchemy
+ # dialect+driver://user:password@host/dbname[?key=value..]
+diff --git a/logging b/logging
+--- a/logging
++++ b/logging
+@@ -45,7 +45,7 @@ formatter = simple
+ [handler_file]
+ # File handler
+ class = FileHandler
+-args = ('/var/log/radicale',)
++args = ('/var/log/radicale/radicale.log',)
+ formatter = full
+
+
diff --git a/www-apps/radicale/files/radicale.init.d b/www-apps/radicale/files/radicale.init.d
new file mode 100644
index 000000000000..8e3e94a6494c
--- /dev/null
+++ b/www-apps/radicale/files/radicale.init.d
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+PIDFILE=/var/run/radicale.pid
+
+depend() {
+ use net
+ need localmount
+}
+
+start() {
+ ebegin "Starting radicale"
+ start-stop-daemon --start --quiet --background \
+ --user radicale \
+ --pidfile ${PIDFILE} --make-pidfile \
+ --exec /usr/bin/radicale -- --foreground
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping radicale"
+ start-stop-daemon --stop --quiet \
+ --pidfile ${PIDFILE}
+ eend $?
+}
diff --git a/www-apps/radicale/metadata.xml b/www-apps/radicale/metadata.xml
new file mode 100644
index 000000000000..246beb8331f0
--- /dev/null
+++ b/www-apps/radicale/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel RĂ¼ger</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/www-apps/radicale/radicale-1.1.1.ebuild b/www-apps/radicale/radicale-1.1.1.ebuild
new file mode 100644
index 000000000000..6ac4c3b39574
--- /dev/null
+++ b/www-apps/radicale/radicale-1.1.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit eutils distutils-r1 user
+
+MY_PN="Radicale"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A simple CalDAV calendar server"
+HOMEPAGE="http://www.radicale.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDIR=/var/lib/radicale
+LDIR=/var/log/radicale
+
+PATCHES=( "${FILESDIR}"/${P}-config.patch )
+
+pkg_setup() {
+ enewgroup radicale
+ enewuser radicale -1 -1 ${RDIR} radicale
+}
+
+python_install_all() {
+ rm README* || die
+
+ # init file
+ newinitd "${FILESDIR}"/radicale.init.d radicale
+
+ # directories
+ diropts -m0750
+ dodir ${RDIR}
+ fowners radicale:radicale ${RDIR}
+ diropts -m0755
+ dodir ${LDIR}
+ fowners radicale:radicale ${LDIR}
+
+ # config file
+ insinto /etc/${PN}
+ doins config logging
+
+ # fcgi and wsgi files
+ exeinto /usr/share/${PN}
+ doexe radicale.wsgi
+ doexe radicale.fcgi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ einfo "A sample WSGI script has been put into ${ROOT}usr/share/${PN}."
+ einfo "You will also find there an example FastCGI script."
+
+ einfo "Radicale supports different authentication backends that depend on external libraries."
+ einfo "Please install"
+ optfeature "LDAP auth" dev-python/python-ldap
+ optfeature "PAM auth" dev-python/python-pam
+ optfeature "HTTP auth" dev-python/requests
+ optfeature "FastCGI mode" dev-python/flup
+ optfeature "Database storage backend" dev-python/sqlalchemy
+ einfo "Please note that some of these libraries are Python 2 only."
+}
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index e4f9bcd741c6..eb8a9e7e5141 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,4 +1,5 @@
DIST 1.0.4.tar.gz 3487476 SHA256 b08df31894f48c43e38ce3f3d32acf0bec67c38164d20f7765a7e4af9e3af7a2 SHA512 bbb3d3048c62b0223799468e24abd8614a75d9118ad9d8493e7118882072fb3401f086239dc05a4a742b39b40520771de5bc9fe6735a2c5853ffb5aa961e6112 WHIRLPOOL 9a7af8a52c822b1024a0fbe45556b7c1c53995c827315d6b2fad6e506720abc93fa1e200428d39cf4788bed7f1e635dc883d37711583157be31b12796167d379
+DIST 1.0.5.tar.gz 3491483 SHA256 d3f14fd1b1cfb51df98ebc341ab78ce741ba443ae2ce9e1662de39d01a95e0f3 SHA512 f32a59eac773df1bd9d36ba26cf7397bd205a2a8918e01f978c42ffb6aa2238a6f4dc871503a43f130c3b10d80f43364f54965d441f602ac895d0483fc073498 WHIRLPOOL 2e6f9a742032d04e863a7801b8707ada523be009d3c7abe8d54390af822653bab923783926082af28ad6a546f86035f50ec44a490e170186f395d6e5395b48bb
DIST spacefm-0.9.3.tar.xz 1291540 SHA256 0072a6f2668ae6649e1cc410f1e7eec172a0297de8b225c963b9e29c6a0ed04d SHA512 02140d1915b77dcbe30c76f3666b8a2bf15f634026d27f059a47c567c5ac697ff1fe9ed95a9dcbed092eaafd9075974cd46a1d315c20e103ea97f0bac9c29df9 WHIRLPOOL 04804f65bafb5fbeb86743a183af3439f0b040d5301cc1b74abc7257a4889d9d16c9ddbe10284da7d1cd9e2b65afb01379835647e1a84e638b6c81778dde7256
DIST spacefm-0.9.4.tar.xz 1283576 SHA256 75886cc93e6586753f01242ba883856567c3fdc90d240f112662ca3080e25955 SHA512 b7c3c92b4b6cb74f6c1d63a91beca9759af23fd3b7e5ffc10a895fc948f07aa5e28a0085820cae39bd5eb6e0489181369870fd760950dea26bf0b13c9f499a66 WHIRLPOOL ffb962e1c89125253368a2c40dde4dc7b02f54f365a77cd14a21a417ca40ace9d08e0603d52fd6b065e57e80c5f281d85f8b1644b883f683cfee2d1996afffd2
DIST spacefm-1.0.0.tar.xz 1338824 SHA256 dc3025bd31ea235afaa55cf609d376dc8c79e63dcd127389085758a9b26b97b6 SHA512 b4306092069125608132c3c7a3f54ba33bcc39876ccb409d69795283c83a6eb7c58e9848c9b3b6dbda606886f1f9359fb96a6b9b1b8076bf585fde237b0e3402 WHIRLPOOL db78cbf76b4d151773412d7646055fa26e058b93107eb4b0d84fba369d277211fd4edbe3660bf5a26f3452e4e9ad6c84d724cee4658c7dda63e479d871a7ee3d
diff --git a/x11-misc/spacefm/metadata.xml b/x11-misc/spacefm/metadata.xml
index c8bfac0ff7c4..624f7ee7074e 100644
--- a/x11-misc/spacefm/metadata.xml
+++ b/x11-misc/spacefm/metadata.xml
@@ -6,7 +6,7 @@
<name>Daniel Campbell</name>
</maintainer>
<upstream>
- <maintainer status="active">
+ <maintainer status="active" type="person">
<email>ignorantguru@users.sourceforge.net</email>
</maintainer>
<changelog>https://ignorantguru.github.com/spacefm/news.html</changelog>
@@ -18,7 +18,7 @@
<use>
<flag name="gtk2">Support GTK+ 2.x instead of GTK+ 3.x</flag>
<flag name="gtk3">Support GTK+ 3.x instead of GTK+ 2.x</flag>
- <flag name="video-thumbnails">Support video thumbnails with ffmpegthumbnailer</flag>
+ <flag name="video-thumbnails">Support video thumbnails with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
</use>
<longdescription lang="en">
SpaceFM is a file manager with built-in VFS, optional udisks-based device
diff --git a/x11-misc/spacefm/spacefm-1.0.5.ebuild b/x11-misc/spacefm/spacefm-1.0.5.ebuild
new file mode 100644
index 000000000000..1a96d97b1e69
--- /dev/null
+++ b/x11-misc/spacefm/spacefm-1.0.5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime gnome2-utils linux-info
+
+DESCRIPTION="A multi-panel tabbed file manager"
+HOMEPAGE="https://ignorantguru.github.com/spacefm/"
+SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
+REQUIRED_USE="gtk2? ( !gtk3 )"
+
+RDEPEND="dev-libs/glib:2
+ dev-util/desktop-file-utils
+ >=virtual/udev-143
+ virtual/freedesktop-icon-theme
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ gtk2? ( x11-libs/gtk+:2 )
+ !gtk2? ( x11-libs/gtk+:3 )
+ x11-libs/pango
+ x11-libs/libX11
+ x11-misc/shared-mime-info
+ video-thumbnails? ( media-video/ffmpegthumbnailer )
+ startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+src_configure() {
+ econf \
+ --htmldir=/usr/share/doc/${PF}/html \
+ $(use_enable startup-notification) \
+ $(use_enable video-thumbnails) \
+ --disable-hal \
+ --enable-inotify \
+ --disable-pixmaps \
+ $(use_with gtk3 gtk3 "yes")
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+
+ einfo
+ elog "To mount as non-root user you need one of the following:"
+ elog " sys-apps/udevil (recommended, see below)"
+ elog " sys-apps/pmount"
+ elog " sys-fs/udisks:0"
+ elog " sys-fs/udisks:2"
+ elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
+ elog " sys-apps/udevil"
+ elog "To perform as root functionality you need one of the following:"
+ elog " x11-misc/ktsuss"
+ elog " x11-libs/gksu"
+ elog " kde-apps/kdesu"
+ elog "Other optional dependencies:"
+ elog " sys-apps/dbus"
+ elog " sys-process/lsof (device processes)"
+ elog " virtual/eject (eject media)"
+ einfo
+ if ! has_version 'sys-fs/udisks' ; then
+ elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
+ elog "you may need to enable kernel polling for device media changes to be detected."
+ elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
+ has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
+ kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
+ einfo
+ fi
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+}