2016-04-19 06:03:48 UTC

9 files changed, 18 insertions, 75 deletions

diff --git a/metadata/md5-cache/dev-libs/leatherman-0.5.1 b/metadata/md5-cache/dev-libs/leatherman-0.5.1
new file mode 100644
index 000000000000..a7a9a93a7422
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/leatherman-0.5.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] net-misc/curl ) sys-devel/make >=dev-util/cmake-2.8.12 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DESCRIPTION=A C++ toolkit
+EAPI=5
+HOMEPAGE=https://github.com/puppetlabs/leatherman
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] net-misc/curl ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=https://github.com/puppetlabs/leatherman/archive/0.5.1.tar.gz -> leatherman-0.5.1.tar.gz
+_eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:- src_configure:- src_compile:ruby-ng src_test:ruby-ng src_install:-
+_eclasses_=cmake-utils	422bbd1bee2557490177a34dbe0a662b	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	23ae8c186171e6476af098d2a50d0ee0	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=1fdc84c478cd73027e33651eb208a410
diff --git a/metadata/md5-cache/net-misc/guacamole-server-0.9.0 b/metadata/md5-cache/net-misc/guacamole-server-0.9.0
deleted file mode 100644
index 4c82a18f351d..000000000000
--- a/metadata/md5-cache/net-misc/guacamole-server-0.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/cairo ssh? ( x11-libs/pango net-libs/libssh2 ) rdesktop? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) vnc? ( net-libs/libvncserver pulseaudio? ( media-sound/pulseaudio ) ) vorbis? ( media-libs/libvorbis )
-DESCRIPTION=This is the proxy-daemon used by www-apps/guacamole
-EAPI=5
-HOMEPAGE=http://guacamole.sourceforge.net/
-IUSE=rdesktop vnc ssh pulseaudio vorbis
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=x11-libs/cairo ssh? ( x11-libs/pango net-libs/libssh2 ) rdesktop? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) vnc? ( net-libs/libvncserver pulseaudio? ( media-sound/pulseaudio ) ) vorbis? ( media-libs/libvorbis )
-SLOT=0
-SRC_URI=mirror://sourceforge/guacamole/guacamole-server-0.9.0.tar.gz
-_eclass_exported_funcs=src_configure:- src_compile:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=5c45a95c14cc33bda634eb2bc359022a
diff --git a/metadata/md5-cache/net-misc/guacamole-server-0.9.2 b/metadata/md5-cache/net-misc/guacamole-server-0.9.2
deleted file mode 100644
index 4d5a908c2932..000000000000
--- a/metadata/md5-cache/net-misc/guacamole-server-0.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/cairo dev-libs/ossp-uuid ssh? ( x11-libs/pango net-libs/libssh2 ) rdesktop? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) vnc? ( net-libs/libvncserver pulseaudio? ( media-sound/pulseaudio ) ) vorbis? ( media-libs/libvorbis ) telnet? ( net-libs/libtelnet )
-DESCRIPTION=This is the proxy-daemon used by www-apps/guacamole
-EAPI=5
-HOMEPAGE=http://guac-dev.org/
-IUSE=rdesktop vnc ssh pulseaudio vorbis telnet
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=x11-libs/cairo dev-libs/ossp-uuid ssh? ( x11-libs/pango net-libs/libssh2 ) rdesktop? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) vnc? ( net-libs/libvncserver pulseaudio? ( media-sound/pulseaudio ) ) vorbis? ( media-libs/libvorbis ) telnet? ( net-libs/libtelnet )
-SLOT=0
-SRC_URI=mirror://sourceforge/guacamole/guacamole-server-0.9.2.tar.gz
-_eclass_exported_funcs=src_configure:- src_compile:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=f37993249b20be8aa946a3b7fdd428c8
diff --git a/metadata/md5-cache/net-misc/guacamole-server-0.9.3 b/metadata/md5-cache/net-misc/guacamole-server-0.9.3
deleted file mode 100644
index 4463eed21f29..000000000000
--- a/metadata/md5-cache/net-misc/guacamole-server-0.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/cairo dev-libs/ossp-uuid ssh? ( x11-libs/pango net-libs/libssh2 ) rdesktop? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 <net-misc/freerdp-9999 ) vnc? ( net-libs/libvncserver pulseaudio? ( media-sound/pulseaudio ) ) vorbis? ( media-libs/libvorbis ) telnet? ( net-libs/libtelnet ) pango? ( x11-libs/pango ) ssl? ( dev-libs/openssl )
-DESCRIPTION=This is the proxy-daemon used by www-apps/guacamole
-EAPI=5
-HOMEPAGE=http://guac-dev.org/
-IUSE=rdesktop vnc ssh pulseaudio vorbis telnet pango terminal ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=x11-libs/cairo dev-libs/ossp-uuid ssh? ( x11-libs/pango net-libs/libssh2 ) rdesktop? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 <net-misc/freerdp-9999 ) vnc? ( net-libs/libvncserver pulseaudio? ( media-sound/pulseaudio ) ) vorbis? ( media-libs/libvorbis ) telnet? ( net-libs/libtelnet ) pango? ( x11-libs/pango ) ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=mirror://sourceforge/guacamole/guacamole-server-0.9.3.tar.gz
-_eclass_exported_funcs=src_configure:- src_compile:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
-_md5_=e5f1974b19eac28b8233d914fa812b77
diff --git a/metadata/md5-cache/net-misc/guacamole-server-0.9.7 b/metadata/md5-cache/net-misc/guacamole-server-0.9.7
deleted file mode 100644
index 18bd111a5540..000000000000
--- a/metadata/md5-cache/net-misc/guacamole-server-0.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=x11-libs/cairo media-libs/libpng:* dev-libs/ossp-uuid rdesktop? ( <net-misc/freerdp-1.1.0_beta1_p20150312 ) ssh? ( x11-libs/pango net-libs/libssh2 ) telnet? ( net-libs/libtelnet x11-libs/pango ) vnc? ( net-libs/libvncserver pulseaudio? ( media-sound/pulseaudio ) ) ssl? ( dev-libs/openssl:* ) vorbis? ( media-libs/libvorbis ) virtual/pkgconfig
-DESCRIPTION=This is the proxy-daemon used by www-apps/guacamole
-EAPI=5
-HOMEPAGE=http://guac-dev.org/
-IUSE=rdesktop vnc ssh pulseaudio vorbis telnet ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=x11-libs/cairo media-libs/libpng:* dev-libs/ossp-uuid rdesktop? ( <net-misc/freerdp-1.1.0_beta1_p20150312 ) ssh? ( x11-libs/pango net-libs/libssh2 ) telnet? ( net-libs/libtelnet x11-libs/pango ) vnc? ( net-libs/libvncserver pulseaudio? ( media-sound/pulseaudio ) ) ssl? ( dev-libs/openssl:* ) vorbis? ( media-libs/libvorbis )
-SLOT=0
-SRC_URI=mirror://sourceforge/guacamole/guacamole-server-0.9.7.tar.gz
-_eclass_exported_funcs=pkg_postinst:- src_configure:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=9e2d001e71e5b2d5a3f707372c20d282
diff --git a/metadata/md5-cache/net-misc/guacamole-server-0.9.8 b/metadata/md5-cache/net-misc/guacamole-server-0.9.8
deleted file mode 100644
index c7d9572adfd8..000000000000
--- a/metadata/md5-cache/net-misc/guacamole-server-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=x11-libs/cairo media-libs/libpng:* dev-libs/ossp-uuid rdesktop? ( <net-misc/freerdp-1.1.0_beta1_p20150312 ) ssh? ( x11-libs/pango net-libs/libssh2 ) telnet? ( net-libs/libtelnet x11-libs/pango ) vnc? ( net-libs/libvncserver pulseaudio? ( media-sound/pulseaudio ) ) ssl? ( dev-libs/openssl:* ) vorbis? ( media-libs/libvorbis ) virtual/pkgconfig
-DESCRIPTION=This is the proxy-daemon used by www-apps/guacamole
-EAPI=5
-HOMEPAGE=http://guac-dev.org/
-IUSE=rdesktop vnc ssh pulseaudio vorbis telnet ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=x11-libs/cairo media-libs/libpng:* dev-libs/ossp-uuid rdesktop? ( <net-misc/freerdp-1.1.0_beta1_p20150312 ) ssh? ( x11-libs/pango net-libs/libssh2 ) telnet? ( net-libs/libtelnet x11-libs/pango ) vnc? ( net-libs/libvncserver pulseaudio? ( media-sound/pulseaudio ) ) ssl? ( dev-libs/openssl:* ) vorbis? ( media-libs/libvorbis )
-SLOT=0
-SRC_URI=mirror://sourceforge/guacamole/guacamole-server-0.9.8.tar.gz
-_eclass_exported_funcs=pkg_postinst:- src_configure:- src_install:-
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	23ae8c186171e6476af098d2a50d0ee0	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=9e2d001e71e5b2d5a3f707372c20d282
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index d6ed79774c4f..b69cc0a3b51c 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -4565,7 +4565,7 @@ dev-libs/keybinder 0.3.0-r200 0.3.0-r201 0.3.0-r300 0.3.1-r200 0.3.1-r300: A lib
 dev-libs/klibc 1.5.25 2.0.2 2.0.2-r1 2.0.3 2.0.3-r1 2.0.4: A minimal libc subset for use with initramfs
 dev-libs/kpathsea 6.1.0_p20120701 6.1.1_p20130530 6.2.0_p20140525 6.2.1_p20150521: Library implementing generic path searching, configuration, and TeX-specific file searching
 dev-libs/kqoauth 0.98 0.98-r1: Library for Qt that implements the OAuth 1.0 authentication specification
-dev-libs/leatherman 0.4.2: A C++ toolkit
+dev-libs/leatherman 0.4.2 0.5.1: A C++ toolkit
 dev-libs/legousbtower 0.5.4: The lego mindstorms usb tower headers and/or modules
 dev-libs/leveldb 1.9.0-r5 1.9.0-r6 1.10.0-r1 1.11.0-r1 1.12.0-r1 1.13.0-r1 1.14.0 1.15.0 1.15.0-r1 1.17 1.18 1.18-r1: a fast key-value storage library written at Google
 dev-libs/libIDL 0.8.14: CORBA tree builder
@@ -14573,7 +14573,7 @@ net-misc/grive 0.4.0_pre20150905 0.4.0_pre20150905-r1 0.4.0_pre20151011 0.5.1_pr
 net-misc/gsasl 1.8.0-r1: The GNU SASL client, server, and library
 net-misc/gsutil 3.42 4.15 4.16 4.17 4.18: command line tool for interacting with cloud storage services
 net-misc/gtkvncviewer 0.4: A small GTK tool to connect to VNC servers
-net-misc/guacamole-server 0.9.0 0.9.2 0.9.3 0.9.7 0.9.8 0.9.9: This is the proxy-daemon used by www-apps/guacamole
+net-misc/guacamole-server 0.9.9: This is the proxy-daemon used by www-apps/guacamole
 net-misc/gupnp-tools 0.8.10 0.8.11: Free replacements of Intel UPnP tools that use GUPnP
 net-misc/gvrpcd 1.3: A program for announcing VLANs using GVRP
 net-misc/gwget 1.0.4: GTK2 WGet Frontend
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 916a55a16603..e0d7dd9495cb 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 19 Apr 2016 05:43:33 +0000
+Tue, 19 Apr 2016 06:03:49 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index fad7d44544d6..65e0eb077811 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6035,10 +6035,8 @@ net-misc/freerdp:server - Build server binaries
 net-misc/gnome-online-miners:flickr - Enable Flickr support
 net-misc/gsasl:gcrypt - Use dev-libs/libgcrypt for low-level crypto
 net-misc/gsasl:ntlm - Add support for Microsoft's NTLM mechanism using net-libs/libntlm
-net-misc/guacamole-server:pango - enable pango rendering
 net-misc/guacamole-server:ssh - enable support for ssh connections
 net-misc/guacamole-server:telnet - enable support for telnet connections
-net-misc/guacamole-server:terminal - enable support for terminal sessions
 net-misc/gwget:epiphany - Build epiphany extensions
 net-misc/hotot:chrome - Build chrome browser extension
 net-misc/htbinit:esfq - Add support for Enhanced Stochastic Fairness queueing discipline.