2016-06-03 14:28:15 UTC

13 files changed, 63 insertions, 45 deletions

diff --git a/metadata/md5-cache/app-crypt/keynote-2.3-r3 b/metadata/md5-cache/app-crypt/keynote-2.3-r3
index 91c47e11c0da..0af557258870 100644
--- a/metadata/md5-cache/app-crypt/keynote-2.3-r3
+++ b/metadata/md5-cache/app-crypt/keynote-2.3-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=ssl? ( dev-libs/openssl:0 ) virtual/yacc
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/yacc
 DESCRIPTION=The KeyNote Trust-Management System
 EAPI=5
 HOMEPAGE=http://www1.cs.columbia.edu/~angelos/keynote.html
-IUSE=ssl
+IUSE=libressl ssl
 KEYWORDS=amd64 x86
 LICENSE=keynote
-RDEPEND=ssl? ( dev-libs/openssl:0 )
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://www1.cs.columbia.edu/~angelos/Code/keynote-2.3.tar.gz
 _eclass_exported_funcs=pkg_setup:- src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=eee2807519effac871e2949e2c1d9f60
+_md5_=507205088bd8615d823728dd86ed8253
diff --git a/metadata/md5-cache/app-crypt/openssl-tpm-engine-0.4.2 b/metadata/md5-cache/app-crypt/openssl-tpm-engine-0.4.2
index 8a046bf10486..4178d2ddd2bb 100644
--- a/metadata/md5-cache/app-crypt/openssl-tpm-engine-0.4.2
+++ b/metadata/md5-cache/app-crypt/openssl-tpm-engine-0.4.2
@@ -1,13 +1,14 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=dev-libs/openssl-0.9.8:* >=app-crypt/trousers-0.2.8 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-crypt/trousers-0.2.8 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=This provides a OpenSSL engine that uses private keys stored in TPM hardware
 EAPI=5
 HOMEPAGE=http://trousers.sourceforge.net
-KEYWORDS=~x86 ~amd64
+IUSE=libressl
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/openssl-0.9.8:* >=app-crypt/trousers-0.2.8
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-crypt/trousers-0.2.8
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/openssl_tpm_engine-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=25c71473a6d6c00dca5c7893ff2c4afc
+_md5_=dd7d7182f90899fa6e58a2615feff83c
diff --git a/metadata/md5-cache/app-crypt/ophcrack-3.3.1 b/metadata/md5-cache/app-crypt/ophcrack-3.3.1
index 854b72a7fd47..04d0b6fcfc86 100644
--- a/metadata/md5-cache/app-crypt/ophcrack-3.3.1
+++ b/metadata/md5-cache/app-crypt/ophcrack-3.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install
-DEPEND=app-arch/unzip virtual/pkgconfig dev-libs/openssl net-libs/netwib qt4? ( dev-qt/qtgui:4 )
+DEPEND=app-arch/unzip virtual/pkgconfig !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib qt4? ( dev-qt/qtgui:4 )
 DESCRIPTION=A time-memory-trade-off-cracker
-EAPI=3
+EAPI=5
 HOMEPAGE=http://ophcrack.sourceforge.net/
-IUSE=qt4 debug +tables
+IUSE=debug libressl qt4 +tables
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=tables? ( app-crypt/ophcrack-tables ) dev-libs/openssl net-libs/netwib qt4? ( dev-qt/qtgui:4 )
+RDEPEND=tables? ( app-crypt/ophcrack-tables ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib qt4? ( dev-qt/qtgui:4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ophcrack/ophcrack-3.3.1.tar.bz2
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=ec8f607fbf93152049b8108ec3769a79
+_md5_=95db893e0ab1d835acb9bbc116c8ba6e
diff --git a/metadata/md5-cache/app-crypt/ophcrack-3.4.0 b/metadata/md5-cache/app-crypt/ophcrack-3.4.0
index 1db7529bb74c..1c4e89b1216a 100644
--- a/metadata/md5-cache/app-crypt/ophcrack-3.4.0
+++ b/metadata/md5-cache/app-crypt/ophcrack-3.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install
-DEPEND=app-arch/unzip virtual/pkgconfig dev-libs/openssl net-libs/netwib qt4? ( dev-qt/qtgui:4 )
+DEPEND=app-arch/unzip virtual/pkgconfig !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib qt4? ( dev-qt/qtgui:4 )
 DESCRIPTION=A time-memory-trade-off-cracker
-EAPI=3
+EAPI=5
 HOMEPAGE=http://ophcrack.sourceforge.net/
-IUSE=qt4 debug +tables
+IUSE=debug libressl qt4 +tables
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=tables? ( app-crypt/ophcrack-tables ) dev-libs/openssl net-libs/netwib qt4? ( dev-qt/qtgui:4 )
+RDEPEND=tables? ( app-crypt/ophcrack-tables ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib qt4? ( dev-qt/qtgui:4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ophcrack/ophcrack-3.4.0.tar.bz2
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=ec8f607fbf93152049b8108ec3769a79
+_md5_=95db893e0ab1d835acb9bbc116c8ba6e
diff --git a/metadata/md5-cache/app-crypt/ophcrack-3.6.0 b/metadata/md5-cache/app-crypt/ophcrack-3.6.0
index 8745a2a350fc..4227ae7fb96d 100644
--- a/metadata/md5-cache/app-crypt/ophcrack-3.6.0
+++ b/metadata/md5-cache/app-crypt/ophcrack-3.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install
-DEPEND=app-arch/unzip virtual/pkgconfig dev-libs/openssl net-libs/netwib qt4? ( dev-qt/qtgui:4 )
+DEPEND=app-arch/unzip virtual/pkgconfig !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib qt4? ( dev-qt/qtgui:4 )
 DESCRIPTION=A time-memory-trade-off-cracker
-EAPI=3
+EAPI=5
 HOMEPAGE=http://ophcrack.sourceforge.net/
-IUSE=qt4 debug +tables
+IUSE=debug libressl qt4 +tables
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=tables? ( app-crypt/ophcrack-tables ) dev-libs/openssl net-libs/netwib qt4? ( dev-qt/qtgui:4 )
+RDEPEND=tables? ( app-crypt/ophcrack-tables ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/netwib qt4? ( dev-qt/qtgui:4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ophcrack/ophcrack-3.6.0.tar.bz2
 _eclass_exported_funcs=src_configure:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=a24e74b51535ced7051c06de568266a7
+_md5_=95db893e0ab1d835acb9bbc116c8ba6e
diff --git a/metadata/md5-cache/app-crypt/osslsigncode-1.4 b/metadata/md5-cache/app-crypt/osslsigncode-1.4
index 050e4e7fc5df..16cb608684fa 100644
--- a/metadata/md5-cache/app-crypt/osslsigncode-1.4
+++ b/metadata/md5-cache/app-crypt/osslsigncode-1.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure
-DEPEND=dev-libs/openssl curl? ( net-misc/curl ) virtual/pkgconfig
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) curl? ( net-misc/curl ) virtual/pkgconfig
 DESCRIPTION=Platform-independent tool for Authenticode signing of EXE/CAB files
-EAPI=4
+EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/osslsigncode
-IUSE=curl
+IUSE=curl libressl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl curl? ( net-misc/curl )
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) curl? ( net-misc/curl )
 SLOT=0
 SRC_URI=mirror://sourceforge/osslsigncode/osslsigncode-1.4.tar.gz
 _eclass_exported_funcs=src_configure:-
-_md5_=a1b47d18b22cfa9e99b8541f451e1588
+_md5_=fdc4f9c169b4eb728bb6e904e4e90602
diff --git a/metadata/md5-cache/app-crypt/pesign-0.108 b/metadata/md5-cache/app-crypt/pesign-0.108
index 5d46c5a0e70d..c7bd3eb64b1c 100644
--- a/metadata/md5-cache/app-crypt/pesign-0.108
+++ b/metadata/md5-cache/app-crypt/pesign-0.108
@@ -1,13 +1,14 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-libs/nspr dev-libs/openssl:0 sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
+DEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
 DESCRIPTION=Tools for manipulating signed PE-COFF binaries
 EAPI=5
 HOMEPAGE=https://github.com/vathpela/pesign
+IUSE=libressl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/nspr dev-libs/openssl:0 sys-apps/util-linux
+RDEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
 SLOT=0
 SRC_URI=https://github.com/vathpela/pesign/archive/0.108.tar.gz -> pesign-0.108.tar.gz
 _eclass_exported_funcs=src_prepare:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=d8855702d1e60bcd950383d5316c4415
+_md5_=8311442311bed24572e8d9ed430c9b6b
diff --git a/metadata/md5-cache/app-crypt/pkcs11-dump-0.3.4 b/metadata/md5-cache/app-crypt/pkcs11-dump-0.3.4
index a4bba1281adb..73b246caaa42 100644
--- a/metadata/md5-cache/app-crypt/pkcs11-dump-0.3.4
+++ b/metadata/md5-cache/app-crypt/pkcs11-dump-0.3.4
@@ -1,12 +1,13 @@
 DEFINED_PHASES=configure
-DEPEND=>=dev-libs/openssl-0.9.7:0 virtual/pkgconfig
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/pkgconfig
 DESCRIPTION=Utilities for PKCS#11 token content dump
-EAPI=4
+EAPI=5
 HOMEPAGE=https://sites.google.com/site/alonbarlev/pkcs11-utilities
+IUSE=libressl
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/openssl-0.9.7:0
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://pkcs11-tools.googlecode.com/files/pkcs11-dump-0.3.4.tar.bz2
 _eclass_exported_funcs=src_configure:-
-_md5_=4e4bd90e503b38670a03f481e0e083cf
+_md5_=1b6d503b8086c5f8be8c7ca596ec4bd2
diff --git a/metadata/md5-cache/app-crypt/sbsigntool-0.6-r1 b/metadata/md5-cache/app-crypt/sbsigntool-0.6-r1
index d2976187d9ca..23fe72a3f436 100644
--- a/metadata/md5-cache/app-crypt/sbsigntool-0.6-r1
+++ b/metadata/md5-cache/app-crypt/sbsigntool-0.6-r1
@@ -1,13 +1,14 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-libs/openssl sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi sys-libs/binutils-libs virtual/pkgconfig
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi sys-libs/binutils-libs virtual/pkgconfig
 DESCRIPTION=Utilities for signing and verifying files for UEFI Secure Boot
-EAPI=4
+EAPI=5
 HOMEPAGE=https://launchpad.net/ubuntu/+source/sbsigntool
+IUSE=libressl
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/openssl sys-apps/util-linux
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
 SLOT=0
 SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/sbsigntool_0.6.orig.tar.gz
 _eclass_exported_funcs=src_prepare:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=61f662956d52d169a81de74d24c8a83b
+_md5_=5699d49dc25586ec7903816c53a97b6e
diff --git a/metadata/md5-cache/app-crypt/sign-1.0.7 b/metadata/md5-cache/app-crypt/sign-1.0.7
index 52a1eae0618d..43e2c2317b11 100644
--- a/metadata/md5-cache/app-crypt/sign-1.0.7
+++ b/metadata/md5-cache/app-crypt/sign-1.0.7
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-libs/openssl-0.9.8
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 DESCRIPTION=File signing and signature verification utility
-EAPI=4
+EAPI=5
 HOMEPAGE=http://swapped.cc/sign/
+IUSE=libressl
 KEYWORDS=amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BZIP2
-RDEPEND=>=dev-libs/openssl-0.9.8
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=http://swapped.cc/sign/files/sign-1.0.7.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=c09d0777a8a461a6c38a3a4fcce55916
+_md5_=4083636f7440142db2d96285a91124ff
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.5.3 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.5.3
new file mode 100644
index 000000000000..ade777db3acf
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-1.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= virtual/libintl:= sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4
+DESCRIPTION=Alternate application launcher for Xfce
+EAPI=6
+HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2= xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:= virtual/libintl:=
+SLOT=0
+SRC_URI=https://github.com/gottcode/xfce4-whiskermenu-plugin/archive/v1.5.3.tar.gz -> xfce4-whiskermenu-plugin-1.5.3.tar.gz
+_eclass_exported_funcs=pkg_preinst:- pkg_postrm:- pkg_postinst:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:-
+_eclasses_=cmake-utils	9e0d156beee613940cde06d0bc00791b	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=d279704d35d6cb6693fc350427e2dcde
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 6d8601c22ef7..92e106f77b9d 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -18992,7 +18992,7 @@ xfce-extra/xfce4-volumed 0.1.13: Daemon to control volume up/down and mute keys
 xfce-extra/xfce4-volumed-pulse 0.2.0: Daemon to control volume up/down and mute keys for pulseaudio
 xfce-extra/xfce4-wavelan-plugin 0.5.11 0.5.12: A panel plug-in to display wireless interface statistics
 xfce-extra/xfce4-weather-plugin 0.8.3-r2 0.8.4 0.8.5 0.8.6: A weather plug-in for the Xfce desktop environment
-xfce-extra/xfce4-whiskermenu-plugin 1.5.0 1.5.1 1.5.2: Alternate application launcher for Xfce
+xfce-extra/xfce4-whiskermenu-plugin 1.5.0 1.5.1 1.5.2 1.5.3: Alternate application launcher for Xfce
 xfce-extra/xfce4-windowck-plugin 0.2.4: Xfce panel plugin which allows to put the maximized window title and windows buttons on the panel
 xfce-extra/xfce4-wmdock-plugin 0.6.0: a compatibility layer for running WindowMaker dockapps on Xfce4
 xfce-extra/xfce4-xkb-plugin 0.5.6 0.7.0 0.7.1 0.7.1-r1: XKB layout switching panel plug-in for the Xfce desktop environment
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8876d5f67627..e2f8919a972d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Jun 2016 13:36:24 +0000
+Fri, 03 Jun 2016 14:28:16 +0000