summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-libs
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/NativeThread/Manifest1
-rw-r--r--net-libs/NativeThread/NativeThread-0_pre20080330.ebuild33
-rw-r--r--net-libs/NativeThread/files/Makefile.patch22
-rw-r--r--net-libs/NativeThread/metadata.xml9
-rw-r--r--net-libs/adns/Manifest1
-rw-r--r--net-libs/adns/adns-1.4-r1.ebuild44
-rw-r--r--net-libs/adns/adns-1.4.ebuild33
-rw-r--r--net-libs/adns/files/README.security11
-rw-r--r--net-libs/adns/files/adns-1.4-cnamechain.patch132
-rw-r--r--net-libs/adns/metadata.xml8
-rw-r--r--net-libs/aqbanking/Manifest3
-rw-r--r--net-libs/aqbanking/aqbanking-5.0.25.ebuild63
-rw-r--r--net-libs/aqbanking/aqbanking-5.4.3_beta.ebuild63
-rw-r--r--net-libs/aqbanking/aqbanking-5.5.1.ebuild65
-rw-r--r--net-libs/aqbanking/metadata.xml10
-rw-r--r--net-libs/axtls/Manifest4
-rw-r--r--net-libs/axtls/axtls-1.5.0.ebuild177
-rw-r--r--net-libs/axtls/axtls-1.5.1.ebuild177
-rw-r--r--net-libs/axtls/axtls-1.5.2.ebuild177
-rw-r--r--net-libs/axtls/axtls-1.5.3.ebuild177
-rw-r--r--net-libs/axtls/files/axhttpd.confd7
-rw-r--r--net-libs/axtls/files/axhttpd.initd26
-rw-r--r--net-libs/axtls/files/config126
-rw-r--r--net-libs/axtls/files/explicit-libdir-r1.patch59
-rw-r--r--net-libs/axtls/metadata.xml17
-rw-r--r--net-libs/balde-markdown/Manifest1
-rw-r--r--net-libs/balde-markdown/balde-markdown-0.1.ebuild41
-rw-r--r--net-libs/balde-markdown/metadata.xml19
-rw-r--r--net-libs/balde/Manifest1
-rw-r--r--net-libs/balde/balde-0.1.1.ebuild59
-rw-r--r--net-libs/balde/metadata.xml19
-rw-r--r--net-libs/c-client/Manifest2
-rw-r--r--net-libs/c-client/c-client-2007f-r4.ebuild131
-rw-r--r--net-libs/c-client/files/c-client-2006k_GENTOO_Makefile.patch70
-rw-r--r--net-libs/c-client/files/c-client-2006k_GENTOO_amd64-so-fix.patch13
-rw-r--r--net-libs/c-client/files/c-client-2006k_KOLAB_Annotations.patch448
-rw-r--r--net-libs/c-client/files/c-client-2007f-ldflags.patch33
-rw-r--r--net-libs/c-client/files/c-client-2007f-topal.patch27
-rw-r--r--net-libs/c-client/metadata.xml12
-rw-r--r--net-libs/canlock/Manifest2
-rw-r--r--net-libs/canlock/canlock-2b.ebuild44
-rw-r--r--net-libs/canlock/files/canlock-2b-make.patch110
-rw-r--r--net-libs/canlock/metadata.xml5
-rw-r--r--net-libs/ccrtp/Manifest2
-rw-r--r--net-libs/ccrtp/ccrtp-2.0.9.ebuild44
-rw-r--r--net-libs/ccrtp/ccrtp-2.1.2.ebuild44
-rw-r--r--net-libs/ccrtp/metadata.xml5
-rw-r--r--net-libs/courier-authlib/Manifest3
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild167
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.66.1.ebuild166
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.66.3.ebuild147
-rw-r--r--net-libs/courier-authlib/files/courier-authlib-0.65.0-sqlite.patch35
-rw-r--r--net-libs/courier-authlib/files/courier-authlib-r141
-rw-r--r--net-libs/courier-authlib/metadata.xml11
-rw-r--r--net-libs/courier-unicode/Manifest2
-rw-r--r--net-libs/courier-unicode/courier-unicode-1.1.ebuild20
-rw-r--r--net-libs/courier-unicode/courier-unicode-1.3.ebuild20
-rw-r--r--net-libs/courier-unicode/metadata.xml11
-rw-r--r--net-libs/cppzmq/Manifest2
-rw-r--r--net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild29
-rw-r--r--net-libs/cppzmq/cppzmq-0_pre150606.ebuild29
-rw-r--r--net-libs/cppzmq/metadata.xml11
-rw-r--r--net-libs/cvm/Manifest3
-rw-r--r--net-libs/cvm/cvm-0.76.ebuild62
-rw-r--r--net-libs/cvm/cvm-0.82.ebuild104
-rw-r--r--net-libs/cvm/cvm-0.96.ebuild106
-rw-r--r--net-libs/cvm/metadata.xml10
-rw-r--r--net-libs/czmq/Manifest2
-rw-r--r--net-libs/czmq/czmq-2.2.0-r2.ebuild46
-rw-r--r--net-libs/czmq/czmq-3.0.2.ebuild52
-rw-r--r--net-libs/czmq/files/version.sh21
-rw-r--r--net-libs/czmq/metadata.xml8
-rw-r--r--net-libs/daq/Manifest3
-rw-r--r--net-libs/daq/daq-0.6.2-r1.ebuild69
-rw-r--r--net-libs/daq/daq-0.6.2.ebuild70
-rw-r--r--net-libs/daq/daq-2.0.0.ebuild69
-rw-r--r--net-libs/daq/daq-2.0.2.ebuild78
-rw-r--r--net-libs/daq/files/daq-2.0.2-libpcap-check.patch36
-rw-r--r--net-libs/daq/files/daq-2.0.2-parallel-grammar.patch39
-rw-r--r--net-libs/daq/metadata.xml36
-rw-r--r--net-libs/dhcpcd-dbus/Manifest1
-rw-r--r--net-libs/dhcpcd-dbus/dhcpcd-dbus-0.6.1.ebuild22
-rw-r--r--net-libs/dhcpcd-dbus/metadata.xml7
-rw-r--r--net-libs/dleyna-connector-dbus/Manifest1
-rw-r--r--net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild30
-rw-r--r--net-libs/dleyna-connector-dbus/metadata.xml5
-rw-r--r--net-libs/dleyna-core/Manifest1
-rw-r--r--net-libs/dleyna-core/dleyna-core-0.5.0.ebuild29
-rw-r--r--net-libs/dleyna-core/metadata.xml5
-rw-r--r--net-libs/dleyna-renderer/Manifest1
-rw-r--r--net-libs/dleyna-renderer/dleyna-renderer-0.5.0.ebuild37
-rw-r--r--net-libs/dleyna-renderer/metadata.xml5
-rw-r--r--net-libs/dslib/Manifest1
-rw-r--r--net-libs/dslib/dslib-3.0-r1.ebuild27
-rw-r--r--net-libs/dslib/metadata.xml12
-rw-r--r--net-libs/enet/Manifest3
-rw-r--r--net-libs/enet/enet-1.2.2.ebuild23
-rw-r--r--net-libs/enet/enet-1.3.12.ebuild33
-rw-r--r--net-libs/enet/enet-1.3.7.ebuild33
-rw-r--r--net-libs/enet/metadata.xml8
-rw-r--r--net-libs/farstream/Manifest2
-rw-r--r--net-libs/farstream/farstream-0.1.2-r1.ebuild93
-rw-r--r--net-libs/farstream/farstream-0.1.2-r2.ebuild85
-rw-r--r--net-libs/farstream/farstream-0.2.7.ebuild67
-rw-r--r--net-libs/farstream/files/farstream-0.1.2-introspection-tag-order.patch132
-rw-r--r--net-libs/farstream/metadata.xml5
-rw-r--r--net-libs/ftplib/Manifest3
-rw-r--r--net-libs/ftplib/files/ftplib-4.0-crash.patch116
-rw-r--r--net-libs/ftplib/ftplib-3.1.1.ebuild44
-rw-r--r--net-libs/ftplib/ftplib-4.0-r1.ebuild46
-rw-r--r--net-libs/ftplib/ftplib-4.0.ebuild37
-rw-r--r--net-libs/ftplib/metadata.xml8
-rw-r--r--net-libs/glib-networking/Manifest3
-rw-r--r--net-libs/glib-networking/files/glib-networking-2.40.1-unittests.patch45
-rw-r--r--net-libs/glib-networking/glib-networking-2.40.1-r1.ebuild65
-rw-r--r--net-libs/glib-networking/glib-networking-2.42.1.ebuild67
-rw-r--r--net-libs/glib-networking/glib-networking-2.44.0.ebuild67
-rw-r--r--net-libs/glib-networking/metadata.xml11
-rw-r--r--net-libs/gloox/Manifest2
-rw-r--r--net-libs/gloox/gloox-1.0.13.ebuild48
-rw-r--r--net-libs/gloox/gloox-1.0.9.ebuild37
-rw-r--r--net-libs/gloox/metadata.xml5
-rw-r--r--net-libs/gnet/Manifest1
-rw-r--r--net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch35
-rw-r--r--net-libs/gnet/files/gnet-2.0.8-context-leak.patch32
-rw-r--r--net-libs/gnet/files/gnet-2.0.8-define-location.patch20
-rw-r--r--net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch16
-rw-r--r--net-libs/gnet/files/gnet-2.0.8-network-tests.patch32
-rw-r--r--net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch32
-rw-r--r--net-libs/gnet/files/gnet-2.0.8-unittest-build.patch22
-rw-r--r--net-libs/gnet/files/gnet-2.0.8-unittest-service.patch31
-rw-r--r--net-libs/gnet/gnet-2.0.8-r2.ebuild68
-rw-r--r--net-libs/gnet/metadata.xml5
-rw-r--r--net-libs/gnome-online-accounts/Manifest3
-rw-r--r--net-libs/gnome-online-accounts/files/gnome-online-accounts-3.16.3-parallel-make.patch34
-rw-r--r--net-libs/gnome-online-accounts/gnome-online-accounts-3.14.3.ebuild78
-rw-r--r--net-libs/gnome-online-accounts/gnome-online-accounts-3.14.4.ebuild78
-rw-r--r--net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3-r1.ebuild88
-rw-r--r--net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3.ebuild76
-rw-r--r--net-libs/gnome-online-accounts/metadata.xml11
-rw-r--r--net-libs/gnutls/Manifest4
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.20-AF_UNIX.patch37
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.20-guile-parallelmake.patch9
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.20-libadd.patch36
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.23-CVE-2013-2116.patch25
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-0092.patch102
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-1959.patch14
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3466.patch311
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3467.patch45
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3468.patch45
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3469.patch122
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.23-cross-compile.patch69
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.23-gdoc-perl-5.18.patch137
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch30
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.23-hppa.patch44
-rw-r--r--net-libs/gnutls/gnutls-2.12.23-r6.ebuild126
-rw-r--r--net-libs/gnutls/gnutls-3.3.15.ebuild175
-rw-r--r--net-libs/gnutls/gnutls-3.3.16-r1.ebuild176
-rw-r--r--net-libs/gnutls/gnutls-3.4.3-r1.ebuild134
-rw-r--r--net-libs/gnutls/metadata.xml30
-rw-r--r--net-libs/gsnmp/Manifest1
-rw-r--r--net-libs/gsnmp/files/gsnmp-0.3.0-g_access.patch10
-rw-r--r--net-libs/gsnmp/files/gsnmp-0.3.0-pkg_config.patch31
-rw-r--r--net-libs/gsnmp/files/gsnmp-0.3.0-underquoting.patch11
-rw-r--r--net-libs/gsnmp/gsnmp-0.3.0.ebuild42
-rw-r--r--net-libs/gsnmp/metadata.xml6
-rw-r--r--net-libs/gsoap/Manifest5
-rw-r--r--net-libs/gsoap/files/gsoap-2.7-fix-pre-iso-headers.patch98
-rw-r--r--net-libs/gsoap/files/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch12
-rw-r--r--net-libs/gsoap/gsoap-2.7.17.ebuild71
-rw-r--r--net-libs/gsoap/gsoap-2.8.12.ebuild75
-rw-r--r--net-libs/gsoap/gsoap-2.8.19.ebuild72
-rw-r--r--net-libs/gsoap/gsoap-2.8.21.ebuild72
-rw-r--r--net-libs/gsoap/gsoap-2.8.22.ebuild72
-rw-r--r--net-libs/gsoap/metadata.xml20
-rw-r--r--net-libs/gssdp/Manifest2
-rw-r--r--net-libs/gssdp/gssdp-0.14.10.ebuild60
-rw-r--r--net-libs/gssdp/gssdp-0.14.11.ebuild60
-rw-r--r--net-libs/gssdp/metadata.xml5
-rw-r--r--net-libs/gtk-vnc/Manifest2
-rw-r--r--net-libs/gtk-vnc/gtk-vnc-0.5.3.ebuild187
-rw-r--r--net-libs/gtk-vnc/gtk-vnc-0.5.4.ebuild176
-rw-r--r--net-libs/gtk-vnc/metadata.xml9
-rw-r--r--net-libs/gupnp-av/Manifest2
-rw-r--r--net-libs/gupnp-av/gupnp-av-0.12.6.ebuild44
-rw-r--r--net-libs/gupnp-av/gupnp-av-0.12.7.ebuild44
-rw-r--r--net-libs/gupnp-av/metadata.xml5
-rw-r--r--net-libs/gupnp-igd/Manifest3
-rw-r--r--net-libs/gupnp-igd/files/gupnp-igd-0.1.11-disable_static_modules.patch10
-rw-r--r--net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch16
-rw-r--r--net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild93
-rw-r--r--net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild105
-rw-r--r--net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild105
-rw-r--r--net-libs/gupnp-igd/metadata.xml6
-rw-r--r--net-libs/gupnp-ui/Manifest1
-rw-r--r--net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild31
-rw-r--r--net-libs/gupnp-ui/metadata.xml5
-rw-r--r--net-libs/gupnp/Manifest2
-rw-r--r--net-libs/gupnp/gupnp-0.20.13.ebuild76
-rw-r--r--net-libs/gupnp/gupnp-0.20.14.ebuild77
-rw-r--r--net-libs/gupnp/metadata.xml5
-rw-r--r--net-libs/h323plus/Manifest1
-rw-r--r--net-libs/h323plus/files/h323plus-1.25.0-ptlib-2.10.10.patch15
-rw-r--r--net-libs/h323plus/files/h323plus-1.25.0-ptrace-debugoptionlist.patch13
-rw-r--r--net-libs/h323plus/files/h323plus-1.25.0-ptrace-param.patch18
-rw-r--r--net-libs/h323plus/h323plus-1.25.0-r1.ebuild68
-rw-r--r--net-libs/h323plus/metadata.xml15
-rw-r--r--net-libs/http-parser/Manifest4
-rw-r--r--net-libs/http-parser/files/http-parser-2.1-flags.patch32
-rw-r--r--net-libs/http-parser/files/http-parser-2.3-flags.patch32
-rw-r--r--net-libs/http-parser/http-parser-2.3.ebuild41
-rw-r--r--net-libs/http-parser/http-parser-2.4.1.ebuild43
-rw-r--r--net-libs/http-parser/http-parser-2.4.2.ebuild43
-rw-r--r--net-libs/http-parser/http-parser-2.5.0.ebuild42
-rw-r--r--net-libs/http-parser/metadata.xml13
-rw-r--r--net-libs/hubbub/Manifest1
-rw-r--r--net-libs/hubbub/files/hubbub-0.1.2-error.patch317
-rw-r--r--net-libs/hubbub/files/hubbub-0.1.2-glibc-2.20.patch17
-rw-r--r--net-libs/hubbub/hubbub-0.1.2-r1.ebuild36
-rw-r--r--net-libs/hubbub/hubbub-0.1.2.ebuild79
-rw-r--r--net-libs/hubbub/metadata.xml9
-rw-r--r--net-libs/iax/Manifest1
-rw-r--r--net-libs/iax/files/0.2.2-debug.patch21
-rw-r--r--net-libs/iax/files/0.2.2-memset.patch12
-rw-r--r--net-libs/iax/files/0.2.2-sandbox.patch19
-rw-r--r--net-libs/iax/iax-0.2.2-r1.ebuild42
-rw-r--r--net-libs/iax/iax-0.2.2-r3.ebuild34
-rw-r--r--net-libs/iax/iax-0.2.2.ebuild30
-rw-r--r--net-libs/iax/metadata.xml8
-rw-r--r--net-libs/iojs/Manifest5
-rw-r--r--net-libs/iojs/files/iojs-1.2.0-pkgconfig.patch56
-rw-r--r--net-libs/iojs/files/iojs-1.7.1-pkgconfig.patch48
-rw-r--r--net-libs/iojs/files/iojs-1.8.1-pkgconfig.patch39
-rw-r--r--net-libs/iojs/iojs-2.3.3.ebuild139
-rw-r--r--net-libs/iojs/iojs-2.3.4.ebuild139
-rw-r--r--net-libs/iojs/iojs-2.4.0.ebuild136
-rw-r--r--net-libs/iojs/iojs-2.5.0.ebuild136
-rw-r--r--net-libs/iojs/iojs-3.0.0.ebuild136
-rw-r--r--net-libs/iojs/metadata.xml27
-rw-r--r--net-libs/jreen/Manifest1
-rw-r--r--net-libs/jreen/jreen-1.2.0.ebuild81
-rw-r--r--net-libs/jreen/metadata.xml8
-rw-r--r--net-libs/ldns/Manifest1
-rw-r--r--net-libs/ldns/ldns-1.6.17.ebuild91
-rw-r--r--net-libs/ldns/metadata.xml19
-rw-r--r--net-libs/liba53/liba53-9999.ebuild24
-rw-r--r--net-libs/liba53/metadata.xml8
-rw-r--r--net-libs/libasr/Manifest2
-rw-r--r--net-libs/libasr/libasr-1.0.1.201505061057.ebuild21
-rw-r--r--net-libs/libasr/libasr-1.0.1.ebuild17
-rw-r--r--net-libs/libasr/metadata.xml11
-rw-r--r--net-libs/libasyncns/Manifest1
-rw-r--r--net-libs/libasyncns/files/libasyncns-0.8-libdir.patch10
-rw-r--r--net-libs/libasyncns/libasyncns-0.8-r3.ebuild60
-rw-r--r--net-libs/libasyncns/metadata.xml7
-rw-r--r--net-libs/libbitcoinconsensus/Manifest6
-rw-r--r--net-libs/libbitcoinconsensus/files/0.9.0-sys_leveldb.patch34
-rw-r--r--net-libs/libbitcoinconsensus/files/9999-sys_libsecp256k1.patch80
-rw-r--r--net-libs/libbitcoinconsensus/files/9999-syslibs.patch243
-rw-r--r--net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.0.ebuild25
-rw-r--r--net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.1.ebuild25
-rw-r--r--net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.0.ebuild26
-rw-r--r--net-libs/libbitcoinconsensus/libbitcoinconsensus-9999.ebuild24
-rw-r--r--net-libs/libbitcoinconsensus/metadata.xml16
-rw-r--r--net-libs/libblkmaker/Manifest4
-rw-r--r--net-libs/libblkmaker/libblkmaker-0.3.2.ebuild27
-rw-r--r--net-libs/libblkmaker/libblkmaker-0.4.2.ebuild26
-rw-r--r--net-libs/libblkmaker/libblkmaker-0.5.0.ebuild26
-rw-r--r--net-libs/libblkmaker/libblkmaker-0.5.1.ebuild26
-rw-r--r--net-libs/libblkmaker/metadata.xml16
-rw-r--r--net-libs/libbluedevil/Manifest2
-rw-r--r--net-libs/libbluedevil/libbluedevil-2.0_rc1.ebuild21
-rw-r--r--net-libs/libbluedevil/libbluedevil-2.1.ebuild18
-rw-r--r--net-libs/libbluedevil/metadata.xml5
-rw-r--r--net-libs/libbt/Manifest2
-rw-r--r--net-libs/libbt/files/1.05-btlist.patch10
-rw-r--r--net-libs/libbt/files/libbt-1.05-build.patch14
-rw-r--r--net-libs/libbt/files/libbt-1.06-build.patch53
-rw-r--r--net-libs/libbt/libbt-1.05.ebuild39
-rw-r--r--net-libs/libbt/libbt-1.06.ebuild35
-rw-r--r--net-libs/libbt/metadata.xml8
-rw-r--r--net-libs/libbtbb/Manifest1
-rw-r--r--net-libs/libbtbb/libbtbb-2014.02.4.ebuild130
-rw-r--r--net-libs/libbtbb/libbtbb-9999.ebuild132
-rw-r--r--net-libs/libbtbb/metadata.xml15
-rw-r--r--net-libs/libcapi/Manifest1
-rw-r--r--net-libs/libcapi/files/libcapi-3.0.7-remove-libcapi20dyn.patch21
-rw-r--r--net-libs/libcapi/libcapi-3.0.7-r1.ebuild24
-rw-r--r--net-libs/libcapi/metadata.xml5
-rw-r--r--net-libs/libcrafter/Manifest1
-rw-r--r--net-libs/libcrafter/libcrafter-0.3.ebuild38
-rw-r--r--net-libs/libcrafter/libcrafter-9999.ebuild38
-rw-r--r--net-libs/libcrafter/metadata.xml30
-rw-r--r--net-libs/libdexter/Manifest1
-rw-r--r--net-libs/libdexter/libdexter-0.2.1-r1.ebuild42
-rw-r--r--net-libs/libdexter/metadata.xml10
-rw-r--r--net-libs/libdmapsharing/Manifest2
-rw-r--r--net-libs/libdmapsharing/libdmapsharing-2.9.30.ebuild57
-rw-r--r--net-libs/libdmapsharing/libdmapsharing-2.9.31.ebuild50
-rw-r--r--net-libs/libdmapsharing/metadata.xml5
-rw-r--r--net-libs/libdom/Manifest4
-rw-r--r--net-libs/libdom/files/libdom-0.1.1-glibc2.20.patch19
-rw-r--r--net-libs/libdom/files/libdom-0.1.2-glibc2.20.patch19
-rw-r--r--net-libs/libdom/libdom-0.1.1.ebuild42
-rw-r--r--net-libs/libdom/libdom-0.1.2-r1.ebuild42
-rw-r--r--net-libs/libdom/metadata.xml9
-rw-r--r--net-libs/libeXosip/Manifest2
-rw-r--r--net-libs/libeXosip/files/libeXosip-3.3.0-automagic-openssl.patch22
-rw-r--r--net-libs/libeXosip/libeXosip-3.5.0.ebuild38
-rw-r--r--net-libs/libeXosip/libeXosip-4.0.0.ebuild37
-rw-r--r--net-libs/libeXosip/metadata.xml8
-rw-r--r--net-libs/libecap/Manifest2
-rw-r--r--net-libs/libecap/libecap-0.2.0.ebuild27
-rw-r--r--net-libs/libecap/libecap-1.0.0.ebuild28
-rw-r--r--net-libs/libecap/metadata.xml6
-rw-r--r--net-libs/libesmtp/Manifest1
-rw-r--r--net-libs/libesmtp/files/libesmtp-1.0-openssl.patch13
-rw-r--r--net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild40
-rw-r--r--net-libs/libesmtp/libesmtp-1.0.6.ebuild39
-rw-r--r--net-libs/libesmtp/metadata.xml8
-rw-r--r--net-libs/libetpan/Manifest2
-rw-r--r--net-libs/libetpan/files/libetpan-1.0-ldflags.patch18
-rw-r--r--net-libs/libetpan/files/libetpan-1.0-nonnull.patch12
-rw-r--r--net-libs/libetpan/libetpan-1.1.ebuild81
-rw-r--r--net-libs/libetpan/libetpan-1.5.ebuild72
-rw-r--r--net-libs/libetpan/metadata.xml17
-rw-r--r--net-libs/libflowmanager/Manifest1
-rw-r--r--net-libs/libflowmanager/libflowmanager-2.0.4.ebuild21
-rw-r--r--net-libs/libflowmanager/metadata.xml5
-rw-r--r--net-libs/libgadu/Manifest3
-rw-r--r--net-libs/libgadu/files/libgadu-1.12.0-tests.patch12
-rw-r--r--net-libs/libgadu/libgadu-1.11.4.ebuild68
-rw-r--r--net-libs/libgadu/libgadu-1.12.0.ebuild77
-rw-r--r--net-libs/libgadu/libgadu-1.12.1.ebuild77
-rw-r--r--net-libs/libgadu/metadata.xml12
-rw-r--r--net-libs/libgcal/Manifest1
-rw-r--r--net-libs/libgcal/libgcal-0.9.6-r1.ebuild54
-rw-r--r--net-libs/libgcal/metadata.xml10
-rw-r--r--net-libs/libgfbgraph/Manifest2
-rw-r--r--net-libs/libgfbgraph/libgfbgraph-0.2.2.ebuild44
-rw-r--r--net-libs/libgfbgraph/libgfbgraph-0.2.3.ebuild45
-rw-r--r--net-libs/libgfbgraph/metadata.xml5
-rw-r--r--net-libs/libgmail/Manifest1
-rw-r--r--net-libs/libgmail/libgmail-0.1.11-r1.ebuild27
-rw-r--r--net-libs/libgmail/metadata.xml8
-rw-r--r--net-libs/libgrss/Manifest2
-rw-r--r--net-libs/libgrss/files/libgrss-0.3.0-fix-slotting.patch125
-rw-r--r--net-libs/libgrss/files/libgrss-0.5.0-fix-slotting.patch124
-rw-r--r--net-libs/libgrss/files/libgrss-0.5.0-headers.patch11
-rw-r--r--net-libs/libgrss/libgrss-0.5.0-r1.ebuild41
-rw-r--r--net-libs/libgrss/libgrss-0.7.0.ebuild27
-rw-r--r--net-libs/libgrss/metadata.xml13
-rw-r--r--net-libs/libgsasl/Manifest1
-rw-r--r--net-libs/libgsasl/files/libgsasl-gss-extra.patch21
-rw-r--r--net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild54
-rw-r--r--net-libs/libgsasl/metadata.xml9
-rw-r--r--net-libs/libgssglue/Manifest1
-rw-r--r--net-libs/libgssglue/files/libgssglue-0.3-protos.patch15
-rw-r--r--net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch15
-rw-r--r--net-libs/libgssglue/libgssglue-0.4.ebuild38
-rw-r--r--net-libs/libgssglue/metadata.xml5
-rw-r--r--net-libs/libhackrf/Manifest3
-rw-r--r--net-libs/libhackrf/libhackrf-2014.04.1.ebuild29
-rw-r--r--net-libs/libhackrf/libhackrf-2014.08.1.ebuild42
-rw-r--r--net-libs/libhackrf/libhackrf-2015.07.2.ebuild46
-rw-r--r--net-libs/libhackrf/libhackrf-9999.ebuild46
-rw-r--r--net-libs/libhackrf/metadata.xml15
-rw-r--r--net-libs/libhubbub/Manifest4
-rw-r--r--net-libs/libhubbub/files/libhubbub-0.3.0-glibc2.20.patch17
-rw-r--r--net-libs/libhubbub/files/libhubbub-0.3.1-glibc2.20.patch17
-rw-r--r--net-libs/libhubbub/libhubbub-0.3.0-r1.ebuild28
-rw-r--r--net-libs/libhubbub/libhubbub-0.3.1-r1.ebuild28
-rw-r--r--net-libs/libhubbub/metadata.xml9
-rw-r--r--net-libs/libident/Manifest1
-rw-r--r--net-libs/libident/libident-0.32.ebuild19
-rw-r--r--net-libs/libident/metadata.xml8
-rw-r--r--net-libs/libinfinity/Manifest1
-rw-r--r--net-libs/libinfinity/files/infinoted.confd12
-rw-r--r--net-libs/libinfinity/files/infinoted.initd28
-rw-r--r--net-libs/libinfinity/libinfinity-0.5.4.ebuild70
-rw-r--r--net-libs/libinfinity/metadata.xml14
-rw-r--r--net-libs/libircclient/Manifest2
-rw-r--r--net-libs/libircclient/files/libircclient-1.6-build.patch13
-rw-r--r--net-libs/libircclient/files/libircclient-1.6-include.patch10
-rw-r--r--net-libs/libircclient/files/libircclient-1.6-shared.patch53
-rw-r--r--net-libs/libircclient/files/libircclient-1.6-static.patch12
-rw-r--r--net-libs/libircclient/files/libircclient-1.8-build.patch13
-rw-r--r--net-libs/libircclient/files/libircclient-1.8-include.patch10
-rw-r--r--net-libs/libircclient/files/libircclient-1.8-shared.patch50
-rw-r--r--net-libs/libircclient/files/libircclient-1.8-static.patch12
-rw-r--r--net-libs/libircclient/libircclient-1.6-r2.ebuild50
-rw-r--r--net-libs/libircclient/libircclient-1.8.ebuild49
-rw-r--r--net-libs/libircclient/metadata.xml8
-rw-r--r--net-libs/libiscsi/Manifest1
-rw-r--r--net-libs/libiscsi/files/libiscsi-1.9.0-0001-Allow-users-to-disable-Werror-at-configure-time.patch35
-rw-r--r--net-libs/libiscsi/libiscsi-1.9.0-r1.ebuild40
-rw-r--r--net-libs/libiscsi/libiscsi-1.9.0.ebuild28
-rw-r--r--net-libs/libiscsi/libiscsi-9999.ebuild28
-rw-r--r--net-libs/libiscsi/metadata.xml11
-rw-r--r--net-libs/libisds/Manifest2
-rw-r--r--net-libs/libisds/libisds-0.10.ebuild59
-rw-r--r--net-libs/libisds/libisds-0.7.ebuild62
-rw-r--r--net-libs/libisds/libisds-9999.ebuild62
-rw-r--r--net-libs/libisds/metadata.xml20
-rw-r--r--net-libs/libkfbapi/Manifest1
-rw-r--r--net-libs/libkfbapi/libkfbapi-1.0.ebuild25
-rw-r--r--net-libs/libkfbapi/metadata.xml5
-rw-r--r--net-libs/libkgapi/Manifest1
-rw-r--r--net-libs/libkgapi/libkgapi-2.2.0.ebuild22
-rw-r--r--net-libs/libkgapi/metadata.xml5
-rw-r--r--net-libs/libkolab/Manifest2
-rw-r--r--net-libs/libkolab/libkolab-0.5.2.ebuild46
-rw-r--r--net-libs/libkolab/libkolab-0.5.3.ebuild46
-rw-r--r--net-libs/libkolab/metadata.xml5
-rw-r--r--net-libs/libkolabxml/Manifest3
-rw-r--r--net-libs/libkolabxml/libkolabxml-1.0.1.ebuild42
-rw-r--r--net-libs/libkolabxml/libkolabxml-1.0.3.ebuild42
-rw-r--r--net-libs/libkolabxml/libkolabxml-1.1.0.ebuild42
-rw-r--r--net-libs/libkolabxml/metadata.xml8
-rw-r--r--net-libs/libkpeople/Manifest1
-rw-r--r--net-libs/libkpeople/libkpeople-0.3.0.ebuild45
-rw-r--r--net-libs/libkpeople/metadata.xml5
-rw-r--r--net-libs/libktorrent/Manifest1
-rw-r--r--net-libs/libktorrent/libktorrent-1.3.1.ebuild52
-rw-r--r--net-libs/libktorrent/metadata.xml5
-rw-r--r--net-libs/libkvkontakte/Manifest5
-rw-r--r--net-libs/libkvkontakte/files/libkvkontakte-2.2.0-libdir.patch24
-rw-r--r--net-libs/libkvkontakte/libkvkontakte-4.10.0.ebuild25
-rw-r--r--net-libs/libkvkontakte/libkvkontakte-4.11.0.ebuild24
-rw-r--r--net-libs/libkvkontakte/libkvkontakte-4.12.0.ebuild24
-rw-r--r--net-libs/libkvkontakte/libkvkontakte-4.4.0.ebuild36
-rw-r--r--net-libs/libkvkontakte/libkvkontakte-4.7.0.ebuild25
-rw-r--r--net-libs/libkvkontakte/metadata.xml5
-rw-r--r--net-libs/liblockfile/Manifest1
-rw-r--r--net-libs/liblockfile/files/Makefile.Darwin.in80
-rw-r--r--net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch18
-rw-r--r--net-libs/liblockfile/files/liblockfile-orphan-file.patch19
-rw-r--r--net-libs/liblockfile/liblockfile-1.09.ebuild48
-rw-r--r--net-libs/liblockfile/metadata.xml5
-rw-r--r--net-libs/libmapi/Manifest1
-rw-r--r--net-libs/libmapi/files/openchange-1.0-BORG-fix-soname-QA.patch18
-rw-r--r--net-libs/libmapi/files/openchange-1.0-BORG-python-location-fix.patch20
-rw-r--r--net-libs/libmapi/libmapi-1.0.ebuild53
-rw-r--r--net-libs/libmapi/metadata.xml7
-rw-r--r--net-libs/libmbim/Manifest3
-rw-r--r--net-libs/libmbim/libmbim-1.10.0.ebuild44
-rw-r--r--net-libs/libmbim/libmbim-1.12.2.ebuild44
-rw-r--r--net-libs/libmbim/libmbim-1.6.0.ebuild45
-rw-r--r--net-libs/libmbim/libmbim-9999.ebuild45
-rw-r--r--net-libs/libmbim/metadata.xml8
-rw-r--r--net-libs/libmediawiki/Manifest4
-rw-r--r--net-libs/libmediawiki/libmediawiki-4.10.0.ebuild22
-rw-r--r--net-libs/libmediawiki/libmediawiki-4.12.0.ebuild21
-rw-r--r--net-libs/libmediawiki/libmediawiki-4.4.0.ebuild36
-rw-r--r--net-libs/libmediawiki/libmediawiki-4.7.0.ebuild22
-rw-r--r--net-libs/libmediawiki/metadata.xml5
-rw-r--r--net-libs/libmicrohttpd/Manifest2
-rw-r--r--net-libs/libmicrohttpd/libmicrohttpd-0.9.39.ebuild50
-rw-r--r--net-libs/libmicrohttpd/libmicrohttpd-0.9.42.ebuild51
-rw-r--r--net-libs/libmicrohttpd/metadata.xml13
-rw-r--r--net-libs/libmirisdr/libmirisdr-9999.ebuild24
-rw-r--r--net-libs/libmirisdr/metadata.xml12
-rw-r--r--net-libs/libmm-qt/Manifest1
-rw-r--r--net-libs/libmm-qt/files/libmm-qt-1.0.1-cxxflags.patch19
-rw-r--r--net-libs/libmm-qt/libmm-qt-1.0.1-r1.ebuild32
-rw-r--r--net-libs/libmm-qt/metadata.xml5
-rw-r--r--net-libs/libmnl/Manifest1
-rw-r--r--net-libs/libmnl/libmnl-1.0.3-r1.ebuild32
-rw-r--r--net-libs/libmnl/metadata.xml13
-rw-r--r--net-libs/libmrss/Manifest1
-rw-r--r--net-libs/libmrss/libmrss-0.19.2.ebuild52
-rw-r--r--net-libs/libmrss/metadata.xml7
-rw-r--r--net-libs/libnatpmp/Manifest4
-rw-r--r--net-libs/libnatpmp/files/remove-static-lib-20130911.patch74
-rw-r--r--net-libs/libnatpmp/files/remove-static-lib.patch44
-rw-r--r--net-libs/libnatpmp/files/respect-FLAGS-20130911.patch53
-rw-r--r--net-libs/libnatpmp/files/respect-FLAGS-20140401.patch36
-rw-r--r--net-libs/libnatpmp/files/respect-FLAGS.patch40
-rw-r--r--net-libs/libnatpmp/files/respect-libdir-20120821.patch20
-rw-r--r--net-libs/libnatpmp/files/respect-libdir.patch19
-rw-r--r--net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild29
-rw-r--r--net-libs/libnatpmp/libnatpmp-20130911.ebuild29
-rw-r--r--net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild30
-rw-r--r--net-libs/libnatpmp/libnatpmp-20150609.ebuild30
-rw-r--r--net-libs/libnatpmp/metadata.xml8
-rw-r--r--net-libs/libndp/Manifest2
-rw-r--r--net-libs/libndp/libndp-1.4.ebuild27
-rw-r--r--net-libs/libndp/libndp-1.5.ebuild28
-rw-r--r--net-libs/libndp/metadata.xml5
-rw-r--r--net-libs/libnet/Manifest3
-rw-r--r--net-libs/libnet/files/1.0.2a-endian.patch20
-rw-r--r--net-libs/libnet/files/1.0.2a-slot.patch189
-rw-r--r--net-libs/libnet/files/libnet-1.2-rc.patch11
-rw-r--r--net-libs/libnet/files/libnet-gcc33-fix13
-rw-r--r--net-libs/libnet/libnet-1.0.2a-r5.ebuild64
-rw-r--r--net-libs/libnet/libnet-1.1.6.ebuild42
-rw-r--r--net-libs/libnet/libnet-1.2_rc3.ebuild45
-rw-r--r--net-libs/libnet/metadata.xml24
-rw-r--r--net-libs/libnetfilter_acct/Manifest1
-rw-r--r--net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild47
-rw-r--r--net-libs/libnetfilter_acct/metadata.xml10
-rw-r--r--net-libs/libnetfilter_conntrack/Manifest2
-rw-r--r--net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.3.ebuild43
-rw-r--r--net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild43
-rw-r--r--net-libs/libnetfilter_conntrack/metadata.xml5
-rw-r--r--net-libs/libnetfilter_cthelper/Manifest1
-rw-r--r--net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0.ebuild26
-rw-r--r--net-libs/libnetfilter_cthelper/metadata.xml5
-rw-r--r--net-libs/libnetfilter_cttimeout/Manifest1
-rw-r--r--net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild26
-rw-r--r--net-libs/libnetfilter_cttimeout/metadata.xml6
-rw-r--r--net-libs/libnetfilter_log/Manifest1
-rw-r--r--net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild26
-rw-r--r--net-libs/libnetfilter_log/metadata.xml5
-rw-r--r--net-libs/libnetfilter_queue/Manifest1
-rw-r--r--net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild29
-rw-r--r--net-libs/libnetfilter_queue/metadata.xml5
-rw-r--r--net-libs/libnfnetlink/Manifest1
-rw-r--r--net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild46
-rw-r--r--net-libs/libnfnetlink/metadata.xml5
-rw-r--r--net-libs/libnfsidmap/Manifest2
-rw-r--r--net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch115
-rw-r--r--net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch22
-rw-r--r--net-libs/libnfsidmap/libnfsidmap-0.24.ebuild46
-rw-r--r--net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild49
-rw-r--r--net-libs/libnfsidmap/libnfsidmap-0.25.ebuild45
-rw-r--r--net-libs/libnfsidmap/metadata.xml5
-rw-r--r--net-libs/libnftnl/Manifest1
-rw-r--r--net-libs/libnftnl/libnftnl-1.0.3.ebuild58
-rw-r--r--net-libs/libnftnl/metadata.xml13
-rw-r--r--net-libs/libnice/Manifest3
-rw-r--r--net-libs/libnice/files/libnice-0.1.13-gstreamer.patch40
-rw-r--r--net-libs/libnice/libnice-0.1.10.ebuild50
-rw-r--r--net-libs/libnice/libnice-0.1.13.ebuild56
-rw-r--r--net-libs/libnice/libnice-0.1.8.ebuild48
-rw-r--r--net-libs/libnice/metadata.xml5
-rw-r--r--net-libs/libnids/Manifest1
-rw-r--r--net-libs/libnids/files/libnids-1.24-ldflags.patch11
-rw-r--r--net-libs/libnids/files/libnids-1.24-static-libs.patch29
-rw-r--r--net-libs/libnids/libnids-1.24-r6.ebuild54
-rw-r--r--net-libs/libnids/metadata.xml13
-rw-r--r--net-libs/libnipper/Manifest1
-rw-r--r--net-libs/libnipper/files/libnipper-0.12.6-gcc47.patch16
-rw-r--r--net-libs/libnipper/files/libnipper-0.12.6-glibc-2.10.patch13
-rw-r--r--net-libs/libnipper/files/libnipper-0.12.6-multilib-strict.patch13
-rw-r--r--net-libs/libnipper/libnipper-0.12.6-r1.ebuild23
-rw-r--r--net-libs/libnipper/metadata.xml12
-rw-r--r--net-libs/libnm-qt/Manifest2
-rw-r--r--net-libs/libnm-qt/libnm-qt-0.9.8.3.ebuild56
-rw-r--r--net-libs/libnm-qt/libnm-qt-0.9.8.4.ebuild58
-rw-r--r--net-libs/libnm-qt/metadata.xml8
-rw-r--r--net-libs/libntlm/Manifest2
-rw-r--r--net-libs/libntlm/libntlm-1.3.ebuild23
-rw-r--r--net-libs/libntlm/libntlm-1.4.ebuild15
-rw-r--r--net-libs/libntlm/metadata.xml12
-rw-r--r--net-libs/libnxml/Manifest1
-rw-r--r--net-libs/libnxml/libnxml-0.18.3.ebuild48
-rw-r--r--net-libs/libnxml/metadata.xml7
-rw-r--r--net-libs/liboauth/Manifest1
-rw-r--r--net-libs/liboauth/files/liboauth-1.0.1-doxygen-out-of-tree.patch50
-rw-r--r--net-libs/liboauth/liboauth-1.0.1.ebuild70
-rw-r--r--net-libs/liboauth/metadata.xml26
-rw-r--r--net-libs/liboping/Manifest2
-rw-r--r--net-libs/liboping/files/liboping-1.6.2-nouidmagic.patch19
-rw-r--r--net-libs/liboping/liboping-1.7.0.ebuild43
-rw-r--r--net-libs/liboping/liboping-1.8.0.ebuild43
-rw-r--r--net-libs/liboping/metadata.xml10
-rw-r--r--net-libs/libopkele/Manifest1
-rw-r--r--net-libs/libopkele/files/libopkele-2.0.4-gcc471.patch23
-rw-r--r--net-libs/libopkele/files/libopkele-2.0.4-missing_includes.patch31
-rw-r--r--net-libs/libopkele/libopkele-2.0.4-r1.ebuild33
-rw-r--r--net-libs/libopkele/metadata.xml5
-rw-r--r--net-libs/libosip/Manifest2
-rw-r--r--net-libs/libosip/files/libosip-3.3.0-out-source-build.patch16
-rw-r--r--net-libs/libosip/libosip-3.6.0.ebuild36
-rw-r--r--net-libs/libosip/libosip-4.0.0.ebuild36
-rw-r--r--net-libs/libosip/metadata.xml5
-rw-r--r--net-libs/libosmo-abis/libosmo-abis-9999.ebuild24
-rw-r--r--net-libs/libosmo-abis/metadata.xml6
-rw-r--r--net-libs/libosmo-dsp/Manifest1
-rw-r--r--net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild41
-rw-r--r--net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild41
-rw-r--r--net-libs/libosmo-dsp/metadata.xml12
-rw-r--r--net-libs/libosmocore/Manifest2
-rw-r--r--net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch11
-rw-r--r--net-libs/libosmocore/libosmocore-0.6.6.ebuild38
-rw-r--r--net-libs/libosmocore/libosmocore-0.8.0.ebuild48
-rw-r--r--net-libs/libosmocore/libosmocore-9999.ebuild48
-rw-r--r--net-libs/libosmocore/metadata.xml10
-rw-r--r--net-libs/libotr/Manifest2
-rw-r--r--net-libs/libotr/libotr-3.2.1.ebuild19
-rw-r--r--net-libs/libotr/libotr-4.1.0.ebuild20
-rw-r--r--net-libs/libotr/metadata.xml5
-rw-r--r--net-libs/libpcap/Manifest1
-rw-r--r--net-libs/libpcap/files/libpcap-1.2.0-cross-linux.patch16
-rw-r--r--net-libs/libpcap/files/libpcap-1.6.1-configure.patch15
-rw-r--r--net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch36
-rw-r--r--net-libs/libpcap/files/libpcap-1.7.2-libnl.patch22
-rw-r--r--net-libs/libpcap/files/mgmt.h33
-rw-r--r--net-libs/libpcap/libpcap-1.7.4.ebuild71
-rw-r--r--net-libs/libpcap/libpcap-9999.ebuild70
-rw-r--r--net-libs/libpcap/metadata.xml13
-rw-r--r--net-libs/libpcapnav/Manifest1
-rw-r--r--net-libs/libpcapnav/files/libpcapnav-0.8-includes.patch20
-rw-r--r--net-libs/libpcapnav/libpcapnav-0.8.ebuild41
-rw-r--r--net-libs/libpcapnav/metadata.xml8
-rw-r--r--net-libs/libpri/Manifest4
-rw-r--r--net-libs/libpri/files/libpri-1.4.12-multilib.patch51
-rw-r--r--net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch47
-rw-r--r--net-libs/libpri/files/libpri-1.4.13-multilib.patch51
-rw-r--r--net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch35
-rw-r--r--net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch41
-rw-r--r--net-libs/libpri/libpri-1.4.12-r2.ebuild30
-rw-r--r--net-libs/libpri/libpri-1.4.13.ebuild30
-rw-r--r--net-libs/libpri/libpri-1.4.14.ebuild30
-rw-r--r--net-libs/libpri/libpri-1.4.15.ebuild34
-rw-r--r--net-libs/libpri/metadata.xml8
-rw-r--r--net-libs/libprotoident/Manifest1
-rw-r--r--net-libs/libprotoident/libprotoident-2.0.7.ebuild28
-rw-r--r--net-libs/libprotoident/metadata.xml8
-rw-r--r--net-libs/libproxy/Manifest1
-rw-r--r--net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch29
-rw-r--r--net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch60
-rw-r--r--net-libs/libproxy/files/libproxy-0.4.11-macosx.patch86
-rw-r--r--net-libs/libproxy/files/libproxy-0.4.11-mozjs.pc.patch23
-rw-r--r--net-libs/libproxy/libproxy-0.4.11-r2.ebuild94
-rw-r--r--net-libs/libproxy/metadata.xml20
-rw-r--r--net-libs/libqinfinity/Manifest1
-rw-r--r--net-libs/libqinfinity/libqinfinity-0.5.2.ebuild29
-rw-r--r--net-libs/libqinfinity/metadata.xml5
-rw-r--r--net-libs/libqmi/Manifest5
-rw-r--r--net-libs/libqmi/files/libqmi-1.0.0-python3.patch176
-rw-r--r--net-libs/libqmi/libqmi-1.0.0.ebuild50
-rw-r--r--net-libs/libqmi/libqmi-1.10.2.ebuild43
-rw-r--r--net-libs/libqmi/libqmi-1.12.6.ebuild43
-rw-r--r--net-libs/libqmi/libqmi-1.4.0.ebuild44
-rw-r--r--net-libs/libqmi/libqmi-1.8.0.ebuild43
-rw-r--r--net-libs/libqmi/libqmi-9999.ebuild43
-rw-r--r--net-libs/libqmi/metadata.xml12
-rw-r--r--net-libs/librouteros/Manifest1
-rw-r--r--net-libs/librouteros/files/disable_werror.patch11
-rw-r--r--net-libs/librouteros/librouteros-1.1.2.ebuild27
-rw-r--r--net-libs/librouteros/metadata.xml13
-rw-r--r--net-libs/librpcsecgss/Manifest2
-rw-r--r--net-libs/librpcsecgss/librpcsecgss-0.16.ebuild21
-rw-r--r--net-libs/librpcsecgss/librpcsecgss-0.19-r1.ebuild30
-rw-r--r--net-libs/librpcsecgss/librpcsecgss-0.19.ebuild21
-rw-r--r--net-libs/librpcsecgss/metadata.xml5
-rw-r--r--net-libs/librsync/Manifest1
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-format-security.patch20
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-getopt.patch17
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-huge-files.patch31
-rw-r--r--net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch19
-rw-r--r--net-libs/librsync/librsync-0.9.7-r3.ebuild36
-rw-r--r--net-libs/librsync/metadata.xml10
-rw-r--r--net-libs/libs3/Manifest1
-rw-r--r--net-libs/libs3/files/libs3-2.0-build.patch83
-rw-r--r--net-libs/libs3/libs3-2.0-r1.ebuild34
-rw-r--r--net-libs/libs3/metadata.xml7
-rw-r--r--net-libs/libsmi/Manifest1
-rw-r--r--net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch19
-rw-r--r--net-libs/libsmi/libsmi-0.4.8-r1.ebuild38
-rw-r--r--net-libs/libsmi/metadata.xml5
-rw-r--r--net-libs/libsoup-gnome/Manifest3
-rw-r--r--net-libs/libsoup-gnome/files/libsoup-gnome-2.44.2-system-lib.patch254
-rw-r--r--net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch258
-rw-r--r--net-libs/libsoup-gnome/files/libsoup-gnome-2.48.0-system-lib.patch283
-rw-r--r--net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild62
-rw-r--r--net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild58
-rw-r--r--net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild62
-rw-r--r--net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild62
-rw-r--r--net-libs/libsoup-gnome/metadata.xml5
-rw-r--r--net-libs/libsoup/Manifest3
-rw-r--r--net-libs/libsoup/libsoup-2.46.0-r1.ebuild90
-rw-r--r--net-libs/libsoup/libsoup-2.48.1.ebuild94
-rw-r--r--net-libs/libsoup/libsoup-2.50.0.ebuild87
-rw-r--r--net-libs/libsoup/metadata.xml9
-rw-r--r--net-libs/libsrtp/Manifest3
-rw-r--r--net-libs/libsrtp/files/libsrtp-1.4.4-invalid-index.patch11
-rw-r--r--net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch52
-rw-r--r--net-libs/libsrtp/files/libsrtp-1.4.4_p20121108-shared.patch55
-rw-r--r--net-libs/libsrtp/files/libsrtp-1.5.2-bindir.patch19
-rw-r--r--net-libs/libsrtp/files/libsrtp-1.5.2-fix-make-install.patch13
-rw-r--r--net-libs/libsrtp/files/libsrtp-CVE-2013-2139.diff46
-rw-r--r--net-libs/libsrtp/files/libsrtp-pcap-automagic-r0.patch19
-rw-r--r--net-libs/libsrtp/libsrtp-1.4.4-r1.ebuild76
-rw-r--r--net-libs/libsrtp/libsrtp-1.4.4-r2.ebuild75
-rw-r--r--net-libs/libsrtp/libsrtp-1.4.4_p20121108-r1.ebuild77
-rw-r--r--net-libs/libsrtp/libsrtp-1.4.4_p20121108.ebuild74
-rw-r--r--net-libs/libsrtp/libsrtp-1.5.2-r1.ebuild80
-rw-r--r--net-libs/libsrtp/libsrtp-1.5.2.ebuild76
-rw-r--r--net-libs/libsrtp/metadata.xml20
-rw-r--r--net-libs/libssh/Manifest5
-rw-r--r--net-libs/libssh/files/libssh-0.5.0-tests.patch11
-rw-r--r--net-libs/libssh/libssh-0.6.5.ebuild89
-rw-r--r--net-libs/libssh/libssh-0.7.0-r1.ebuild89
-rw-r--r--net-libs/libssh/libssh-0.7.1.ebuild87
-rw-r--r--net-libs/libssh/libssh-9999.ebuild82
-rw-r--r--net-libs/libssh/metadata.xml15
-rw-r--r--net-libs/libssh2/Manifest2
-rw-r--r--net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch10
-rw-r--r--net-libs/libssh2/libssh2-1.5.0.ebuild42
-rw-r--r--net-libs/libssh2/libssh2-1.6.0.ebuild42
-rw-r--r--net-libs/libssh2/libssh2-9999.ebuild44
-rw-r--r--net-libs/libssh2/metadata.xml8
-rw-r--r--net-libs/libtelnet/Manifest1
-rw-r--r--net-libs/libtelnet/libtelnet-0.21.ebuild34
-rw-r--r--net-libs/libtelnet/libtelnet-9999.ebuild34
-rw-r--r--net-libs/libtelnet/metadata.xml11
-rw-r--r--net-libs/libtirpc/Manifest5
-rw-r--r--net-libs/libtirpc/files/libtirpc-0.2.1-fortify.patch18
-rw-r--r--net-libs/libtirpc/files/libtirpc-0.2.2-rpc-des-prot.patch36
-rw-r--r--net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch29
-rw-r--r--net-libs/libtirpc/libtirpc-0.1.10.ebuild25
-rw-r--r--net-libs/libtirpc/libtirpc-0.2.4-r1.ebuild50
-rw-r--r--net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild61
-rw-r--r--net-libs/libtirpc/libtirpc-0.2.5.ebuild65
-rw-r--r--net-libs/libtirpc/libtirpc-0.3.1.ebuild61
-rw-r--r--net-libs/libtirpc/metadata.xml8
-rw-r--r--net-libs/libtorrent/Manifest2
-rw-r--r--net-libs/libtorrent/files/download_constructor.diff21
-rw-r--r--net-libs/libtorrent/libtorrent-0.13.3.ebuild48
-rw-r--r--net-libs/libtorrent/libtorrent-0.13.4.ebuild48
-rw-r--r--net-libs/libtorrent/metadata.xml5
-rw-r--r--net-libs/libtrace/Manifest2
-rw-r--r--net-libs/libtrace/files/libtrace-3.0.20-autoconf-1.13.patch11
-rw-r--r--net-libs/libtrace/files/libtrace-3.0.20-libwandio-linking.patch8
-rw-r--r--net-libs/libtrace/files/libtrace-3.0.20-no-examples.patch11
-rw-r--r--net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch21
-rw-r--r--net-libs/libtrace/libtrace-3.0.21.ebuild52
-rw-r--r--net-libs/libtrace/libtrace-3.0.22.ebuild52
-rw-r--r--net-libs/libtrace/metadata.xml5
-rw-r--r--net-libs/libupnp/Manifest2
-rw-r--r--net-libs/libupnp/files/libupnp-1.6.18-suse.patch132
-rw-r--r--net-libs/libupnp/files/libupnp-1.6.19-suse.patch132
-rw-r--r--net-libs/libupnp/libupnp-1.6.18-r1.ebuild52
-rw-r--r--net-libs/libupnp/libupnp-1.6.18.ebuild53
-rw-r--r--net-libs/libupnp/libupnp-1.6.19.ebuild52
-rw-r--r--net-libs/libupnp/metadata.xml16
-rw-r--r--net-libs/libvncserver/Manifest1
-rw-r--r--net-libs/libvncserver/files/libvncserver-0.9.10-libva-1.0.patch52
-rw-r--r--net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch76
-rw-r--r--net-libs/libvncserver/files/libvncserver-memcpy.patch24
-rw-r--r--net-libs/libvncserver/libvncserver-0.9.10-r1.ebuild68
-rw-r--r--net-libs/libvncserver/libvncserver-0.9.10-r3.ebuild68
-rw-r--r--net-libs/libvncserver/libvncserver-0.9.10.ebuild67
-rw-r--r--net-libs/libvncserver/metadata.xml28
-rw-r--r--net-libs/libwhisker/Manifest1
-rw-r--r--net-libs/libwhisker/libwhisker-2.5-r1.ebuild34
-rw-r--r--net-libs/libwhisker/metadata.xml15
-rw-r--r--net-libs/libyahoo2/Manifest1
-rw-r--r--net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch16
-rw-r--r--net-libs/libyahoo2/libyahoo2-1.0.1.ebuild44
-rw-r--r--net-libs/libyahoo2/metadata.xml8
-rw-r--r--net-libs/libzapojit/Manifest1
-rw-r--r--net-libs/libzapojit/libzapojit-0.0.3.ebuild40
-rw-r--r--net-libs/libzapojit/metadata.xml5
-rw-r--r--net-libs/libzrtpcpp/Manifest2
-rw-r--r--net-libs/libzrtpcpp/libzrtpcpp-2.3.4.ebuild26
-rw-r--r--net-libs/libzrtpcpp/libzrtpcpp-4.2.4.ebuild41
-rw-r--r--net-libs/libzrtpcpp/metadata.xml5
-rw-r--r--net-libs/loudmouth/Manifest1
-rw-r--r--net-libs/loudmouth/files/loudmouth-1.4.3-async-fix.patch30
-rw-r--r--net-libs/loudmouth/files/loudmouth-1.4.3-asyncns-system.patch83
-rw-r--r--net-libs/loudmouth/files/loudmouth-1.4.3-drop-stanzas-on-fail.patch47
-rw-r--r--net-libs/loudmouth/files/loudmouth-1.4.3-fix-sasl-md5-digest-uri.patch24
-rw-r--r--net-libs/loudmouth/files/loudmouth-1.4.3-free-before-closed.patch137
-rw-r--r--net-libs/loudmouth/files/loudmouth-1.4.3-glib-2.32.patch13
-rw-r--r--net-libs/loudmouth/files/loudmouth-1.4.3-gnutls28.patch15
-rw-r--r--net-libs/loudmouth/files/loudmouth-1.4.3-id-tag-in-opening-headers.patch35
-rw-r--r--net-libs/loudmouth/files/loudmouth-1.4.3-invalid-unicode.patch144
-rw-r--r--net-libs/loudmouth/files/loudmouth-1.4.3-silence-chdir.patch33
-rw-r--r--net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild96
-rw-r--r--net-libs/loudmouth/metadata.xml11
-rw-r--r--net-libs/meanwhile/Manifest1
-rw-r--r--net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch213
-rw-r--r--net-libs/meanwhile/files/meanwhile-1.0.2-presence.patch42
-rw-r--r--net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild45
-rw-r--r--net-libs/meanwhile/metadata.xml11
-rw-r--r--net-libs/metadata.xml32
-rw-r--r--net-libs/miniupnpc/Manifest5
-rw-r--r--net-libs/miniupnpc/metadata.xml13
-rw-r--r--net-libs/miniupnpc/miniupnpc-1.6-r1.ebuild58
-rw-r--r--net-libs/miniupnpc/miniupnpc-1.6.20120509.ebuild41
-rw-r--r--net-libs/miniupnpc/miniupnpc-1.7.ebuild50
-rw-r--r--net-libs/miniupnpc/miniupnpc-1.8.ebuild50
-rw-r--r--net-libs/miniupnpc/miniupnpc-1.9.20150427.ebuild54
-rw-r--r--net-libs/nacl/Manifest1
-rw-r--r--net-libs/nacl/metadata.xml8
-rw-r--r--net-libs/nacl/nacl-0_p20110221.ebuild74
-rw-r--r--net-libs/nativebiginteger/Manifest2
-rw-r--r--net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch31
-rw-r--r--net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch17
-rw-r--r--net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch31
-rw-r--r--net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch22
-rw-r--r--net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch35
-rw-r--r--net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch23
-rw-r--r--net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch11
-rw-r--r--net-libs/nativebiginteger/metadata.xml9
-rw-r--r--net-libs/nativebiginteger/nativebiginteger-0.6.4-r3.ebuild36
-rw-r--r--net-libs/nativebiginteger/nativebiginteger-0.6.4.ebuild30
-rw-r--r--net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild68
-rw-r--r--net-libs/neon/Manifest2
-rw-r--r--net-libs/neon/files/neon-0.30.1-xml2-config.patch15
-rw-r--r--net-libs/neon/metadata.xml25
-rw-r--r--net-libs/neon/neon-0.30.0-r1.ebuild108
-rw-r--r--net-libs/neon/neon-0.30.0.ebuild96
-rw-r--r--net-libs/neon/neon-0.30.1.ebuild110
-rw-r--r--net-libs/net6/Manifest1
-rw-r--r--net-libs/net6/metadata.xml11
-rw-r--r--net-libs/net6/net6-1.3.14.ebuild40
-rw-r--r--net-libs/netembryo/Manifest1
-rw-r--r--net-libs/netembryo/metadata.xml11
-rw-r--r--net-libs/netembryo/netembryo-0.1.1.ebuild38
-rw-r--r--net-libs/netwib/Manifest2
-rw-r--r--net-libs/netwib/metadata.xml9
-rw-r--r--net-libs/netwib/netwib-5.39.0.ebuild60
-rw-r--r--net-libs/nfqueue-bindings/Manifest1
-rw-r--r--net-libs/nfqueue-bindings/metadata.xml10
-rw-r--r--net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild58
-rw-r--r--net-libs/nghttp2/Manifest4
-rw-r--r--net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch34
-rw-r--r--net-libs/nghttp2/metadata.xml15
-rw-r--r--net-libs/nghttp2/nghttp2-0.7.15.ebuild67
-rw-r--r--net-libs/nghttp2/nghttp2-1.0.1.ebuild68
-rw-r--r--net-libs/nghttp2/nghttp2-1.0.2.ebuild65
-rw-r--r--net-libs/nghttp2/nghttp2-1.0.5.ebuild61
-rw-r--r--net-libs/nghttp2/nghttp2-9999.ebuild61
-rw-r--r--net-libs/nodejs/Manifest5
-rw-r--r--net-libs/nodejs/files/nodejs-v8-3.5.patch11
-rw-r--r--net-libs/nodejs/metadata.xml17
-rw-r--r--net-libs/nodejs/nodejs-0.10.30.ebuild73
-rw-r--r--net-libs/nodejs/nodejs-0.10.38.ebuild73
-rw-r--r--net-libs/nodejs/nodejs-0.12.6.ebuild124
-rw-r--r--net-libs/nodejs/nodejs-0.12.7.ebuild124
-rw-r--r--net-libs/nodejs/nodejs-0.8.28.ebuild72
-rw-r--r--net-libs/obby/Manifest1
-rw-r--r--net-libs/obby/metadata.xml13
-rw-r--r--net-libs/obby/obby-0.4.8.ebuild35
-rw-r--r--net-libs/opal/Manifest4
-rw-r--r--net-libs/opal/files/opal-3.10.11-libav9-gentoo.patch262
-rw-r--r--net-libs/opal/files/opal-3.10.9-avoid_cflags_mixup.patch131
-rw-r--r--net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch13
-rw-r--r--net-libs/opal/files/opal-3.10.9-ffmpeg.patch189
-rw-r--r--net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch29
-rw-r--r--net-libs/opal/files/opal-3.10.9-labs_is_in_stdlib.patch11
-rw-r--r--net-libs/opal/files/opal-3.10.9-svn_revision_override.patch15
-rw-r--r--net-libs/opal/files/opal-3.12.4-avoid_cflags_mixup.patch132
-rw-r--r--net-libs/opal/files/opal-3.12.4-java-ruby-swig-fix.patch28
-rw-r--r--net-libs/opal/metadata.xml43
-rw-r--r--net-libs/opal/opal-3.10.11.ebuild253
-rw-r--r--net-libs/opal/opal-3.12.4.ebuild235
-rw-r--r--net-libs/openmq-cclient/Manifest1
-rw-r--r--net-libs/openmq-cclient/files/Makefile.in-469
-rw-r--r--net-libs/openmq-cclient/files/openmq-cclient-4.4.1-aix-gcc.patch13
-rw-r--r--net-libs/openmq-cclient/metadata.xml19
-rw-r--r--net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild79
-rw-r--r--net-libs/openpgm/Manifest2
-rw-r--r--net-libs/openpgm/metadata.xml15
-rw-r--r--net-libs/openpgm/openpgm-5.1.118.ebuild42
-rw-r--r--net-libs/openpgm/openpgm-5.2.122.ebuild29
-rw-r--r--net-libs/openslp/Manifest2
-rw-r--r--net-libs/openslp/files/openslp-1.2.1-cflags.patch11
-rw-r--r--net-libs/openslp/files/openslp-1.2.1-fbsd.patch12
-rw-r--r--net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch11
-rw-r--r--net-libs/openslp/files/openslp-2.0.0-cflags.patch25
-rw-r--r--net-libs/openslp/files/openslp-compile_fix.patch14
-rw-r--r--net-libs/openslp/files/openslp-no_install_doc.patch21
-rw-r--r--net-libs/openslp/files/openslp-opt.patch25
-rw-r--r--net-libs/openslp/files/slpd-init89
-rw-r--r--net-libs/openslp/files/slpd.service10
-rw-r--r--net-libs/openslp/metadata.xml8
-rw-r--r--net-libs/openslp/openslp-1.2.1-r3.ebuild42
-rw-r--r--net-libs/openslp/openslp-2.0.0.ebuild34
-rw-r--r--net-libs/ortp/Manifest3
-rw-r--r--net-libs/ortp/metadata.xml10
-rw-r--r--net-libs/ortp/ortp-0.20.0.ebuild77
-rw-r--r--net-libs/ortp/ortp-0.22.0.ebuild82
-rw-r--r--net-libs/ortp/ortp-0.23.0.ebuild75
-rw-r--r--net-libs/osptoolkit/Manifest2
-rw-r--r--net-libs/osptoolkit/metadata.xml11
-rw-r--r--net-libs/osptoolkit/osptoolkit-3.5.0.ebuild94
-rw-r--r--net-libs/osptoolkit/osptoolkit-4.1.5.ebuild94
-rw-r--r--net-libs/pacparser/Manifest1
-rw-r--r--net-libs/pacparser/files/pacparser-1.3.1-makefile.patch66
-rw-r--r--net-libs/pacparser/metadata.xml26
-rw-r--r--net-libs/pacparser/pacparser-1.3.1.ebuild53
-rw-r--r--net-libs/phodav/Manifest2
-rw-r--r--net-libs/phodav/files/70-spice-webdavd.rules1
-rw-r--r--net-libs/phodav/files/phodav-2.0-slot.patch39
-rw-r--r--net-libs/phodav/files/spice-webdavd.initd17
-rw-r--r--net-libs/phodav/metadata.xml9
-rw-r--r--net-libs/phodav/phodav-0.4.ebuild55
-rw-r--r--net-libs/phodav/phodav-2.0-r1.ebuild75
-rw-r--r--net-libs/polarssl/Manifest2
-rw-r--r--net-libs/polarssl/files/polarssl-1.3.8-ssl_pthread_server.patch40
-rw-r--r--net-libs/polarssl/files/polarssl-1.3.9-respect-cflags.patch15
-rw-r--r--net-libs/polarssl/metadata.xml18
-rw-r--r--net-libs/polarssl/polarssl-1.3.8.ebuild91
-rw-r--r--net-libs/polarssl/polarssl-1.3.9.ebuild91
-rw-r--r--net-libs/ptlib/Manifest4
-rw-r--r--net-libs/ptlib/files/ptlib-2.10.10-mga-bison-parameter.patch39
-rw-r--r--net-libs/ptlib/files/ptlib-2.10.10-respect_cflags_cxxflags.patch14
-rw-r--r--net-libs/ptlib/files/ptlib-2.10.9-disable-telnet-symbols.patch19
-rw-r--r--net-libs/ptlib/files/ptlib-2.10.9-pkgconfig_ldflags.patch11
-rw-r--r--net-libs/ptlib/files/ptlib-2.10.9-respect_cxxflags.patch10
-rw-r--r--net-libs/ptlib/files/ptlib-2.10.9-svn_revision_override.patch18
-rw-r--r--net-libs/ptlib/files/ptlib-2.12.4-respect_cxxflags.patch12
-rw-r--r--net-libs/ptlib/files/ptlib-2.12.4-sdl-linking.patch11
-rw-r--r--net-libs/ptlib/metadata.xml27
-rw-r--r--net-libs/ptlib/ptlib-2.10.11.ebuild230
-rw-r--r--net-libs/ptlib/ptlib-2.12.9.ebuild223
-rw-r--r--net-libs/qmf/Manifest1
-rw-r--r--net-libs/qmf/files/qmf-4.0.2-tests.patch13
-rw-r--r--net-libs/qmf/metadata.xml9
-rw-r--r--net-libs/qmf/qmf-4.0.3.ebuild108
-rw-r--r--net-libs/qtweetlib/Manifest1
-rw-r--r--net-libs/qtweetlib/metadata.xml8
-rw-r--r--net-libs/qtweetlib/qtweetlib-0.5.ebuild41
-rw-r--r--net-libs/qtweetlib/qtweetlib-9999.ebuild41
-rw-r--r--net-libs/qxmpp/Manifest5
-rw-r--r--net-libs/qxmpp/metadata.xml14
-rw-r--r--net-libs/qxmpp/qxmpp-0.7.4.ebuild48
-rw-r--r--net-libs/qxmpp/qxmpp-0.7.5.ebuild48
-rw-r--r--net-libs/qxmpp/qxmpp-0.7.6-r1.ebuild57
-rw-r--r--net-libs/qxmpp/qxmpp-0.7.6.ebuild48
-rw-r--r--net-libs/qxmpp/qxmpp-0.8.0.ebuild60
-rw-r--r--net-libs/qxmpp/qxmpp-0.8.2.ebuild62
-rw-r--r--net-libs/qxmpp/qxmpp-9999.ebuild58
-rw-r--r--net-libs/rabbitmq-c/Manifest2
-rw-r--r--net-libs/rabbitmq-c/files/xmlto.patch25
-rw-r--r--net-libs/rabbitmq-c/metadata.xml16
-rw-r--r--net-libs/rabbitmq-c/rabbitmq-c-0.3.0.ebuild46
-rw-r--r--net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild43
-rw-r--r--net-libs/rb_libtorrent/Manifest4
-rw-r--r--net-libs/rb_libtorrent/files/rb_libtorrent-0.16.17-python.patch37
-rw-r--r--net-libs/rb_libtorrent/files/rb_libtorrent-1.0.2-python.patch32
-rw-r--r--net-libs/rb_libtorrent/metadata.xml13
-rw-r--r--net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild73
-rw-r--r--net-libs/rb_libtorrent/rb_libtorrent-0.16.17.ebuild78
-rw-r--r--net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild73
-rw-r--r--net-libs/rb_libtorrent/rb_libtorrent-1.0.4.ebuild75
-rw-r--r--net-libs/rb_libtorrent/rb_libtorrent-1.0.5.ebuild75
-rw-r--r--net-libs/rest/Manifest2
-rw-r--r--net-libs/rest/files/rest-0.7.92-oauth-missing-include.patch25
-rw-r--r--net-libs/rest/files/rest-0.7.92-tests-GError-pointers.patch40
-rw-r--r--net-libs/rest/files/rest-0.7.92-xml-parser-missing-break.patch26
-rw-r--r--net-libs/rest/metadata.xml9
-rw-r--r--net-libs/rest/rest-0.7.92-r1.ebuild55
-rw-r--r--net-libs/rest/rest-0.7.92-r2.ebuild65
-rw-r--r--net-libs/rest/rest-0.7.93.ebuild60
-rw-r--r--net-libs/roadrunner/Manifest1
-rw-r--r--net-libs/roadrunner/metadata.xml7
-rw-r--r--net-libs/roadrunner/roadrunner-0.9.1.ebuild38
-rw-r--r--net-libs/rpc2/Manifest3
-rw-r--r--net-libs/rpc2/metadata.xml5
-rw-r--r--net-libs/rpc2/rpc2-2.0.ebuild25
-rw-r--r--net-libs/rpc2/rpc2-2.10.ebuild27
-rw-r--r--net-libs/rpc2/rpc2-2.8.ebuild25
-rw-r--r--net-libs/serf/Manifest1
-rw-r--r--net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch13
-rw-r--r--net-libs/serf/files/serf-1.3.8-scons_variables.patch110
-rw-r--r--net-libs/serf/files/serf-1.3.8-tests.patch95
-rw-r--r--net-libs/serf/metadata.xml11
-rw-r--r--net-libs/serf/serf-1.3.8.ebuild61
-rw-r--r--net-libs/socket++/Manifest2
-rw-r--r--net-libs/socket++/files/socket++-1.12.12-gcc47.patch20
-rw-r--r--net-libs/socket++/files/socket++.pc11
-rw-r--r--net-libs/socket++/metadata.xml6
-rw-r--r--net-libs/socket++/socket++-1.12.12-r2.ebuild41
-rw-r--r--net-libs/socket++/socket++-1.12.13.ebuild41
-rw-r--r--net-libs/socket_wrapper/Manifest1
-rw-r--r--net-libs/socket_wrapper/metadata.xml9
-rw-r--r--net-libs/socket_wrapper/socket_wrapper-1.1.3.ebuild30
-rw-r--r--net-libs/sofia-sip/Manifest1
-rw-r--r--net-libs/sofia-sip/metadata.xml8
-rw-r--r--net-libs/sofia-sip/sofia-sip-1.12.11.ebuild35
-rw-r--r--net-libs/stem/Manifest3
-rw-r--r--net-libs/stem/metadata.xml15
-rw-r--r--net-libs/stem/stem-1.3.0.ebuild39
-rw-r--r--net-libs/stem/stem-1.4.0.ebuild38
-rw-r--r--net-libs/stem/stem-1.4.1.ebuild38
-rw-r--r--net-libs/telepathy-farstream/Manifest1
-rw-r--r--net-libs/telepathy-farstream/metadata.xml5
-rw-r--r--net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild49
-rw-r--r--net-libs/telepathy-glib/Manifest2
-rw-r--r--net-libs/telepathy-glib/metadata.xml8
-rw-r--r--net-libs/telepathy-glib/telepathy-glib-0.24.0.ebuild63
-rw-r--r--net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild64
-rw-r--r--net-libs/telepathy-logger-qt/Manifest1
-rw-r--r--net-libs/telepathy-logger-qt/metadata.xml5
-rw-r--r--net-libs/telepathy-logger-qt/telepathy-logger-qt-0.8.0.ebuild46
-rw-r--r--net-libs/telepathy-qt/Manifest2
-rw-r--r--net-libs/telepathy-qt/files/0.9.6.1-default-source.patch25
-rw-r--r--net-libs/telepathy-qt/files/0.9.6.1-yes-release.patch17
-rw-r--r--net-libs/telepathy-qt/metadata.xml9
-rw-r--r--net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild95
-rw-r--r--net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild100
-rw-r--r--net-libs/txtorcon/Manifest1
-rw-r--r--net-libs/txtorcon/metadata.xml12
-rw-r--r--net-libs/txtorcon/txtorcon-0.13.0.ebuild31
-rw-r--r--net-libs/udns/Manifest1
-rw-r--r--net-libs/udns/metadata.xml13
-rw-r--r--net-libs/udns/udns-0.4.ebuild53
-rw-r--r--net-libs/uhttpmock/Manifest2
-rw-r--r--net-libs/uhttpmock/metadata.xml5
-rw-r--r--net-libs/uhttpmock/uhttpmock-0.4.0.ebuild44
-rw-r--r--net-libs/uhttpmock/uhttpmock-0.5.0.ebuild44
-rw-r--r--net-libs/vanessa-mcast/Manifest1
-rw-r--r--net-libs/vanessa-mcast/metadata.xml7
-rw-r--r--net-libs/vanessa-mcast/vanessa-mcast-1.0.0.ebuild24
-rw-r--r--net-libs/vanessa-socket/Manifest2
-rw-r--r--net-libs/vanessa-socket/files/vanessa-socket-0.0.7-version.patch21
-rw-r--r--net-libs/vanessa-socket/metadata.xml8
-rw-r--r--net-libs/vanessa-socket/vanessa-socket-0.0.12.ebuild30
-rw-r--r--net-libs/vanessa-socket/vanessa-socket-0.0.13.ebuild27
-rw-r--r--net-libs/webkit-gtk/Manifest3
-rwxr-xr-xnet-libs/webkit-gtk/files/gir-paxctl-lt-wrapper33
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch10
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch67
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch95
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch20
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch20
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch12
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch20
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch32
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch30
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch11
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.6.0-atomic-ppc.patch48
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch34
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch31
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch26
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.8.1-ia64-malloc.patch31
-rw-r--r--net-libs/webkit-gtk/metadata.xml13
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild282
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild293
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild231
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild239
-rw-r--r--net-libs/wt/Manifest2
-rw-r--r--net-libs/wt/files/cmakelist.patch5
-rw-r--r--net-libs/wt/files/wt-fix-automagic.patch282
-rw-r--r--net-libs/wt/metadata.xml18
-rw-r--r--net-libs/wt/wt-3.2.2_p1-r1.ebuild135
-rw-r--r--net-libs/wt/wt-3.3.1.ebuild141
-rw-r--r--net-libs/wvstreams/Manifest1
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch50
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch23
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch16
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch56
-rw-r--r--net-libs/wvstreams/metadata.xml16
-rw-r--r--net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild105
-rw-r--r--net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild105
-rw-r--r--net-libs/xrootd/Manifest2
-rw-r--r--net-libs/xrootd/files/cmsd.confd9
-rw-r--r--net-libs/xrootd/files/cmsd.initd35
-rw-r--r--net-libs/xrootd/files/frm_purged.initd35
-rw-r--r--net-libs/xrootd/files/frm_xfrd.initd35
-rw-r--r--net-libs/xrootd/files/xrootd-no-werror.patch11
-rw-r--r--net-libs/xrootd/files/xrootd.confd21
-rw-r--r--net-libs/xrootd/files/xrootd.initd33
-rw-r--r--net-libs/xrootd/metadata.xml18
-rw-r--r--net-libs/xrootd/xrootd-3.3.6.ebuild78
-rw-r--r--net-libs/xrootd/xrootd-4.1.1.ebuild86
-rw-r--r--net-libs/zeromq/Manifest5
-rw-r--r--net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch105
-rw-r--r--net-libs/zeromq/metadata.xml33
-rw-r--r--net-libs/zeromq/zeromq-2.2.0.ebuild52
-rw-r--r--net-libs/zeromq/zeromq-3.2.3.ebuild62
-rw-r--r--net-libs/zeromq/zeromq-3.2.5.ebuild61
-rw-r--r--net-libs/zeromq/zeromq-4.1.1.ebuild50
-rw-r--r--net-libs/zeromq/zeromq-4.1.2.ebuild50
1071 files changed, 39670 insertions, 0 deletions
diff --git a/net-libs/NativeThread/Manifest b/net-libs/NativeThread/Manifest
new file mode 100644
index 000000000000..ddc915f54a7f
--- /dev/null
+++ b/net-libs/NativeThread/Manifest
@@ -0,0 +1 @@
+DIST NativeThread-0_pre20080330.tar.bz2 2707 RMD160 6b93881f53a2ed89096d4a1900c3b48e08cb0201 SHA1 ca68ea04fcb1d9fd9f8aaed34a3e92a1de6539d9 SHA256 ae5277c25420fc76f59d296400c20562e37ff0ad4ecab63e537b9a053ac5802c
diff --git a/net-libs/NativeThread/NativeThread-0_pre20080330.ebuild b/net-libs/NativeThread/NativeThread-0_pre20080330.ebuild
new file mode 100644
index 000000000000..8bb9e1c3c9ff
--- /dev/null
+++ b/net-libs/NativeThread/NativeThread-0_pre20080330.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils flag-o-matic java-pkg-2 toolchain-funcs
+
+DESCRIPTION="NativeThread for priorities on linux for freenet"
+HOMEPAGE="http://www.freenetproject.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=net-p2p/freenet-0.7
+ >=virtual/jdk-1.4"
+RDEPEND=""
+
+src_unpack() {
+ unpack ${A}
+ epatch "${FILESDIR}"/Makefile.patch
+}
+
+src_compile() {
+ append-flags -fPIC
+ tc-export CC
+ emake || die
+}
+
+src_install() {
+ dolib.so lib${PN}.so || die
+}
diff --git a/net-libs/NativeThread/files/Makefile.patch b/net-libs/NativeThread/files/Makefile.patch
new file mode 100644
index 000000000000..e1f0209a6f3f
--- /dev/null
+++ b/net-libs/NativeThread/files/Makefile.patch
@@ -0,0 +1,22 @@
+--- Makefile 2008-03-03 13:59:06.000000000 +0100
++++ Makefile.new 2008-03-30 16:27:12.000000000 +0200
+@@ -1,14 +1,14 @@
+-CC = gcc
+ INC = $(JAVA_HOME)/include
+-CFLAGS = -Wall -O3 -fPIC
+-LDFLAGS = -shared -Wl,-soname,libnative.so -I$(INC) -I$(INC)/linux
++CFLAGS += -Wall
++LDFLAGS += -shared -Wl,-soname,libnative.so -I$(INC) -I$(INC)/linux
+ LIBS = -lc
+
+ all: clean libNativeThread.so
+
+ NativeThread.class:
+- javac java/NativeThread.java
+- mv java/NativeThread.class freenet/support/io/
++ javac -classpath /usr/share/freenet/lib/freenet.jar NativeThread.java
++ mkdir -p freenet/support/io
++ mv NativeThread.class freenet/support/io/
+
+ libNativeThread.so: NativeThread.c NativeThread.h
+ $(CC) $(CFLAGS) -o libNativeThread.so $(LDFLAGS) NativeThread.c $(LIBS)
diff --git a/net-libs/NativeThread/metadata.xml b/net-libs/NativeThread/metadata.xml
new file mode 100644
index 000000000000..fed3658eec53
--- /dev/null
+++ b/net-libs/NativeThread/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>tommy@gentoo.org</email>
+ <name>Thomas Sachau (Tommy[D])</name>
+ </maintainer>
+</pkgmetadata>
+
diff --git a/net-libs/adns/Manifest b/net-libs/adns/Manifest
new file mode 100644
index 000000000000..e6f07a9ab462
--- /dev/null
+++ b/net-libs/adns/Manifest
@@ -0,0 +1 @@
+DIST adns-1.4.tar.gz 252668 RMD160 ccff2111bfa3eb99e28d355d48e9e17333f34394 SHA1 87283c3bcd09ceb2e605e91abedfb537a18f1884 SHA256 717b92a39117a5d8b04ea7c652c630659c6eecb35211129a8cee95e6524ca9fe
diff --git a/net-libs/adns/adns-1.4-r1.ebuild b/net-libs/adns/adns-1.4-r1.ebuild
new file mode 100644
index 000000000000..48c26e5a786d
--- /dev/null
+++ b/net-libs/adns/adns-1.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Advanced, easy to use, asynchronous-capable DNS client library and utilities"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~ian/adns/"
+SRC_URI="ftp://ftp.chiark.greenend.org.uk/users/ian/adns/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-cnamechain.patch
+ #remove bogus test wrt bug #295072
+ rm "${S}"/regress/case-cnametocname.sys
+}
+
+src_configure() {
+ CC=$(tc-getCC) econf || die "econf failed"
+}
+
+src_compile() {
+ emake AR=$(tc-getAR) RANLIB=$(tc-getRANLIB) || die "emake failed"
+}
+
+src_install () {
+ dodir /usr/{include,bin,$(get_libdir)}
+ emake prefix="${D}"/usr libdir="${D}"/usr/$(get_libdir) install || die "emake install failed"
+ dodoc README TODO changelog "${FILESDIR}"/README.security
+ dohtml *.html
+}
+
+pkg_postinst() {
+ ewarn "$(<${FILESDIR}/README.security)"
+}
diff --git a/net-libs/adns/adns-1.4.ebuild b/net-libs/adns/adns-1.4.ebuild
new file mode 100644
index 000000000000..b9ad2859cd70
--- /dev/null
+++ b/net-libs/adns/adns-1.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Advanced, easy to use, asynchronous-capable DNS client library and utilities"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~ian/adns/"
+SRC_URI="ftp://ftp.chiark.greenend.org.uk/users/ian/adns/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+ CC=$(tc-getCC) econf || die "econf failed"
+ emake AR=$(tc-getAR) RANLIB=$(tc-getRANLIB) || die "emake failed"
+}
+
+src_install () {
+ dodir /usr/{include,bin,$(get_libdir)}
+ emake prefix="${D}"/usr libdir="${D}"/usr/$(get_libdir) install || die "emake install failed"
+ dodoc README TODO changelog "${FILESDIR}"/README.security
+ dohtml *.html
+}
+
+pkg_postinst() {
+ ewarn "$(<${FILESDIR}/README.security)"
+}
diff --git a/net-libs/adns/files/README.security b/net-libs/adns/files/README.security
new file mode 100644
index 000000000000..c09f544f3f99
--- /dev/null
+++ b/net-libs/adns/files/README.security
@@ -0,0 +1,11 @@
+SECURITY AND PERFORMANCE - AN IMPORTANT NOTE
+
+adns is not a `full-service resolver': it does no caching of responses
+at all, and has no defence against bad nameservers or fake packets
+which appear to come from your real nameservers. It relies on the
+full-service resolvers listed in resolv.conf to handle these tasks.
+
+For secure and reasonable operation you MUST run a full-service
+nameserver on the same system as your adns applications, or on the
+same local, fully trusted network. You MUST only list such
+nameservers in the adns configuration (eg resolv.conf).
diff --git a/net-libs/adns/files/adns-1.4-cnamechain.patch b/net-libs/adns/files/adns-1.4-cnamechain.patch
new file mode 100644
index 000000000000..4c87a1434660
--- /dev/null
+++ b/net-libs/adns/files/adns-1.4-cnamechain.patch
@@ -0,0 +1,132 @@
+[ADNS] Re: CNAME chains
+Brad Spencer spencer at infointeractive.com
+Mon, 28 Aug 2006 14:43:00 -0300
+
+Previous message: CNAME chains
+Next message: CNAME chains option
+Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
+--pf9I7BMVVzbSWLtt
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+
+On Fri, Aug 25, 2006 at 11:36:04AM -0700, William Ahern wrote:
+> On Fri, Aug 25, 2006 at 09:39:01AM +0100, peter burden wrote:
+> > Hello,
+> > Is there any way to make ADNS follow CNAME chains ?
+> >
+> > I have set the adns_qf_cname_loose query flag and it seems OK for a
+> > single
+> > CNAME - e.g. (output from 'dig')
+
+I posted a small patch back in 2003 that made changes to adns so that
+it would follow CNAME chains. See
+
+http://www.chiark.greenend.org.uk/pipermail/adns-discuss/2003/001072.html
+
+The patch included in that post is against an old adns version, so I
+have attached my latest version of the patch to this message. (I have
+not tested that the attached patch applied cleanly to the current adns
+source, but it may be slightly more in sync with the current version.)
+
+> CNAME chains are technically not allowed. Such chains are violations of the
+> specifications. Also, I believe MX host lookups returning CNAMEs (i.e. MX
+> yahoo.com -> A mail.yahoo.com -> CNAME foo) is also illegal.
+
+I have also been told that CNAME chains are illegal, but I can not
+find any actual text that says that a resolver should fail when it
+encounters them. In fact, RFC 1034 Section 3.6.2 says:
+
+ Domain names in RRs which point at another name should always point at
+ the primary name and not the alias. This avoids extra indirections in
+ accessing information. For example, the address to name RR for the
+ above host should be:
+
+ 52.0.0.10.IN-ADDR.ARPA IN PTR C.ISI.EDU
+
+ rather than pointing at USC-ISIC.ARPA.
+
+The above implies that CNAME chains are illegal, IMO. But then, the
+next sentence is:
+
+ Of course, by the robustness principle, domain software should not
+ fail when presented with CNAME chains or loops; CNAME chains
+ should be followed and CNAME loops signalled as an error.
+
+This advice, coupled with the fact that CNAME chains exist in the
+wild, triggered me to create the patch in the first place. My patch
+doesn't detect loops, but instead simply won't follow chains longer
+than a certain (hard-coded) size.
+
+Hope this helps!
+
+--
+------------------------------------------------------------------
+Brad Spencer - spencer@infointeractive.com - "It's quite nice..."
+Systems Architect | InfoInterActive Corp. | A Canadian AOL Company
+
+--pf9I7BMVVzbSWLtt
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: attachment; filename="cname_chains.diff"
+
+Index: src/internal.h
+===================================================================
+RCS file: /iia/cvsroot/3rdParty/gnu/adns/adns-1.0/src/internal.h,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -p -r1.3 -r1.4
+--- src/internal.h 2 Oct 2003 17:01:46 -0000 1.3
++++ src/internal.h 2 Oct 2003 17:14:29 -0000 1.4
+@@ -206,6 +206,9 @@ struct adns__query {
+ int cname_dglen, cname_begin;
+ /* If non-0, has been allocated using . */
+
++ int cname_alias_hops_left;
++ /* The number of cname alias hops we will allow */
++
+ vbuf search_vb;
+ int search_origlen, search_pos, search_doneabs;
+ /* Used by the searching algorithm. The query domain in textual form
+Index: src/query.c
+===================================================================
+RCS file: /iia/cvsroot/3rdParty/gnu/adns/adns-1.0/src/query.c,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -p -r1.3 -r1.4
+--- src/query.c 2 Oct 2003 17:01:47 -0000 1.3
++++ src/query.c 2 Oct 2003 17:14:29 -0000 1.4
+@@ -63,6 +63,8 @@ static adns_query query_alloc(adns_state
+
+ qu->cname_dgram= 0;
+ qu->cname_dglen= qu->cname_begin= 0;
++ /* Allow CNAME chains up to some sane limit */
++ qu->cname_alias_hops_left = 10;
+
+ adns__vbuf_init(&qu->search_vb);
+ qu->search_origlen= qu->search_pos= qu->search_doneabs= 0;
+Index: src/reply.c
+===================================================================
+RCS file: /iia/cvsroot/3rdParty/gnu/adns/adns-1.0/src/reply.c,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -p -r1.3 -r1.4
+--- src/reply.c 2 Oct 2003 17:01:47 -0000 1.3
++++ src/reply.c 2 Oct 2003 17:14:30 -0000 1.4
+@@ -191,12 +191,13 @@ void adns__procdgram(adns_state ads, con
+ if (qu->flags & adns_qf_cname_forbid) {
+ adns__query_fail(qu,adns_s_prohibitedcname);
+ return;
+- } else if (qu->cname_dgram) { /* Ignore second and subsequent CNAME(s) */
++ } else if (qu->cname_dgram && --(qu->cname_alias_hops_left) <= 0) { /* Don't follow "too long" CNAME chains */
+ adns__debug(ads,serv,qu,"allegedly canonical name %s"
+- " is actually alias for %s", qu->answer->cname,
++ " is actually alias for %s and aliases too deep",
++ qu->answer->cname,
+ adns__diag_domain(ads,serv,qu, &qu->vb,
+ dgram,dglen,rdstart));
+- adns__query_fail(qu,adns_s_prohibitedcname);
++ adns__query_fail(qu,adns_s_norecurse);
+ return;
+ } else if (wantedrrs) { /* Ignore CNAME(s) after RR(s). */
+ adns__debug(ads,serv,qu,"ignoring CNAME (to %s) coexisting with RR",
+
+--pf9I7BMVVzbSWLtt--
diff --git a/net-libs/adns/metadata.xml b/net-libs/adns/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/net-libs/adns/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ <name>Default assignee for orphaned packages</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
new file mode 100644
index 000000000000..d63e8ee0465f
--- /dev/null
+++ b/net-libs/aqbanking/Manifest
@@ -0,0 +1,3 @@
+DIST aqbanking-5.0.25.tar.gz 3637565 SHA256 bb99f16704200e1ff456574b17895e04ef375479b21e075607454e6bc7c02151 SHA512 57a2f759c8958737fea2735771a62d2c71181bbab4666f642e06094093f6a545be3df56db45991e7fb03248e3fdd6ace2096df498ff3596dbcb6857caf4e53d0 WHIRLPOOL d1c76f27bcfa60f7bead53eef004dfe6f26d60d912e4d0bf39421323d20f7e87a6b4b15e205c2984fb7482f81691deee5d496c73ac4c411d3838a2c5c1ff3d1f
+DIST aqbanking-5.4.3beta.tar.gz 3743279 SHA256 81cc22eb2566e112c0d62427acf8de64cf542e7fc95262ff06addbc2e58a8183 SHA512 3dfd90c1460e7a4b02dc33adf6378cc5ef2127e278ba4c23a4e95eaa732c7f6487fbd1dde5fdce0080d58edb2d69c8e2148cb64b23c0ff85773148a548bc24a2 WHIRLPOOL 8cbfd734541106a5dabebb57f282ffb25e191958746f618f69d6b2e1455c19e0686191aebaac526f988345b420e21829fd5857b26b619831c33dc017ed100791
+DIST aqbanking-5.5.1.tar.gz 3818696 SHA256 238f17d27d86e0cef239479c4be152cb98f5be9d6b87fca38741d32e762faddf SHA512 37220e2da9289b43929fa7406c0ce81596e26e6e82b2c2052a743029e1cbc77e6c3d44a2767a637f5e724a4e328d3110584025b730e2cdfa9d350279e2ac2659 WHIRLPOOL 69620b7bf3161f7eb61ad453aa7336b673cc3114000d6cd6bf7f162c24ecb8ee8ab0c66e5440607c1f6163573b1f3e7d257122c414865c15b5934dafad8d717d
diff --git a/net-libs/aqbanking/aqbanking-5.0.25.ebuild b/net-libs/aqbanking/aqbanking-5.0.25.ebuild
new file mode 100644
index 000000000000..1bcc2cf2baa6
--- /dev/null
+++ b/net-libs/aqbanking/aqbanking-5.0.25.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Generic Online Banking Interface"
+HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
+SRC_URI="http://www.aquamaniac.de/sites/download/download.php?package=03&release=95&file=01&dummy=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE="chipcard debug doc examples gtk ofx"
+
+RDEPEND=">=app-misc/ktoblzcheck-1.39
+ >=dev-libs/gmp-5
+ >=sys-libs/gwenhywfar-4.3.3[gtk?]
+ virtual/libintl
+ ofx? ( >=dev-libs/libofx-0.9.5 )
+ chipcard? ( >=sys-libs/libchipcard-5.0.2 )"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+MAKEOPTS="${MAKEOPTS} -j1" # 5.0.x fails with -j9 on quadcore
+
+src_configure() {
+ local backends="aqhbci aqnone aqpaypal"
+ use ofx && backends="${backends} aqofxconnect"
+
+ local mytest
+ use gtk && mytest="--enable-gui-tests"
+
+ econf \
+ $(use_enable debug) \
+ $(use_enable doc full-doc) \
+ --with-backends="${backends}" \
+ --with-docpath=/usr/share/doc/${PF}/apidoc \
+ ${mytest}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ rm -rf "${ED}"/usr/share/doc/aq{banking,hbci,paypal}
+
+ dodoc AUTHORS ChangeLog NEWS README TODO
+
+ newdoc src/plugins/backends/aqhbci/tools/aqhbci-tool/README \
+ README.aqhbci-tool
+ newdoc src/plugins/backends/aqpaypal/tools/aqpaypal-tool/README \
+ README.aqpaypal-tool
+
+ if use examples; then
+ docinto tutorials
+ dodoc tutorials/*.{c,h} tutorials/README
+ fi
+
+ prune_libtool_files --all
+}
diff --git a/net-libs/aqbanking/aqbanking-5.4.3_beta.ebuild b/net-libs/aqbanking/aqbanking-5.4.3_beta.ebuild
new file mode 100644
index 000000000000..7b7adb7cfc3d
--- /dev/null
+++ b/net-libs/aqbanking/aqbanking-5.4.3_beta.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+MY_P="${P/_beta/beta}"
+DESCRIPTION="Generic Online Banking Interface"
+HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
+SRC_URI="http://www.aquamaniac.de/sites/download/download.php?package=03&release=115&file=01&dummy=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="chipcard debug doc examples gtk ofx"
+
+RDEPEND=">=app-misc/ktoblzcheck-1.45
+ >=dev-libs/gmp-5
+ >=sys-libs/gwenhywfar-4.12.0_beta[gtk?]
+ virtual/libintl
+ ofx? ( >=dev-libs/libofx-0.9.5 )
+ chipcard? ( >=sys-libs/libchipcard-5.0.2 )"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+MAKEOPTS="${MAKEOPTS} -j1" # 5.0.x fails with -j9 on quadcore
+
+src_configure() {
+ local backends="aqhbci aqnone aqpaypal"
+ use ofx && backends="${backends} aqofxconnect"
+
+ local mytest
+ use gtk && mytest="--enable-gui-tests"
+
+ econf \
+ $(use_enable debug) \
+ $(use_enable doc full-doc) \
+ --with-backends="${backends}" \
+ --with-docpath=/usr/share/doc/${PF}/apidoc \
+ ${mytest}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ rm -rf "${ED}"/usr/share/doc/aq{banking,hbci,paypal}
+
+ dodoc AUTHORS ChangeLog NEWS README TODO
+
+ newdoc src/plugins/backends/aqhbci/tools/aqhbci-tool/README \
+ README.aqhbci-tool
+
+ if use examples; then
+ docinto tutorials
+ dodoc tutorials/*.{c,h} tutorials/README
+ fi
+
+ prune_libtool_files --all
+}
diff --git a/net-libs/aqbanking/aqbanking-5.5.1.ebuild b/net-libs/aqbanking/aqbanking-5.5.1.ebuild
new file mode 100644
index 000000000000..3583b874269f
--- /dev/null
+++ b/net-libs/aqbanking/aqbanking-5.5.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+MY_P="${P/_beta/beta}"
+DESCRIPTION="Generic Online Banking Interface"
+HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
+SRC_URI="http://www.aquamaniac.de/sites/download/download.php?package=03&release=118&file=01&dummy=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="chipcard debug doc ebics examples gtk ofx"
+
+RDEPEND=">=app-misc/ktoblzcheck-1.48
+ >=dev-libs/gmp-5
+ >=sys-libs/gwenhywfar-4.13.1[gtk?]
+ virtual/libintl
+ ofx? ( >=dev-libs/libofx-0.9.5 )
+ chipcard? ( >=sys-libs/libchipcard-5.0.2 )
+ ebics? ( dev-libs/xmlsec[gcrypt,gnutls] )"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+MAKEOPTS="${MAKEOPTS} -j1" # 5.0.x fails with -j9 on quadcore
+
+src_configure() {
+ local backends="aqhbci aqnone aqpaypal"
+ use ofx && backends="${backends} aqofxconnect"
+ use ebics && backends="${backends} aqebics"
+
+ local mytest
+ use gtk && mytest="--enable-gui-tests"
+
+ econf \
+ $(use_enable debug) \
+ $(use_enable doc full-doc) \
+ --with-backends="${backends}" \
+ --with-docpath=/usr/share/doc/${PF}/apidoc \
+ ${mytest}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ rm -rf "${ED}"/usr/share/doc/aq{banking,hbci,paypal}
+
+ dodoc AUTHORS ChangeLog NEWS README TODO
+
+ newdoc src/plugins/backends/aqhbci/tools/aqhbci-tool/README \
+ README.aqhbci-tool
+
+ if use examples; then
+ docinto tutorials
+ dodoc tutorials/*.{c,h} tutorials/README
+ fi
+
+ prune_libtool_files --all
+}
diff --git a/net-libs/aqbanking/metadata.xml b/net-libs/aqbanking/metadata.xml
new file mode 100644
index 000000000000..73fd1d760834
--- /dev/null
+++ b/net-libs/aqbanking/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>hanno@gentoo.org</email></maintainer>
+ <use>
+ <flag name='chipcard'>Enable support for DDV/RSA-chipcards</flag>
+ <flag name='ebics'>Enable support for Electronic Banking Internet Communication Standard (EBICS)</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
new file mode 100644
index 000000000000..74b94912a489
--- /dev/null
+++ b/net-libs/axtls/Manifest
@@ -0,0 +1,4 @@
+DIST axTLS-1.5.0.tar.gz 1302393 SHA256 7ff27d1eb1ad1630e1a3431278d72857c1124edd9a15a07a79709bc77d8bb710 SHA512 526e3c408c960e7e48dd791c6cf94a3dbc62a36c0453e4705529490160cacd5ca1c663fab153a899618e78516714e3afb7a93dae075d2717eb9a91e63f3e9c04 WHIRLPOOL 5fc0e9f4d3f8994dc2909f85261aac538b9563b3dee787d8d6a0942f087041893217a0b9237d5c0824c3a64bb8272bb30d2c4fcdbd11a879107f20892c8f180f
+DIST axTLS-1.5.1.tar.gz 1305575 SHA256 860a2754c497109854889e78eb2efdf00661f3b5dbb5e130bd5d8441a2f6ea50 SHA512 4b35e151d222496f5e4ab9c849ca9b14a245590a07f07132eab2fa633dac4cf7abfe29344f643fa182c9c443a139d3230d4b3554d3ff0932410ab36ae3666d92 WHIRLPOOL c1072aa94a7916db38d26902bac175d17e4f8fe1a431956d0b366f9cd913c89c145d119c823d9c1bfa51d54aa191ca43386b4312bea3a16f61d9df4ff2eb6b68
+DIST axTLS-1.5.2.tar.gz 1309632 SHA256 c4568cdf3e326c6fee2d7d16b4e13e05a29cecf49c1774c7858fe83cde01f8bb SHA512 138c1134c949fb85335454907c8fa74f18860d16371aba7d4d46faa4fb0e9cbf41d259cf72389f439d8d6436dc200951001a53e996793ba59254f5ddefe99999 WHIRLPOOL 36b889c4aa5e3c2c0da20a189ec7342db86b757acbb5c9c8a12262d95ceabb490ac97fa608efd66757e74e6347e0f5ff5bd5c76ac453d9dbdc115c45b8e35ad4
+DIST axTLS-1.5.3.tar.gz 1309853 SHA256 367ce7918b9e7738d853d5eaaa9d4fbdb362c5b323d4c0622a72d891f6b8d8e6 SHA512 d37fb1341259b079ed234512a96656d67e005c50d9f8e0c856fb140c9da35267624e065134e0cc8310f70e5cf5d196c7dd34f01e2a7a5cc29e77e7ca46c25281 WHIRLPOOL 92de1a06da740adf0238550d36a75216bace6c7fb867e82d38f2ca2362dcf0e41810191933aa788ffda080367b6beb312f1a9a240ab687a6c4f324988d36a81c
diff --git a/net-libs/axtls/axtls-1.5.0.ebuild b/net-libs/axtls/axtls-1.5.0.ebuild
new file mode 100644
index 000000000000..b0149d23dbd5
--- /dev/null
+++ b/net-libs/axtls/axtls-1.5.0.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib multilib-minimal savedconfig toolchain-funcs user
+
+################################################################################
+# axtls CONFIG MINI-HOWTO
+#
+# Note: axtls is highly configurable and uses mconf, like the linux kernel.
+# You can configure it in a couple of ways:
+#
+# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
+# you want, and possibly a lot more.
+#
+# 2) You can create your own configuration file by doing
+#
+# FEATURES="keepwork" USE="savedconfig -*" emerge axtls
+# cd /var/tmp/portage/net-libs/axtls*/work/axTLS
+# make menuconfig
+#
+# Now configure axtls as you want. Finally save your config file:
+#
+# cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
+#
+# where ${PV} is the current version. You can then run emerge again with
+# your configuration by doing
+#
+# USE="savedconfig" emerge axtls
+#
+################################################################################
+
+MY_PN=${PN/tls/TLS}
+
+DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
+HOMEPAGE="http://axtls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-code"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 x86"
+
+IUSE="httpd cgi-lua cgi-php static static-libs doc"
+
+# TODO: add ipv6, and c#, java, lua, perl bindings
+# Currently these all have some issue
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="
+ httpd? (
+ cgi-lua? ( dev-lang/lua )
+ cgi-php? ( dev-lang/php[cgi] )
+ )"
+
+#Note1: static, cgi-* makes no sense if httpd is not given
+REQUIRED_USE="
+ static? ( httpd )
+ cgi-lua? ( httpd )
+ cgi-php? ( httpd )"
+
+AXTLS_GROUP="axtls"
+AXTLS_USER="axtls"
+
+pkg_setup() {
+ use httpd && {
+ ebegin "Creating axtls user and group"
+ enewgroup ${AXTLS_GROUP}
+ enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
+ }
+}
+
+src_prepare() {
+ tc-export AR CC
+
+ epatch "${FILESDIR}/explicit-libdir-r1.patch"
+
+ #We want CONFIG_DEBUG to avoid stripping
+ #but not for debugging info
+ sed -i -e 's: -g::' config/Rules.mak || die
+ sed -i -e 's: -g::' config/makefile.conf || die
+
+ multilib_copy_sources
+}
+
+use_flag_config() {
+ cp "${FILESDIR}"/config config/.config || die
+
+ #Respect CFLAGS/LDFLAGS
+ sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
+ config/.config || die
+ sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
+ config/.config || die
+
+ #The logic is that the default config file enables everything and we disable
+ #here with sed unless a USE flags says to keep it
+ if use httpd; then
+ if ! use static; then
+ sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
+ config/.config || die
+ fi
+ if ! use cgi-php && ! use cgi-lua; then
+ sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
+ config/.config || die
+ fi
+ if ! use cgi-php; then
+ sed -i -e 's:,.php::' config/.config || die
+ fi
+ if ! use cgi-lua; then
+ sed -i -e 's:\.lua,::' \
+ -e 's:lua:php:' \
+ -e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
+ config/.config || die
+ fi
+ else
+ sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
+ config/.config || die
+ fi
+
+ yes "n" | emake -j1 oldconfig > /dev/null || die
+}
+
+multilib_src_configure() {
+ #Per-ABI substitutions.
+ sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
+ Makefile || die
+
+ #Use CC as the host compiler for mconf
+ sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
+ config/Rules.mak || die
+
+ if use savedconfig; then
+ restore_config config/.config
+ if [[ -f config/.config ]]; then
+ ewarn "Using saved config, all other USE flags ignored"
+ else
+ ewarn "No saved config, seeding with the default"
+ cp "${FILESDIR}"/config config/.config || die
+ fi
+ yes "" | emake -j1 oldconfig > /dev/null || die
+ else
+ use_flag_config
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi && use savedconfig; then
+ save_config config/.config
+ fi
+
+ emake PREFIX="${ED}/usr" install
+
+ if ! use static-libs; then
+ rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
+ fi
+
+ # The build system needs to install before it builds docs
+ if multilib_is_native_abi && use doc; then
+ emake docs
+ dodoc -r docsrc/html
+ fi
+}
+
+multilib_src_install_all() {
+ if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
+ mv "${ED}"/usr/bin/{,ax}htpasswd || die
+ fi
+
+ if use httpd; then
+ newinitd "${FILESDIR}"/axhttpd.initd axhttpd
+ newconfd "${FILESDIR}"/axhttpd.confd axhttpd
+ fi
+
+ docompress -x /usr/share/doc/${PF}/README
+ dodoc README
+}
diff --git a/net-libs/axtls/axtls-1.5.1.ebuild b/net-libs/axtls/axtls-1.5.1.ebuild
new file mode 100644
index 000000000000..b0149d23dbd5
--- /dev/null
+++ b/net-libs/axtls/axtls-1.5.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib multilib-minimal savedconfig toolchain-funcs user
+
+################################################################################
+# axtls CONFIG MINI-HOWTO
+#
+# Note: axtls is highly configurable and uses mconf, like the linux kernel.
+# You can configure it in a couple of ways:
+#
+# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
+# you want, and possibly a lot more.
+#
+# 2) You can create your own configuration file by doing
+#
+# FEATURES="keepwork" USE="savedconfig -*" emerge axtls
+# cd /var/tmp/portage/net-libs/axtls*/work/axTLS
+# make menuconfig
+#
+# Now configure axtls as you want. Finally save your config file:
+#
+# cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
+#
+# where ${PV} is the current version. You can then run emerge again with
+# your configuration by doing
+#
+# USE="savedconfig" emerge axtls
+#
+################################################################################
+
+MY_PN=${PN/tls/TLS}
+
+DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
+HOMEPAGE="http://axtls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-code"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 x86"
+
+IUSE="httpd cgi-lua cgi-php static static-libs doc"
+
+# TODO: add ipv6, and c#, java, lua, perl bindings
+# Currently these all have some issue
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="
+ httpd? (
+ cgi-lua? ( dev-lang/lua )
+ cgi-php? ( dev-lang/php[cgi] )
+ )"
+
+#Note1: static, cgi-* makes no sense if httpd is not given
+REQUIRED_USE="
+ static? ( httpd )
+ cgi-lua? ( httpd )
+ cgi-php? ( httpd )"
+
+AXTLS_GROUP="axtls"
+AXTLS_USER="axtls"
+
+pkg_setup() {
+ use httpd && {
+ ebegin "Creating axtls user and group"
+ enewgroup ${AXTLS_GROUP}
+ enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
+ }
+}
+
+src_prepare() {
+ tc-export AR CC
+
+ epatch "${FILESDIR}/explicit-libdir-r1.patch"
+
+ #We want CONFIG_DEBUG to avoid stripping
+ #but not for debugging info
+ sed -i -e 's: -g::' config/Rules.mak || die
+ sed -i -e 's: -g::' config/makefile.conf || die
+
+ multilib_copy_sources
+}
+
+use_flag_config() {
+ cp "${FILESDIR}"/config config/.config || die
+
+ #Respect CFLAGS/LDFLAGS
+ sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
+ config/.config || die
+ sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
+ config/.config || die
+
+ #The logic is that the default config file enables everything and we disable
+ #here with sed unless a USE flags says to keep it
+ if use httpd; then
+ if ! use static; then
+ sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
+ config/.config || die
+ fi
+ if ! use cgi-php && ! use cgi-lua; then
+ sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
+ config/.config || die
+ fi
+ if ! use cgi-php; then
+ sed -i -e 's:,.php::' config/.config || die
+ fi
+ if ! use cgi-lua; then
+ sed -i -e 's:\.lua,::' \
+ -e 's:lua:php:' \
+ -e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
+ config/.config || die
+ fi
+ else
+ sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
+ config/.config || die
+ fi
+
+ yes "n" | emake -j1 oldconfig > /dev/null || die
+}
+
+multilib_src_configure() {
+ #Per-ABI substitutions.
+ sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
+ Makefile || die
+
+ #Use CC as the host compiler for mconf
+ sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
+ config/Rules.mak || die
+
+ if use savedconfig; then
+ restore_config config/.config
+ if [[ -f config/.config ]]; then
+ ewarn "Using saved config, all other USE flags ignored"
+ else
+ ewarn "No saved config, seeding with the default"
+ cp "${FILESDIR}"/config config/.config || die
+ fi
+ yes "" | emake -j1 oldconfig > /dev/null || die
+ else
+ use_flag_config
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi && use savedconfig; then
+ save_config config/.config
+ fi
+
+ emake PREFIX="${ED}/usr" install
+
+ if ! use static-libs; then
+ rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
+ fi
+
+ # The build system needs to install before it builds docs
+ if multilib_is_native_abi && use doc; then
+ emake docs
+ dodoc -r docsrc/html
+ fi
+}
+
+multilib_src_install_all() {
+ if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
+ mv "${ED}"/usr/bin/{,ax}htpasswd || die
+ fi
+
+ if use httpd; then
+ newinitd "${FILESDIR}"/axhttpd.initd axhttpd
+ newconfd "${FILESDIR}"/axhttpd.confd axhttpd
+ fi
+
+ docompress -x /usr/share/doc/${PF}/README
+ dodoc README
+}
diff --git a/net-libs/axtls/axtls-1.5.2.ebuild b/net-libs/axtls/axtls-1.5.2.ebuild
new file mode 100644
index 000000000000..ea6a5d6e8211
--- /dev/null
+++ b/net-libs/axtls/axtls-1.5.2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib multilib-minimal savedconfig toolchain-funcs user
+
+################################################################################
+# axtls CONFIG MINI-HOWTO
+#
+# Note: axtls is highly configurable and uses mconf, like the linux kernel.
+# You can configure it in a couple of ways:
+#
+# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
+# you want, and possibly a lot more.
+#
+# 2) You can create your own configuration file by doing
+#
+# FEATURES="keepwork" USE="savedconfig -*" emerge axtls
+# cd /var/tmp/portage/net-libs/axtls*/work/axTLS
+# make menuconfig
+#
+# Now configure axtls as you want. Finally save your config file:
+#
+# cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
+#
+# where ${PV} is the current version. You can then run emerge again with
+# your configuration by doing
+#
+# USE="savedconfig" emerge axtls
+#
+################################################################################
+
+MY_PN=${PN/tls/TLS}
+
+DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
+HOMEPAGE="http://axtls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-code"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
+
+IUSE="httpd cgi-lua cgi-php static static-libs doc"
+
+# TODO: add ipv6, and c#, java, lua, perl bindings
+# Currently these all have some issue
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="
+ httpd? (
+ cgi-lua? ( dev-lang/lua )
+ cgi-php? ( dev-lang/php[cgi] )
+ )"
+
+#Note1: static, cgi-* makes no sense if httpd is not given
+REQUIRED_USE="
+ static? ( httpd )
+ cgi-lua? ( httpd )
+ cgi-php? ( httpd )"
+
+AXTLS_GROUP="axtls"
+AXTLS_USER="axtls"
+
+pkg_setup() {
+ use httpd && {
+ ebegin "Creating axtls user and group"
+ enewgroup ${AXTLS_GROUP}
+ enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
+ }
+}
+
+src_prepare() {
+ tc-export AR CC
+
+ epatch "${FILESDIR}/explicit-libdir-r1.patch"
+
+ #We want CONFIG_DEBUG to avoid stripping
+ #but not for debugging info
+ sed -i -e 's: -g::' config/Rules.mak || die
+ sed -i -e 's: -g::' config/makefile.conf || die
+
+ multilib_copy_sources
+}
+
+use_flag_config() {
+ cp "${FILESDIR}"/config config/.config || die
+
+ #Respect CFLAGS/LDFLAGS
+ sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
+ config/.config || die
+ sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
+ config/.config || die
+
+ #The logic is that the default config file enables everything and we disable
+ #here with sed unless a USE flags says to keep it
+ if use httpd; then
+ if ! use static; then
+ sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
+ config/.config || die
+ fi
+ if ! use cgi-php && ! use cgi-lua; then
+ sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
+ config/.config || die
+ fi
+ if ! use cgi-php; then
+ sed -i -e 's:,.php::' config/.config || die
+ fi
+ if ! use cgi-lua; then
+ sed -i -e 's:\.lua,::' \
+ -e 's:lua:php:' \
+ -e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
+ config/.config || die
+ fi
+ else
+ sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
+ config/.config || die
+ fi
+
+ yes "n" | emake -j1 oldconfig > /dev/null || die
+}
+
+multilib_src_configure() {
+ #Per-ABI substitutions.
+ sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
+ Makefile || die
+
+ #Use CC as the host compiler for mconf
+ sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
+ config/Rules.mak || die
+
+ if use savedconfig; then
+ restore_config config/.config
+ if [[ -f config/.config ]]; then
+ ewarn "Using saved config, all other USE flags ignored"
+ else
+ ewarn "No saved config, seeding with the default"
+ cp "${FILESDIR}"/config config/.config || die
+ fi
+ yes "" | emake -j1 oldconfig > /dev/null || die
+ else
+ use_flag_config
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi && use savedconfig; then
+ save_config config/.config
+ fi
+
+ emake PREFIX="${ED}/usr" install
+
+ if ! use static-libs; then
+ rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
+ fi
+
+ # The build system needs to install before it builds docs
+ if multilib_is_native_abi && use doc; then
+ emake docs
+ dodoc -r docsrc/html
+ fi
+}
+
+multilib_src_install_all() {
+ if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
+ mv "${ED}"/usr/bin/{,ax}htpasswd || die
+ fi
+
+ if use httpd; then
+ newinitd "${FILESDIR}"/axhttpd.initd axhttpd
+ newconfd "${FILESDIR}"/axhttpd.confd axhttpd
+ fi
+
+ docompress -x /usr/share/doc/${PF}/README
+ dodoc README
+}
diff --git a/net-libs/axtls/axtls-1.5.3.ebuild b/net-libs/axtls/axtls-1.5.3.ebuild
new file mode 100644
index 000000000000..ea6a5d6e8211
--- /dev/null
+++ b/net-libs/axtls/axtls-1.5.3.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib multilib-minimal savedconfig toolchain-funcs user
+
+################################################################################
+# axtls CONFIG MINI-HOWTO
+#
+# Note: axtls is highly configurable and uses mconf, like the linux kernel.
+# You can configure it in a couple of ways:
+#
+# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
+# you want, and possibly a lot more.
+#
+# 2) You can create your own configuration file by doing
+#
+# FEATURES="keepwork" USE="savedconfig -*" emerge axtls
+# cd /var/tmp/portage/net-libs/axtls*/work/axTLS
+# make menuconfig
+#
+# Now configure axtls as you want. Finally save your config file:
+#
+# cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
+#
+# where ${PV} is the current version. You can then run emerge again with
+# your configuration by doing
+#
+# USE="savedconfig" emerge axtls
+#
+################################################################################
+
+MY_PN=${PN/tls/TLS}
+
+DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
+HOMEPAGE="http://axtls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-code"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
+
+IUSE="httpd cgi-lua cgi-php static static-libs doc"
+
+# TODO: add ipv6, and c#, java, lua, perl bindings
+# Currently these all have some issue
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="
+ httpd? (
+ cgi-lua? ( dev-lang/lua )
+ cgi-php? ( dev-lang/php[cgi] )
+ )"
+
+#Note1: static, cgi-* makes no sense if httpd is not given
+REQUIRED_USE="
+ static? ( httpd )
+ cgi-lua? ( httpd )
+ cgi-php? ( httpd )"
+
+AXTLS_GROUP="axtls"
+AXTLS_USER="axtls"
+
+pkg_setup() {
+ use httpd && {
+ ebegin "Creating axtls user and group"
+ enewgroup ${AXTLS_GROUP}
+ enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
+ }
+}
+
+src_prepare() {
+ tc-export AR CC
+
+ epatch "${FILESDIR}/explicit-libdir-r1.patch"
+
+ #We want CONFIG_DEBUG to avoid stripping
+ #but not for debugging info
+ sed -i -e 's: -g::' config/Rules.mak || die
+ sed -i -e 's: -g::' config/makefile.conf || die
+
+ multilib_copy_sources
+}
+
+use_flag_config() {
+ cp "${FILESDIR}"/config config/.config || die
+
+ #Respect CFLAGS/LDFLAGS
+ sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
+ config/.config || die
+ sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
+ config/.config || die
+
+ #The logic is that the default config file enables everything and we disable
+ #here with sed unless a USE flags says to keep it
+ if use httpd; then
+ if ! use static; then
+ sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
+ config/.config || die
+ fi
+ if ! use cgi-php && ! use cgi-lua; then
+ sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
+ config/.config || die
+ fi
+ if ! use cgi-php; then
+ sed -i -e 's:,.php::' config/.config || die
+ fi
+ if ! use cgi-lua; then
+ sed -i -e 's:\.lua,::' \
+ -e 's:lua:php:' \
+ -e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
+ config/.config || die
+ fi
+ else
+ sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
+ config/.config || die
+ fi
+
+ yes "n" | emake -j1 oldconfig > /dev/null || die
+}
+
+multilib_src_configure() {
+ #Per-ABI substitutions.
+ sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
+ Makefile || die
+
+ #Use CC as the host compiler for mconf
+ sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
+ config/Rules.mak || die
+
+ if use savedconfig; then
+ restore_config config/.config
+ if [[ -f config/.config ]]; then
+ ewarn "Using saved config, all other USE flags ignored"
+ else
+ ewarn "No saved config, seeding with the default"
+ cp "${FILESDIR}"/config config/.config || die
+ fi
+ yes "" | emake -j1 oldconfig > /dev/null || die
+ else
+ use_flag_config
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi && use savedconfig; then
+ save_config config/.config
+ fi
+
+ emake PREFIX="${ED}/usr" install
+
+ if ! use static-libs; then
+ rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
+ fi
+
+ # The build system needs to install before it builds docs
+ if multilib_is_native_abi && use doc; then
+ emake docs
+ dodoc -r docsrc/html
+ fi
+}
+
+multilib_src_install_all() {
+ if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
+ mv "${ED}"/usr/bin/{,ax}htpasswd || die
+ fi
+
+ if use httpd; then
+ newinitd "${FILESDIR}"/axhttpd.initd axhttpd
+ newconfd "${FILESDIR}"/axhttpd.confd axhttpd
+ fi
+
+ docompress -x /usr/share/doc/${PF}/README
+ dodoc README
+}
diff --git a/net-libs/axtls/files/axhttpd.confd b/net-libs/axtls/files/axhttpd.confd
new file mode 100644
index 000000000000..02f129203f88
--- /dev/null
+++ b/net-libs/axtls/files/axhttpd.confd
@@ -0,0 +1,7 @@
+#Zero or more of the following may be given:
+#
+# -p [address:]httpport
+# -s [address:]httpsport
+# -w webroot
+#
+#AXHTTPD_OPTS="-w /var/www/localhost/htdocs -p 8080 -s 4343"
diff --git a/net-libs/axtls/files/axhttpd.initd b/net-libs/axtls/files/axhttpd.initd
new file mode 100644
index 000000000000..1fcba2fc1289
--- /dev/null
+++ b/net-libs/axtls/files/axhttpd.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+AXHTTPD_USER="axtls"
+AXHTTPD_GROUP="axtls"
+AXHTTPD_DAEMON="/usr/bin/axhttpd"
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting axhttpd"
+ start-stop-daemon --quiet --start "${AXHTTPD_DAEMON}" \
+ --user "${AXHTTPD_USER}":"${AXHTTPD_GROUP}" \
+ -- ${AXHTTPD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping axhttpd"
+ start-stop-daemon --quiet --stop "${AXHTTPD_DAEMON}"
+ eend $?
+}
diff --git a/net-libs/axtls/files/config b/net-libs/axtls/files/config
new file mode 100644
index 000000000000..6eb608defc82
--- /dev/null
+++ b/net-libs/axtls/files/config
@@ -0,0 +1,126 @@
+#
+# Automatically generated make config: don't edit
+#
+HAVE_DOT_CONFIG=y
+CONFIG_PLATFORM_LINUX=y
+# CONFIG_PLATFORM_CYGWIN is not set
+# CONFIG_PLATFORM_WIN32 is not set
+
+#
+# General Configuration
+#
+PREFIX="/usr"
+CONFIG_DEBUG=y
+# CONFIG_STRIP_UNWANTED_SECTIONS is not set
+# CONFIG_VISUAL_STUDIO_7_0 is not set
+# CONFIG_VISUAL_STUDIO_8_0 is not set
+# CONFIG_VISUAL_STUDIO_10_0 is not set
+CONFIG_VISUAL_STUDIO_7_0_BASE=""
+CONFIG_VISUAL_STUDIO_8_0_BASE=""
+CONFIG_VISUAL_STUDIO_10_0_BASE=""
+CONFIG_EXTRA_CFLAGS_OPTIONS=""
+CONFIG_EXTRA_LDFLAGS_OPTIONS=""
+
+#
+# SSL Library
+#
+# CONFIG_SSL_SERVER_ONLY is not set
+# CONFIG_SSL_CERT_VERIFICATION is not set
+# CONFIG_SSL_ENABLE_CLIENT is not set
+CONFIG_SSL_FULL_MODE=y
+# CONFIG_SSL_SKELETON_MODE is not set
+# CONFIG_SSL_PROT_LOW is not set
+# CONFIG_SSL_PROT_MEDIUM is not set
+CONFIG_SSL_PROT_HIGH=y
+CONFIG_SSL_USE_DEFAULT_KEY=y
+CONFIG_SSL_PRIVATE_KEY_LOCATION=""
+CONFIG_SSL_PRIVATE_KEY_PASSWORD=""
+CONFIG_SSL_X509_CERT_LOCATION=""
+# CONFIG_SSL_GENERATE_X509_CERT is not set
+CONFIG_SSL_X509_COMMON_NAME=""
+CONFIG_SSL_X509_ORGANIZATION_NAME=""
+CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME=""
+CONFIG_SSL_ENABLE_V23_HANDSHAKE=y
+CONFIG_SSL_HAS_PEM=y
+CONFIG_SSL_USE_PKCS12=y
+CONFIG_SSL_EXPIRY_TIME=24
+CONFIG_X509_MAX_CA_CERTS=300
+CONFIG_SSL_MAX_CERTS=6
+# CONFIG_SSL_CTX_MUTEXING is not set
+CONFIG_USE_DEV_URANDOM=y
+# CONFIG_WIN32_USE_CRYPTO_LIB is not set
+CONFIG_OPENSSL_COMPATIBLE=y
+# CONFIG_PERFORMANCE_TESTING is not set
+CONFIG_SSL_TEST=y
+CONFIG_AXTLSWRAP=y
+CONFIG_AXHTTPD=y
+
+#
+# Axhttpd Configuration
+#
+CONFIG_HTTP_STATIC_BUILD=y
+CONFIG_HTTP_PORT=8080
+CONFIG_HTTP_HTTPS_PORT=4343
+CONFIG_HTTP_SESSION_CACHE_SIZE=5
+CONFIG_HTTP_WEBROOT="/var/www/localhost/htdocs"
+CONFIG_HTTP_TIMEOUT=300
+
+#
+# CGI
+#
+CONFIG_HTTP_HAS_CGI=y
+CONFIG_HTTP_CGI_EXTENSIONS=".lua,.php"
+CONFIG_HTTP_ENABLE_LUA=y
+CONFIG_HTTP_LUA_PREFIX="/usr"
+# CONFIG_HTTP_BUILD_LUA is not set
+CONFIG_HTTP_CGI_LAUNCHER="/usr/bin/lua"
+CONFIG_HTTP_DIRECTORIES=y
+CONFIG_HTTP_HAS_AUTHORIZATION=y
+# CONFIG_HTTP_HAS_IPV6 is not set
+CONFIG_HTTP_ENABLE_DIFFERENT_USER=y
+CONFIG_HTTP_USER="axtls"
+CONFIG_HTTP_VERBOSE=y
+CONFIG_HTTP_IS_DAEMON=y
+
+#
+# Language Bindings
+#
+# CONFIG_BINDINGS is not set
+# CONFIG_CSHARP_BINDINGS is not set
+# CONFIG_VBNET_BINDINGS is not set
+CONFIG_DOT_NET_FRAMEWORK_BASE=""
+# CONFIG_JAVA_BINDINGS is not set
+CONFIG_JAVA_HOME=""
+# CONFIG_PERL_BINDINGS is not set
+CONFIG_PERL_CORE=""
+CONFIG_PERL_LIB=""
+# CONFIG_LUA_BINDINGS is not set
+CONFIG_LUA_CORE=""
+
+#
+# Samples
+#
+CONFIG_SAMPLES=y
+CONFIG_C_SAMPLES=y
+# CONFIG_CSHARP_SAMPLES is not set
+# CONFIG_VBNET_SAMPLES is not set
+# CONFIG_JAVA_SAMPLES is not set
+# CONFIG_PERL_SAMPLES is not set
+# CONFIG_LUA_SAMPLES is not set
+
+#
+# BigInt Options
+#
+# CONFIG_BIGINT_CLASSICAL is not set
+# CONFIG_BIGINT_MONTGOMERY is not set
+CONFIG_BIGINT_BARRETT=y
+CONFIG_BIGINT_CRT=y
+CONFIG_BIGINT_KARATSUBA=y
+MUL_KARATSUBA_THRESH=20
+SQU_KARATSUBA_THRESH=40
+CONFIG_BIGINT_SLIDING_WINDOW=y
+CONFIG_BIGINT_SQUARE=y
+# CONFIG_BIGINT_CHECK_ON is not set
+CONFIG_INTEGER_32BIT=y
+# CONFIG_INTEGER_16BIT is not set
+# CONFIG_INTEGER_8BIT is not set
diff --git a/net-libs/axtls/files/explicit-libdir-r1.patch b/net-libs/axtls/files/explicit-libdir-r1.patch
new file mode 100644
index 000000000000..288b053e0f75
--- /dev/null
+++ b/net-libs/axtls/files/explicit-libdir-r1.patch
@@ -0,0 +1,59 @@
+From 51c1e48d3f55da25adff306b891ad258eca35a8d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 14 Jun 2014 23:35:42 +0200
+Subject: [PATCH] Respect libdir.
+
+---
+ Makefile | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 036a29e..10a1649 100644
+--- a/Makefile
++++ b/Makefile
+@@ -60,6 +60,8 @@ ifdef CONFIG_SAMPLES
+ $(MAKE) -C samples
+ endif
+
++LIBDIR = $(PREFIX)/lib
++
+ $(STAGE) : ssl/version.h
+ @mkdir -p $(STAGE)
+
+@@ -67,8 +69,10 @@ $(STAGE) : ssl/version.h
+ ssl/version.h:
+ @echo "#define AXTLS_VERSION \"(no version)\"" > ssl/version.h
+
++$(LIBDIR) : $(PREFIX)
++ @mkdir -p $(LIBDIR)
++
+ $(PREFIX) :
+- @mkdir -p $(PREFIX)/lib
+ @mkdir -p $(PREFIX)/bin
+
+ release:
+@@ -88,9 +92,9 @@ win32_demo:
+ @echo "#define AXTLS_VERSION \"$(VERSION)\"" > ssl/version.h
+ $(MAKE) win32releaseconf
+
+-install: $(PREFIX) all
+- cp --no-dereference $(STAGE)/libax* $(PREFIX)/lib
+- chmod 755 $(PREFIX)/lib/libax*
++install: $(LIBDIR) $(PREFIX) all
++ cp --no-dereference $(STAGE)/libax* $(LIBDIR)
++ chmod 755 $(LIBDIR)/libax*
+ ifdef CONFIG_SAMPLES
+ install -m 755 $(STAGE)/ax* $(PREFIX)/bin
+ endif
+@@ -112,7 +116,7 @@ endif
+ install -m 644 config/config.h $(PREFIX)/include/axTLS
+
+ installclean:
+- -@rm $(PREFIX)/lib/libax* > /dev/null 2>&1
++ -@rm $(LIBDIR)/libax* > /dev/null 2>&1
+ -@rm $(PREFIX)/bin/ax* > /dev/null 2>&1
+ -@rm $(PREFIX)/bin/axhttpd* > /dev/null 2>&1
+ -@rm `perl -e 'use Config; print $$Config{installarchlib};'`/axtlsp.pm > /dev/null 2>&1
+--
+2.0.0
+
diff --git a/net-libs/axtls/metadata.xml b/net-libs/axtls/metadata.xml
new file mode 100644
index 000000000000..29910d9bd8a2
--- /dev/null
+++ b/net-libs/axtls/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+ <use>
+ <flag name="httpd">Enables axhttpd web server component</flag>
+ <flag name="static">Statically build axhttpd server</flag>
+ <flag name="cgi-lua">Enables lua backed cgi for axhttpd server</flag>
+ <flag name="cgi-php">Enables php backed cgi for axhttpd server</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">axtls</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/balde-markdown/Manifest b/net-libs/balde-markdown/Manifest
new file mode 100644
index 000000000000..b4b63bd322d0
--- /dev/null
+++ b/net-libs/balde-markdown/Manifest
@@ -0,0 +1 @@
+DIST balde-markdown-0.1.tar.bz2 260429 SHA256 face375e275fae323b1e01c1cf430479e163d7130f3b1cffc310564bf71bf2b1 SHA512 ba0a952d1f8480f6173a8af6eb662741ac04db4e39d65158afac97606c2faaaff973dce384b2bc1d42aabbdd345cd451fc5624f1c6d2f941f2630b2e76a01d10 WHIRLPOOL cbfdb1e1d457b4f6963999d9a4472d6f8bed21a8562f38dbf2c48a31e48ec30028c71f0f2084c7274ca0921e032fe52ec05aad53a671c911c48af765cfb4baa7
diff --git a/net-libs/balde-markdown/balde-markdown-0.1.ebuild b/net-libs/balde-markdown/balde-markdown-0.1.ebuild
new file mode 100644
index 000000000000..8add6454f1c0
--- /dev/null
+++ b/net-libs/balde-markdown/balde-markdown-0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://github.com/balde/balde-markdown.git
+ https://github.com/balde/balde-markdown.git"
+ inherit git-r3 autotools
+fi
+
+DESCRIPTION="A balde extension that adds Markdown support"
+HOMEPAGE="https://github.com/balde/balde-markdown"
+
+SRC_URI="https://github.com/balde/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+ SRC_URI=""
+ KEYWORDS=""
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-libs/glib-2.34
+ >=net-libs/balde-0.1
+ app-text/discount"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ [[ ${PV} = *9999* ]] && eautoreconf
+ default
+}
+
+src_configure() {
+ econf \
+ --without-valgrind
+}
diff --git a/net-libs/balde-markdown/metadata.xml b/net-libs/balde-markdown/metadata.xml
new file mode 100644
index 000000000000..58572cfdde2c
--- /dev/null
+++ b/net-libs/balde-markdown/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>rafaelmartins@gentoo.org</email>
+ <name>Rafael G. Martins</name>
+ </maintainer>
+ <longdescription lang="en">
+ A balde extension that adds Markdown support.
+ </longdescription>
+ <upstream>
+ <maintainer status="active">
+ <email>rafaelmartins@gentoo.org</email>
+ <name>Rafael G. Martins</name>
+ </maintainer>
+ <bugs-to>mailto:balde-dev@googlegroups.com</bugs-to>
+ <remote-id type="github">balde/balde-markdown</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/balde/Manifest b/net-libs/balde/Manifest
new file mode 100644
index 000000000000..fdc0715f17ee
--- /dev/null
+++ b/net-libs/balde/Manifest
@@ -0,0 +1 @@
+DIST balde-0.1.1.tar.bz2 360412 SHA256 0da03157d0c87d8699ff36d98636ebfd3ca62bd0d4db15ea567601eaa0e40dba SHA512 fafb9e9344ecb1caf6a4451b99adb3505fb728015e2bcce3d81162f679a70267e49a0dc194c6c977a7a155f9b5ae3318fdfcb63fb0223e43943c0fc5e8503acd WHIRLPOOL bff449dfaf1ed45d6655fc861ab69b95a114abf41e5395f3988937af2c465d096f845e2bbb4294fb7fcc8b8ace8c125f149e074a636a0ab130975124a886cef5
diff --git a/net-libs/balde/balde-0.1.1.ebuild b/net-libs/balde/balde-0.1.1.ebuild
new file mode 100644
index 000000000000..e205e1a111e2
--- /dev/null
+++ b/net-libs/balde/balde-0.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://github.com/balde/balde.git
+ https://github.com/balde/balde.git"
+ inherit git-r3 autotools
+fi
+
+DESCRIPTION="A microframework for C based on GLib and bad intentions"
+HOMEPAGE="http://balde.io/"
+
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+ SRC_URI=""
+ KEYWORDS=""
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/glib-2.34
+ dev-libs/fcgi
+ x11-misc/shared-mime-info"
+
+if [[ ${PV} = *9999* ]]; then
+ RDEPEND="${RDEPEND}
+ dev-util/peg"
+fi
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+src_prepare() {
+ [[ ${PV} = *9999* ]] && eautoreconf
+ default
+}
+
+src_configure() {
+ econf \
+ $(use_with doc doxygen) \
+ --disable-examples \
+ --without-valgrind
+}
+
+src_compile() {
+ default
+ use doc && emake doxygen
+}
+
+src_install() {
+ default
+ use doc && dohtml -r doc/build/html/.
+}
diff --git a/net-libs/balde/metadata.xml b/net-libs/balde/metadata.xml
new file mode 100644
index 000000000000..577f319f7966
--- /dev/null
+++ b/net-libs/balde/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>rafaelmartins@gentoo.org</email>
+ <name>Rafael G. Martins</name>
+ </maintainer>
+ <longdescription lang="en">
+ A microframework for C based on GLib and bad intentions.
+ </longdescription>
+ <upstream>
+ <maintainer status="active">
+ <email>rafaelmartins@gentoo.org</email>
+ <name>Rafael G. Martins</name>
+ </maintainer>
+ <bugs-to>mailto:balde-dev@googlegroups.com</bugs-to>
+ <remote-id type="github">balde/balde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
new file mode 100644
index 000000000000..6d91db7bfbf9
--- /dev/null
+++ b/net-libs/c-client/Manifest
@@ -0,0 +1,2 @@
+DIST c-client-2007f-chappa-115-all.patch.gz 30571 SHA256 ce7512e1b0d904d6429bb999bc0b159becc253088bbd89ef2185e6c948723cff SHA512 f44489ec38aa6a3dc682872a6857154254c23352db81ee380dfdfad39743234d97a8bcc07a74459f7532efe2fc073cf7d9c078433e11a95de19beeb387ff8b65 WHIRLPOOL 9fef9066c43df4c15f4f75bbad3634481e4cfce69c054682fe40193c30db6f9ceaed40138d00133c1bf1623dd45d251031562b2f16f1699ebcf0fbc8ce6c4653
+DIST imap-2007f.tar.Z 2793529 SHA256 870e95f6bd19265832a88fd89b77c54c841c59022fd21e69254050c8b1005e3c SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae WHIRLPOOL 655536d61a178940363241ad8c94a28be75e90abf3b8c585eb61364a6394ff49bb5fd5dc6de4bec5f992f03b592e583df04f0103e8f3c167aa68a476c574c4ec
diff --git a/net-libs/c-client/c-client-2007f-r4.ebuild b/net-libs/c-client/c-client-2007f-r4.ebuild
new file mode 100644
index 000000000000..ad79696a28bf
--- /dev/null
+++ b/net-libs/c-client/c-client-2007f-r4.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit flag-o-matic eutils libtool toolchain-funcs multilib
+
+MY_PN=imap
+MY_P="${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
+
+CHAPPA_PL=115
+DESCRIPTION="UW IMAP c-client library"
+HOMEPAGE="http://www.washington.edu/imap/"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z
+ chappa? ( mirror://gentoo/${P}-chappa-${CHAPPA_PL}-all.patch.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD pam ssl static-libs topal chappa"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+ !net-mail/uw-imap
+ kerberos? ( app-crypt/mit-krb5 )"
+DEPEND="${RDEPEND}
+ kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) )"
+
+src_prepare() {
+ # Tarball packed with bad file perms
+ chmod -R u+rwX,go-w .
+
+ # lots of things need -fPIC, including various platforms, and this library
+ # generally should be built with it anyway.
+ append-flags -fPIC
+
+ # Modifications so we can build it optimally and correctly
+ sed \
+ -e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
+ -e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
+ -e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
+ -i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
+
+ # Make the build system more multilib aware
+ sed \
+ -e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \
+ -e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \
+ -i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
+
+ # Targets should use the Gentoo (ie linux) fs
+ sed -e '/^bsf:/,/^$/ s:ACTIVEFILE=.*:ACTIVEFILE=/var/lib/news/active:g' \
+ -i src/osdep/unix/Makefile || die "Makefile sex fixing failed for FreeBSD"
+
+ # Apply a patch to only build the stuff we need for c-client
+ epatch "${FILESDIR}"/${PN}-2006k_GENTOO_Makefile.patch
+
+ # Apply patch to add the compilation of a .so for PHP
+ # This was previously conditional, but is more widely useful.
+ epatch "${FILESDIR}"/${PN}-2006k_GENTOO_amd64-so-fix.patch
+
+ # Remove the pesky checks about SSL stuff
+ sed -e '/read.*exit/d' -i Makefile || die
+
+ # Respect LDFLAGS
+ epatch "${FILESDIR}"/${PN}-2007f-ldflags.patch
+ sed -e "s/CC=cc/CC=$(tc-getCC)/" \
+ -e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
+ -e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
+ -i src/osdep/unix/Makefile || die "Respecting build flags"
+
+ use topal && epatch "${FILESDIR}/${P}-topal.patch"
+ use chappa && epatch "${DISTDIR}/${P}-chappa-${CHAPPA_PL}-all.patch.gz"
+
+ elibtoolize
+}
+
+src_compile() {
+ local mymake ipver ssltype target passwdtype
+ ipver='IP=4'
+ use ipv6 && ipver="IP=6" && touch ip6
+ use ssl && ssltype="unix" || ssltype="none"
+ if use kernel_linux ; then
+ use pam && target=lnp passwdtype=pam || target=lnx passwdtype=std
+ elif use kernel_FreeBSD ; then
+ target=bsf passwdtype=pam
+ fi
+ use kerberos \
+ && mymake="EXTRAAUTHENTICATORS=gss" \
+ && EXTRALIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \
+ # no parallel builds supported!
+ emake -j1 SSLTYPE=${ssltype} $target \
+ PASSWDTYPE=${passwdtype} ${ipver} ${mymake} \
+ EXTRACFLAGS="${CFLAGS}" \
+ EXTRALDFLAGS="${LDFLAGS}" \
+ EXTRALIBS="${EXTRALIBS}" \
+ GSSDIR=/usr
+}
+
+src_install() {
+ if use static-libs; then
+ # Library binary
+ dolib.a c-client/c-client.a
+ dosym c-client.a /usr/$(get_libdir)/libc-client.a
+ fi
+
+ # Now the shared library
+ dolib.so c-client/libc-client.so.1.0.0
+
+ dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
+ dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
+
+ # Headers
+ insinto /usr/include/imap
+ doins src/osdep/unix/*.h
+ doins src/c-client/*.h
+ doins c-client/linkage.h
+ doins c-client/linkage.c
+ doins c-client/osdep.h
+ if use ssl; then
+ echo " ssl_onceonlyinit ();" >> "${D}"/usr/include/imap/linkage.c || die
+ fi
+ # Docs
+ dodoc README docs/*.txt docs/BUILD docs/CONFIG docs/RELNOTES docs/SSLBUILD
+ if use doc; then
+ docinto rfc
+ dodoc docs/rfc/*.txt
+ docinto draft
+ dodoc docs/draft/*
+ fi
+}
diff --git a/net-libs/c-client/files/c-client-2006k_GENTOO_Makefile.patch b/net-libs/c-client/files/c-client-2006k_GENTOO_Makefile.patch
new file mode 100644
index 000000000000..50a57f0747db
--- /dev/null
+++ b/net-libs/c-client/files/c-client-2006k_GENTOO_Makefile.patch
@@ -0,0 +1,70 @@
+Fix the Makefile for building on Gentoo.
+
+diff -r b15554ece4d6 Makefile
+--- a/Makefile Thu Feb 21 17:49:39 2008 +0100
++++ b/Makefile Thu Feb 21 18:51:31 2008 +0100
+@@ -295,7 +295,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
+
+ # Make the IMAP Toolkit
+
+-all: c-client SPECIALS rebuild bundled
++all: c-client SPECIALS rebuild
+
+ c-client:
+ @echo Not processed yet. In a first-time build, you must specify
+@@ -665,16 +665,9 @@ an ua:
+ $(TOOLS)/$@ "$(LN)" src/ansilib c-client
+ $(TOOLS)/$@ "$(LN)" src/charset c-client
+ $(TOOLS)/$@ "$(LN)" src/osdep/$(SYSTEM) c-client
+- $(TOOLS)/$@ "$(LN)" src/mtest mtest
+- $(TOOLS)/$@ "$(LN)" src/ipopd ipopd
+- $(TOOLS)/$@ "$(LN)" src/imapd imapd
+- $(TOOLS)/$@ "$(LN)" src/mailutil mailutil
+- $(TOOLS)/$@ "$(LN)" src/mlock mlock
+- $(TOOLS)/$@ "$(LN)" src/dmail dmail
+- $(TOOLS)/$@ "$(LN)" src/tmail tmail
+ $(LN) $(TOOLS)/$@ .
+
+-build: OSTYPE rebuild rebuildclean bundled
++build: OSTYPE rebuild rebuildclean
+
+ OSTYPE:
+ @$(MAKE) ip$(IP)
+@@ -690,8 +683,6 @@ OSTYPE:
+ echo $(BUILDTYPE) > OSTYPE
+ $(TOUCH) rebuild
+
+-rebuild:
+- @$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'
+ @echo Rebuilding c-client for `$(CAT) OSTYPE`...
+ @$(TOUCH) SPECIALS
+ $(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
+@@ -700,28 +691,6 @@ rebuildclean:
+ rebuildclean:
+ $(SH) -c '$(RM) rebuild || true'
+
+-bundled:
+- @echo Building bundled tools...
+- $(CD) mtest;$(MAKE)
+- $(CD) ipopd;$(MAKE)
+- $(CD) imapd;$(MAKE)
+- $(CD) mailutil;$(MAKE)
+- @$(SH) -c '(test -f /usr/include/sysexits.h ) || make sysexitwarn'
+- $(CD) mlock;$(MAKE) || true
+- $(CD) dmail;$(MAKE) || true
+- $(CD) tmail;$(MAKE) || true
+-
+-
+-sysexitwarn:
+- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+- @echo + Hmm...it does not look like /usr/include/sysexits.h exists.
+- @echo + Either your system is too ancient to have the sysexits.h
+- @echo + include, or your C compiler gets it from some other location
+- @echo + than /usr/include. If your system is too old to have the
+- @echo + sysexits.h include, you will not be able to build the
+- @echo + following programs.
+- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+-
+ clean:
+ @echo Removing old processed sources and binaries...
+ $(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest imapd ipopd mailutil mlock dmail tmail || true'
diff --git a/net-libs/c-client/files/c-client-2006k_GENTOO_amd64-so-fix.patch b/net-libs/c-client/files/c-client-2006k_GENTOO_amd64-so-fix.patch
new file mode 100644
index 000000000000..79b067d21f94
--- /dev/null
+++ b/net-libs/c-client/files/c-client-2006k_GENTOO_amd64-so-fix.patch
@@ -0,0 +1,13 @@
+diff -r 7c3e6c6ef2ba src/osdep/unix/Makefile
+--- a/src/osdep/unix/Makefile Thu Feb 21 18:51:32 2008 +0100
++++ b/src/osdep/unix/Makefile Thu Feb 21 18:53:15 2008 +0100
+@@ -962,6 +962,9 @@ onceenv:
+ -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
+ echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+ echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
++ echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
++ -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
++ >> ARCHIVE
+ echo $(OS) > OSTYPE
+ ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
+ ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
diff --git a/net-libs/c-client/files/c-client-2006k_KOLAB_Annotations.patch b/net-libs/c-client/files/c-client-2006k_KOLAB_Annotations.patch
new file mode 100644
index 000000000000..8eec02d029c4
--- /dev/null
+++ b/net-libs/c-client/files/c-client-2006k_KOLAB_Annotations.patch
@@ -0,0 +1,448 @@
+Provides get/set ANNOTATIONS support to the c-client library. [Version: 2006k]
+
+diff -r 217555555c77 src/c-client/imap4r1.c
+--- a/src/c-client/imap4r1.c Thu Feb 21 17:37:37 2008 +0100
++++ b/src/c-client/imap4r1.c Thu Feb 21 17:38:15 2008 +0100
+@@ -135,7 +135,8 @@ typedef struct imap_argument {
+ #define MULTIAPPEND 13
+ #define SNLIST 14
+ #define MULTIAPPENDREDO 15
+-
++#define QLIST 16
++#define QSTRING 17
+
+ /* Append data */
+
+@@ -205,12 +206,15 @@ void imap_gc_body (BODY *body);
+ void imap_gc_body (BODY *body);
+ void imap_capability (MAILSTREAM *stream);
+ long imap_acl_work (MAILSTREAM *stream,char *command,IMAPARG *args[]);
++long imap_annotation_work (MAILSTREAM *stream,char *command,IMAPARG *args[]);
+
+ IMAPPARSEDREPLY *imap_send (MAILSTREAM *stream,char *cmd,IMAPARG *args[]);
+ IMAPPARSEDREPLY *imap_sout (MAILSTREAM *stream,char *tag,char *base,char **s);
+ long imap_soutr (MAILSTREAM *stream,char *string);
+ IMAPPARSEDREPLY *imap_send_astring (MAILSTREAM *stream,char *tag,char **s,
+ SIZEDTEXT *as,long wildok,char *limit);
++IMAPPARSEDREPLY *imap_send_qstring (MAILSTREAM *stream,char *tag,char **s,
++ SIZEDTEXT *as,char *limit);
+ IMAPPARSEDREPLY *imap_send_literal (MAILSTREAM *stream,char *tag,char **s,
+ STRING *st);
+ IMAPPARSEDREPLY *imap_send_spgm (MAILSTREAM *stream,char *tag,char *base,
+@@ -2753,6 +2757,84 @@ long imap_getacl (MAILSTREAM *stream,cha
+ args[0] = &ambx; args[1] = NIL;
+ return imap_acl_work (stream,"GETACL",args);
+ }
++
++/* IMAP set annotation
++ * Accepts: mail stream
++ * annotation struct
++ * Returns: T on success, NIL on failure
++ */
++
++long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation)
++{
++ IMAPARG *args[4],ambx,apth,aval;
++ long ret;
++
++ ambx.type = ASTRING;
++ ambx.text = (void *) annotation->mbox;
++ args[0] = &ambx;
++
++ apth.type = QSTRING;
++ apth.text = (void *) annotation->entry;
++ args[1] = &apth;
++
++ STRINGLIST *st,*l;
++ ANNOTATION_VALUES *v;
++
++ l = st = mail_newstringlist();
++ v = annotation->values;
++ while(v){
++ l->text.size = strlen((char *) (l->text.data = (unsigned char*)cpystr(v->attr)));
++ l->next = mail_newstringlist();
++ l = l->next;
++ l->text.size = strlen((char *) (l->text.data = (unsigned char*)cpystr(v->value)));
++ if(v->next){
++ l->next = mail_newstringlist();
++ l = l->next;
++ }
++ v = v->next;
++ }
++
++ aval.type = QLIST;
++ aval.text = (void *)st;
++ args[2] = &aval;
++ args[3] = NIL;
++
++ ret = imap_annotation_work(stream, "SETANNOTATION",args);
++ mail_free_stringlist(&st);
++ return ret;
++}
++
++
++
++/* IMAP get annotation
++ * Accepts: mail stream
++ * mailbox name
++ * annotation entry list
++ * annotation attribute list
++ * Returns: T on success with data returned via callback, NIL on failure
++ */
++
++long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries, STRINGLIST *attributes)
++{
++ IMAPARG *args[4],ambx,apth,aattr;
++ long ret;
++ ambx.type = ASTRING;
++ ambx.text = (void*) mailbox;
++ args[0] = &ambx;
++
++
++ apth.type = QLIST;
++ apth.text = (void*) entries;
++ args[1] = &apth;
++
++ aattr.type = QLIST;
++ aattr.text = (void*) attributes;
++ args[2] = &aattr;
++
++ args[3] = NIL;
++ ret = imap_annotation_work(stream, "GETANNOTATION",args);
++ return ret;
++}
+
+ /* IMAP list rights
+ * Accepts: mail stream
+@@ -2805,6 +2887,16 @@ long imap_acl_work (MAILSTREAM *stream,c
+ else mm_log ("ACL not available on this IMAP server",ERROR);
+ return ret;
+ }
++ long imap_annotation_work(MAILSTREAM *stream, char *command,IMAPARG *args[])
++{
++ long ret = NIL;
++ IMAPPARSEDREPLY *reply;
++ if (imap_OK (stream,reply = imap_send (stream,command,args)))
++ ret = LONGT;
++ else mm_log (reply->text,ERROR);
++ return ret;
++}
++
+
+ /* IMAP set quota
+ * Accepts: mail stream
+@@ -2937,6 +3029,11 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
+ if (reply = imap_send_astring (stream,tag,&s,&st,NIL,CMDBASE+MAXCOMMAND))
+ return reply;
+ break;
++ case QSTRING: /* atom or string, must be literal? */
++ st.size = strlen ((char *) (st.data = (unsigned char *) arg->text));
++ if (reply = imap_send_qstring (stream,tag,&s,&st,CMDBASE+MAXCOMMAND))
++ return reply;
++ break;
+ case LITERAL: /* literal, as a stringstruct */
+ if (reply = imap_send_literal (stream,tag,&s,arg->text)) return reply;
+ break;
+@@ -2947,6 +3044,18 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
+ do { /* for each list item */
+ *s++ = c; /* write prefix character */
+ if (reply = imap_send_astring (stream,tag,&s,&list->text,NIL,
++ CMDBASE+MAXCOMMAND)) return reply;
++ c = ' '; /* prefix character for subsequent strings */
++ }
++ while (list = list->next);
++ *s++ = ')'; /* close list */
++ break;
++ case QLIST: /* list of strings */
++ list = (STRINGLIST *) arg->text;
++ c = '('; /* open paren */
++ do { /* for each list item */
++ *s++ = c; /* write prefix character */
++ if (reply = imap_send_qstring (stream,tag,&s,&list->text,
+ CMDBASE+MAXCOMMAND)) return reply;
+ c = ' '; /* prefix character for subsequent strings */
+ }
+@@ -3119,6 +3228,32 @@ IMAPPARSEDREPLY *imap_send (MAILSTREAM *
+ reply = imap_sout (stream,tag,CMDBASE,&s);
+ mail_unlock (stream); /* unlock stream */
+ return reply;
++}
++
++/* IMAP send quoted-string
++ * Accepts: MAIL stream
++ * reply tag
++ * pointer to current position pointer of output bigbuf
++ * atom-string to output
++ * maximum to write as atom or qstring
++ * Returns: error reply or NIL if success
++ */
++
++IMAPPARSEDREPLY *imap_send_qstring (MAILSTREAM *stream,char *tag,char **s,
++ SIZEDTEXT *as,char *limit)
++{
++ unsigned long j;
++ char c;
++ STRING st;
++ /* in case needed */
++ INIT (&st,mail_string,(void *) as->data,as->size);
++ /* always write literal if no space */
++ if ((*s + as->size) > limit) return imap_send_literal (stream,tag,s,&st);
++
++ *(*s)++ = '"'; /* write open quote */
++ for (j = 0; j < as->size; j++) *(*s)++ = as->data[j];
++ *(*s)++ = '"'; /* write close quote */
++ return NIL;
+ }
+
+ /* IMAP send atom-string
+@@ -4049,6 +4184,50 @@ void imap_parse_unsolicited (MAILSTREAM
+ }
+ }
+
++ else if (!strcmp (reply->key,"ANNOTATION") && (s = reply->text)){
++ char * mbox;
++ /* response looks like ANNOTATION "mailbox" "entry" ("attr" "value" ["attr" "value"]) ["entry" ("attr "value" ["attr" "value"] )]*/
++ getannotation_t an = (getannotation_t) mail_parameters (NIL,GET_ANNOTATION,NIL);
++
++ mbox = imap_parse_astring (stream, &s, reply,NIL);
++
++ while(*s){
++ ANNOTATION * al = mail_newannotation();
++ al->mbox = cpystr(mbox);
++ t = imap_parse_astring (stream, &s, reply,NIL);
++ al->entry = t;
++ STRINGLIST *strlist;
++ if (s){while (*s == ' ')s++;}
++
++ strlist = imap_parse_stringlist(stream, &s,reply);
++
++ ANNOTATION_VALUES *vlIter, *vlBegin;
++ vlIter = vlBegin = NIL;
++ if (strlist) {
++ while(strlist){
++ if(vlIter){
++ vlIter->next = mail_newannotationvalue();
++ vlIter = vlIter->next;
++ }else{
++ vlIter = mail_newannotationvalue();
++ vlBegin = vlIter;
++ }
++ if ( strlist->text.size )
++ vlIter->attr = cpystr (strlist->text.data);
++ strlist = strlist->next;
++ if(!strlist) continue;
++ if ( strlist->text.size )
++ vlIter->value = cpystr (strlist->text.data);
++ strlist = strlist->next;
++ }
++ }
++ al->values = vlBegin;
++ if (an)
++ (*an) (stream,al);
++ mail_free_annotation(&al);
++ }
++ fs_give ((void **)&mbox);
++ }
+ else if (!strcmp (reply->key,"ACL") && (s = reply->text) &&
+ (t = imap_parse_astring (stream,&s,reply,NIL))) {
+ getacl_t ar = (getacl_t) mail_parameters (NIL,GET_ACL,NIL);
+diff -r 217555555c77 src/c-client/imap4r1.h
+--- a/src/c-client/imap4r1.h Thu Feb 21 17:37:37 2008 +0100
++++ b/src/c-client/imap4r1.h Thu Feb 21 17:38:15 2008 +0100
+@@ -279,3 +279,5 @@ long imap_setquota (MAILSTREAM *stream,c
+ long imap_setquota (MAILSTREAM *stream,char *qroot,STRINGLIST *limits);
+ long imap_getquota (MAILSTREAM *stream,char *qroot);
+ long imap_getquotaroot (MAILSTREAM *stream,char *mailbox);
++long imap_getannotation (MAILSTREAM *stream,char *mailbox,STRINGLIST *entries,STRINGLIST *attributes);
++long imap_setannotation (MAILSTREAM *stream,ANNOTATION *annotation);
+diff -r 217555555c77 src/c-client/mail.c
+--- a/src/c-client/mail.c Thu Feb 21 17:37:37 2008 +0100
++++ b/src/c-client/mail.c Thu Feb 21 17:38:15 2008 +0100
+@@ -69,6 +69,7 @@ static newsrcquery_t mailnewsrcquery = N
+ static newsrcquery_t mailnewsrcquery = NIL;
+ /* ACL results callback */
+ static getacl_t mailaclresults = NIL;
++static getannotation_t mailannotationresults = NIL;
+ /* list rights results callback */
+ static listrights_t maillistrightsresults = NIL;
+ /* my rights results callback */
+@@ -598,6 +599,11 @@ void *mail_parameters (MAILSTREAM *strea
+ ret = (void *) (debugsensitive ? VOIDT : NIL);
+ break;
+
++ case SET_ANNOTATION:
++ mailannotationresults = (getannotation_t) value;
++ case GET_ANNOTATION:
++ ret = (void *) mailannotationresults;
++ break;
+ case SET_ACL:
+ mailaclresults = (getacl_t) value;
+ case GET_ACL:
+@@ -5701,7 +5707,15 @@ ACLLIST *mail_newacllist (void)
+ return (ACLLIST *) memset (fs_get (sizeof (ACLLIST)),0,sizeof (ACLLIST));
+ }
+
+-
++ANNOTATION *mail_newannotation (void)
++{
++ return (ANNOTATION *) memset (fs_get (sizeof (ANNOTATION)),0,sizeof(ANNOTATION));
++}
++
++ANNOTATION_VALUES *mail_newannotationvalue (void)
++{
++ return (ANNOTATION_VALUES *) memset (fs_get (sizeof (ANNOTATION_VALUES)),0,sizeof(ANNOTATION_VALUES));
++}
+ /* Mail instantiate new quotalist
+ * Returns: new quotalist
+ */
+@@ -6024,6 +6038,25 @@ void mail_free_acllist (ACLLIST **al)
+ }
+ }
+
++static void mail_free_annotation_values(ANNOTATION_VALUES **val)
++{
++ if (*val) {
++ if ((*val)->attr) fs_give ((void**) &(*val)->attr);
++ if ((*val)->value) fs_give ((void**) &(*val)->value);
++ mail_free_annotation_values (&(*val)->next);
++ fs_give ((void **) val);
++ }
++}
++void mail_free_annotation(ANNOTATION **al)
++{
++ if (*al) {
++ if((*al)->mbox) fs_give ((void**) &(*al)->mbox);
++ if((*al)->entry) fs_give ((void**) &(*al)->entry);
++ if((*al)->values)
++ mail_free_annotation_values(&(*al)->values);
++ fs_give ((void **) al);
++ }
++}
+
+ /* Mail garbage collect quotalist
+ * Accepts: pointer to quotalist pointer
+diff -r 217555555c77 src/c-client/mail.h
+--- a/src/c-client/mail.h Thu Feb 21 17:37:37 2008 +0100
++++ b/src/c-client/mail.h Thu Feb 21 17:38:15 2008 +0100
+@@ -351,6 +351,8 @@
+ #define SET_SCANCONTENTS (long) 573
+ #define GET_MHALLOWINBOX (long) 574
+ #define SET_MHALLOWINBOX (long) 575
++#define GET_ANNOTATION (long) 576
++#define SET_ANNOTATION (long) 577
+
+ /* Driver flags */
+
+@@ -1043,6 +1045,24 @@ ACLLIST {
+ char *identifier; /* authentication identifier */
+ char *rights; /* access rights */
+ ACLLIST *next;
++};
++
++/* ANNOTATION Response */
++
++#define ANNOTATION_VALUES struct annotation_value_list
++
++ANNOTATION_VALUES {
++ char *attr;
++ char *value;
++ ANNOTATION_VALUES *next;
++};
++
++#define ANNOTATION struct annotation
++
++ANNOTATION {
++ char *mbox;
++ char *entry;
++ ANNOTATION_VALUES * values;
+ };
+
+ /* Quota resource list */
+@@ -1353,6 +1373,7 @@ typedef void (*logouthook_t) (void *data
+ typedef void (*logouthook_t) (void *data);
+ typedef char *(*sslclientcert_t) (void);
+ typedef char *(*sslclientkey_t) (void);
++typedef void (*getannotation_t) (MAILSTREAM *stream,ANNOTATION* annot);
+
+ /* Globals */
+
+@@ -1771,7 +1792,10 @@ SORTPGM *mail_newsortpgm (void);
+ SORTPGM *mail_newsortpgm (void);
+ THREADNODE *mail_newthreadnode (SORTCACHE *sc);
+ ACLLIST *mail_newacllist (void);
++ANNOTATION* mail_newannotation(void);
++ANNOTATION_VALUES* mail_newannotationvalue(void);
+ QUOTALIST *mail_newquotalist (void);
++void mail_free_annotation(ANNOTATION **a);
+ void mail_free_body (BODY **body);
+ void mail_free_body_data (BODY *body);
+ void mail_free_body_parameter (PARAMETER **parameter);
+diff -r 217555555c77 src/mtest/mtest.c
+--- a/src/mtest/mtest.c Thu Feb 21 17:37:37 2008 +0100
++++ b/src/mtest/mtest.c Thu Feb 21 17:38:15 2008 +0100
+@@ -145,6 +145,8 @@ int main ()
+ #endif
+ return NIL;
+ }
++
++void mm_annotation (MAILSTREAM *stream, ANNOTATION *a);
+
+ /* MM command loop
+ * Accepts: MAIL stream
+@@ -195,6 +197,28 @@ void mm (MAILSTREAM *stream,long debug)
+ mail_setflag (stream,arg,"\\DELETED");
+ else puts ("?Bad message number");
+ break;
++ case 'A':
++ {
++ char parms[MAILTMPLEN];
++ prompt("Annotation: ",parms);
++ if (parms) {
++ mail_parameters(stream,SET_ANNOTATION,mm_annotation);
++ STRINGLIST *entries = mail_newstringlist();
++ STRINGLIST *cur = entries;
++ cur->text.size = strlen((char *) (cur->text.data = (unsigned char*)cpystr (parms)));
++ cur->next = NIL;
++
++ STRINGLIST *attributes = mail_newstringlist();
++ cur = attributes;
++ cur->text.size = strlen((char *) (cur->text.data = (unsigned char*)cpystr ("*")));
++ cur->next = NIL;
++
++ imap_getannotation(stream,"INBOX",entries,attributes);
++ mail_free_stringlist(&entries);
++ mail_free_stringlist(&attributes);
++ }
++ }
++ break;
+ case 'E': /* Expunge command */
+ mail_expunge (stream);
+ last = 0;
+@@ -347,7 +371,7 @@ void mm (MAILSTREAM *stream,long debug)
+ case '?': /* ? command */
+ puts ("Body, Check, Delete, Expunge, Find, GC, Headers, Literal,");
+ puts (" MailboxStatus, New Mailbox, Overview, Ping, Quit, Send, Type,");
+- puts ("Undelete, Xit, +, -, or <RETURN> for next message");
++ puts ("Undelete, Xit,Annotation, +, -, or <RETURN> for next message");
+ break;
+ default: /* bogus command */
+ printf ("?Unrecognized command: %s\n",cmd);
+@@ -600,6 +624,18 @@ void prompt (char *msg,char *txt)
+
+ /* Interfaces to C-client */
+
++void mm_annotation (MAILSTREAM *stream, ANNOTATION *a)
++{
++ if(a){
++ fprintf(stderr,"mailbox: %s\nentry: %s\n",a->mbox,a->entry);
++ ANNOTATION_VALUES * v = a->values;
++ while(v){
++ fprintf(stderr,"attr: %s, value: %s\n",v->attr,v->value);
++ v = v->next;
++ }
++ }
++}
++
+
+ void mm_searched (MAILSTREAM *stream,unsigned long number)
+ {
diff --git a/net-libs/c-client/files/c-client-2007f-ldflags.patch b/net-libs/c-client/files/c-client-2007f-ldflags.patch
new file mode 100644
index 000000000000..5c143b79bc7e
--- /dev/null
+++ b/net-libs/c-client/files/c-client-2007f-ldflags.patch
@@ -0,0 +1,33 @@
+--- src/osdep/unix/Makefile~ 2011-06-07 16:04:29.000000000 +0300
++++ src/osdep/unix/Makefile 2011-06-07 15:55:31.000000000 +0300
+@@ -954,23 +954,24 @@
+
+ # Once-only environment setup
+
+-once: onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
++once: ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c
+
+ onceenv:
+ @echo Once-only environment setup...
+ echo $(CC) > CCTYPE
+- echo $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
+- echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
++ echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
++ echo `$(CAT) OSCFLAGS` -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
+ -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
+ -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
+ -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
+ -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" \
+ -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
+ -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
+- echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
++ echo $(EXTRALIBS) `$(CAT) LDFLAGS` > LIBS
++ echo $(EXTRALDFLAGS) `$(CAT) LDFLAGS` -lcrypt $(BASELDFLAGS) > LDFLAGS
+ echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
+- echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
+- -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
++ echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` $(EXTRALDFLAGS) `$(CAT) OSFLAGS` -shared \
++ -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" `$(CAT) LIBS` $(BASELDFLAGS) \
+ >> ARCHIVE
+ echo $(OS) > OSTYPE
+ ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
diff --git a/net-libs/c-client/files/c-client-2007f-topal.patch b/net-libs/c-client/files/c-client-2007f-topal.patch
new file mode 100644
index 000000000000..2b5db04cace5
--- /dev/null
+++ b/net-libs/c-client/files/c-client-2007f-topal.patch
@@ -0,0 +1,27 @@
+diff -cr alpine-2.00.orig/imap/src/c-client/mail.h alpine-2.00.new/imap/src/c-client/mail.h
+*** src/c-client/mail.h 2008-08-08 18:34:22.000000000 +0100
+--- src/c-client/mail.h 2009-05-01 13:40:37.000000000 +0100
+***************
+*** 775,780 ****
+--- 775,781 ----
+ unsigned long bytes; /* size of text in octets */
+ } size;
+ char *md5; /* MD5 checksum */
++ unsigned short topal_hack; /* set to 1 if topal has wrecked the sending */
+ void *sparep; /* spare pointer reserved for main program */
+ };
+
+diff -cr alpine-2.00.orig/imap/src/c-client/mail.c alpine-2.00.new/imap/src/c-client/mail.c
+*** src/c-client/mail.c 2008-06-04 19:39:54.000000000 +0100
+--- src/c-client/mail.c 2009-04-30 22:34:13.000000000 +0100
+***************
+*** 2712,2717 ****
+--- 2712,2719 ----
+ BODY *b = NIL;
+ PART *pt;
+ unsigned long i;
++ /* Topal hack 2 */
++ mail_fetchstructure (stream,msgno,&b);
+ /* make sure have a body */
+ if (section && *section && mail_fetchstructure (stream,msgno,&b) && b)
+ while (*section) { /* find desired section */
diff --git a/net-libs/c-client/metadata.xml b/net-libs/c-client/metadata.xml
new file mode 100644
index 000000000000..20b32568dbd9
--- /dev/null
+++ b/net-libs/c-client/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-mail</herd>
+ <use>
+ <flag name="doc">Install RFCs related to IMAP</flag>
+ <flag name='topal'>Enable support for <pkg>net-mail/topal</pkg>
+ for use with <pkg>mail-client/alpine</pkg></flag>
+ <flag name='chappa'>Enable Eduardo Chappa's patches for use with
+ <pkg>mail-client/alpine</pkg> (mainly adds support for maildir)</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest
new file mode 100644
index 000000000000..1f94012b01fe
--- /dev/null
+++ b/net-libs/canlock/Manifest
@@ -0,0 +1,2 @@
+DIST canlock_2b-6.diff.gz 7946 SHA256 fd08c6d5fc8f2934248a86affec404d5c0b3d360dc9b810389ec7a2c193ff502 SHA512 fa89d638d87e5cb18bd6c270200cd5d962c5a263855e5cbbd8e944dea633a61d6f0c271da04d56096ef23e0a9f252e3bdead496e9aa9afe31d3f8e7ef679020f WHIRLPOOL 0277808d414c4b06f23b697373ec6207ffc22404550a493b2be6ce43b2b13a1042e461b16f6efbd540a7a5bccc20286224d6afe2b4c572b979198f8a3e5381d5
+DIST canlock_2b.orig.tar.gz 14099 SHA256 90234e47727dfd9782b79e05b6efa879d2792ad8feb46788b583032a71af0da7 SHA512 3ceeac6a17fc3bb3330626d22145371ed5f53ad2a33c6a60b639dab0dbc8ff85623839a9d1e1d4cb78580a9060b0ec9fd3489d1374feecf587b2ec5c7963f58e WHIRLPOOL 7f48d62dd29e89f4745cdb09c5f6d4600dc402b8cc327bbfa2b2d8b62ab940426a1e44fac93a64fdf471aecedbd14610c3fa83e0f36fc936edf140305f281b28
diff --git a/net-libs/canlock/canlock-2b.ebuild b/net-libs/canlock/canlock-2b.ebuild
new file mode 100644
index 000000000000..cad4f1f61dae
--- /dev/null
+++ b/net-libs/canlock/canlock-2b.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+MY_P="${P/-/_}"
+DESCRIPTION="A library for creating and verifying Usenet cancel locks"
+HOMEPAGE="http://packages.qa.debian.org/c/canlock.html"
+SRC_URI="mirror://debian/pool/main/c/${PN}/${MY_P}.orig.tar.gz
+ mirror://debian/pool/main/c/${PN}/${MY_P}-6.diff.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+S=${WORKDIR}/${P/-/}
+
+src_prepare() {
+ epatch "${WORKDIR}"/${MY_P}-6.diff \
+ "${FILESDIR}"/${P}-make.patch
+}
+
+src_compile() {
+ local targets="shared"
+ if use static-libs || use test ; then
+ targets+=" static"
+ fi
+
+ emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" ${targets}
+}
+
+src_install() {
+ use static-libs && dolib.a src/libcanlock.a
+ dolib.so src/libcanlock.so.2.0.0
+ dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so.2
+ dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so
+ insinto /usr/include
+ doins include/canlock.h
+ dodoc CHANGES README doc/HOWTO
+}
diff --git a/net-libs/canlock/files/canlock-2b-make.patch b/net-libs/canlock/files/canlock-2b-make.patch
new file mode 100644
index 000000000000..492b88bee143
--- /dev/null
+++ b/net-libs/canlock/files/canlock-2b-make.patch
@@ -0,0 +1,110 @@
+--- canlock2b/Makefile
++++ canlock2b/Makefile
+@@ -1,33 +1,35 @@
+-CFLAGS = -Iinclude
+-LDFLAGS = -L. -lcanlock
++CFLAGS += -Iinclude
++LIBS = -L. -lcanlock
+ CC = gcc
+-STATIC_LIB = libcanlock.a
+
+-all: hmactest canlocktest $(STATIC_LIB)
++all: shared static
+
+-sha1test: t/sha1test.c $(STATIC_LIB)
+- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
++sha1test: t/sha1test.c shared
++ $(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
+
+-hmactest: t/hmactest.c $(STATIC_LIB)
+- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
++hmactest: t/hmactest.c shared
++ $(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
+
+-canlocktest: t/canlocktest.c $(STATIC_LIB)
+- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
++canlocktest: t/canlocktest.c shared
++ $(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
+
+-$(STATIC_LIB):
+- cd src && make
+- ln -s src/libcanlock.a libcanlock.a
++static:
++ cd src && $(MAKE) libcanlock.a
++ ln -sf src/libcanlock.a libcanlock.a
++
++shared:
++ cd src && $(MAKE) libcanlock.so.2.0.0
+
+ clean:
+ rm -f src/*.o t/*.o t/*.out *.gmon gmon.*
+- cd src && make clean
++ cd src && $(MAKE) clean
+ rm -f *.a canlocktest hmactest sha1test *.exe *.h lib-stamp
+
+ install: all
+- cd src && make install DESTDIR=$(DESTDIR)
++ cd src && $(MAKE) install DESTDIR=$(DESTDIR)
+ install --mode=644 include/canlock.h $(DESTDIR)/usr/include
+-
+-test: all
++
++test: hmactest canlocktest
+ @echo "hmactest: "
+ @./hmactest > t/hmactest.out || echo hmm
+ @diff t/hmactest.shouldbe t/hmactest.out && echo " Pass." || (echo " **FAIL**" ; exit 1)
+--- canlock2b/src/Makefile
++++ canlock2b/src/Makefile
+@@ -1,9 +1,11 @@
+-LIBOBJS = base64.lo canlock.lo hmac_sha1.lo sha1.lo
+ CC = gcc
++AR = ar
++RANLIB = ranlib
+ LIBTOOL = libtool
+-CFLAGS = -I../include
++CFLAGS += -I../include
+ SOURCES = base64.c canlock.c hmac_sha1.c sha1.c
+-OBJS = base64.o canlock.o hmac_sha1.o sha1.o
++OBJS := $(SOURCES:.c=.o)
++LIBOBJS := $(SOURCES:.c=.lo)
+ SHARELINKFLAGS = -Wl,-soname -Wl,libcanlock.so.2
+ SHAREDFLAGS = -fPIC -DPIC
+ LIBS = libcanlock.a libcanlock.so.2.0.0
+@@ -11,22 +13,25 @@
+
+ all: $(LIBS)
+
+-libcanlock.a:
+- $(CC) $(CFLAGS) -c $(SOURCES)
+- ar cru libcanlock.a $(OBJS)
+- ranlib libcanlock.a
+- rm $(OBJS)
+-
+-libcanlock.so.2.0.0:
+- $(CC) $(CFLAGS) $(SHAREDFLAGS) -c $(SOURCES)
+- $(CC) -shared $(OBJS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0
++%.o: %.c
++ $(CC) $(CFLAGS) -c -o $@ $<
++
++%.lo: %.c
++ $(CC) $(CFLAGS) $(SHAREDFLAGS) -c -o $@ $<
++
++libcanlock.a: $(OBJS)
++ $(AR) cru libcanlock.a $(OBJS)
++ $(RANLIB) libcanlock.a
++
++libcanlock.so.2.0.0: $(LIBOBJS)
++ $(CC) -shared $(LIBOBJS) $(LDFLAGS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0
+
+ install: all
+ $(INSTALL) libcanlock.so.2.0.0 $(DESTDIR)/usr/lib
+ cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so.2
+ cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so
+ $(INSTALL) libcanlock.a $(DESTDIR)/usr/lib/libcanlock.a
+- ranlib $(DESTDIR)/usr/lib/libcanlock.a
+-
++ $(RANLIB) $(DESTDIR)/usr/lib/libcanlock.a
++
+ clean:
+- rm -f $(OBJS) $(LIBS)
++ rm -f $(OBJS) $(LIBOBJS) $(LIBS)
diff --git a/net-libs/canlock/metadata.xml b/net-libs/canlock/metadata.xml
new file mode 100644
index 000000000000..4d0ebe73a55f
--- /dev/null
+++ b/net-libs/canlock/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-news</herd>
+</pkgmetadata>
diff --git a/net-libs/ccrtp/Manifest b/net-libs/ccrtp/Manifest
new file mode 100644
index 000000000000..d7aa8236dc35
--- /dev/null
+++ b/net-libs/ccrtp/Manifest
@@ -0,0 +1,2 @@
+DIST ccrtp-2.0.9.tar.gz 751786 SHA256 2032176f7d64db05d7bc557a045d0b24ec76f264448a30a7de9f12c5a31530df SHA512 2e63a049ead5bd8a2f3c65d3badb6d6b2a20e185698f62ea9f7e559e8d0aac6151e7a314317d63ea33282c891d75af32571da3471254600abea462097c47dfe3 WHIRLPOOL ad9211c8dcd62ef77a45a59dc906c8af1a4f6b2ca9883cb66afecd97f73cb88c2b019616ea6fad8a496402cd46675ce35084149f8f84777d064ca50683be0d19
+DIST ccrtp-2.1.2.tar.gz 764869 SHA256 f035ca0e1b5d37b78e358f07a25b05c5cdaf2c85c4b31cf29f6be17f288a349e SHA512 a835f57a0eef7cba11c55c93ce2f11ebd8ab4099e7c723043c51e4872f3da87af946fc50fac18b47ea5d72b2a1227b377810e9134c1f3a8982d4ce5944d043e9 WHIRLPOOL cef4015f9537c2b4383bc84bf2ecbc70b3abacb5f21230ea1c613a55a73728450051c1086e549e7b83f24c84c9b3de19fa4acd324bdd55040d9e798c21be7922
diff --git a/net-libs/ccrtp/ccrtp-2.0.9.ebuild b/net-libs/ccrtp/ccrtp-2.0.9.ebuild
new file mode 100644
index 000000000000..15b40ed6ced3
--- /dev/null
+++ b/net-libs/ccrtp/ccrtp-2.0.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib
+
+DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"
+HOMEPAGE="http://www.gnu.org/software/ccrtp/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 ppc ppc64 x86"
+LICENSE="GPL-2"
+IUSE="doc"
+SLOT="0/2"
+
+RDEPEND=">=dev-cpp/commoncpp2-1.3.0:0=
+ dev-libs/libgcrypt:0=
+ >=dev-libs/ucommon-5.0.0:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+src_configure() {
+ econf --disable-static
+}
+
+src_install() {
+ default
+ prune_libtool_files
+ use doc && dohtml -r doc/html/*
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.4.so.0 ]] ; then
+ elog "Please run: revdep-rebuild --library libccrtp1-1.4.so.0"
+ fi
+ if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.5.so.0 ]] ; then
+ elog "Please run: revdep-rebuild --library libccrtp1-1.5.so.0"
+ fi
+ if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.6.so.0 ]] ; then
+ elog "Please run: revdep-rebuild --library libccrtp1-1.6.so.0"
+ fi
+}
diff --git a/net-libs/ccrtp/ccrtp-2.1.2.ebuild b/net-libs/ccrtp/ccrtp-2.1.2.ebuild
new file mode 100644
index 000000000000..df7a7ee551bb
--- /dev/null
+++ b/net-libs/ccrtp/ccrtp-2.1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib
+
+DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"
+HOMEPAGE="http://www.gnu.org/software/ccrtp/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+LICENSE="GPL-2"
+IUSE="doc"
+SLOT="0/2"
+
+RDEPEND=">=dev-cpp/commoncpp2-1.3.0:0=
+ dev-libs/libgcrypt:0=
+ >=dev-libs/ucommon-5.0.0:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+src_configure() {
+ econf --disable-static
+}
+
+src_install() {
+ default
+ prune_libtool_files
+ use doc && dohtml -r doc/html/*
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.4.so.0 ]] ; then
+ elog "Please run: revdep-rebuild --library libccrtp1-1.4.so.0"
+ fi
+ if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.5.so.0 ]] ; then
+ elog "Please run: revdep-rebuild --library libccrtp1-1.5.so.0"
+ fi
+ if [[ -e "${ROOT}"/usr/$(get_libdir)/libccrtp1-1.6.so.0 ]] ; then
+ elog "Please run: revdep-rebuild --library libccrtp1-1.6.so.0"
+ fi
+}
diff --git a/net-libs/ccrtp/metadata.xml b/net-libs/ccrtp/metadata.xml
new file mode 100644
index 000000000000..4538a68724a6
--- /dev/null
+++ b/net-libs/ccrtp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
new file mode 100644
index 000000000000..1d46d1ece01e
--- /dev/null
+++ b/net-libs/courier-authlib/Manifest
@@ -0,0 +1,3 @@
+DIST courier-authlib-0.65.0.tar.bz2 2303751 SHA256 db3e34ee2b075897864c44aaae924388c74b32ed40b83f0fcf8626a060c1ea47 SHA512 edc4a51bc0d748e7d6cdbf9e9c67c43eeedd9e3846d91a8eea24613f6fb5125d2e713ef7fd63cbbe1905205f2a406b4ff3f31d7c3fb7028939123dbc728d8e38 WHIRLPOOL d86ad93ebe701f0742e83988ad14bb750c98ada952fbc6422641840b0074b8f285ca41c0f6458b79c36196a435c99c76d767e8cf3fdf3110107b25112712887a
+DIST courier-authlib-0.66.1.tar.bz2 2299965 SHA256 8f89166f57c8e59f445fe0135da92b95f1c4417896d01eda5e2e94d8ff878fe8 SHA512 d2b0c9c92c0af8c596fd9b14337034e2859c4540b5b20523e8dfbec78f54021104b6864c7f3488f518ebfff488b38bdbc26690763175940d12019f5cbc482b33 WHIRLPOOL 345f458ca19d8892784fa56a72658f50faa65ea7094f590b0fe9880f085e32a2609a25fad76f083bbe0bd278b39db582e3defef3212089b3a3a54d58149ef593
+DIST courier-authlib-0.66.3.tar.bz2 2085083 SHA256 033402a86e334999eaf17c1b722d6f6cc1961fccb5d2ee88342dfd6c5d534961 SHA512 09d97c8efc79d84437feefca13f5161c0e113864b9c971a4a980b359c9c14699f8d07eac6b52ac0a7d30f9770656e672f64c3445ecf4dcad88f51a427310d530 WHIRLPOOL 4763eaadf6da2cd014f68638a8e2b6be6f00bb64234251c65b0de3af821e2484232919a52bac515fccefa1967ff0c4b3d79516d769ce73c0f2ac57802b6818f9
diff --git a/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
new file mode 100644
index 000000000000..000da67c8558
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils flag-o-matic multilib user
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs vpopmail"
+
+RESTRICT="userpriv
+ !berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+ gdbm? ( sys-libs/gdbm )
+ !gdbm? ( sys-libs/db )
+ >=dev-libs/openssl-0.9.6
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( >=dev-db/postgresql-8.4 )
+ sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+# vpopmail support removed upstream
+REQUIRED_USE="( !vpopmail )"
+
+pkg_setup() {
+ if ! has_version 'dev-tcltk/expect' ; then
+ ewarn 'The dev-tcltk/expect package is not installed.'
+ ewarn 'Without it, you will not be able to change system login passwords.'
+ ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+ ewarn 'and others) will work just fine.'
+ fi
+}
+
+src_prepare() {
+ # move local macro to m4 and run eautoreconf
+ mkdir "${S}/m4" || die
+ sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > \
+ m4/sysconftool.m4 || die
+ sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
+ epatch "${FILESDIR}/${P}-sqlite.patch"
+ eautoreconf
+}
+
+src_configure() {
+ filter-flags -fomit-frame-pointer
+ local myconf
+ if use berkdb ; then
+ if use gdbm ; then
+ ewarn "Both gdbm and berkdb selected. Using gdbm."
+ else
+ myconf="--with-db=db"
+ fi
+ fi
+ use gdbm && myconf="--with-db=gdbm"
+ use debug && myconf+=" debug=true"
+ use sqlite && myconf+=" --with-sqlite-libs"
+
+ econf \
+ --sysconfdir=/etc/courier \
+ --datadir=/usr/share/courier \
+ --libexecdir=/usr/$(get_libdir)/courier \
+ --localstatedir=/var/lib/courier \
+ --sharedstatedir=/var/lib/courier/com \
+ --with-authdaemonvar=/var/lib/courier/authdaemon \
+ --with-authshadow \
+ --without-redhat \
+ --with-mailuser=mail \
+ --with-mailgroup=mail \
+ --cache-file="${S}/configuring.cache" \
+ $(use_with pam authpam) \
+ $(use_with ldap authldap) \
+ $(use_with mysql authmysql) \
+ $(use_with postgres authpgsql) \
+ $(use_with sqlite authsqlite) \
+ ${myconf}
+}
+
+orderfirst() {
+ file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+ if [[ -e "${file}" ]] ; then
+ orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+ new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/ / /g\"`\""
+ sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+ fi
+}
+
+finduserdb() {
+ for dir in \
+ /etc/courier/authlib /etc/courier /etc/courier-imap \
+ /usr/lib/courier/etc /usr/lib/courier-imap/etc \
+ /usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+ /usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+ /usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+ if [[ -e "${dir}/userdb" ]] ; then
+ einfo "Found userdb at: ${dir}/userdb"
+ cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+ chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+ continue
+ fi
+ done
+}
+
+src_install() {
+ diropts -o mail -g mail
+ dodir /etc/courier
+ keepdir /var/lib/courier/authdaemon
+ keepdir /etc/courier/authlib
+ emake DESTDIR="${D}" install
+ [[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+ emake DESTDIR="${D}" install-configure
+ rm -f "${D}"/etc/courier/authlib/*.bak
+ chown mail:mail "${D}"/etc/courier/authlib/* || die
+ for y in "${D}"/etc/courier/authlib/*.dist ; do
+ [[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+ done
+ use pam && orderfirst authdaemonrc authmodulelist authpam
+ use ldap && orderfirst authdaemonrc authmodulelist authldap
+ use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+ use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+ use mysql && orderfirst authdaemonrc authmodulelist authmysql
+ dodoc AUTHORS ChangeLog* INSTALL NEWS README
+ dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
+ if use mysql ; then
+ dodoc README.authmysql.myownquery
+ dohtml README.authmysql.html
+ fi
+ if use postgres ; then
+ dohtml README.authpostgres.html README.authmysql.html
+ fi
+ if use ldap ; then
+ dodoc README.ldap
+ dodir /etc/openldap/schema
+ cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+ fi
+ if use sqlite ; then
+ dohtml README.authsqlite.html README.authmysql.html
+ fi
+ newinitd "${FILESDIR}/${PN}-r1" "${PN}"
+
+ use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+ if [[ -e /etc/courier/authlib/userdb ]] ; then
+ einfo "Running makeuserdb ..."
+ chmod go-rwx /etc/courier/authlib/userdb || die
+ makeuserdb
+ fi
+
+ # Suggest cleaning out the following old files
+ list="$(find /etc/courier -maxdepth 1 -type f | grep \"^/etc/courier/auth\")"
+ if [[ ! -z "${list}" ]] ; then
+ ewarn "Courier authentication files are now in /etc/courier/authlib/"
+ elog "The following files are no longer needed and can likely be removed:"
+ elog " rm $(echo \"${list}\")"
+ fi
+}
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.1.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.1.ebuild
new file mode 100644
index 000000000000..e5a258536de9
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.66.1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic multilib user
+
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs vpopmail"
+
+RESTRICT="userpriv
+ !berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+ gdbm? ( sys-libs/gdbm )
+ !gdbm? ( sys-libs/db )
+ >=dev-libs/openssl-0.9.6
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( >=dev-db/postgresql-8.4 )
+ sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+# vpopmail support removed upstream
+REQUIRED_USE="( !vpopmail )"
+
+pkg_setup() {
+ if ! has_version 'dev-tcltk/expect' ; then
+ ewarn 'The dev-tcltk/expect package is not installed.'
+ ewarn 'Without it, you will not be able to change system login passwords.'
+ ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+ ewarn 'and others) will work just fine.'
+ fi
+}
+
+src_prepare() {
+ # move local macro to m4 and run eautoreconf
+ mkdir "${S}/m4" || die
+ sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > \
+ m4/sysconftool.m4 || die
+ sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
+ eautoreconf
+}
+
+src_configure() {
+ filter-flags -fomit-frame-pointer
+ local myconf
+ if use berkdb ; then
+ if use gdbm ; then
+ ewarn "Both gdbm and berkdb selected. Using gdbm."
+ else
+ myconf="--with-db=db"
+ fi
+ fi
+ use gdbm && myconf="--with-db=gdbm"
+ use debug && myconf+=" debug=true"
+ use sqlite && myconf+=" --with-sqlite-libs"
+
+ econf \
+ --sysconfdir=/etc/courier \
+ --datadir=/usr/share/courier \
+ --libexecdir=/usr/$(get_libdir)/courier \
+ --localstatedir=/var/lib/courier \
+ --sharedstatedir=/var/lib/courier/com \
+ --with-authdaemonvar=/var/lib/courier/authdaemon \
+ --with-authshadow \
+ --without-redhat \
+ --with-mailuser=mail \
+ --with-mailgroup=mail \
+ --cache-file="${S}/configuring.cache" \
+ $(use_with pam authpam) \
+ $(use_with ldap authldap) \
+ $(use_with mysql authmysql) \
+ $(use_with postgres authpgsql) \
+ $(use_with sqlite authsqlite) \
+ ${myconf}
+}
+
+orderfirst() {
+ file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+ if [[ -e "${file}" ]] ; then
+ orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+ new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/ / /g\"`\""
+ sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+ fi
+}
+
+finduserdb() {
+ for dir in \
+ /etc/courier/authlib /etc/courier /etc/courier-imap \
+ /usr/lib/courier/etc /usr/lib/courier-imap/etc \
+ /usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+ /usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+ /usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+ if [[ -e "${dir}/userdb" ]] ; then
+ einfo "Found userdb at: ${dir}/userdb"
+ cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+ chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+ continue
+ fi
+ done
+}
+
+src_install() {
+ diropts -o mail -g mail
+ dodir /etc/courier
+ keepdir /var/lib/courier/authdaemon
+ keepdir /etc/courier/authlib
+ emake DESTDIR="${D}" install
+ [[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+ emake DESTDIR="${D}" install-configure
+ rm -f "${D}"/etc/courier/authlib/*.bak
+ chown mail:mail "${D}"/etc/courier/authlib/* || die
+ for y in "${D}"/etc/courier/authlib/*.dist ; do
+ [[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+ done
+ use pam && orderfirst authdaemonrc authmodulelist authpam
+ use ldap && orderfirst authdaemonrc authmodulelist authldap
+ use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+ use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+ use mysql && orderfirst authdaemonrc authmodulelist authmysql
+ dodoc AUTHORS ChangeLog* INSTALL NEWS README
+ dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
+ if use mysql ; then
+ dodoc README.authmysql.myownquery
+ dohtml README.authmysql.html
+ fi
+ if use postgres ; then
+ dohtml README.authpostgres.html README.authmysql.html
+ fi
+ if use ldap ; then
+ dodoc README.ldap
+ dodir /etc/openldap/schema
+ cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+ fi
+ if use sqlite ; then
+ dohtml README.authsqlite.html README.authmysql.html
+ fi
+ newinitd "${FILESDIR}/${PN}-r1" "${PN}"
+
+ use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+ if [[ -e /etc/courier/authlib/userdb ]] ; then
+ einfo "Running makeuserdb ..."
+ chmod go-rwx /etc/courier/authlib/userdb || die
+ makeuserdb
+ fi
+
+ # Suggest cleaning out the following old files
+ list="$(find /etc/courier -maxdepth 1 -type f | grep \"^/etc/courier/auth\")"
+ if [[ ! -z "${list}" ]] ; then
+ ewarn "Courier authentication files are now in /etc/courier/authlib/"
+ elog "The following files are no longer needed and can likely be removed:"
+ elog " rm $(echo \"${list}\")"
+ fi
+}
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.3.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.3.ebuild
new file mode 100644
index 000000000000..eaccece8c04a
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.66.3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib user
+
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb crypt debug gdbm ldap mysql pam postgres sqlite static-libs vpopmail"
+
+RESTRICT="userpriv
+ !berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+ =net-libs/courier-unicode-1.3
+ gdbm? ( sys-libs/gdbm )
+ !gdbm? ( sys-libs/db:= )
+ dev-libs/openssl:=
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:= )
+ sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ if ! has_version 'dev-tcltk/expect' ; then
+ ewarn 'The dev-tcltk/expect package is not installed.'
+ ewarn 'Without it, you will not be able to change system login passwords.'
+ ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+ ewarn 'and others) will work just fine.'
+ fi
+}
+
+src_configure() {
+ filter-flags -fomit-frame-pointer
+ local myconf
+ if use berkdb ; then
+ if use gdbm ; then
+ ewarn "Both gdbm and berkdb selected. Using gdbm."
+ else
+ myconf="--with-db=db"
+ fi
+ fi
+ use gdbm && myconf="--with-db=gdbm"
+ use debug && myconf+=" debug=true"
+ use sqlite && myconf+=" --with-sqlite-libs"
+
+ econf \
+ --sysconfdir=/etc/courier \
+ --datadir=/usr/share/courier \
+ --libexecdir=/usr/$(get_libdir)/courier \
+ --localstatedir=/var/lib/courier \
+ --sharedstatedir=/var/lib/courier/com \
+ --with-authdaemonvar=/var/lib/courier/authdaemon \
+ --with-authshadow \
+ --without-redhat \
+ --with-mailuser=mail \
+ --with-mailgroup=mail \
+ --cache-file="${S}/configuring.cache" \
+ $(use_with pam authpam) \
+ $(use_with ldap authldap) \
+ $(use_with mysql authmysql) \
+ $(use_with postgres authpgsql) \
+ $(use_with sqlite authsqlite) \
+ ${myconf}
+}
+
+orderfirst() {
+ file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+ if [[ -e "${file}" ]] ; then
+ orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+ new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/ / /g\"`\""
+ sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+ fi
+}
+
+finduserdb() {
+ for dir in \
+ /etc/courier/authlib /etc/courier /etc/courier-imap \
+ /usr/lib/courier/etc /usr/lib/courier-imap/etc \
+ /usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+ /usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+ /usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+ if [[ -e "${dir}/userdb" ]] ; then
+ einfo "Found userdb at: ${dir}/userdb"
+ cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+ chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+ continue
+ fi
+ done
+}
+
+src_install() {
+ diropts -o mail -g mail
+ dodir /etc/courier
+ keepdir /var/lib/courier/authdaemon
+ keepdir /etc/courier/authlib
+ emake DESTDIR="${D}" install
+ [[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+ emake DESTDIR="${D}" install-configure
+ rm -f "${D}"/etc/courier/authlib/*.bak
+ chown mail:mail "${D}"/etc/courier/authlib/* || die
+ for y in "${D}"/etc/courier/authlib/*.dist ; do
+ [[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+ done
+ use pam && orderfirst authdaemonrc authmodulelist authpam
+ use ldap && orderfirst authdaemonrc authmodulelist authldap
+ use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+ use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+ use mysql && orderfirst authdaemonrc authmodulelist authmysql
+ dodoc AUTHORS ChangeLog* INSTALL NEWS README
+ dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
+ if use mysql ; then
+ dodoc README.authmysql.myownquery
+ dohtml README.authmysql.html
+ fi
+ if use postgres ; then
+ dohtml README.authpostgres.html README.authmysql.html
+ fi
+ if use ldap ; then
+ dodoc README.ldap
+ dodir /etc/openldap/schema
+ cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+ fi
+ if use sqlite ; then
+ dohtml README.authsqlite.html README.authmysql.html
+ fi
+ newinitd "${FILESDIR}/${PN}-r1" "${PN}"
+
+ use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+ if [[ -e /etc/courier/authlib/userdb ]] ; then
+ einfo "Running makeuserdb ..."
+ chmod go-rwx /etc/courier/authlib/userdb || die
+ makeuserdb
+ fi
+}
diff --git a/net-libs/courier-authlib/files/courier-authlib-0.65.0-sqlite.patch b/net-libs/courier-authlib/files/courier-authlib-0.65.0-sqlite.patch
new file mode 100644
index 000000000000..d6c6480a38b2
--- /dev/null
+++ b/net-libs/courier-authlib/files/courier-authlib-0.65.0-sqlite.patch
@@ -0,0 +1,35 @@
+--- configure.in 2012-10-17 08:50:00.387963153 +0000
++++ configure.in 2012-10-17 08:50:21.121706830 +0000
+@@ -635,7 +635,7 @@
+ LIBS="$saveLIBS"
+ fi
+
+-if test "$doauthmysql" != "yes"
++if test "$doauthsqlite" != "yes"
+ then
+ SQLITE_LIBS=""
+ SQLITE_CFLAGS=""
+--- authsqlite.h 2012-10-03 19:54:10.000000000 +0300
++++ authsqlite.h 2013-03-01 12:03:16.834315060 +0200
+@@ -6,7 +6,9 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sqlite3.h>
++/*
+ #include <errmsg.h>
++*/
+
+ struct authsqliteuserinfo {
+ char *username;
+--- authsqlitelib.c 2012-10-04 05:48:21.000000000 +0300
++++ authsqlitelib.c 2013-03-01 12:03:00.801437111 +0200
+@@ -10,7 +10,9 @@
+ #include <ctype.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++/*
+ #include <mysql.h>
++*/
+ #include <time.h>
+
+ #include "authsqlite.h"
diff --git a/net-libs/courier-authlib/files/courier-authlib-r1 b/net-libs/courier-authlib/files/courier-authlib-r1
new file mode 100644
index 000000000000..5edf5c60cefb
--- /dev/null
+++ b/net-libs/courier-authlib/files/courier-authlib-r1
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need net
+ provide authdaemond
+}
+
+checkconfig() {
+ if [ ! -e /etc/courier/authlib/authdaemonrc ] ; then
+ eerror "You need an /etc/courier/authlib/authdaemonrc file to run authdaemon"
+ return 1
+ fi
+}
+
+setauth() {
+ . /etc/courier/authlib/authdaemonrc
+ AUTHLIB="/usr/lib/courier/courier-authlib"
+ AUTHDAEMOND="authdaemond"
+ pidfile="/var/run/authdaemon.pid"
+ logger="/usr/sbin/courierlogger"
+ export DEBUG_LOGIN DEFAULTOPTIONS LOGGEROPTS
+}
+
+start() {
+ checkconfig || return 1
+ setauth
+ ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
+ start-stop-daemon --quiet --start --pidfile "${pidfile}" --exec \
+ /usr/bin/env ${logger} -- ${LOGGEROPTS} -pid="${pidfile}" -start "${AUTHLIB}/${AUTHDAEMOND}"
+ eend $?
+}
+
+stop() {
+ setauth
+ ebegin "Stopping courier-authlib: ${AUTHDAEMOND}"
+ start-stop-daemon --quiet --stop --pidfile "${pidfile}"
+ eend $?
+}
diff --git a/net-libs/courier-authlib/metadata.xml b/net-libs/courier-authlib/metadata.xml
new file mode 100644
index 000000000000..8f8d517f9cf1
--- /dev/null
+++ b/net-libs/courier-authlib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-mail</herd>
+ <use>
+ <flag name="vpopmail">Enable vpopmail support</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">courier</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
new file mode 100644
index 000000000000..a125db7af6e9
--- /dev/null
+++ b/net-libs/courier-unicode/Manifest
@@ -0,0 +1,2 @@
+DIST courier-unicode-1.1.tar.bz2 372684 SHA256 a10e61d20f3bf25bebdec495dea54258948f333a29f29a7f155a31f9bfb3f56c SHA512 df373663ad0fbeafbd89b7265a9623ff74926a396689e5309c3fbea327686e802659a87a8b308c3d0d9c1819c7299834c80694b2230dfe901d555d3febfa2d8b WHIRLPOOL 721f39db88add73b8d0a0048e8e58f308521d956eec8aaa507fd1f2794dc9239607d2b61386323f809ca648394e9446709e6cef2658c685a846668774f377111
+DIST courier-unicode-1.3.tar.bz2 394011 SHA256 8067d2fec621af1a463b690b325c700920f98e1271052354abfd4c8ca82f7e68 SHA512 4384874f0f2298ff5034d7541ffd3155a3aa6a6b2d73fb108b5072a0dd0bb8236389b83161625bed7f923f724fa11bbed42af28234d5c6e5b6d370c407e8f677 WHIRLPOOL fde3ed95aa10a47c4f96f64b281955f1a38283268625015da250cd4b1388348a638d3cb035e29c47734b5f484099d96f33b91f7a612979c41cbd801d8bead222
diff --git a/net-libs/courier-unicode/courier-unicode-1.1.ebuild b/net-libs/courier-unicode/courier-unicode-1.1.ebuild
new file mode 100644
index 000000000000..dd240c2be6e0
--- /dev/null
+++ b/net-libs/courier-unicode/courier-unicode-1.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Unicode library used by the courier mail server"
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 ~x86"
+IUSE=""
+
+src_install() {
+ default
+ prune_libtool_files
+ dodoc AUTHORS ChangeLog README
+}
diff --git a/net-libs/courier-unicode/courier-unicode-1.3.ebuild b/net-libs/courier-unicode/courier-unicode-1.3.ebuild
new file mode 100644
index 000000000000..7d40f2082b9e
--- /dev/null
+++ b/net-libs/courier-unicode/courier-unicode-1.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Unicode library used by the courier mail server"
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+src_install() {
+ default
+ prune_libtool_files
+ dodoc AUTHORS ChangeLog README
+}
diff --git a/net-libs/courier-unicode/metadata.xml b/net-libs/courier-unicode/metadata.xml
new file mode 100644
index 000000000000..eed2873227af
--- /dev/null
+++ b/net-libs/courier-unicode/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-mail</herd>
+ <maintainer>
+ <email>hanno@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">courier</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest
new file mode 100644
index 000000000000..6a3eb5f81386
--- /dev/null
+++ b/net-libs/cppzmq/Manifest
@@ -0,0 +1,2 @@
+DIST cppzmq-0_pre130717.tar.xz 3736 SHA256 94efc2ad76ef779f9ede32d2bbffc82b37ca3004b62a67aed031b3dc4a9e7472 SHA512 3dbff2d3c1cc9f40b58477d2654cd1af4b639c71ca332dd6bcf33cce3d420a2c9e56312c0824bbccc6cea721b5688f8ec255180aace898dca57eb98a8d40c142 WHIRLPOOL 7d99aba2696fdf09c0e2b0af076ef5ca56d89e0dddb3c82f44433a0881fe354169d037a73ee415c0f7ab1e11895fc0d9043726255ffbb67224839b49afea5456
+DIST cppzmq-0_pre150606.tar.xz 4032 SHA256 fb1cb2ebfdfe955f68edca6b09a7f974e63bd35941bd01423907bc4f81febbaf SHA512 d5ab584989f0eec7ce227de4534820f6e00582b8f45ebab5472c8244823a14a89e74005edb8ae933037a1df9684cc21641cd271a147f39577331b96474927efe WHIRLPOOL 15fdc4cedd9dc6e1434cb286d00a4524e73e5e0fae0e11220bd7b1dce0898ef1afedaa5b5cc416add613d5237362661f6d309f9acb629c8026f25e814001fb11
diff --git a/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild b/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild
new file mode 100644
index 000000000000..b44c84e6828f
--- /dev/null
+++ b/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="High-level CPP Binding for ZeroMQ"
+HOMEPAGE="https://github.com/zeromq/cppzmq"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=net-libs/zeromq-3"
+DEPEND=""
+
+src_install() {
+ doheader zmq.hpp
+ dodoc README
+}
+
+src_test() {
+ $(tc-getCC) -c ./zmq.hpp -L ./.libs/ -I ./include/ -o ./test.o || die "This version of cppzmq is not compatible with the installed version of net-libs/zeromq"
+ rm -f ./test.o
+}
diff --git a/net-libs/cppzmq/cppzmq-0_pre150606.ebuild b/net-libs/cppzmq/cppzmq-0_pre150606.ebuild
new file mode 100644
index 000000000000..b44c84e6828f
--- /dev/null
+++ b/net-libs/cppzmq/cppzmq-0_pre150606.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="High-level CPP Binding for ZeroMQ"
+HOMEPAGE="https://github.com/zeromq/cppzmq"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=net-libs/zeromq-3"
+DEPEND=""
+
+src_install() {
+ doheader zmq.hpp
+ dodoc README
+}
+
+src_test() {
+ $(tc-getCC) -c ./zmq.hpp -L ./.libs/ -I ./include/ -o ./test.o || die "This version of cppzmq is not compatible with the installed version of net-libs/zeromq"
+ rm -f ./test.o
+}
diff --git a/net-libs/cppzmq/metadata.xml b/net-libs/cppzmq/metadata.xml
new file mode 100644
index 000000000000..bbae0452e962
--- /dev/null
+++ b/net-libs/cppzmq/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci</herd>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">zeromq/cppzmq</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
new file mode 100644
index 000000000000..dc6718bc3709
--- /dev/null
+++ b/net-libs/cvm/Manifest
@@ -0,0 +1,3 @@
+DIST cvm-0.76.tar.gz 91957 SHA256 0b0bbc21ad7bbe6acab66a85369502c2907e522fa2fd5c33c6f584ad1ccc000e
+DIST cvm-0.82.tar.gz 93615 SHA256 5c209c2ac911ba5473b1ef1b78407afa6821eca26de476291a7362fee616d0fe
+DIST cvm-0.96.tar.gz 127999 SHA256 b85121b2f4b160b27c95705bd83a871675ed4b65b8bcb259a0877f37606224e9
diff --git a/net-libs/cvm/cvm-0.76.ebuild b/net-libs/cvm/cvm-0.76.ebuild
new file mode 100644
index 000000000000..d5b1d71ba269
--- /dev/null
+++ b/net-libs/cvm/cvm-0.76.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Credential Validation Modules by Bruce Guenter"
+HOMEPAGE="http://untroubled.org/cvm/"
+SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc sparc x86"
+IUSE="mysql postgres test"
+
+RDEPEND="dev-db/cdb"
+DEPEND="${RDEPEND}
+ >=dev-libs/bglibs-1.041
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql[server] )
+ test? ( app-editors/vim )"
+# some of the testcases use ex/vi/xxd
+
+src_unpack() {
+ unpack ${A}
+ # disable this test, as it breaks under Portage
+ # and there is no easy fix
+ sed -i.orig -e '/qmail-lookup-nodomain/,/^END_OF_TEST_RESULTS/d' "${S}"/tests.sh || die "sed failed"
+}
+
+src_compile() {
+ echo "/usr/include/bglibs" > conf-bgincs
+ echo "/usr/lib/bglibs" > conf-bglibs
+ echo "${D}/usr/include" > conf-include
+ echo "${D}/usr/lib" > conf-lib
+ echo "${D}/usr/bin" > conf-bin
+ echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+ echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld
+ emake || die
+
+ if use mysql; then
+ make mysql || die "making mysql support failed"
+ fi
+
+ if use postgres; then
+ make pgsql || die "making postgres support failed"
+ fi
+}
+
+src_install() {
+ einstall || die
+
+ dodoc ANNOUNCEMENT NEWS NEWS.sql NEWS.vmailmgr README README.vchkpw
+ dodoc README.vmailmgr TODO VERSION
+ dohtml *.html
+}
+
+src_test() {
+ sh tests.sh || die "Testing Failed"
+}
diff --git a/net-libs/cvm/cvm-0.82.ebuild b/net-libs/cvm/cvm-0.82.ebuild
new file mode 100644
index 000000000000..b3b32e2747ef
--- /dev/null
+++ b/net-libs/cvm/cvm-0.82.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Credential Validation Modules by Bruce Guenter"
+HOMEPAGE="http://untroubled.org/cvm/"
+SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86 ~amd64"
+IUSE="mysql postgres test vpopmail"
+
+RDEPEND="dev-db/cdb"
+DEPEND="${RDEPEND}
+ >=dev-libs/bglibs-1.041
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql[server] )
+ vpopmail? ( net-mail/vpopmail )
+ test? ( app-editors/vim )"
+# some of the testcases use ex/vi/xxd
+
+src_unpack() {
+ unpack ${A}
+ # disable this test, as it breaks under Portage
+ # and there is no easy fix
+ sed -i.orig \
+ -e '/qmail-lookup-nodomain/,/^END_OF_TEST_RESULTS/d' \
+ "${S}"/tests.sh || die "sed failed"
+ # Fix the vpopmail build
+ sed -i.orig \
+ -e '/.\/ltload cvm-vchkpw/s,-lmysqlclient,,g' \
+ -e '/.\/ltload cvm-vchkpw/s,-L/usr/local/vpopmail/lib,,g' \
+ -e '/.\/ltload cvm-vchkpw/s,-L/var/vpopmail/lib,,g' \
+ -e '/.\/ltload cvm-vchkpw/s,-L/usr/local/lib/mysql,,g' \
+ -e '/.\/ltload cvm-vchkpw/s,\.la,.la `cat /var/vpopmail/etc/lib_deps`,g' \
+ "${S}"/Makefile \
+ || die "Failed to fix vpopmail linking parts of Makefile"
+ sed -i.orig \
+ -e '/.\/compile cvm-vchkpw/s,$, `cat /var/vpopmail/etc/inc_deps`,g' \
+ "${S}"/Makefile \
+ || die "Failed to fix vpopmail compiling parts of Makefile"
+}
+
+src_compile() {
+ echo "/usr/include/bglibs" > conf-bgincs
+ echo "/usr/lib/bglibs" > conf-bglibs
+ echo "/usr/include" > conf-include
+ echo "/usr/lib" > conf-lib
+ echo "/usr/bin" > conf-bin
+ echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+ echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld
+ emake || die
+
+ if use mysql; then
+ einfo "Building MySQL support"
+ emake mysql || die "making mysql support failed"
+ fi
+
+ if use postgres; then
+ einfo "Building Postgresql support"
+ emake pgsql || die "making postgres support failed"
+ fi
+
+ if use vpopmail; then
+ einfo "Building vpopmail support"
+ emake cvm-vchkpw || die "making vpopmail support failed"
+ fi
+}
+
+src_install() {
+ # Upstreams installer is incredibly broken
+ dolib .libs/*.a .libs/*.so.*
+ for i in a so ; do
+ dosym libcvm-v2client.${i} /usr/$(get_libdir)/libcvm-client.${i}
+ done
+
+ for i in {bench,test}client chain checkpassword pwfile qmail unix \
+ vmailmgr{,-local,-udp} v1{benchclient,checkpassword,testclient} \
+ ; do
+ dobin .libs/cvm-${i}
+ done
+ use mysql && dobin .libs/cvm-mysql{,-local,-udp}
+ use postgres && dobin .libs/cvm-pgsql{,-local,-udp}
+ use vpopmail && dobin .libs/cvm-vchkpw
+
+ insinto /usr/include/cvm
+ doins {credentials,errors,facts,module,protocol,sasl,v1client,v2client}.h
+ dosym v1client.h /usr/include/cvm/client.h
+ dosym cvm/sasl.h /usr/include/cvm-sasl.h
+
+ dodoc ANNOUNCEMENT NEWS{,.sql,.vmailmgr}
+ dodoc README{,.vchkpw,.vmailmgr}
+ dodoc TODO VERSION ChangeLog*
+ dohtml *.html
+}
+
+src_test() {
+ sh tests.sh || die "Testing Failed"
+}
diff --git a/net-libs/cvm/cvm-0.96.ebuild b/net-libs/cvm/cvm-0.96.ebuild
new file mode 100644
index 000000000000..926b4d9e9e66
--- /dev/null
+++ b/net-libs/cvm/cvm-0.96.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Credential Validation Modules by Bruce Guenter"
+HOMEPAGE="http://untroubled.org/cvm/"
+SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="mysql postgres test vpopmail"
+
+RDEPEND="dev-db/cdb"
+DEPEND="${RDEPEND}
+ >=dev-libs/bglibs-1.041
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql[server] )
+ vpopmail? ( net-mail/vpopmail )
+ test? ( app-editors/vim )"
+# some of the testcases use ex/vi/xxd
+
+MAKEOPTS="${MAKEOPTS} -j1" #310843
+
+src_unpack() {
+ unpack ${A}
+ # disable this test, as it breaks under Portage
+ # and there is no easy fix
+ sed -i.orig \
+ -e '/qmail-lookup-nodomain/,/^END_OF_TEST_RESULTS/d' \
+ "${S}"/tests.sh || die "sed failed"
+ # Fix the vpopmail build
+ sed -i.orig \
+ -e '/.\/ltload cvm-vchkpw/s,-lmysqlclient,,g' \
+ -e '/.\/ltload cvm-vchkpw/s,-L/usr/local/vpopmail/lib,,g' \
+ -e '/.\/ltload cvm-vchkpw/s,-L/var/vpopmail/lib,,g' \
+ -e '/.\/ltload cvm-vchkpw/s,-L/usr/local/lib/mysql,,g' \
+ -e '/.\/ltload cvm-vchkpw/s,\.la,.la `cat /var/vpopmail/etc/lib_deps`,g' \
+ "${S}"/Makefile \
+ || die "Failed to fix vpopmail linking parts of Makefile"
+ sed -i.orig \
+ -e '/.\/compile cvm-vchkpw/s,$, `cat /var/vpopmail/etc/inc_deps`,g' \
+ "${S}"/Makefile \
+ || die "Failed to fix vpopmail compiling parts of Makefile"
+}
+
+src_compile() {
+ echo "/usr/include/bglibs" > conf-bgincs
+ echo "/usr/lib/bglibs" > conf-bglibs
+ echo "/usr/include" > conf-include
+ echo "/usr/lib" > conf-lib
+ echo "/usr/bin" > conf-bin
+ echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+ echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld
+ emake || die
+
+ if use mysql; then
+ einfo "Building MySQL support"
+ emake mysql || die "making mysql support failed"
+ fi
+
+ if use postgres; then
+ einfo "Building Postgresql support"
+ emake pgsql || die "making postgres support failed"
+ fi
+
+ if use vpopmail; then
+ einfo "Building vpopmail support"
+ emake cvm-vchkpw || die "making vpopmail support failed"
+ fi
+}
+
+src_install() {
+ # Upstreams installer is incredibly broken
+ dolib .libs/*.a .libs/*.so.*
+ for i in a so ; do
+ dosym libcvm-v2client.${i} /usr/$(get_libdir)/libcvm-client.${i}
+ done
+
+ for i in {bench,test}client chain checkpassword pwfile qmail unix \
+ vmailmgr{,-local,-udp} v1{benchclient,checkpassword,testclient} \
+ ; do
+ dobin .libs/cvm-${i}
+ done
+ use mysql && dobin .libs/cvm-mysql{,-local,-udp}
+ use postgres && dobin .libs/cvm-pgsql{,-local,-udp}
+ use vpopmail && dobin .libs/cvm-vchkpw
+
+ insinto /usr/include/cvm
+ doins {credentials,errors,facts,module,protocol,sasl,v1client,v2client}.h
+ dosym v1client.h /usr/include/cvm/client.h
+ dosym cvm/sasl.h /usr/include/cvm-sasl.h
+
+ dodoc ANNOUNCEMENT NEWS{,.sql,.vmailmgr}
+ dodoc README{,.vchkpw,.vmailmgr}
+ dodoc TODO VERSION ChangeLog*
+ dohtml *.html
+}
+
+src_test() {
+ sh tests.sh || die "Testing Failed"
+}
diff --git a/net-libs/cvm/metadata.xml b/net-libs/cvm/metadata.xml
new file mode 100644
index 000000000000..c8ae1a99908d
--- /dev/null
+++ b/net-libs/cvm/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="vpopmail">Enable vpopmail support</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
new file mode 100644
index 000000000000..344b2925cd89
--- /dev/null
+++ b/net-libs/czmq/Manifest
@@ -0,0 +1,2 @@
+DIST czmq-2.2.0.tar.gz 592293 SHA256 eaf86f935da6ff9c5e273313d2c59ec90ca19b2339cc7e588a1fa0b4296829e7 SHA512 51825e8a62a53cb3ac5fcf95b217e7dceb1745d31e243679e3c6ad0c7cce26e5844119bd054312e3764f0299df7e26bf9373a68cb1e7afc675966aa616a90ab6 WHIRLPOOL 7f1044029a7648d18206410efba74a7613619630a02bab0425aa9faf27c43d73306820db702764686ecd22021ace09d21422f717ed1f631b8d4db95f51e8df0c
+DIST czmq-3.0.2.tar.gz 818110 SHA256 8bca39ab69375fa4e981daf87b3feae85384d5b40cef6adbe9d5eb063357699a SHA512 ed2b97eb9b20ee8e491ba4c100920af0a54d146cb01c227fdef66939cdf4747c779d950df52e68782c68cfce1d4579b4870b005a8c58a32b477de2414b8b6453 WHIRLPOOL e384d670920cea02a5adabea51bfa7f98725ef0ba7e12d9417d26fc2f3e8dc35dc798a8b2f5a548a42f3d21d1395d304a45d00552cda2d51b1529e0bec6960f8
diff --git a/net-libs/czmq/czmq-2.2.0-r2.ebuild b/net-libs/czmq/czmq-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..052e84f1939f
--- /dev/null
+++ b/net-libs/czmq/czmq-2.2.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION=" High-level C Binding for ZeroMQ"
+HOMEPAGE="http://czmq.zeromq.org"
+SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm hppa x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+ dev-libs/libsodium:=
+ sys-apps/util-linux
+ >=net-libs/zeromq-2.1
+ <net-libs/zeromq-4
+"
+DEPEND="${RDEPEND}
+ doc? (
+ app-text/asciidoc
+ app-text/xmlto
+ )"
+
+DOCS=( NEWS AUTHORS )
+
+src_prepare() {
+ sed -i -e 's|-Werror||g' configure.ac || die
+ autotools-utils_src_prepare
+}
+
+src_install() {
+ autotools-utils_src_install
+ mv "${ED}"/usr/bin/makecert{,-czmq} || die
+}
+
+pkg_postinst() {
+ elog "Due to file collisions we moved the makecert tool to makecert-${PN}."
+}
diff --git a/net-libs/czmq/czmq-3.0.2.ebuild b/net-libs/czmq/czmq-3.0.2.ebuild
new file mode 100644
index 000000000000..c69664d75bae
--- /dev/null
+++ b/net-libs/czmq/czmq-3.0.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION=" High-level C Binding for ZeroMQ"
+HOMEPAGE="http://czmq.zeromq.org"
+SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND="
+ sys-apps/util-linux
+ net-libs/zeromq
+"
+DEPEND="${RDEPEND}
+ doc? (
+ app-text/asciidoc
+ app-text/xmlto
+ )"
+
+DOCS=( NEWS AUTHORS )
+
+# Network access
+RESTRICT=test
+
+src_prepare() {
+ use test && AUTOTOOLS_IN_SOURCE_BUILD=1
+ sed -i -e 's|-Werror||g' configure.ac || die
+ autotools-utils_src_prepare
+}
+
+src_test() {
+ autotools-utils_src_test check-verbose VERBOSE=1
+}
+
+src_install() {
+ autotools-utils_src_install
+ mv "${ED}"/usr/bin/makecert{,-czmq} || die
+}
+
+pkg_postinst() {
+ elog "Due to file collisions we moved the makecert tool to makecert-${PN}."
+}
diff --git a/net-libs/czmq/files/version.sh b/net-libs/czmq/files/version.sh
new file mode 100644
index 000000000000..527ba285ebbb
--- /dev/null
+++ b/net-libs/czmq/files/version.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# This script extracts the version from the project header file
+#
+project=$1
+if [ ! -f include/$project.h ]; then
+ echo "version.sh: error: include/$project.h does not exist" 1>&2
+ exit 1
+fi
+MAJOR=`egrep '^#define .*_VERSION_MAJOR +[0-9]+$' include/$project.h`
+MINOR=`egrep '^#define .*_VERSION_MINOR +[0-9]+$' include/$project.h`
+PATCH=`egrep '^#define .*_VERSION_PATCH +[0-9]+$' include/$project.h`
+if [ -z "$MAJOR" -o -z "$MINOR" -o -z "$PATCH" ]; then
+ echo "version.sh: error: could not extract version from include/$project.h" 1>&2
+ exit 1
+fi
+MAJOR=`echo $MAJOR | awk '{ print $3 }'`
+MINOR=`echo $MINOR | awk '{ print $3 }'`
+PATCH=`echo $PATCH | awk '{ print $3 }'`
+echo $MAJOR.$MINOR.$PATCH | tr -d '\n'
+
diff --git a/net-libs/czmq/metadata.xml b/net-libs/czmq/metadata.xml
new file mode 100644
index 000000000000..7bc6ee8ea837
--- /dev/null
+++ b/net-libs/czmq/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <name>Justin Lecher</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
new file mode 100644
index 000000000000..03e713150297
--- /dev/null
+++ b/net-libs/daq/Manifest
@@ -0,0 +1,3 @@
+DIST daq-0.6.2.tar.gz 451581 SHA256 0159865b5dc127ed2faf8d6732d781939f27e38b7c7deabcd369a22ea9e42f26 SHA512 da19034f210d9c202f5e3ba7ddf60645498ed8bdaf28410811922ebb1338b56c55c8e992e46e1c7b9b89de6148b471129826a02ab2a45c7232bc4091a4e53125 WHIRLPOOL 01e7b47e27b71d11648936911bb9bd2657b387fd15eb41f5939b23b3e2da9753d66165eddd0831ba4e827ab67ee2f61ee963cb98788ad4a7ca9d03f921031ff6
+DIST daq-2.0.0.tar.gz 480030 SHA256 fbafc8e362a96fcadc69731f91203ef90845507aae0a4774d5c2825e9d2c1c38 SHA512 aa79e06473592c0ee57a3a2da60f01f35e6268a126fcb3a992ee7c6da48a079cf359db7439be3778997e774c340630d768712c9efea10c570feb4961f9a00b3c WHIRLPOOL c1eb41df6718a7ece0da95599f78f080a32337a3522181ad31db46a0285d584dfd46e2fffce5e73ef3ba0409bd033b59ac0b272df1d7ee104f6160edc69bc8be
+DIST daq-2.0.2.tar.gz 474447 SHA256 d65d1e67c4994e02c3142c49a648642e780b7e3d942b4a51f605309beac269a8 SHA512 b2a47e174155f21cb1c6f1e1c431ea7cca6aa9f7371228e77def3c526a67fd42d0e26e4c94263195e041b203cdf0c2aaef14f9035afb23dde0bd5df3bf422cbd WHIRLPOOL 3902ccda294c5967c509971abbbfb787f46792cd6bc286097e1d8b88c5d0f25c29019c918d41cabb8d52e4fcb1d99ae60e6eea3319aea2ee46aa8aa9b117e738
diff --git a/net-libs/daq/daq-0.6.2-r1.ebuild b/net-libs/daq/daq-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..b405df12296c
--- /dev/null
+++ b/net-libs/daq/daq-0.6.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils multilib
+
+DESCRIPTION="Data Acquisition library, for packet I/O"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="http://www.snort.org/downloads/1339 -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
+
+DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
+ dump? ( >=net-libs/libpcap-1.0.0 )
+ nfq? ( dev-libs/libdnet
+ >=net-firewall/iptables-1.4.10
+ net-libs/libnetfilter_queue )
+ ipq? ( dev-libs/libdnet
+ >=net-firewall/iptables-1.4.10
+ net-libs/libnetfilter_queue )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf \
+ $(use_enable ipv6) \
+ $(use_enable pcap pcap-module) \
+ $(use_enable afpacket afpacket-module) \
+ $(use_enable dump dump-module) \
+ $(use_enable nfq nfq-module) \
+ $(use_enable ipq ipq-module) \
+ $(use_enable static-libs static) \
+ --disable-ipfw-module \
+ --disable-bundled-modules
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc ChangeLog README
+
+ # Remove unneeded .la files
+ rm \
+ "${D}"usr/$(get_libdir)/daq/*.la \
+ "${D}"usr/$(get_libdir)/libdaq*.la \
+ "${D}"usr/$(get_libdir)/libsfbpf.la \
+ || die
+
+ # If not using static-libs don't install the static libraries
+ # This has been bugged upstream
+ if ! use static-libs; then
+ for z in libdaq_static libdaq_static_modules; do
+ rm "${D}"usr/$(get_libdir)/${z}.a
+ done
+ fi
+}
+
+pkg_postinst() {
+ einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
+ einfo "calls to PCAP functions with an abstraction layer that facilitates"
+ einfo "operation on a variety of hardware and software interfaces without"
+ einfo "requiring changes to application such as Snort."
+ einfo
+ einfo "Please see the README file for DAQ for information about specific"
+ einfo "DAQ modules."
+}
diff --git a/net-libs/daq/daq-0.6.2.ebuild b/net-libs/daq/daq-0.6.2.ebuild
new file mode 100644
index 000000000000..85723a6c97ef
--- /dev/null
+++ b/net-libs/daq/daq-0.6.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils multilib
+
+DESCRIPTION="Data Acquisition library, for packet I/O"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="http://www.snort.org/downloads/1339 -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ~ppc x86"
+IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
+
+DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
+ dump? ( >=net-libs/libpcap-1.0.0 )
+ nfq? ( dev-libs/libdnet
+ >=net-firewall/iptables-1.4.10
+ net-libs/libnetfilter_queue )
+ ipq? ( dev-libs/libdnet
+ >=net-firewall/iptables-1.4.10
+ net-libs/libnetfilter_queue )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf \
+ $(use_enable ipv6) \
+ $(use_enable pcap pcap-module) \
+ $(use_enable afpacket afpacket-module) \
+ $(use_enable dump dump-module) \
+ $(use_enable nfq nfq-module) \
+ $(use_enable ipq ipq-module) \
+ $(use_enable static-libs static) \
+ --disable-ipfw-module \
+ --disable-bundled-modules
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc ChangeLog README
+
+ # Remove unneeded .la files
+ for x in pcap afpacket dump nfq ipq; do
+ rm "${D}"usr/lib64/daq/daq_${x}.la
+ done
+ for y in libdaq libdaq_static libdaq_static_modules libsfbpf; do
+ rm "${D}"usr/lib64/${y}.la
+ done
+
+ # If not using static-libs don't install the static libraries
+ # This has been bugged upstream
+ if ! use static-libs; then
+ for z in libdaq_static libdaq_static_modules; do
+ rm "${D}"usr/lib64/${z}.a
+ done
+ fi
+}
+
+pkg_postinst() {
+ einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
+ einfo "calls to PCAP functions with an abstraction layer that facilitates"
+ einfo "operation on a variety of hardware and software interfaces without"
+ einfo "requiring changes to application such as Snort."
+ einfo
+ einfo "Please see the README file for DAQ for information about specific"
+ einfo "DAQ modules."
+}
diff --git a/net-libs/daq/daq-2.0.0.ebuild b/net-libs/daq/daq-2.0.0.ebuild
new file mode 100644
index 000000000000..27a503142d2b
--- /dev/null
+++ b/net-libs/daq/daq-2.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils multilib
+
+DESCRIPTION="Data Acquisition library, for packet I/O"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="http://www.snort.org/downloads/2311 -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
+
+DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
+ dump? ( >=net-libs/libpcap-1.0.0 )
+ nfq? ( dev-libs/libdnet
+ >=net-firewall/iptables-1.4.10
+ net-libs/libnetfilter_queue )
+ ipq? ( dev-libs/libdnet
+ >=net-firewall/iptables-1.4.10
+ net-libs/libnetfilter_queue )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf \
+ $(use_enable ipv6) \
+ $(use_enable pcap pcap-module) \
+ $(use_enable afpacket afpacket-module) \
+ $(use_enable dump dump-module) \
+ $(use_enable nfq nfq-module) \
+ $(use_enable ipq ipq-module) \
+ $(use_enable static-libs static) \
+ --disable-ipfw-module \
+ --disable-bundled-modules
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc ChangeLog README
+
+ # Remove unneeded .la files
+ rm \
+ "${D}"usr/$(get_libdir)/daq/*.la \
+ "${D}"usr/$(get_libdir)/libdaq*.la \
+ "${D}"usr/$(get_libdir)/libsfbpf.la \
+ || die
+
+ # If not using static-libs don't install the static libraries
+ # This has been bugged upstream
+ if ! use static-libs; then
+ for z in libdaq_static libdaq_static_modules; do
+ rm "${D}"usr/$(get_libdir)/${z}.a
+ done
+ fi
+}
+
+pkg_postinst() {
+ einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
+ einfo "calls to PCAP functions with an abstraction layer that facilitates"
+ einfo "operation on a variety of hardware and software interfaces without"
+ einfo "requiring changes to application such as Snort."
+ einfo
+ einfo "Please see the README file for DAQ for information about specific"
+ einfo "DAQ modules."
+}
diff --git a/net-libs/daq/daq-2.0.2.ebuild b/net-libs/daq/daq-2.0.2.ebuild
new file mode 100644
index 000000000000..6bd73f786a13
--- /dev/null
+++ b/net-libs/daq/daq-2.0.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib autotools
+
+DESCRIPTION="Data Acquisition library, for packet I/O"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="http://www.snort.org/downloads/2778 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs"
+
+PCAP_DEPEND=">=net-libs/libpcap-1.0.0"
+IPT_DEPEND="
+ >=net-firewall/iptables-1.4.10
+ dev-libs/libdnet
+ net-libs/libnetfilter_queue
+
+"
+DEPEND="
+ dump? ( ${PCAP_DEPEND} )
+ ipq? ( ${IPT_DEPEND} )
+ nfq? ( ${IPT_DEPEND} )
+ pcap? ( ${PCAP_DEPEND} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-parallel-grammar.patch #511892
+ epatch "${FILESDIR}"/${P}-libpcap-check.patch
+ eautoreconf
+}
+
+src_configure() {
+ # We forced libpcap to 1.x, so we can set this cache var so
+ # cross-compiling doesn't break on us.
+ daq_cv_libpcap_version_1x=yes \
+ econf \
+ $(use_enable ipv6) \
+ $(use_enable pcap pcap-module) \
+ $(use_enable afpacket afpacket-module) \
+ $(use_enable dump dump-module) \
+ $(use_enable nfq nfq-module) \
+ $(use_enable ipq ipq-module) \
+ $(use_enable static-libs static) \
+ --disable-ipfw-module \
+ --disable-bundled-modules
+}
+
+DOCS=( ChangeLog README )
+
+src_install() {
+ default
+
+ prune_libtool_files
+
+ # If not using static-libs don't install the static libraries
+ # This has been bugged upstream
+ if ! use static-libs; then
+ for z in libdaq_static libdaq_static_modules; do
+ rm "${D}"usr/$(get_libdir)/${z}.a
+ done
+ fi
+}
+
+pkg_postinst() {
+ einfo "The Data Acquisition library (DAQ) for packet I/O replaces direct"
+ einfo "calls to PCAP functions with an abstraction layer that facilitates"
+ einfo "operation on a variety of hardware and software interfaces without"
+ einfo "requiring changes to application such as Snort."
+ einfo
+ einfo "Please see the README file for DAQ for information about specific"
+ einfo "DAQ modules."
+}
diff --git a/net-libs/daq/files/daq-2.0.2-libpcap-check.patch b/net-libs/daq/files/daq-2.0.2-libpcap-check.patch
new file mode 100644
index 000000000000..b68a8a4865f1
--- /dev/null
+++ b/net-libs/daq/files/daq-2.0.2-libpcap-check.patch
@@ -0,0 +1,36 @@
+fix the libpcap check so that people can set the cache version when cross-compiling
+
+patch by Shawn Wallace <sjwallace@google.com>
+
+--- a/m4/sf.m4
++++ b/m4/sf.m4
+@@ -135,7 +135,7 @@
+ echo
+ exit 1
+ fi
+- AC_MSG_CHECKING([for libpcap version >= $1])
++ AC_CACHE_CHECK([for libpcap version >= $1], [daq_cv_libpcap_version_1x], [
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+@@ -147,16 +147,13 @@
+ if (strcmp(pcap_version, $1) < 0)
+ return 1;
+ ]])],
+- [libpcap_version_1x="yes"],
+- [libpcap_version_1x="no"])
+- if test "x$libpcap_version_1x" = "xno"; then
+- AC_MSG_RESULT(no)
++ [daq_cv_libpcap_version_1x="yes"],
++ [daq_cv_libpcap_version_1x="no"])])
++ if test "x$daq_cv_libpcap_version_1x" = "xno"; then
+ echo
+ echo " ERROR! Libpcap library version >= $1 not found."
+ echo " Get it from http://www.tcpdump.org"
+ echo
+ exit 1
+- else
+- AC_MSG_RESULT(yes)
+ fi
+ ])
+
diff --git a/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch b/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch
new file mode 100644
index 000000000000..42e0f93791ac
--- /dev/null
+++ b/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/511892
+
+the scanner needs the generated header file, so make sure it's listed as a
+dependency. else you see a failure:
+ $ cd sfbpf
+ $ make clean
+ $ make sf_scanner.lo
+ <missing tokdefs.h>
+we'd like to list it as a dep of the object, but automake can use generated
+file names, so it's not easy to list that.
+
+we can't have both of the outputs from grammar.y run the lex, otherwise we
+hit random parallel build failures:
+ $ cd sfbpf
+ $ make clean
+ $ make tokdefs.h sf_grammar.c -j
+ <run yacc twice & fail>
+
+--- a/sfbpf/Makefile.am
++++ b/sfbpf/Makefile.am
+@@ -43,14 +43,16 @@
+ libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@
+
+ # use of $@ and $< here is a GNU idiom that borks BSD
+-${builddir}/sf_scanner.c: ${srcdir}/scanner.l
++${builddir}/sf_scanner.c: ${srcdir}/scanner.l ${builddir}/tokdefs.h
+ @rm -f ${builddir}/sf_scanner.c
+ ${srcdir}/runlex.sh $(V_LEX) -osf_scanner.c ${srcdir}/scanner.l
+
+-${builddir}/tokdefs.h ${builddir}/sf_grammar.c: ${srcdir}/grammar.y
++${builddir}/sf_grammar.c: ${srcdir}/grammar.y
+ @rm -f ${builddir}/sf_grammar.c ${builddir}/tokdefs.h
+ $(V_YACC) -d ${srcdir}/grammar.y
+ mv y.tab.c sf_grammar.c
+ mv y.tab.h tokdefs.h
+
++${builddir}/tokdefs.h: ${builddir}/sf_grammar.c ; @true
++
+ CLEANFILES = ${builddir}/sf_scanner.c ${builddir}/sf_grammar.c ${builddir}/tokdefs.h ${builddir}/sf_scanner.h
diff --git a/net-libs/daq/metadata.xml b/net-libs/daq/metadata.xml
new file mode 100644
index 000000000000..877529260333
--- /dev/null
+++ b/net-libs/daq/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>jason.r.wallace@gmail.com</email>
+ <name>Jason Wallace</name>
+</maintainer>
+<maintainer>
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+</maintainer>
+<herd>netmon</herd>
+<longdescription>Data Acquisition library, for packet I/O with Snort 2.9 and later</longdescription>
+<use>
+ <flag name='afpacket'>
+ Build the AFPacket data acquisition module. Functions similar to the PCAP
+ module but with better performance. Snort can run unprivileged when using
+ this module. AFpacket supports both inline and passive modes.
+ </flag>
+ <flag name='dump'>Build the Dump data acquisition module. The dump DAQ
+ allows you to test the various inline mode features available in
+ 2.9 Snort like injection and normalization.
+ </flag>
+ <flag name='pcap'>Build the PCAP data acquisition module.</flag>
+ <flag name='nfq'>
+ Build the NFQ data acquisition module. NFQ is the new way to process iptables
+ packets for inline deployments. Snort can not run unprivileged when using this module.
+ </flag>
+ <flag name='ipq'>
+ Build the IPQ data acquisition module. IPQ is the old way to process iptables
+ packets for inline deployments. Snort can not run unprivileged when using this module.
+ </flag>
+</use>
+</pkgmetadata>
+
diff --git a/net-libs/dhcpcd-dbus/Manifest b/net-libs/dhcpcd-dbus/Manifest
new file mode 100644
index 000000000000..beeeb387fd6d
--- /dev/null
+++ b/net-libs/dhcpcd-dbus/Manifest
@@ -0,0 +1 @@
+DIST dhcpcd-dbus-0.6.1.tar.bz2 21807 SHA256 cdb03f21fa2d37be8804d3aba80012ad0735131e263f05bc44c36f5f13d70a06 SHA512 ec110654115afedead094c6766877e7b3f5facbfec6778590d8aa3ceef777b183754fc077a10cf5c16b39c03e42d5948abd7c21e1d8a2d7fa376ec229bd75e6a WHIRLPOOL 73f8f3367ab7d096f8aa8b358cd413f5afe56a06f8aac4b7e160933d5aa17d4900ce897aef972d18e2d1664b42245178a8ce184357f725e18223860e33a17589
diff --git a/net-libs/dhcpcd-dbus/dhcpcd-dbus-0.6.1.ebuild b/net-libs/dhcpcd-dbus/dhcpcd-dbus-0.6.1.ebuild
new file mode 100644
index 000000000000..8af439479b80
--- /dev/null
+++ b/net-libs/dhcpcd-dbus/dhcpcd-dbus-0.6.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="DBus bindings for dhcpcd"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd-dbus/"
+SRC_URI="http://roy.marples.name/downloads/dhcpcd/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/dbus"
+RDEPEND="${DEPEND}
+ >=net-misc/dhcpcd-5.0"
+
+src_configure() {
+ econf --localstatedir=/var
+}
diff --git a/net-libs/dhcpcd-dbus/metadata.xml b/net-libs/dhcpcd-dbus/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/net-libs/dhcpcd-dbus/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/dleyna-connector-dbus/Manifest b/net-libs/dleyna-connector-dbus/Manifest
new file mode 100644
index 000000000000..ac01742a3e8d
--- /dev/null
+++ b/net-libs/dleyna-connector-dbus/Manifest
@@ -0,0 +1 @@
+DIST dleyna-connector-dbus-0.2.0.tar.gz 324464 SHA256 e791511206761282a658bb8253de076dcb1f8c8fbdc81219efe5ffe80cb2bea5 SHA512 0a1fc71fe299b295e86e47f2e356c89abc77f710e84bebe0f26fdb2ccbba5e693d5c8fc73133d46d902ba700f4369ade988f571ae7475f3325d5d5cce382f1d2 WHIRLPOOL 31c8cbbfd48c13bcabed8ac7fa966e7f3a96b1ddb76e104092ebcfc2ce54c5a15f5bc6ba944b2170219737d9cb8f643eea816a035a4d1628248c26ef142d627f
diff --git a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild
new file mode 100644
index 000000000000..26a45db53e0f
--- /dev/null
+++ b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="utility library for higher level dLeyna libraries"
+HOMEPAGE="https://01.org/dleyna/"
+SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.28:2
+ >=net-libs/dleyna-core-0.2.1:1.0
+ >=sys-apps/dbus-1
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/net-libs/dleyna-connector-dbus/metadata.xml b/net-libs/dleyna-connector-dbus/metadata.xml
new file mode 100644
index 000000000000..dad9001338dc
--- /dev/null
+++ b/net-libs/dleyna-connector-dbus/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/dleyna-core/Manifest b/net-libs/dleyna-core/Manifest
new file mode 100644
index 000000000000..b9eff33670c8
--- /dev/null
+++ b/net-libs/dleyna-core/Manifest
@@ -0,0 +1 @@
+DIST dleyna-core-0.5.0.tar.gz 337307 SHA256 de3027acf5718eae837b5f126bd49b8111189fb075e040d43b480d2b9b114aae SHA512 8611ae61482dcb0ca55513ed4ce7cae9372f88d710033e5abbaeb3c06533a7b2ac143757776bf9ced0dd3f0149ee9f2e42e90fac3ecbbeb42f38d13aeae7849f WHIRLPOOL 8f99dfb1d7c76c2f89e35dc835795f87ee044437184a45abe4250b4104c50954034245d570b40cf73a8311806678d14fe3ab723037fd7ccfcdae8ff35e317823
diff --git a/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
new file mode 100644
index 000000000000..351f5b4088f1
--- /dev/null
+++ b/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="utility library for higher level dLeyna libraries"
+HOMEPAGE="https://01.org/dleyna/"
+SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0/4"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.28:2
+ >=net-libs/gupnp-0.20.5
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/net-libs/dleyna-core/metadata.xml b/net-libs/dleyna-core/metadata.xml
new file mode 100644
index 000000000000..dad9001338dc
--- /dev/null
+++ b/net-libs/dleyna-core/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/dleyna-renderer/Manifest b/net-libs/dleyna-renderer/Manifest
new file mode 100644
index 000000000000..49e83d654787
--- /dev/null
+++ b/net-libs/dleyna-renderer/Manifest
@@ -0,0 +1 @@
+DIST dleyna-renderer-0.5.0.tar.gz 378208 SHA256 a62e98991b268f3a23d1c3e2275cdffb114a440d0b364e45480c8028573a6bc3 SHA512 28802057d6e0b7da24fd8abb11748faeb78ea6ef15ce85d83907497ff252c86cec1072a919e64bab6df0a375e0092c1281569802515fb87d9dc083098f1d4820 WHIRLPOOL 7cb73ba0fcaf203d9ca0617728d1a266b02e48a58c72e613368ef5db1c5fd67034975cfec33246ebbbc9e1537f1b5a200e1c6635cb9154f1086efc2dc68577ae
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.5.0.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.5.0.ebuild
new file mode 100644
index 000000000000..8412252d3935
--- /dev/null
+++ b/net-libs/dleyna-renderer/dleyna-renderer-0.5.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="library implementing services that allow clients to discover and manipulate DLNA renderers"
+HOMEPAGE="https://01.org/dleyna/"
+SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.28:2
+ >=media-libs/gupnp-dlna-0.9.4:2.0
+ >=net-libs/dleyna-core-0.5
+ >=net-libs/gssdp-0.13.2
+ >=net-libs/gupnp-0.20.5
+ >=net-libs/gupnp-av-0.11.5
+ >=net-libs/libsoup-2.28.2:2.4
+"
+RDEPEND="${COMMON_DEPEND}
+ net-libs/dleyna-connector-dbus
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/net-libs/dleyna-renderer/metadata.xml b/net-libs/dleyna-renderer/metadata.xml
new file mode 100644
index 000000000000..dad9001338dc
--- /dev/null
+++ b/net-libs/dleyna-renderer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/dslib/Manifest b/net-libs/dslib/Manifest
new file mode 100644
index 000000000000..c0e18c24199f
--- /dev/null
+++ b/net-libs/dslib/Manifest
@@ -0,0 +1 @@
+DIST dslib-3.0.tar.gz 85076 SHA256 2c2439c35aa01166c0e259bc27ddccdccc5801779a78d13ebdd8c51b88ac8aa0 SHA512 070e93fc89a50b379400613ff8991c8cbf6b58e2997f11dba917f943f3539e5b248f6a357f75f905bdacead3fc1eb0afbcc0a2af1bdcf9ce0cfc8884132c7ed9 WHIRLPOOL 3940df68c3e0235b59e198e76eb80bdc828d6a6c160ec2c4156e86d3aac8124fc5b7f75e6f5a00c29a85ec80e9195c1dc049080efcd88329134b21909138f064
diff --git a/net-libs/dslib/dslib-3.0-r1.ebuild b/net-libs/dslib/dslib-3.0-r1.ebuild
new file mode 100644
index 000000000000..d5559fcb74d3
--- /dev/null
+++ b/net-libs/dslib/dslib-3.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to access Czech eGov system \"Datove schranky\""
+HOMEPAGE="http://labs.nic.cz/page/969/datovka/"
+SRC_URI="http://www.nic.cz/public_media/datove_schranky/releases//src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ >=dev-python/sudsds-1.0.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/net-libs/dslib/metadata.xml b/net-libs/dslib/metadata.xml
new file mode 100644
index 000000000000..d0a904d48d95
--- /dev/null
+++ b/net-libs/dslib/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<longdescription>
+ A library for accessing ISDS (Informační systém datových schránek
+ / Data Box Information System) SOAP services as defined in Czech ISDS Act
+ (300/2008 Coll.) and implied documents.
+</longdescription>
+<maintainer>
+ <email>scarabeus@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest
new file mode 100644
index 000000000000..712f39627ca4
--- /dev/null
+++ b/net-libs/enet/Manifest
@@ -0,0 +1,3 @@
+DIST enet-1.2.2.tar.gz 413454 SHA256 6ce4e183ebfe980201b39174ad952993dbd8e8a7c325903fd520074ac7c2e20f SHA512 2c28ab4b650dd4165ee5913c1bc80dc47e43f2363a5fdd7f3aa9be8fb3afbc8aff7a6bce731f7dac45eb930fc6338cd811c07e8dedca5554a7dd32293685062d WHIRLPOOL f63da36d2cc5c1dc15f0f88234620536c300c64906c1e9f3bfddcd6cf70aa81bd37b653c34dd0d25baae4022addcd17b9b9f4863f7899e1630fc22f08c095fcd
+DIST enet-1.3.12.tar.gz 550604 SHA256 a5851cbd0dde2ddb47bca487a61976825159cb508ece3b1e34605420ac7e1d0b SHA512 cd41f807dedd2a2d2e55ef9094d210a5dcc1df8f6371c7d974414eecec91b59d094dfb0ea5ac091875466a9c95141f340f82da2143698df8c95f787fffe04ee3 WHIRLPOOL fdf709830e272a0aa0ca35c28092cc65dd52e1d5870d185c863b90fb81e2bda99863886ef559098188cf0b5abffb02a4e01c7ad495995f6a9e14862719f1c5eb
+DIST enet-1.3.7.tar.gz 522150 SHA256 15acbfd8e3aaf353320a60c785093cdf34f2ae207bcdd489503ca3f37659fe15 SHA512 b715347d94d8c5361033002e366f2cd7b8dd263faf7e84bd3d120de770f85025749fed4325c08f12d27875a112fb534a0464f8776bea6c3df2f048b57e5623f0 WHIRLPOOL 2ed39a5669ba74e11a08b70a5518a5314b43dad7629132f7e75f10445bea6491bdf27cd6ca34f9434a65fee236074169173687823f76bba3d66a2959a3478916
diff --git a/net-libs/enet/enet-1.2.2.ebuild b/net-libs/enet/enet-1.2.2.ebuild
new file mode 100644
index 000000000000..be0618bb7245
--- /dev/null
+++ b/net-libs/enet/enet-1.2.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit base
+
+DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP"
+HOMEPAGE="http://enet.bespin.org/"
+SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE="static-libs"
+
+DOCS=( "ChangeLog" "README" )
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable static-libs static)
+}
diff --git a/net-libs/enet/enet-1.3.12.ebuild b/net-libs/enet/enet-1.3.12.ebuild
new file mode 100644
index 000000000000..fc29b1c024ff
--- /dev/null
+++ b/net-libs/enet/enet-1.3.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base
+
+DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP"
+HOMEPAGE="http://enet.bespin.org/"
+SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.3/2.2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="!${CATEGORY}/${PN}:0"
+
+DOCS=( "ChangeLog" "README" )
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ base_src_install
+ if ! use static-libs ; then
+ find "${D}" -type f -name '*.la' -exec rm {} + || die
+ fi
+}
diff --git a/net-libs/enet/enet-1.3.7.ebuild b/net-libs/enet/enet-1.3.7.ebuild
new file mode 100644
index 000000000000..26de62ae8437
--- /dev/null
+++ b/net-libs/enet/enet-1.3.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base
+
+DESCRIPTION="relatively thin, simple and robust network communication layer on top of UDP"
+HOMEPAGE="http://enet.bespin.org/"
+SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.3/2.2"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="static-libs"
+
+RDEPEND="!${CATEGORY}/${PN}:0"
+
+DOCS=( "ChangeLog" "README" )
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ base_src_install
+ if ! use static-libs ; then
+ find "${D}" -type f -name '*.la' -exec rm {} + || die
+ fi
+}
diff --git a/net-libs/enet/metadata.xml b/net-libs/enet/metadata.xml
new file mode 100644
index 000000000000..5b80fb94c393
--- /dev/null
+++ b/net-libs/enet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
new file mode 100644
index 000000000000..e0a26e7dd3f4
--- /dev/null
+++ b/net-libs/farstream/Manifest
@@ -0,0 +1,2 @@
+DIST farstream-0.1.2.tar.gz 1265972 SHA256 fa5a40597b47b59d124f7fd57f66704b030d576cdc0d90e107c7a592f05e73d9 SHA512 7d9ddde5d17205752a17298fb90cf855a828b2ae58746fbdc7e47749cee5e5eac4fd56f97f58251a5d253901cdd555e9cfade6016b6d92df99daefbe850e2910 WHIRLPOOL 273d20082152ff09adf8e64481b1b7c7ba7e6a24fc09addc219880fbee7f1e6b9845ce727c032fa3c364e8d2440736fd0324015426591b7e9766f11054828294
+DIST farstream-0.2.7.tar.gz 1309470 SHA256 dad0ed43cf94e71df558c23825abe57db59d1ee8d970ffaec5e2dbc2e7acbf7d SHA512 98c72eb9045bf7d0ee7d38fc1d7eea0b8ad942fc39843df075bf6f61bc0bed619aafb36ae08d55a6e61265bd47137ec75ffbfc2846c7cbcb4cbef187844426d8 WHIRLPOOL 515901c25aab04c5c7ae91a96285e36095844d730cf38e4f4f9aabfaeb7ed09a0a4ba5eddbfcb1b7c8ff52ed7f7f16cb7a7a2814d29953d8d5097bb06dd95abc
diff --git a/net-libs/farstream/farstream-0.1.2-r1.ebuild b/net-libs/farstream/farstream-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..0c33e7eb15c8
--- /dev/null
+++ b/net-libs/farstream/farstream-0.1.2-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit eutils python
+
+DESCRIPTION="Audio/video conferencing framework specifically designed for instant messengers"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/Farstream"
+SRC_URI="http://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="alpha ia64 sparc"
+IUSE="+introspection python msn test upnp"
+
+SLOT="0.1"
+
+# Tests need shmsink from gst-plugins-bad, which isn't packaged
+RESTRICT="test"
+
+COMMONDEPEND="
+ >=media-libs/gstreamer-0.10.33:0.10
+ >=media-libs/gst-plugins-base-0.10.33:0.10
+ >=dev-libs/glib-2.30:2
+ >=net-libs/libnice-0.1.0
+ introspection? ( >=dev-libs/gobject-introspection-0.10.11 )
+ python? (
+ >=dev-python/pygobject-2.16:2
+ >=dev-python/gst-python-0.10.10:0.10 )
+ upnp? ( net-libs/gupnp-igd )
+"
+RDEPEND="${COMMONDEPEND}
+ >=media-libs/gst-plugins-good-0.10.17:0.10
+ >=media-libs/gst-plugins-bad-0.10.17:0.10
+ || (
+ >=media-plugins/gst-plugins-libnice-0.1.0:0.10
+ <=net-libs/libnice-0.1.3[gstreamer] )
+ msn? ( >=media-plugins/gst-plugins-mimic-0.10.17:0.10 )
+ !net-libs/farsight2
+"
+# This package is just a rename from farsight2
+
+MAKEOPTS="${MAKEOPTS} -j1" # Parallel is completely broken on this slot, bug #434618
+
+DEPEND="${COMMONDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+ test? (
+ media-libs/gst-plugins-good:0.10
+ media-plugins/gst-plugins-vorbis:0.10 )"
+
+pkg_setup() {
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # Fix building with gobject-introspection-1.33.x, bug #425096
+ epatch "${FILESDIR}/${P}-introspection-tag-order.patch"
+}
+
+src_configure() {
+ plugins="fsrawconference,fsrtpconference,fsfunnel,fsrtcpfilter,fsvideoanyrate"
+ use msn && plugins="${plugins},fsmsnconference"
+ econf --disable-static \
+ $(use_enable introspection) \
+ $(use_enable python) \
+ $(use_enable upnp gupnp) \
+ --with-plugins=${plugins}
+}
+
+src_install() {
+ # Parallel install fails, bug #434618 (fixed in latest slot)
+ emake -j1 install DESTDIR="${D}"
+ dodoc AUTHORS README ChangeLog
+
+ # Remove .la files since static libs are no longer being installed
+ find "${D}" -name '*.la' -exec rm -f '{}' + || die
+}
+
+src_test() {
+ # FIXME: do an out-of-tree build for tests if USE=-msn
+ if ! use msn; then
+ elog "Tests disabled without msn use flag"
+ return
+ fi
+
+ emake -j1 check
+}
diff --git a/net-libs/farstream/farstream-0.1.2-r2.ebuild b/net-libs/farstream/farstream-0.1.2-r2.ebuild
new file mode 100644
index 000000000000..0e6440e6b082
--- /dev/null
+++ b/net-libs/farstream/farstream-0.1.2-r2.ebuild
@@ -0,0 +1,85 @@
+# 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 python-single-r1
+
+DESCRIPTION="Audio/video conferencing framework specifically designed for instant messengers"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/Farstream"
+SRC_URI="http://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+
+IUSE="+introspection python test upnp"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+SLOT="0.1"
+
+# Tests need shmsink from gst-plugins-bad, which isn't packaged
+RESTRICT="test"
+
+COMMONDEPEND="
+ >=media-libs/gstreamer-0.10.33:0.10
+ >=media-libs/gst-plugins-base-0.10.33:0.10
+ >=dev-libs/glib-2.30:2
+ >=net-libs/libnice-0.1.0
+ introspection? ( >=dev-libs/gobject-introspection-0.10.11 )
+ python? ( ${PYTHON_DEPS}
+ >=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
+ >=dev-python/gst-python-0.10.10:0.10[${PYTHON_USEDEP}] )
+ upnp? ( net-libs/gupnp-igd )
+"
+RDEPEND="${COMMONDEPEND}
+ >=media-libs/gst-plugins-good-0.10.17:0.10
+ >=media-libs/gst-plugins-bad-0.10.17:0.10
+ || (
+ >=media-plugins/gst-plugins-libnice-0.1.0:0.10
+ <=net-libs/libnice-0.1.3[gstreamer] )
+ !net-libs/farsight2
+"
+# This package is just a rename from farsight2
+
+MAKEOPTS="${MAKEOPTS} -j1" # Parallel is completely broken on this slot, bug #434618
+
+DEPEND="${COMMONDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+ test? (
+ media-libs/gst-plugins-good:0.10
+ media-plugins/gst-plugins-vorbis:0.10 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# FIXME: do an out-of-tree build for tests if USE=-msn
+RESTRICT="test"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Fix building with gobject-introspection-1.33.x, bug #425096
+ epatch "${FILESDIR}/${P}-introspection-tag-order.patch"
+}
+
+src_configure() {
+ plugins="fsrawconference,fsrtpconference,fsfunnel,fsrtcpfilter,fsvideoanyrate"
+ econf --disable-static \
+ $(use_enable introspection) \
+ $(use_enable python) \
+ $(use_enable upnp gupnp) \
+ --with-plugins=${plugins}
+}
+
+src_install() {
+ # Parallel install fails, bug #434618 (fixed in latest slot)
+ emake -j1 install DESTDIR="${D}"
+ dodoc AUTHORS README ChangeLog
+
+ # Remove .la files since static libs are no longer being installed
+ find "${D}" -name '*.la' -exec rm -f '{}' + || die
+}
diff --git a/net-libs/farstream/farstream-0.2.7.ebuild b/net-libs/farstream/farstream-0.2.7.ebuild
new file mode 100644
index 000000000000..4828d308df54
--- /dev/null
+++ b/net-libs/farstream/farstream-0.2.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1
+
+DESCRIPTION="Audio/video conferencing framework specifically designed for instant messengers"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/Farstream"
+SRC_URI="http://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="+introspection test upnp"
+
+SLOT="0.2/5" # .so version
+
+# Tests need shmsink from gst-plugins-bad, which isn't packaged
+# FIXME: do an out-of-tree build for tests if USE=-msn
+RESTRICT="test"
+
+COMMONDEPEND="
+ >=media-libs/gstreamer-1.4:1.0
+ >=media-libs/gst-plugins-base-1.4:1.0
+ >=dev-libs/glib-2.32:2
+ >=net-libs/libnice-0.1.8
+ introspection? ( >=dev-libs/gobject-introspection-0.10.11 )
+ upnp? ( >=net-libs/gupnp-igd-0.2:= )
+"
+RDEPEND="${COMMONDEPEND}
+ >=media-libs/gst-plugins-good-1.4:1.0
+ >=media-libs/gst-plugins-bad-1.4:1.0
+ media-plugins/gst-plugins-libnice:1.0
+"
+DEPEND="${COMMONDEPEND}
+ ${PYTHON_DEPS}
+ >=dev-util/gtk-doc-am-1.18
+ virtual/pkgconfig
+ test? (
+ media-libs/gst-plugins-base:1.0[vorbis]
+ media-libs/gst-plugins-good:1.0 )
+"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ plugins="fsrawconference,fsrtpconference,fsfunnel,fsrtcpfilter,fsvideoanyrate"
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable upnp gupnp) \
+ --with-plugins=${plugins}
+}
+
+src_compile() {
+ # Prevent sandbox violations, bug #539224
+ # https://bugzilla.gnome.org/show_bug.cgi?id=744135
+ # https://bugzilla.gnome.org/show_bug.cgi?id=744134
+ addpredict /dev
+ gnome2_src_compile
+}
diff --git a/net-libs/farstream/files/farstream-0.1.2-introspection-tag-order.patch b/net-libs/farstream/files/farstream-0.1.2-introspection-tag-order.patch
new file mode 100644
index 000000000000..3283e1fd2990
--- /dev/null
+++ b/net-libs/farstream/files/farstream-0.1.2-introspection-tag-order.patch
@@ -0,0 +1,132 @@
+From 39450457190675716c8e66700e35b05334a6a1a0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
+Date: Fri, 25 May 2012 17:06:59 -0400
+Subject: [PATCH] Gtk-doc tags belong after the description
+
+---
+ farstream/fs-session.c | 16 +++++++---------
+ farstream/fs-stream.c | 15 ++++++---------
+ 2 files changed, 13 insertions(+), 18 deletions(-)
+
+diff --git a/farstream/fs-session.c b/farstream/fs-session.c
+index 80794d1..abb1bc3 100644
+--- a/farstream/fs-session.c
++++ b/farstream/fs-session.c
+@@ -270,9 +270,6 @@ fs_session_class_init (FsSessionClass *klass)
+ /**
+ * FsSession:codec-preferences:
+ *
+- * Type: GLib.List(FsCodec)
+- * Transfer: full
+- *
+ * This is the current preferences list for the local codecs. It is
+ * set by the user to specify the codec options and priorities. The user may
+ * change its value with fs_session_set_codec_preferences() at any time
+@@ -283,6 +280,9 @@ fs_session_class_init (FsSessionClass *klass)
+ * or %FS_CODEC_ID_ANY. If the encoding name is "reserve-pt", then the
+ * payload type of the codec will be "reserved" and not be used by any
+ * dynamically assigned payload type.
++ *
++ * Type: GLib.List(FsCodec)
++ * Transfer: full
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_CODEC_PREFERENCES,
+@@ -296,9 +296,6 @@ fs_session_class_init (FsSessionClass *klass)
+ /**
+ * FsSession:codecs:
+ *
+- * Type: GLib.List(FsCodec)
+- * Transfer: full
+- *
+ * This is the list of codecs used for this session. It will include the
+ * codecs and payload type used to receive media on this session. It will
+ * also include any configuration parameter that must be transmitted reliably
+@@ -317,6 +314,8 @@ fs_session_class_init (FsSessionClass *klass)
+ * It is a #GList of #FsCodec. User must free this codec list using
+ * fs_codec_list_destroy() when done.
+ *
++ * Type: GLib.List(FsCodec)
++ * Transfer: full
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_CODECS,
+@@ -329,9 +328,6 @@ fs_session_class_init (FsSessionClass *klass)
+ /**
+ * FsSession:codecs-without-config:
+ *
+- * Type: GLib.List(FsCodec)
+- * Transfer: full
+- *
+ * This is the same list of codecs as #FsSession:codecs without
+ * the configuration information that describes the data sent. It is suitable
+ * for configurations where a list of codecs is shared by many senders.
+@@ -349,6 +345,8 @@ fs_session_class_init (FsSessionClass *klass)
+ * It is a #GList of #FsCodec. User must free this codec list using
+ * fs_codec_list_destroy() when done.
+ *
++ * Type: GLib.List(FsCodec)
++ * Transfer: full
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_CODECS_WITHOUT_CONFIG,
+diff --git a/farstream/fs-stream.c b/farstream/fs-stream.c
+index b9e1320..110641d 100644
+--- a/farstream/fs-stream.c
++++ b/farstream/fs-stream.c
+@@ -176,13 +176,12 @@ fs_stream_class_init (FsStreamClass *klass)
+ /**
+ * FsStream:remote-codecs:
+ *
+- * Type: GLib.List(FsCodec)
+- * Transfer: full
+- *
+ * This is the list of remote codecs for this stream. They must be set by the
+ * user as soon as they are known using fs_stream_set_remote_codecs()
+ * (generally through external signaling). It is a #GList of #FsCodec.
+ *
++ * Type: GLib.List(FsCodec)
++ * Transfer: full
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_REMOTE_CODECS,
+@@ -195,15 +194,14 @@ fs_stream_class_init (FsStreamClass *klass)
+ /**
+ * FsStream:negotiated-codecs:
+ *
+- * Type: GLib.List(FsCodec)
+- * Transfer: full
+- *
+ * This is the list of negotiatied codecs, it is the same list as the list
+ * of #FsCodec from the parent #FsSession, except that the codec config data
+ * has been replaced with the data from the remote codecs for this stream.
+ * This is the list of #FsCodec used to receive data from this stream.
+ * It is a #GList of #FsCodec.
+ *
++ * Type: GLib.List(FsCodec)
++ * Transfer: full
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_NEGOTIATED_CODECS,
+@@ -216,9 +214,6 @@ fs_stream_class_init (FsStreamClass *klass)
+ /**
+ * FsStream:current-recv-codecs:
+ *
+- * Type: GLib.List(FsCodec)
+- * Transfer: full
+- *
+ * This is the list of codecs that have been received by this stream.
+ * The user must free the list if fs_codec_list_destroy().
+ * The "farstream-recv-codecs-changed" message is send on the #GstBus
+@@ -228,6 +223,8 @@ fs_stream_class_init (FsStreamClass *klass)
+ * also be emitted if the pad already exists, but the source material that
+ * will come to it is different.
+ *
++ * Type: GLib.List(FsCodec)
++ * Transfer: full
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_CURRENT_RECV_CODECS,
+--
+1.7.8.6
+
diff --git a/net-libs/farstream/metadata.xml b/net-libs/farstream/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/net-libs/farstream/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/ftplib/Manifest b/net-libs/ftplib/Manifest
new file mode 100644
index 000000000000..237209ec65ae
--- /dev/null
+++ b/net-libs/ftplib/Manifest
@@ -0,0 +1,3 @@
+DIST ftplib-4.0.tar.gz 66680 SHA256 a9fabf1fdb2d6cc3713fd5413724ecc266f438a53a24595619080db9e51426a1 SHA512 ff39c243a6acbb67a8d2779f34b59f69f45d578ea3976c14aee1abcc56bf16cbbc6518ba96a4ccf34f6dd469eef388043caf066858b8df24bebfab7ab30a1c62 WHIRLPOOL 710035aa579611790d1991c0f48628c808a703f410db4d2f545b099449e3c3d3a76897d01ae1c50f47485f4b7b76492f1e2ac52445a4cc9264c41208f84500db
+DIST ftplib_3.1-1-9.debian.tar.gz 8560 SHA256 92aa7dc894cc144d3f92c7a5e60f1ea57c78eef2f93e4449242ad03aaef50644 SHA512 c87fb17bca4616d85f064f718161071b35a0e3f1c84ce8f13b4cd9f9b75f5115a4c518680d77af240196f0b2ee5eff520e0d4a0b87c797554c1ee8caa4962e07 WHIRLPOOL 6545603c973516a9fb180da3f39b741eb84e9cb2b383e4eff4ff75c55271c2e73d2547b790f841135688b5a7ec4fc1a6f95c8ff1745bea10c4ff2a73ecac0b62
+DIST ftplib_3.1-1.orig.tar.gz 90724 SHA256 64161ea4aeb1a1314eb821584521f97a1cac18b01e77722687666a1835a0b76d SHA512 5a0116ce1526f77532ced94c00bc1199378da1e1707c86637c83c6e9a27fef3a290bfefb7fc537946219587625b39560399cf136b83878a7829a2f3bee5f926f WHIRLPOOL 21df0807a5d3fa506cc6c10c7116f268b08cbab2af187aa6cc96c3b63fb0e1cc1b61ef32d1bb6c4f99d9122adc579a75d97095ae530abb112cd6fe38c472be19
diff --git a/net-libs/ftplib/files/ftplib-4.0-crash.patch b/net-libs/ftplib/files/ftplib-4.0-crash.patch
new file mode 100644
index 000000000000..c984e2d81b19
--- /dev/null
+++ b/net-libs/ftplib/files/ftplib-4.0-crash.patch
@@ -0,0 +1,116 @@
+include sys/select.h for the select() prototype on unix systems.
+
+fix warning about using chars as subscripts in arrays. on many systems, isdigit
+turns into an index of an array, so the pnum char needs to be casted to an int.
+the spec says these funcs take an int, not a char.
+
+fix warnings about the rv return value being uninitialized in FtpAcceptConnection.
+
+fix a crasher in FtpClose where it derefs the ctrl pointer before checking
+if it's NULL.
+
+fix the FtpQuit API to return 0/1 as it's documented so the caller can detect.
+
+patch by Mike Frysinger <vapier@gentoo.org>
+
+--- a/src/ftplib.c
++++ b/src/ftplib.c
+@@ -31,6 +32,7 @@
+ #if defined(__unix__)
+ #include <sys/time.h>
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
+@@ -453,7 +456,7 @@ GLOBALDEF int FtpConnect(const char *hos
+ pnum = "ftp";
+ else
+ *pnum++ = '\0';
+- if (isdigit(*pnum))
++ if (isdigit((int)*pnum))
+ sin.sin_port = htons(atoi(pnum));
+ else
+ {
+@@ -841,7 +862,7 @@ static int FtpAcceptConnection(netbuf *n
+ int i;
+ struct timeval tv;
+ fd_set mask;
+- int rv;
++ int rv = 0;
+
+ FD_ZERO(&mask);
+ FD_SET(nControl->handle, &mask);
+@@ -858,14 +879,12 @@ static int FtpAcceptConnection(netbuf *n
+ sizeof(nControl->response));
+ net_close(nData->handle);
+ nData->handle = 0;
+- rv = 0;
+ }
+ else if (i == 0)
+ {
+ strcpy(nControl->response, "timed out waiting for connection");
+ net_close(nData->handle);
+ nData->handle = 0;
+- rv = 0;
+ }
+ else
+ {
+@@ -885,7 +904,6 @@ static int FtpAcceptConnection(netbuf *n
+ strncpy(nControl->response, strerror(i),
+ sizeof(nControl->response));
+ nData->handle = 0;
+- rv = 0;
+ }
+ }
+ else if (FD_ISSET(nControl->handle, &mask))
+@@ -893,7 +911,6 @@ static int FtpAcceptConnection(netbuf *n
+ net_close(nData->handle);
+ nData->handle = 0;
+ readresp('2', nControl);
+- rv = 0;
+ }
+ }
+ return rv;
+@@ -1054,10 +1054,11 @@ GLOBALDEF int FtpClose(netbuf *nData)
+ net_close(nData->handle);
+ ctrl = nData->ctrl;
+ free(nData);
+- ctrl->data = NULL;
+- if (ctrl && ctrl->response[0] != '4' && ctrl->response[0] != 5)
++ if (ctrl)
+ {
+- return(readresp('2', ctrl));
++ ctrl->data = NULL;
++ if (ctrl->response[0] != '4' && ctrl->response[0] != 5)
++ return readresp('2', ctrl);
+ }
+ return 1;
+ case FTPLIB_CONTROL:
+@@ -1442,12 +1443,13 @@ GLOBALDEF int FtpDelete(const char *fnm, netbuf *nControl)
+ *
+ * return 1 if successful, 0 otherwise
+ */
+-GLOBALDEF void FtpQuit(netbuf *nControl)
++GLOBALDEF int FtpQuit(netbuf *nControl)
+ {
+ if (nControl->dir != FTPLIB_CONTROL)
+- return;
++ return 0;
+ FtpSendCmd("QUIT",'2',nControl);
+ net_close(nControl->handle);
+ free(nControl->buf);
+ free(nControl);
++ return 1;
+ }
+--- a/src/ftplib.h
++++ b/src/ftplib.h
+@@ -111,7 +111,7 @@ GLOBALREF int FtpPut(const char *input, const char *path, char mode,
+ netbuf *nControl);
+ GLOBALREF int FtpRename(const char *src, const char *dst, netbuf *nControl);
+ GLOBALREF int FtpDelete(const char *fnm, netbuf *nControl);
+-GLOBALREF void FtpQuit(netbuf *nControl);
++GLOBALREF int FtpQuit(netbuf *nControl);
+
+ #ifdef __cplusplus
+ };
diff --git a/net-libs/ftplib/ftplib-3.1.1.ebuild b/net-libs/ftplib/ftplib-3.1.1.ebuild
new file mode 100644
index 000000000000..0a80ac6e8028
--- /dev/null
+++ b/net-libs/ftplib/ftplib-3.1.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils multilib toolchain-funcs versionator
+
+DEB_REV=9
+MY_PV=$(replace_version_separator 2 -)
+
+DESCRIPTION="A set of routines that implement the FTP protocol"
+HOMEPAGE="http://nbpfaus.net/~pfau/ftplib/"
+DEB_URI="mirror://debian/pool/main/f/${PN}"
+SRC_URI="${DEB_URI}/${PN}_${MY_PV}.orig.tar.gz
+ ${DEB_URI}/${PN}_${MY_PV}-${DEB_REV}.debian.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+ epatch "${WORKDIR}"/debian/patches/{check-getservbyname-failure,fix-ascii-read-without-eol}
+
+ sed -i \
+ -e '/shared/s:$(CC):$(CC) $(LDFLAGS):' \
+ -e 's:/usr/local:$(DESTDIR)/usr:' \
+ -e '/^LDFLAGS/s:=:+=:' \
+ -e "s:/lib:/$(get_libdir):" \
+ linux/Makefile || die
+}
+
+src_compile() {
+ tc-export CC
+ emake -C linux DEBUG="${CFLAGS}"
+}
+
+src_install() {
+ dodir /usr/bin /usr/include /usr/$(get_libdir)
+ emake -C linux DESTDIR="${D}" install
+ dodoc additional_rfcs CHANGES ftplib.lsm NOTES README* RFC959.txt TODO
+}
diff --git a/net-libs/ftplib/ftplib-4.0-r1.ebuild b/net-libs/ftplib/ftplib-4.0-r1.ebuild
new file mode 100644
index 000000000000..9afad088aa30
--- /dev/null
+++ b/net-libs/ftplib/ftplib-4.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit multilib multilib-minimal toolchain-funcs eutils
+
+DESCRIPTION="A set of routines that implement the FTP protocol"
+HOMEPAGE="http://nbpfaus.net/~pfau/ftplib/"
+SRC_URI="http://nbpfaus.net/~pfau/ftplib/${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+ sed -i \
+ -e '/shared/s:$(CC):$(CC) $(LDFLAGS):' \
+ -e 's:/usr/local:$(DESTDIR)/usr:' \
+ -e '/^LDFLAGS/s:=:+=:' \
+ -e "s:/lib:/$(get_libdir):" \
+ -e '/ar -rcs/s:ar:$(AR):' \
+ src/Makefile || die
+ epatch "${FILESDIR}"/${PN}-4.0-crash.patch
+
+ multilib_copy_sources
+}
+
+multilib_src_compile() {
+ emake -C src \
+ DEBUG="${CFLAGS} ${CPPFLAGS}" \
+ AR="$(tc-getAR)" \
+ CC="$(tc-getCC)"
+}
+
+multilib_src_install() {
+ dodir /usr/bin /usr/include /usr/$(get_libdir)
+ emake -C src DESTDIR="${ED}" install
+}
+
+multilib_src_install_all() {
+ dodoc additional_rfcs CHANGES README* RFC959.txt
+ dohtml html/*
+}
diff --git a/net-libs/ftplib/ftplib-4.0.ebuild b/net-libs/ftplib/ftplib-4.0.ebuild
new file mode 100644
index 000000000000..9ec70207a44b
--- /dev/null
+++ b/net-libs/ftplib/ftplib-4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils multilib toolchain-funcs versionator
+
+DESCRIPTION="A set of routines that implement the FTP protocol"
+HOMEPAGE="http://nbpfaus.net/~pfau/ftplib/"
+SRC_URI="http://nbpfaus.net/~pfau/ftplib/${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+ sed -i \
+ -e '/shared/s:$(CC):$(CC) $(LDFLAGS):' \
+ -e 's:/usr/local:$(DESTDIR)/usr:' \
+ -e '/^LDFLAGS/s:=:+=:' \
+ -e "s:/lib:/$(get_libdir):" \
+ -e '/ar -rcs/s:ar:$(AR):' \
+ src/Makefile || die
+}
+
+src_compile() {
+ tc-export AR CC
+ emake -C src DEBUG="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+ dodir /usr/bin /usr/include /usr/$(get_libdir)
+ emake -C src DESTDIR="${ED}" install
+ dodoc additional_rfcs CHANGES README* RFC959.txt
+ dohtml html/*
+}
diff --git a/net-libs/ftplib/metadata.xml b/net-libs/ftplib/metadata.xml
new file mode 100644
index 000000000000..c572c7d9b478
--- /dev/null
+++ b/net-libs/ftplib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>video</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
new file mode 100644
index 000000000000..9f9ae79b570a
--- /dev/null
+++ b/net-libs/glib-networking/Manifest
@@ -0,0 +1,3 @@
+DIST glib-networking-2.40.1.tar.xz 368444 SHA256 9fb3e54d049a480afdb814ff7452e7ab67e5d5f607ade230d7713f19922b5a28 SHA512 5d6485b486e1e51fc4f5ac27b3d7455ecf34989a9204cc372926cb202d532711fa57a76aac9f77ca9ba70acade7453d3831111cc86e24669dea2f8fc3e87c822 WHIRLPOOL 2a60ed6f971595496864e3f8f01970a88c8bb558125371a2dee4ff8eb51435cf7146c4edfe07de6850d5156c1c9bd34e5be74c69154157ed92c74dcda893cd84
+DIST glib-networking-2.42.1.tar.xz 374540 SHA256 c06bf76da3353695fcc791b7b02e5d60c01c379e554f7841dc6cbca32f65f3a0 SHA512 e7cd6aad1ea6e8eb3feb2ff719e1b34da0ed18254f2e8f1fcf061b14bb5919651ecbae469217c504be4d034e0f334868c1556f6aac1027e505eb35ffd99b3a58 WHIRLPOOL aa76055b0924a4f7dc338ad702d9dfaefe08a5cb0f6cb334838f8d83143e7cee4a079b8ecc01e4be4241adb574d5b7a188c159d8fc176a3bf77004749dd48422
+DIST glib-networking-2.44.0.tar.xz 375456 SHA256 8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346 SHA512 318d7b7a4beeb21f75da9278bae7016bf78be48f9e2b9365d48246c97d1c6b6f5aba3365ef81f2592fd3cc3d5d16122c245dd3cfede6eaffc3e94113a527e10b WHIRLPOOL aaee32a45fbccbece1378a0a304b6215862bd1fd69991fbd99f344027693b4040b5acfe6b96f20c9d05d648cc72394dade50a233d61f19195e2f7ced5c4f0292
diff --git a/net-libs/glib-networking/files/glib-networking-2.40.1-unittests.patch b/net-libs/glib-networking/files/glib-networking-2.40.1-unittests.patch
new file mode 100644
index 000000000000..4301b84620b7
--- /dev/null
+++ b/net-libs/glib-networking/files/glib-networking-2.40.1-unittests.patch
@@ -0,0 +1,45 @@
+From 8867e6a0b3b84b41b5a61c5194fa1300c5c39d8c Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 25 Apr 2014 22:59:01 +0200
+Subject: [PATCH] test connection is not PKCS#11 related
+
+Avoids silly test failure:
+
+CCLD connection
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../lib64/Scrt1.o: In
+function `_start':
+(.text+0x20): undefined reference to `main'
+collect2: error: ld returned 1 exit status
+Makefile:897: recipe for target 'connection' failed
+make[4]: *** [connection] Error 1
+---
+ tls/tests/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tls/tests/Makefile.am b/tls/tests/Makefile.am
+index 6287b9c..009b388 100644
+--- a/tls/tests/Makefile.am
++++ b/tls/tests/Makefile.am
+@@ -15,6 +15,9 @@ test_programs = \
+ connection \
+ $(NULL)
+
++connection_SOURCES = connection.c \
++ mock-interaction.c mock-interaction.h
++
+ if HAVE_PKCS11
+
+ test_programs += \
+@@ -33,9 +36,6 @@ pkcs11_slot_SOURCES = pkcs11-slot.c \
+ mock-pkcs11.c mock-pkcs11.h \
+ mock-interaction.c mock-interaction.h
+
+-connection_SOURCES = connection.c \
+- mock-interaction.c mock-interaction.h
+-
+ endif
+
+ testfiles_data = \
+--
+1.9.0
+
diff --git a/net-libs/glib-networking/glib-networking-2.40.1-r1.ebuild b/net-libs/glib-networking/glib-networking-2.40.1-r1.ebuild
new file mode 100644
index 000000000000..5e4722211b30
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.40.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+gnome +libproxy smartcard +ssl test"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.40.0-r1:2[${MULTILIB_USEDEP}]
+ gnome? ( gnome-base/gsettings-desktop-schemas )
+ libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+ smartcard? (
+ >=app-crypt/p11-kit-0.18.4[${MULTILIB_USEDEP}]
+ >=net-libs/gnutls-2.12.23-r6:=[pkcs11,${MULTILIB_USEDEP}] )
+ ssl? (
+ app-misc/ca-certificates
+ >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? ( sys-apps/dbus[X] )
+"
+# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-unittests.patch
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static \
+ --with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+ $(use_with gnome gnome-proxy) \
+ $(use_with libproxy) \
+ $(use_with smartcard pkcs11) \
+ $(use_with ssl gnutls)
+}
+
+multilib_src_test() {
+ # non-native tests fail if glib-networking is already installed.
+ # have no idea what's wrong. would appreciate some help.
+ multilib_is_native_abi || return 0
+
+ Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
diff --git a/net-libs/glib-networking/glib-networking-2.42.1.ebuild b/net-libs/glib-networking/glib-networking-2.42.1.ebuild
new file mode 100644
index 000000000000..b9760c87e8d9
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.42.1.ebuild
@@ -0,0 +1,67 @@
+# 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 autotools eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+gnome +libproxy smartcard +ssl test"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.42:2[${MULTILIB_USEDEP}]
+ gnome? ( gnome-base/gsettings-desktop-schemas )
+ libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+ smartcard? (
+ >=app-crypt/p11-kit-0.18.4[${MULTILIB_USEDEP}]
+ >=net-libs/gnutls-3:=[pkcs11,${MULTILIB_USEDEP}] )
+ ssl? (
+ app-misc/ca-certificates
+ >=net-libs/gnutls-3:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? ( sys-apps/dbus[X] )
+"
+# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
+
+src_prepare() {
+ # Fix test build failure with USE=-smartcard
+ epatch "${FILESDIR}"/${PN}-2.40.1-unittests.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static \
+ --with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+ $(use_with gnome gnome-proxy) \
+ $(use_with libproxy) \
+ $(use_with smartcard pkcs11) \
+ $(use_with ssl gnutls)
+}
+
+multilib_src_test() {
+ # non-native tests fail if glib-networking is already installed.
+ # have no idea what's wrong. would appreciate some help.
+ multilib_is_native_abi || return 0
+
+ Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
diff --git a/net-libs/glib-networking/glib-networking-2.44.0.ebuild b/net-libs/glib-networking/glib-networking-2.44.0.ebuild
new file mode 100644
index 000000000000..93b82ef7aeab
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.44.0.ebuild
@@ -0,0 +1,67 @@
+# 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 autotools eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="+gnome +libproxy smartcard +ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.39.1:2[${MULTILIB_USEDEP}]
+ gnome? ( gnome-base/gsettings-desktop-schemas )
+ libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+ smartcard? (
+ >=app-crypt/p11-kit-0.18.4[${MULTILIB_USEDEP}]
+ >=net-libs/gnutls-3:=[pkcs11,${MULTILIB_USEDEP}] )
+ ssl? (
+ app-misc/ca-certificates
+ >=net-libs/gnutls-3:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? ( sys-apps/dbus[X] )
+"
+# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
+
+src_prepare() {
+ # Fix test build failure with USE=-smartcard
+ epatch "${FILESDIR}"/${PN}-2.40.1-unittests.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static \
+ --with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+ $(use_with gnome gnome-proxy) \
+ $(use_with libproxy) \
+ $(use_with smartcard pkcs11) \
+ $(use_with ssl gnutls)
+}
+
+multilib_src_test() {
+ # non-native tests fail if glib-networking is already installed.
+ # have no idea what's wrong. would appreciate some help.
+ multilib_is_native_abi || return 0
+
+ Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
diff --git a/net-libs/glib-networking/metadata.xml b/net-libs/glib-networking/metadata.xml
new file mode 100644
index 000000000000..4a1545e7ec5d
--- /dev/null
+++ b/net-libs/glib-networking/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting
+ the HTTP/HTTPS/SOCKS proxy configuration</flag>
+ <flag name="gnome">Extract HTTP/HTTPS/SOCKS proxy configuration
+ stored using GSettings</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
new file mode 100644
index 000000000000..815e0641563c
--- /dev/null
+++ b/net-libs/gloox/Manifest
@@ -0,0 +1,2 @@
+DIST gloox-1.0.13.tar.bz2 675842 SHA256 4d9f1eeac97c6563dde11d4bdba346a025ef27908b088b47b5c8d3d03df6ea8a SHA512 9f9773a5c3d2ae8a4eec6e8365c8578c089004d0f5101c2e8a8bf96ac8e8b6a08cf4e92f93afb8d07af0e8cc2c238c12f4f8df75a81c2a06dfb039c1d4ae850a WHIRLPOOL 772b18a22acff536abb378a4307c6dcb3b9b35b231d061f05b22d5cb260d8da3c0356bdbca0a8cac9feab0fbc9124bc41472b91a335215291e1e66a9184ccc78
+DIST gloox-1.0.9.tar.bz2 670206 SHA256 143dd50e1edc4eb1d304fa28bdd6ab9e53b60c37c1726dd0e34c06c51f9a453e SHA512 a3fa7acc76fdca0421030e71b6a13ca0b04589946df2a781609f1bddae5329299d68ce99a4a94a0760206b112759636379ce67d220422b99302fc799964bfa22 WHIRLPOOL 414eb34fa3ec11ae929f84198d95ed0da9de0739655ae1188ac3eb03998de5cecb9c165ad284496b405b49126236b628dc5b4579e855b10377add145fabb63b1
diff --git a/net-libs/gloox/gloox-1.0.13.ebuild b/net-libs/gloox/gloox-1.0.13.ebuild
new file mode 100644
index 000000000000..5bc18fc75472
--- /dev/null
+++ b/net-libs/gloox/gloox-1.0.13.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_P="${P/_/-}"
+DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
+HOMEPAGE="http://camaya.net/gloox"
+SRC_URI="http://camaya.net/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86"
+IUSE="debug gnutls idn ssl static-libs test zlib"
+
+DEPEND="idn? ( net-dns/libidn )
+ gnutls? ( net-libs/gnutls )
+ ssl? ( dev-libs/openssl )
+ zlib? ( sys-libs/zlib )"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch_user
+}
+
+src_configure() {
+ # Examples are not installed anyway, so - why should we build them?
+ econf \
+ --without-examples \
+ $(use debug && echo "--enable-debug") \
+ $(use_enable static-libs static) \
+ $(use_with idn libidn) \
+ $(use_with gnutls) \
+ $(use_with ssl openssl) \
+ $(use_with test tests) \
+ $(use_with zlib)
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/net-libs/gloox/gloox-1.0.9.ebuild b/net-libs/gloox/gloox-1.0.9.ebuild
new file mode 100644
index 000000000000..51c93c5f4f77
--- /dev/null
+++ b/net-libs/gloox/gloox-1.0.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${P/_/-}
+DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
+HOMEPAGE="http://camaya.net/gloox"
+SRC_URI="http://camaya.net/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86"
+IUSE="debug gnutls idn ssl zlib"
+
+DEPEND="idn? ( net-dns/libidn )
+ gnutls? ( net-libs/gnutls )
+ ssl? ( dev-libs/openssl )
+ zlib? ( sys-libs/zlib )"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ econf \
+ $(use_enable debug debug) \
+ $(use_with idn libidn) \
+ $(use_with gnutls gnutls) \
+ $(use_with ssl openssl) \
+ $(use_with zlib zlib)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+}
diff --git a/net-libs/gloox/metadata.xml b/net-libs/gloox/metadata.xml
new file mode 100644
index 000000000000..3e2b4181f5be
--- /dev/null
+++ b/net-libs/gloox/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-im</herd>
+</pkgmetadata>
diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest
new file mode 100644
index 000000000000..38280452b983
--- /dev/null
+++ b/net-libs/gnet/Manifest
@@ -0,0 +1 @@
+DIST gnet-2.0.8.tar.bz2 514019 SHA256 14034c7ef571a93f2aca21b2280fa86b35ef5730541d3eb57557dd42d7cc506b SHA512 b52ce73c62eb93d7f68a124128780dcf6c6795e82436d0882469dd7873d482c6b87c77d4efa9f69838a58313d7d958abad5b41a89620014c239030d0294cf11f WHIRLPOOL f259f28194b9932f30a72cfe9cbd7a645dbf18a0d02b8b3a506e4bf90ffb77a76f45500142d0b7b2e2c370f0da2f40e99710f5599336ff7d1080de108a60cbfd
diff --git a/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch b/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch
new file mode 100644
index 000000000000..0ca2156b791d
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch
@@ -0,0 +1,35 @@
+From a61601a487394cbd5970c3b736aea71bf277ecc1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
+Date: Sat, 16 Oct 2010 20:13:52 +0100
+Subject: [PATCH] tests: require check >= 0.9.7 for unit tests, and fix for new API
+
+The check API changed slightly. Fix things for the new API.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=632258
+---
+ tests/check/gnetcheck.h | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/check/gnetcheck.h b/tests/check/gnetcheck.h
+index aeb9f68..14b6c28 100644
+--- a/tests/check/gnetcheck.h
++++ b/tests/check/gnetcheck.h
+@@ -311,11 +311,11 @@ int main (int argc, char **argv) \
+ gboolean _gnet_check_run_test_func (const gchar * func_name);
+
+ static inline void
+-__gnet_tcase_add_test (TCase * tc, TFun tf, const gchar * func_name,
+- int sig, int start, int end)
++__gnet_tcase_add_test (TCase * tc, TFun tf, const char * fname, int signal,
++ int allowed_exit_value, int start, int end)
+ {
+- if (_gnet_check_run_test_func (func_name)) {
+- _tcase_add_test (tc, tf, func_name, sig, start, end);
++ if (_gnet_check_run_test_func (fname)) {
++ _tcase_add_test (tc, tf, fname, signal, allowed_exit_value, start, end);
+ }
+ }
+
+--
+1.7.3.1
+
diff --git a/net-libs/gnet/files/gnet-2.0.8-context-leak.patch b/net-libs/gnet/files/gnet-2.0.8-context-leak.patch
new file mode 100644
index 000000000000..a56e549edccf
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-context-leak.patch
@@ -0,0 +1,32 @@
+From d6997987ce7f3e84d1125715b17502452d085073 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tpm@src.gnome.org>
+Date: Tue, 13 May 2008 07:10:28 +0000
+Subject: [PATCH] Don't leak main context ref when one was set. Spotted by Kuang-Chun Cheng.
+
+ * src/conn.c: (gnet_conn_unref):
+ Don't leak main context ref when one was set.
+ Spotted by Kuang-Chun Cheng.
+
+
+svn path=/trunk/; revision=495
+---
+ src/conn.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/conn.c b/src/conn.c
+index f4de415..9d41fa6 100644
+--- a/src/conn.c
++++ b/src/conn.c
+@@ -305,6 +305,9 @@ gnet_conn_unref (GConn* conn)
+ if (conn->inetaddr)
+ gnet_inetaddr_delete (conn->inetaddr);
+
++ if (conn->context)
++ g_main_context_unref (conn->context);
++
+ g_free (conn->buffer);
+
+ g_free (conn);
+--
+1.7.3.1
+
diff --git a/net-libs/gnet/files/gnet-2.0.8-define-location.patch b/net-libs/gnet/files/gnet-2.0.8-define-location.patch
new file mode 100644
index 000000000000..1ce6bcac06af
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-define-location.patch
@@ -0,0 +1,20 @@
+--- a/tests/check/gnetcheck.h 2009-11-22 23:17:25.000000000 +0100
++++ b/tests/check/gnetcheck.h 2009-11-22 23:18:19.000000000 +0100
+@@ -310,6 +310,8 @@
+
+ gboolean _gnet_check_run_test_func (const gchar * func_name);
+
++#define _tcase_add_test __gnet_tcase_add_test
++
+ static inline void
+ __gnet_tcase_add_test (TCase * tc, TFun tf, const gchar * func_name,
+ int sig_, int start_, int end_)
+@@ -319,8 +321,6 @@
+ }
+ }
+
+-#define _tcase_add_test __gnet_tcase_add_test
+-
+ G_END_DECLS
+
+ #endif /* __GNET_CHECK_H__ */
diff --git a/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch b/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch
new file mode 100644
index 000000000000..9c85b72d8e29
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch
@@ -0,0 +1,16 @@
+Bug-Debian: http://bugs.debian.org/652165
+Author: Julien Cristau <jcristau@debian.org>
+
+use pkg-config to get the glib include path, not hardcode it.
+
+--- gnet-2.0.8.orig/gnet-2.0.pc.in
++++ gnet-2.0.8/gnet-2.0.pc.in
+@@ -6,5 +6,6 @@
+ Name: Gnet
+ Description: A network compatibility layer library
+ Version: @VERSION@
+-Libs: -L${libdir} -lgnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ @GLIB_LIBS@ @GTHREAD_LIBS@
+-Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/ @GLIB_CFLAGS@ @GTHREAD_CFLAGS@
++Libs: -L${libdir} -lgnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@
++Requires.private: glib-2.0 gthread-2.0
++Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/
diff --git a/net-libs/gnet/files/gnet-2.0.8-network-tests.patch b/net-libs/gnet/files/gnet-2.0.8-network-tests.patch
new file mode 100644
index 000000000000..7bb7cefd133c
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-network-tests.patch
@@ -0,0 +1,32 @@
+From 576f6de12bf4a509882af0bbe4727e27e8bc9373 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 16 Nov 2010 14:18:08 +0100
+Subject: [PATCH] Do not build network related tests if not enabled
+
+---
+ tests/check/gnet/gnetconn.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/tests/check/gnet/gnetconn.c b/tests/check/gnet/gnetconn.c
+index 739b467..0558e28 100644
+--- a/tests/check/gnet/gnetconn.c
++++ b/tests/check/gnet/gnetconn.c
+@@ -25,6 +25,7 @@
+
+ #include <string.h>
+
++#ifdef GNET_ENABLE_NETWORK_TESTS
+ static void
+ conn_fail_cb (GConn * conn, GConnEvent * event, gpointer data)
+ {
+@@ -243,6 +244,7 @@ GNET_START_TEST (test_conn_new_socket)
+ g_main_loop_unref (loop);
+ }
+ GNET_END_TEST;
++#endif
+
+ static Suite *
+ gnetconn_suite (void)
+--
+1.7.3.1
+
diff --git a/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch b/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch
new file mode 100644
index 000000000000..b75258e38d02
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch
@@ -0,0 +1,32 @@
+From 1825f69b1a149cd3f2daa5f6c3333a32f0470f0a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
+Date: Sat, 16 Oct 2010 23:10:15 +0100
+Subject: tests: update GConnHttp unit test to not use inactive domains
+
+www.gnetlibrary.org has been abandoned.
+
+diff --git a/tests/check/gnet/gnetconnhttp.c b/tests/check/gnet/gnetconnhttp.c
+index b1cecce..4316f74 100644
+--- a/tests/check/gnet/gnetconnhttp.c
++++ b/tests/check/gnet/gnetconnhttp.c
+@@ -487,7 +487,7 @@ GNET_END_TEST;
+
+ GNET_START_TEST (test_gnet_http_get)
+ {
+- const gchar *urls[] = {"http://www.gnetlibrary.org/src/",
++ const gchar *urls[] = {"http://www.gnome.org/",
+ "http://www.heise.de" };
+ guint i;
+
+@@ -514,7 +514,7 @@ GNET_END_TEST;
+
+ GNET_START_TEST (test_get_binary)
+ {
+- gchar *uris[] = { "http://www.gnetlibrary.org/gnet.png" };
++ gchar *uris[] = { "http://www.gnome.org/img/logo/foot-16.png" };
+ guint i;
+
+ for (i = 0; i < G_N_ELEMENTS (uris); ++i) {
+--
+cgit v0.10.1
+
diff --git a/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch b/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch
new file mode 100644
index 000000000000..9527dbe5da65
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch
@@ -0,0 +1,22 @@
+Fix build failure with newer releases of check library.
+
+--- a/tests/check/gnetcheck.h 2014-09-27 15:32:17.088312230 +0200
++++ b/tests/check/gnetcheck.h 2014-09-27 15:32:35.728239492 +0200
+@@ -281,7 +281,7 @@
+ _gnet_check_expecting_log = TRUE; \
+ _gnet_check_raised_critical = FALSE; \
+ code; \
+- _fail_unless (_gnet_check_raised_critical, __FILE__, __LINE__, \
++ (_gnet_check_raised_critical) ? _mark_point(__FILE__, __LINE__) : _ck_assert_failed (__FILE__, __LINE__, \
+ "Expected g_critical, got nothing", NULL); \
+ _gnet_check_expecting_log = FALSE; \
+ } G_STMT_END
+@@ -291,7 +291,7 @@
+ _gnet_check_expecting_log = TRUE; \
+ _gnet_check_raised_warning = FALSE; \
+ code; \
+- _fail_unless (_gnet_check_raised_warning, __FILE__, __LINE__, \
++ (_gnet_check_raised_warning) ? _mark_point(__FILE__, __LINE__) : _ck_assert_failed (__FILE__, __LINE__, \
+ "Expected g_warning, got nothing", NULL); \
+ _gnet_check_expecting_log = FALSE; \
+ } G_STMT_END
diff --git a/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch b/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch
new file mode 100644
index 000000000000..f2946aaf438c
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch
@@ -0,0 +1,31 @@
+Disable unittests requiring a running HTTP server on port 80.
+
+--- a/tests/check/gnet/gnetinetaddr.c.old 2014-09-27 17:56:51.130350306 +0200
++++ b/tests/check/gnet/gnetinetaddr.c 2014-09-27 17:57:23.396114568 +0200
+@@ -443,7 +443,7 @@
+
+ GNET_START_TEST (test_inetaddr_list_async)
+ {
+- do_test_inetaddr_list_async ("localhost");
++/* do_test_inetaddr_list_async ("localhost"); */
+ /* FIXME: these might not work right yet because of the timings in the test
+ #ifdef GNET_ENABLE_NETWORK_TESTS
+ do_test_inetaddr_list_async ("www.google.com");
+@@ -573,7 +573,7 @@
+
+ GNET_START_TEST (test_inetaddr_name_async)
+ {
+- do_test_inetaddr_name_async ("localhost");
++/* do_test_inetaddr_name_async ("localhost"); */
+
+ /* FIXME: these might not work right yet because of the timings in the test
+ #ifdef GNET_ENABLE_NETWORK_TESTS
+@@ -798,7 +798,7 @@
+
+ GNET_START_TEST (test_inetaddr_reverse_async)
+ {
+- do_test_inetaddr_reverse_async ("localhost");
++/* do_test_inetaddr_reverse_async ("localhost"); */
+
+ #ifdef GNET_ENABLE_NETWORK_TESTS
+ do_test_inetaddr_reverse_async ("gabe.freedesktop.org");
diff --git a/net-libs/gnet/gnet-2.0.8-r2.ebuild b/net-libs/gnet/gnet-2.0.8-r2.ebuild
new file mode 100644
index 000000000000..c86b795e148b
--- /dev/null
+++ b/net-libs/gnet/gnet-2.0.8-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A simple network library"
+HOMEPAGE="http://live.gnome.org/GNetLibrary"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+# FIXME: automagic use of valgrind
+RDEPEND=">=dev-libs/glib-2.6:2"
+DEPEND="${RDEPEND}
+ >=dev-libs/check-0.9.11
+ >=dev-util/gtk-doc-am-1.2
+ virtual/pkgconfig
+"
+# FIXME: check should only be needed with USE 'test', bug #349301
+# test? ( >=dev-libs/check-0.9.7 )"
+
+src_prepare() {
+ # Do not leak main context reference, from master
+ epatch "${FILESDIR}"/${PN}-2.0.8-context-leak.patch
+
+ # Fix usage of check framework, bug #296849, from master
+ epatch "${FILESDIR}"/${PN}-2.0.8-check-usage-update.patch
+
+ # ifdef around network tests code, refs. bug #320759
+ epatch "${FILESDIR}"/${PN}-2.0.8-network-tests.patch
+
+ # Do not hardcode glib patch in pkgconfig file, debian bug #652165
+ epatch "${FILESDIR}"/${PN}-2.0.8-fix-pkgconfig-abuse.patch
+
+ # Compatibility with recent check releases, bug #498046
+ epatch "${FILESDIR}"/${PN}-2.0.8-unittest-build.patch
+
+ # gnetlibrary.org has been adandoned, from master
+ epatch "${FILESDIR}"/${PN}-2.0.8-test-existing-domain.patch
+
+ # Do not depend on a running HTTP server on port 80 for unittest
+ epatch "${FILESDIR}"/${PN}-2.0.8-unittest-service.patch
+
+ # Do not pass silly cflags with USE=debug, bug #320759
+ sed -i \
+ -e 's:-Werror::' \
+ -e '/AM_PROG_CC_STDC/d' \
+ -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
+ configure.ac || die
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README* TODO"
+ # Do not enable network tests in an ebuild environment
+ gnome2_src_configure \
+ --disable-static \
+ --disable-network-tests
+}
diff --git a/net-libs/gnet/metadata.xml b/net-libs/gnet/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/net-libs/gnet/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
new file mode 100644
index 000000000000..dd5255867e7d
--- /dev/null
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-online-accounts-3.14.3.tar.xz 1408156 SHA256 6fe2dc67ab2c50a1c127767f43f31513dac72453bd41d4b4265217a19667c2c6 SHA512 849fd4419a78ea442f610701d4653bfaa18974a35324f0b8209efe9d86e193dccfe67d044a868e1e6e594403b494884bac7109860a6352eecd1b58903432aa39 WHIRLPOOL dcb9373b4c7db2845b0854c52c345f767785ac8e8e590d7e09f41e86d895d40ad9cdd8e4dc11efa5d7ed397b27d41c4f3065a08ec335ba695d3a2a315f49ea2d
+DIST gnome-online-accounts-3.14.4.tar.xz 1415052 SHA256 4c348bfd4baa41d263afefd3d82659f486367d48eb89a3755cde9caae754ceb1 SHA512 12e3ef72cea818c183f038898ee52e4583bc55c70dd6564282c7d2b2d9e013a6a1de1452cb88e5a97e2dccb86d81396689ab069249a8f8710974386404ffbc6e WHIRLPOOL 859947b2e4824c9776a96a68d3d50f47b82e6bf42b8349cdb3c16fe678518a441792a872c44361580b8018d27623c872ae37a715e61cb5ae87c3513bdc3fa636
+DIST gnome-online-accounts-3.16.3.tar.xz 1420940 SHA256 a0648e4d595f5c63f85c03bf65a2cf1204e8615aba242c50c15aa4c9696a0ca0 SHA512 34056d996b6d2d217375e1a86ff544915ae707759b64c77030366f9d3d34c0c735869130beb7fe94bbd949adc46d87153de47afa2fe1bcd3f175c6c420037145 WHIRLPOOL 902205f3a792e864e8ca119dbcc0fd81399cf5e9fb5bdc821bd8400870e282f47c595d411d6f678d15834504136f060720ab805d2b018bb30515edc09cf6e059
diff --git a/net-libs/gnome-online-accounts/files/gnome-online-accounts-3.16.3-parallel-make.patch b/net-libs/gnome-online-accounts/files/gnome-online-accounts-3.16.3-parallel-make.patch
new file mode 100644
index 000000000000..7d7cec31c05d
--- /dev/null
+++ b/net-libs/gnome-online-accounts/files/gnome-online-accounts-3.16.3-parallel-make.patch
@@ -0,0 +1,34 @@
+From 8de9eb8f452ee7e6d780c29ebb946567d900c181 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 13 Jun 2015 12:41:15 -0400
+Subject: [PATCH] build: fix webextension parallel install failure
+
+libgoa-backend-1.0 must be installed before libgoawebextension; unpleasant
+automake syntax required.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=750897
+---
+ src/goabackend/Makefile.am | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
+index 8c14774..06467ec 100644
+--- a/src/goabackend/Makefile.am
++++ b/src/goabackend/Makefile.am
+@@ -166,6 +166,13 @@ libgoawebextension_la_LDFLAGS = \
+ -no-undefined \
+ $(NULL)
+
++# Force installation order: libgoa-backend-1.0 must be installed first, othwerwise
++# libtool will incorrectly relink libgoawebextension.la under parallel make install.
++# Requires ugly automake syntax - see http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
++
++installwebextensionLTLIBRARIES = install-webextensionLTLIBRARIES
++$(installwebextensionLTLIBRARIES): install-libLTLIBRARIES
++
+ # ----------------------------------------------------------------------------------------------------
+
+ BUILT_SOURCES = \
+--
+2.4.3
+
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.3.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.3.ebuild
new file mode 100644
index 000000000000..d0398686e708
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+IUSE="gnome +introspection kerberos" # telepathy"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+ >=dev-libs/glib-2.35:2
+ >=app-crypt/libsecret-0.5
+ >=dev-libs/json-glib-0.16
+ dev-libs/libxml2:2
+ >=net-libs/libsoup-2.42:2.4
+ net-libs/rest:0.7
+ net-libs/telepathy-glib
+ >=net-libs/webkit-gtk-2.1.90:3
+ >=x11-libs/gtk+-3.11.1:3
+ x11-libs/pango
+
+ introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+ kerberos? (
+ app-crypt/gcr:0=
+ app-crypt/mit-krb5 )
+"
+# telepathy? ( net-libs/telepathy-glib )
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ >=dev-util/gtk-doc-am-1.3
+ >=dev-util/gdbus-codegen-2.30.0
+ >=dev-util/intltool-0.50.1
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
+src_configure() {
+ # TODO: Give users a way to set the G/Y!/FB/Twitter/Windows Live secrets
+ # Twitter/Y! disabled per upstream recommendation, bug #497168
+ # telepathy optional support is really badly done, bug #494456
+ gnome2_src_configure \
+ --disable-static \
+ --disable-twitter \
+ --disable-yahoo \
+ --enable-documentation \
+ --enable-exchange \
+ --enable-facebook \
+ --enable-flickr \
+ --enable-imap-smtp \
+ --enable-media-server \
+ --enable-owncloud \
+ --enable-pocket \
+ --enable-telepathy \
+ --enable-windows-live \
+ $(use_enable kerberos)
+ #$(use_enable telepathy)
+ # gudev & cheese from sub-configure is overriden
+ # by top level configure, and disabled so leave it like that
+}
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.4.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.4.ebuild
new file mode 100644
index 000000000000..d0398686e708
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+IUSE="gnome +introspection kerberos" # telepathy"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+ >=dev-libs/glib-2.35:2
+ >=app-crypt/libsecret-0.5
+ >=dev-libs/json-glib-0.16
+ dev-libs/libxml2:2
+ >=net-libs/libsoup-2.42:2.4
+ net-libs/rest:0.7
+ net-libs/telepathy-glib
+ >=net-libs/webkit-gtk-2.1.90:3
+ >=x11-libs/gtk+-3.11.1:3
+ x11-libs/pango
+
+ introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+ kerberos? (
+ app-crypt/gcr:0=
+ app-crypt/mit-krb5 )
+"
+# telepathy? ( net-libs/telepathy-glib )
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ >=dev-util/gtk-doc-am-1.3
+ >=dev-util/gdbus-codegen-2.30.0
+ >=dev-util/intltool-0.50.1
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
+src_configure() {
+ # TODO: Give users a way to set the G/Y!/FB/Twitter/Windows Live secrets
+ # Twitter/Y! disabled per upstream recommendation, bug #497168
+ # telepathy optional support is really badly done, bug #494456
+ gnome2_src_configure \
+ --disable-static \
+ --disable-twitter \
+ --disable-yahoo \
+ --enable-documentation \
+ --enable-exchange \
+ --enable-facebook \
+ --enable-flickr \
+ --enable-imap-smtp \
+ --enable-media-server \
+ --enable-owncloud \
+ --enable-pocket \
+ --enable-telepathy \
+ --enable-windows-live \
+ $(use_enable kerberos)
+ #$(use_enable telepathy)
+ # gudev & cheese from sub-configure is overriden
+ # by top level configure, and disabled so leave it like that
+}
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3-r1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3-r1.ebuild
new file mode 100644
index 000000000000..a341946a608b
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3-r1.ebuild
@@ -0,0 +1,88 @@
+# 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 autotools eutils gnome2
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+IUSE="gnome +introspection kerberos" # telepathy"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+ >=dev-libs/glib-2.35:2
+ >=app-crypt/libsecret-0.5
+ >=dev-libs/json-glib-0.16
+ dev-libs/libxml2:2
+ >=net-libs/libsoup-2.42:2.4
+ net-libs/rest:0.7
+ net-libs/telepathy-glib
+ >=net-libs/webkit-gtk-2.7.2:4
+ >=x11-libs/gtk+-3.11.1:3
+ x11-libs/pango
+
+ introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+ kerberos? (
+ app-crypt/gcr:0=
+ app-crypt/mit-krb5 )
+"
+# telepathy? ( net-libs/telepathy-glib )
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ >=dev-util/gtk-doc-am-1.3
+ >=dev-util/gdbus-codegen-2.30.0
+ >=dev-util/intltool-0.50.1
+ sys-devel/gettext
+ virtual/pkgconfig
+
+ dev-libs/gobject-introspection-common
+ gnome-base/gnome-common
+"
+# eautoreconf needs gobject-introspection-common, gnome-common
+
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
+src_prepare() {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=750897
+ epatch "${FILESDIR}"/${PN}-3.16.3-parallel-make.patch
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # TODO: Give users a way to set the G/FB/Windows Live secrets
+ # telepathy optional support is really badly done, bug #494456
+ gnome2_src_configure \
+ --disable-static \
+ --enable-documentation \
+ --enable-exchange \
+ --enable-facebook \
+ --enable-flickr \
+ --enable-foursquare \
+ --enable-imap-smtp \
+ --enable-media-server \
+ --enable-owncloud \
+ --enable-pocket \
+ --enable-telepathy \
+ --enable-windows-live \
+ $(use_enable kerberos)
+ #$(use_enable telepathy)
+ # gudev & cheese from sub-configure is overriden
+ # by top level configure, and disabled so leave it like that
+}
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3.ebuild
new file mode 100644
index 000000000000..c1afbf97d1a7
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+IUSE="gnome +introspection kerberos" # telepathy"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+ >=dev-libs/glib-2.35:2
+ >=app-crypt/libsecret-0.5
+ >=dev-libs/json-glib-0.16
+ dev-libs/libxml2:2
+ >=net-libs/libsoup-2.42:2.4
+ net-libs/rest:0.7
+ net-libs/telepathy-glib
+ >=net-libs/webkit-gtk-2.7.2:4
+ >=x11-libs/gtk+-3.11.1:3
+ x11-libs/pango
+
+ introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+ kerberos? (
+ app-crypt/gcr:0=
+ app-crypt/mit-krb5 )
+"
+# telepathy? ( net-libs/telepathy-glib )
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ >=dev-util/gtk-doc-am-1.3
+ >=dev-util/gdbus-codegen-2.30.0
+ >=dev-util/intltool-0.50.1
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
+src_configure() {
+ # TODO: Give users a way to set the G/FB/Windows Live secrets
+ # telepathy optional support is really badly done, bug #494456
+ gnome2_src_configure \
+ --disable-static \
+ --enable-documentation \
+ --enable-exchange \
+ --enable-facebook \
+ --enable-flickr \
+ --enable-foursquare \
+ --enable-imap-smtp \
+ --enable-media-server \
+ --enable-owncloud \
+ --enable-pocket \
+ --enable-telepathy \
+ --enable-windows-live \
+ $(use_enable kerberos)
+ #$(use_enable telepathy)
+ # gudev & cheese from sub-configure is overriden
+ # by top level configure, and disabled so leave it like that
+}
diff --git a/net-libs/gnome-online-accounts/metadata.xml b/net-libs/gnome-online-accounts/metadata.xml
new file mode 100644
index 000000000000..a27834f8df74
--- /dev/null
+++ b/net-libs/gnome-online-accounts/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<use>
+ <flag name="gnome">Use <pkg>gnome-base/gnome-control-center</pkg>
+ to set GNOME online accounts preferences</flag>
+ <!-- <flag name="telepathy">Provide widget to configure the telepathy
+ frawework</flag> -->
+</use>
+</pkgmetadata>
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
new file mode 100644
index 000000000000..a8eb18c12c11
--- /dev/null
+++ b/net-libs/gnutls/Manifest
@@ -0,0 +1,4 @@
+DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
+DIST gnutls-3.3.15.tar.xz 6286288 SHA256 8961227852911a1974e15bc017ddbcd4779876c867226d199f06648d8b27ba4b SHA512 0d112f20fd1a010c278ecc5c0e9e22a040c5a765073ea722329e9d5d7b4c661c6bd2fc6749903ea562fe44caf9a1643c6d95e2e193bb8c444e2e6418f73d5445 WHIRLPOOL 4a7b28952bcbe837d4f9e9b62b9254a43510363634daa1c9dc61bf07c7734699011bf5963d4556d3f53c45f63cdf6d2447f7b101e026d0d21c94d827bff9c6dc
+DIST gnutls-3.3.16.tar.xz 6298460 SHA256 80a471c723572a43ddbe75d7825a3275f640650cc99eae42963ab39b9d0b7552 SHA512 bf9b8f9e51abc1292602bf3a577bdb0d87461ee66d13c840916d83ce59fb67c395dec97a185aacced8af526bd5d845a5c92839d4c91c18b042d86f470feb0779 WHIRLPOOL de17d7b4157e330dfcad9aa2f0ea2e86ee4e6fa7e368b4dba2abdd4a00b86ac435d1b5149c17494dd6e7618bc128e5f3af94657cfceffb8e4a53fb2494e45058
+DIST gnutls-3.4.3.tar.xz 6546268 SHA256 65dd55e6de709203b698a729a4a2a7aa07367b63c1615a198ef2436fdd28e928 SHA512 f877500c6d3a731c3560a5f68554532818c87538ba91324957eb2bb85fc2212acfd6dee8f6dd9c5c006d8bd0e311ee17b517e86caca26239b571701e26d623e2 WHIRLPOOL caaf6461b840197bd2c0f9300576cf6065193ba4003640bbd28b15e0dad93db12e9ae8d6298f134ead5b147a9ad8f31e91f96ba561ade296caee9494d1b5f63f
diff --git a/net-libs/gnutls/files/gnutls-2.12.20-AF_UNIX.patch b/net-libs/gnutls/files/gnutls-2.12.20-AF_UNIX.patch
new file mode 100644
index 000000000000..719baf37b210
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.20-AF_UNIX.patch
@@ -0,0 +1,37 @@
+Backport of commit 60a13b98e9f410c3b1019252f271d3c0f20b2e61 for 2.12.20
+
+From 60a13b98e9f410c3b1019252f271d3c0f20b2e61 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Fri, 23 Sep 2011 14:39:29 +0000
+Subject: a hack to allow compilation on systems without AF_LOCAL.
+
+--- lib/nettle/egd.c
++++ lib/nettle/egd.c
+@@ -33,6 +33,12 @@
+
+ #include <gnutls_errors.h>
+
++#ifdef AF_UNIX
++# define LOCAL_SOCKET_TYPE AF_UNIX
++#else
++# define LOCAL_SOCKET_TYPE AF_LOCAL
++#endif
++
+ #ifndef offsetof
+ #define offsetof(type, member) ((size_t) &((type *)0)->member)
+ #endif
+@@ -141,12 +147,12 @@
+ }
+
+ memset (&addr, 0, sizeof addr);
+- addr.sun_family = AF_LOCAL;
++ addr.sun_family = LOCAL_SOCKET_TYPE;
+ strcpy (addr.sun_path, name);
+ addr_len = (offsetof (struct sockaddr_un, sun_path)
+ + strlen (addr.sun_path));
+
+- fd = socket (AF_LOCAL, SOCK_STREAM, 0);
++ fd = socket (LOCAL_SOCKET_TYPE, SOCK_STREAM, 0);
+ if (fd == -1)
+ {
+ _gnutls_debug_log ("can't create unix domain socket: %s\n",
diff --git a/net-libs/gnutls/files/gnutls-2.12.20-guile-parallelmake.patch b/net-libs/gnutls/files/gnutls-2.12.20-guile-parallelmake.patch
new file mode 100644
index 000000000000..5bb085793deb
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.20-guile-parallelmake.patch
@@ -0,0 +1,9 @@
+--- a/guile/src/Makefile.am
++++ b/guile/src/Makefile.am
+@@ -124,4 +124,7 @@
+
+ .c.x: $(BUILT_SOURCES)
+ $(guile_snarf) -o $@ $< $(snarfcppopts)
++core.x: core.c enums.h enum-map.i.c priorities.i.c smobs.h smob-types.i.c
++errors.x: errors.c enums.h
++extra.x: extra.c enums.h extra-enums.h extra-enum-map.i.c extra-smobs.h extra-smob-types.i.c smobs.h
diff --git a/net-libs/gnutls/files/gnutls-2.12.20-libadd.patch b/net-libs/gnutls/files/gnutls-2.12.20-libadd.patch
new file mode 100644
index 000000000000..fe5f1964ddda
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.20-libadd.patch
@@ -0,0 +1,36 @@
+--- gnutls-2.12.20/libextra/Makefile.am
++++ gnutls-2.12.20/libextra/Makefile.am
+@@ -69,7 +69,7 @@
+ if ENABLE_MINITASN1
+ libgnutls_openssl_la_LIBADD += ../lib/minitasn1/libminitasn1.la
+ else
+-libgnutls_openssl_la_LDFLAGS += $(LTLIBTASN1)
++libgnutls_openssl_la_LIBADD += $(LTLIBTASN1)
+ endif
+
+ if HAVE_LD_OUTPUT_DEF
+@@ -89,8 +89,9 @@
+ libgnutls_extra_la_SOURCES += \
+ ext_inner_application.h ext_inner_application.c gnutls_ia.c
+
++cryptolib_ldadd =
+ if !ENABLE_NETTLE
+-libgnutls_extra_la_LIBADD += $(LTLIBGCRYPT)
++cryptolib_ldadd = $(LTLIBGCRYPT)
+ endif
+
+ # Rest
+@@ -104,11 +105,10 @@
+ DISTCLEANFILES += $(defexec_DATA)
+
+ libgnutls_extra_la_LDFLAGS += \
+- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+- $(LZO_LIBS)
++ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
+ libgnutls_extra_la_LIBADD += ../lib/gl/liblgnu.la gl/libxgnu.la \
+- ../lib/libgnutls.la
++ ../lib/libgnutls.la $(cryptolib_ldadd) $(LZO_LIBS)
+
+ if HAVE_LD_VERSION_SCRIPT
+ libgnutls_extra_la_LDFLAGS += \
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-CVE-2013-2116.patch b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2013-2116.patch
new file mode 100644
index 000000000000..2223e708a609
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2013-2116.patch
@@ -0,0 +1,25 @@
+From 5164d5a1d57cd0372a5dd074382ca960ca18b27d Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Thu, 23 May 2013 09:54:37 +0200
+Subject: [PATCH] re-applied sanity check patch
+
+---
+ lib/gnutls_cipher.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
+index 2835121..71f5a98 100644
+--- a/lib/gnutls_cipher.c
++++ b/lib/gnutls_cipher.c
+@@ -561,6 +561,8 @@ _gnutls_ciphertext2compressed (gnutls_session_t session,
+ return GNUTLS_E_DECRYPTION_FAILED;
+ }
+ pad = ciphertext.data[ciphertext.size - 1]; /* pad */
++ if (pad+1 > ciphertext.size-hash_size)
++ pad_failed = GNUTLS_E_DECRYPTION_FAILED;
+
+ /* Check the pading bytes (TLS 1.x).
+ * Note that we access all 256 bytes of ciphertext for padding check
+--
+1.7.1
+
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-0092.patch b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-0092.patch
new file mode 100644
index 000000000000..21d3f3b9c467
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-0092.patch
@@ -0,0 +1,102 @@
+From 6aa26f78150ccbdf0aec1878a41c17c41d358a3b Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Thu, 27 Feb 2014 19:42:26 +0100
+Subject: [PATCH] corrected return codes
+
+---
+ lib/x509/verify.c | 16 ++++++++++------
+ 1 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/lib/x509/verify.c b/lib/x509/verify.c
+index c9a6b0d..eef85a8 100644
+--- a/lib/x509/verify.c
++++ b/lib/x509/verify.c
+@@ -141,7 +141,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer,
+ if (result < 0)
+ {
+ gnutls_assert ();
+- goto cleanup;
++ goto fail;
+ }
+
+ result =
+@@ -150,7 +150,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer,
+ if (result < 0)
+ {
+ gnutls_assert ();
+- goto cleanup;
++ goto fail;
+ }
+
+ result =
+@@ -158,7 +158,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer,
+ if (result < 0)
+ {
+ gnutls_assert ();
+- goto cleanup;
++ goto fail;
+ }
+
+ result =
+@@ -166,7 +166,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer,
+ if (result < 0)
+ {
+ gnutls_assert ();
+- goto cleanup;
++ goto fail;
+ }
+
+ /* If the subject certificate is the same as the issuer
+@@ -206,6 +206,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer,
+ else
+ gnutls_assert ();
+
++fail:
+ result = 0;
+
+ cleanup:
+@@ -330,7 +331,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert,
+ gnutls_datum_t cert_signed_data = { NULL, 0 };
+ gnutls_datum_t cert_signature = { NULL, 0 };
+ gnutls_x509_crt_t issuer = NULL;
+- int issuer_version, result;
++ int issuer_version, result = 0;
+
+ if (output)
+ *output = 0;
+@@ -363,7 +364,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert,
+ if (issuer_version < 0)
+ {
+ gnutls_assert ();
+- return issuer_version;
++ return 0;
+ }
+
+ if (!(flags & GNUTLS_VERIFY_DISABLE_CA_SIGN) &&
+@@ -385,6 +386,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert,
+ if (result < 0)
+ {
+ gnutls_assert ();
++ result = 0;
+ goto cleanup;
+ }
+
+@@ -393,6 +395,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert,
+ if (result < 0)
+ {
+ gnutls_assert ();
++ result = 0;
+ goto cleanup;
+ }
+
+@@ -410,6 +413,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert,
+ else if (result < 0)
+ {
+ gnutls_assert();
++ result = 0;
+ goto cleanup;
+ }
+
+--
+1.7.1
+
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-1959.patch b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-1959.patch
new file mode 100644
index 000000000000..28989c97ceb7
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-1959.patch
@@ -0,0 +1,14 @@
+--- a/lib/x509/verify.c
++++ b/lib/x509/verify.c
+@@ -692,8 +693,10 @@
+ /* note that here we disable this V1 CA flag. So that no version 1
+ * certificates can exist in a supplied chain.
+ */
+- if (!(flags & GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT))
++ if (!(flags & GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT)) {
+ flags &= ~(GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
++ flags |= GNUTLS_VERIFY_DO_NOT_ALLOW_X509_V1_CA_CRT;
++ }
+ if ((ret =
+ _gnutls_verify_certificate2(certificate_list[i - 1],
+ &certificate_list[i], 1, \ No newline at end of file
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3466.patch b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3466.patch
new file mode 100644
index 000000000000..9e32296e86de
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3466.patch
@@ -0,0 +1,311 @@
+From e47d30e272a0b3977db8dae09327acad45b931d8 Mon Sep 17 00:00:00 2001
+From: mancha <mancha1@zoho.com>
+Date: Sun, 1 Jun 2014
+Subject: CVE-2014-3466
+
+This is a backport adaptation for use with GnuTLS 2.12.23.
+
+Relevant upstream commit(s):
+-------------------------
+https://gitorious.org/gnutls/gnutls/commit/688ea6428a432c
+https://gitorious.org/gnutls/gnutls/commit/a7be326f0e33cf
+
+---
+ lib/gnutls_handshake.c | 2
+ tests/Makefile.am | 2
+ tests/long-session-id.c | 268 ++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 270 insertions(+), 2 deletions(-)
+
+--- a/lib/gnutls_handshake.c
++++ b/lib/gnutls_handshake.c
+@@ -1797,7 +1797,7 @@ _gnutls_read_server_hello (gnutls_sessio
+ DECR_LEN (len, 1);
+ session_id_len = data[pos++];
+
+- if (len < session_id_len)
++ if (len < session_id_len || session_id_len > TLS_MAX_SESSION_ID_SIZE)
+ {
+ gnutls_assert ();
+ return GNUTLS_E_UNSUPPORTED_VERSION_PACKET;
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -64,7 +64,7 @@ ctests = simple gc set_pkcs12_cred certd
+ crq_key_id x509sign-verify cve-2009-1415 cve-2009-1416 \
+ crq_apis init_roundtrip pkcs12_s2k_pem dn2 mini-eagain \
+ nul-in-x509-names x509_altname pkcs12_encode mini-x509 \
+- mini-x509-rehandshake rng-fork x509cert gendh
++ mini-x509-rehandshake rng-fork x509cert gendh long-session-id
+
+ if ENABLE_OPENSSL
+ ctests += openssl
+--- /dev/null
++++ b/tests/long-session-id.c
+@@ -0,0 +1,268 @@
++/*
++ * Copyright (C) 2012 Free Software Foundation, Inc.
++ *
++ * Author: Nikos Mavrogiannopoulos
++ *
++ * This file is part of GnuTLS.
++ *
++ * GnuTLS is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * GnuTLS is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with GnuTLS; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include <stdio.h>
++#include <stdlib.h>
++
++#if defined(_WIN32)
++
++int main()
++{
++ exit(77);
++}
++
++#else
++
++#include <string.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <sys/socket.h>
++#include <sys/wait.h>
++#include <arpa/inet.h>
++#include <unistd.h>
++#include <gnutls/gnutls.h>
++#include <signal.h>
++
++static int debug = 0;
++static void terminate(int);
++
++/* This program tests the robustness of record
++ * decoding.
++ */
++
++static void client_log_func(int level, const char *str)
++{
++ fprintf(stderr, "client|<%d>| %s", level, str);
++}
++
++static unsigned char server_cert_pem[] =
++ "-----BEGIN CERTIFICATE-----\n"
++ "MIICVjCCAcGgAwIBAgIERiYdMTALBgkqhkiG9w0BAQUwGTEXMBUGA1UEAxMOR251\n"
++ "VExTIHRlc3QgQ0EwHhcNMDcwNDE4MTMyOTIxWhcNMDgwNDE3MTMyOTIxWjA3MRsw\n"
++ "GQYDVQQKExJHbnVUTFMgdGVzdCBzZXJ2ZXIxGDAWBgNVBAMTD3Rlc3QuZ251dGxz\n"
++ "Lm9yZzCBnDALBgkqhkiG9w0BAQEDgYwAMIGIAoGA17pcr6MM8C6pJ1aqU46o63+B\n"
++ "dUxrmL5K6rce+EvDasTaDQC46kwTHzYWk95y78akXrJutsoKiFV1kJbtple8DDt2\n"
++ "DZcevensf9Op7PuFZKBroEjOd35znDET/z3IrqVgbtm2jFqab7a+n2q9p/CgMyf1\n"
++ "tx2S5Zacc1LWn9bIjrECAwEAAaOBkzCBkDAMBgNVHRMBAf8EAjAAMBoGA1UdEQQT\n"
++ "MBGCD3Rlc3QuZ251dGxzLm9yZzATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHQ8B\n"
++ "Af8EBQMDB6AAMB0GA1UdDgQWBBTrx0Vu5fglyoyNgw106YbU3VW0dTAfBgNVHSME\n"
++ "GDAWgBTpPBz7rZJu5gakViyi4cBTJ8jylTALBgkqhkiG9w0BAQUDgYEAaFEPTt+7\n"
++ "bzvBuOf7+QmeQcn29kT6Bsyh1RHJXf8KTk5QRfwp6ogbp94JQWcNQ/S7YDFHglD1\n"
++ "AwUNBRXwd3riUsMnsxgeSDxYBfJYbDLeohNBsqaPDJb7XailWbMQKfAbFQ8cnOxg\n"
++ "rOKLUQRWJ0K3HyXRMhbqjdLIaQiCvQLuizo=\n" "-----END CERTIFICATE-----\n";
++
++const gnutls_datum_t server_cert = { server_cert_pem,
++ sizeof(server_cert_pem)
++};
++
++static unsigned char server_key_pem[] =
++ "-----BEGIN RSA PRIVATE KEY-----\n"
++ "MIICXAIBAAKBgQDXulyvowzwLqknVqpTjqjrf4F1TGuYvkrqtx74S8NqxNoNALjq\n"
++ "TBMfNhaT3nLvxqResm62ygqIVXWQlu2mV7wMO3YNlx696ex/06ns+4VkoGugSM53\n"
++ "fnOcMRP/PciupWBu2baMWppvtr6far2n8KAzJ/W3HZLllpxzUtaf1siOsQIDAQAB\n"
++ "AoGAYAFyKkAYC/PYF8e7+X+tsVCHXppp8AoP8TEZuUqOZz/AArVlle/ROrypg5kl\n"
++ "8YunrvUdzH9R/KZ7saNZlAPLjZyFG9beL/am6Ai7q7Ma5HMqjGU8kTEGwD7K+lbG\n"
++ "iomokKMOl+kkbY/2sI5Czmbm+/PqLXOjtVc5RAsdbgvtmvkCQQDdV5QuU8jap8Hs\n"
++ "Eodv/tLJ2z4+SKCV2k/7FXSKWe0vlrq0cl2qZfoTUYRnKRBcWxc9o92DxK44wgPi\n"
++ "oMQS+O7fAkEA+YG+K9e60sj1K4NYbMPAbYILbZxORDecvP8lcphvwkOVUqbmxOGh\n"
++ "XRmTZUuhBrJhJKKf6u7gf3KWlPl6ShKEbwJASC118cF6nurTjuLf7YKARDjNTEws\n"
++ "qZEeQbdWYINAmCMj0RH2P0mvybrsXSOD5UoDAyO7aWuqkHGcCLv6FGG+qwJAOVqq\n"
++ "tXdUucl6GjOKKw5geIvRRrQMhb/m5scb+5iw8A4LEEHPgGiBaF5NtJZLALgWfo5n\n"
++ "hmC8+G8F0F78znQtPwJBANexu+Tg5KfOnzSILJMo3oXiXhf5PqXIDmbN0BKyCKAQ\n"
++ "LfkcEcUbVfmDaHpvzwY9VEaoMOKVLitETXdNSxVpvWM=\n"
++ "-----END RSA PRIVATE KEY-----\n";
++
++const gnutls_datum_t server_key = { server_key_pem,
++ sizeof(server_key_pem)
++};
++
++
++/* A very basic TLS client, with anonymous authentication.
++ */
++
++static void client(int fd, const char *prio)
++{
++ int ret;
++ gnutls_anon_client_credentials_t anoncred;
++ gnutls_certificate_credentials_t x509_cred;
++ gnutls_session_t session;
++ /* Need to enable anonymous KX specifically. */
++
++ gnutls_global_init();
++
++ if (debug) {
++ gnutls_global_set_log_function(client_log_func);
++ gnutls_global_set_log_level(7);
++ }
++
++ gnutls_anon_allocate_client_credentials(&anoncred);
++ gnutls_certificate_allocate_credentials(&x509_cred);
++
++ /* Initialize TLS session
++ */
++ gnutls_init(&session, GNUTLS_CLIENT);
++
++ /* Use default priorities */
++ gnutls_priority_set_direct(session, prio, NULL);
++
++ /* put the anonymous credentials to the current session
++ */
++ gnutls_credentials_set(session, GNUTLS_CRD_ANON, anoncred);
++ gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
++
++ gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
++
++ /* Perform the TLS handshake
++ */
++ do {
++ ret = gnutls_handshake(session);
++ }
++ while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
++
++ if (ret < 0) {
++ fprintf(stderr, "client: Handshake failed (expected)\n");
++ gnutls_perror(ret);
++ exit(0);
++ } else {
++ if (debug)
++ fprintf(stderr, "client: Handshake was completed\n");
++ }
++
++ close(fd);
++
++ gnutls_deinit(session);
++
++ gnutls_anon_free_client_credentials(anoncred);
++ gnutls_certificate_free_credentials(x509_cred);
++
++ gnutls_global_deinit();
++}
++
++
++/* These are global */
++pid_t child;
++
++static void terminate(int ret)
++{
++ kill(child, SIGTERM);
++ exit(ret);
++}
++
++static void server(int fd, const char *prio)
++{
++ int ret;
++ uint8_t id[255];
++ uint8_t buffer[] = "\x16\x03\x00\x01\x25"
++ "\x02\x00\x01\x21"
++ "\x03\x00"/*Server Version */
++ /*Random*/"\x00\x00\x00\x00\x01\x00\x00\x00\x00\x01\x00\x00\x00\x00\x01\x00\x00\x00\x00\x01\x00\x00\x00\x00\x01\x00\x00\x00\x00\x01\x00\x00"
++ /*SessionID*/"\xfe";
++
++ ret = read(fd, id, sizeof(id));
++ if (ret < 0) {
++ abort();
++ }
++
++ ret = write(fd, buffer, sizeof(buffer));
++ if (ret < 0) {
++ return;
++ }
++
++ memset(id, 0xff, sizeof(id));
++ ret = write(fd, id, sizeof(id));
++ if (ret < 0) {
++ return;
++ }
++
++ memset(id, 0xff, sizeof(id));
++ ret = write(fd, id, sizeof(id));
++ if (ret < 0) {
++ return;
++ }
++ sleep(3);
++
++ return;
++}
++
++static void start(const char *prio)
++{
++ int fd[2];
++ int ret;
++
++ ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fd);
++ if (ret < 0) {
++ perror("socketpair");
++ exit(1);
++ }
++
++ child = fork();
++ if (child < 0) {
++ perror("fork");
++ exit(1);
++ }
++
++ if (child) {
++ /* parent */
++ close(fd[1]);
++ server(fd[0], prio);
++ kill(child, SIGTERM);
++ } else {
++ close(fd[0]);
++ client(fd[1], prio);
++ exit(0);
++ }
++}
++
++static void ch_handler(int sig)
++{
++ int status, ret = 0;
++ wait(&status);
++ if (WEXITSTATUS(status) != 0 ||
++ (WIFSIGNALED(status) && WTERMSIG(status) == SIGSEGV)) {
++ if (WIFSIGNALED(status)) {
++ fprintf(stderr, "Child died with sigsegv\n");
++ ret = 1;
++ } else {
++ fprintf(stderr, "Child died with status %d\n",
++ WEXITSTATUS(status));
++ }
++ terminate(ret);
++ }
++ return;
++}
++
++int main(int argc, char **argv)
++{
++ signal(SIGCHLD, ch_handler);
++
++ if (argc > 1)
++ debug = 1;
++
++ start("NORMAL");
++ return 0;
++}
++
++#endif /* _WIN32 */
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3467.patch b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3467.patch
new file mode 100644
index 000000000000..e52965e2b824
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3467.patch
@@ -0,0 +1,45 @@
+From d4ff19de527cd3eb444c560639324cda35bc838e Mon Sep 17 00:00:00 2001
+From: mancha <mancha1@zoho.com>
+Date: Sun, 1 Jun 2014
+Subject: CVE-2014-3467
+
+This is a backport adaptation for use with GnuTLS 2.12.23.
+
+Relevant upstream commit(s):
+-------------------------
+http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=ff3b5c68cc32e3
+http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=51612fca32dda4
+
+---
+ lib/minitasn1/decoding.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/lib/minitasn1/decoding.c
++++ b/lib/minitasn1/decoding.c
+@@ -149,7 +149,7 @@ asn1_get_tag_der (const unsigned char *d
+ /* Long form */
+ punt = 1;
+ ris = 0;
+- while (punt <= der_len && der[punt] & 128)
++ while (punt < der_len && der[punt] & 128)
+ {
+ last = ris;
+
+@@ -259,7 +259,7 @@ _asn1_get_time_der (const unsigned char
+ if (der_len <= 0 || str == NULL)
+ return ASN1_DER_ERROR;
+ str_len = asn1_get_length_der (der, der_len, &len_len);
+- if (str_len < 0 || str_size < str_len)
++ if (str_len <= 0 || str_size < str_len)
+ return ASN1_DER_ERROR;
+ memcpy (str, der + len_len, str_len);
+ str[str_len] = 0;
+@@ -285,7 +285,7 @@ _asn1_get_objectid_der (const unsigned c
+ return ASN1_GENERIC_ERROR;
+ len = asn1_get_length_der (der, der_len, &len_len);
+
+- if (len < 0 || len > der_len || len_len > der_len)
++ if (len <= 0 || len > der_len || len_len > der_len)
+ return ASN1_DER_ERROR;
+
+ val1 = der[len_len] / 40;
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3468.patch b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3468.patch
new file mode 100644
index 000000000000..bd324094c293
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3468.patch
@@ -0,0 +1,45 @@
+From 24ed1d41707f873f3b7a22159e4bb3942f319fac Mon Sep 17 00:00:00 2001
+From: mancha <mancha1@zoho.com>
+Date: Sun, 1 Jun 2014
+Subject: CVE-2014-3468
+
+This is a backport adaptation for use with GnuTLS 2.12.23.
+
+Relevant upstream commit(s):
+-------------------------
+http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=1c3ccb3e040bf1
+
+---
+ lib/minitasn1/decoding.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/lib/minitasn1/decoding.c
++++ b/lib/minitasn1/decoding.c
+@@ -226,7 +226,7 @@ asn1_get_octet_der (const unsigned char
+ int *ret_len, unsigned char *str, int str_size,
+ int *str_len)
+ {
+- int len_len;
++ int len_len = 0;
+
+ if (der_len <= 0)
+ return ASN1_GENERIC_ERROR;
+@@ -347,7 +347,7 @@ asn1_get_bit_der (const unsigned char *d
+ int *ret_len, unsigned char *str, int str_size,
+ int *bit_len)
+ {
+- int len_len, len_byte;
++ int len_len = 0, len_byte;
+
+ if (der_len <= 0)
+ return ASN1_GENERIC_ERROR;
+@@ -358,6 +358,9 @@ asn1_get_bit_der (const unsigned char *d
+ *ret_len = len_byte + len_len + 1;
+ *bit_len = len_byte * 8 - der[len_len];
+
++ if (*bit_len <= 0)
++ return ASN1_DER_ERROR;
++
+ if (str_size >= len_byte)
+ memcpy (str, der + len_len + 1, len_byte);
+ else
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3469.patch b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3469.patch
new file mode 100644
index 000000000000..a99b433b3c92
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-CVE-2014-3469.patch
@@ -0,0 +1,122 @@
+From 7f5a6256231e278aa7d00b6851c22fb457537262 Mon Sep 17 00:00:00 2001
+From: mancha <mancha1@zoho.com>
+Date: Sun, 1 Jun 2014
+Subject: CVE-2014-3469
+
+This is a backport adaptation for use with GnuTLS 2.12.23.
+
+Relevant upstream commit(s):
+-------------------------
+http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=a8b3e14f84174e
+http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=3d6a02f19ff15a
+http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=53958290ab731c
+
+---
+ lib/minitasn1/decoding.c | 11 ++++++++---
+ lib/minitasn1/element.c | 27 ++++++++++++++++++---------
+ 2 files changed, 26 insertions(+), 12 deletions(-)
+
+--- a/lib/minitasn1/decoding.c
++++ b/lib/minitasn1/decoding.c
+@@ -231,7 +231,6 @@ asn1_get_octet_der (const unsigned char
+ if (der_len <= 0)
+ return ASN1_GENERIC_ERROR;
+
+- /* if(str==NULL) return ASN1_SUCCESS; */
+ *str_len = asn1_get_length_der (der, der_len, &len_len);
+
+ if (*str_len < 0)
+@@ -239,7 +238,10 @@ asn1_get_octet_der (const unsigned char
+
+ *ret_len = *str_len + len_len;
+ if (str_size >= *str_len)
+- memcpy (str, der + len_len, *str_len);
++ {
++ if (*str_len > 0 && str != NULL)
++ memcpy (str, der + len_len, *str_len);
++ }
+ else
+ {
+ return ASN1_MEM_ERROR;
+@@ -362,7 +364,10 @@ asn1_get_bit_der (const unsigned char *d
+ return ASN1_DER_ERROR;
+
+ if (str_size >= len_byte)
+- memcpy (str, der + len_len + 1, len_byte);
++ {
++ if (len_byte > 0 && str)
++ memcpy (str, der + len_len + 1, len_byte);
++ }
+ else
+ {
+ return ASN1_MEM_ERROR;
+--- a/lib/minitasn1/element.c
++++ b/lib/minitasn1/element.c
+@@ -112,8 +112,11 @@ _asn1_convert_integer (const unsigned ch
+ /* VALUE_OUT is too short to contain the value conversion */
+ return ASN1_MEM_ERROR;
+
+- for (k2 = k; k2 < SIZEOF_UNSIGNED_LONG_INT; k2++)
+- value_out[k2 - k] = val[k2];
++ if (value_out != NULL)
++ {
++ for (k2 = k; k2 < SIZEOF_UNSIGNED_LONG_INT; k2++)
++ value_out[k2 - k] = val[k2];
++ }
+
+ #if 0
+ printf ("_asn1_convert_integer: valueIn=%s, lenOut=%d", value, *len);
+@@ -611,7 +614,8 @@ asn1_write_value (asn1_node node_root, c
+ if (ptr_size < data_size) { \
+ return ASN1_MEM_ERROR; \
+ } else { \
+- memcpy( ptr, data, data_size); \
++ if (ptr && data_size > 0) \
++ memcpy( ptr, data, data_size); \
+ }
+
+ #define PUT_STR_VALUE( ptr, ptr_size, data) \
+@@ -620,16 +624,19 @@ asn1_write_value (asn1_node node_root, c
+ return ASN1_MEM_ERROR; \
+ } else { \
+ /* this strcpy is checked */ \
+- _asn1_strcpy(ptr, data); \
++ if (ptr) { \
++ _asn1_strcpy(ptr, data); \
++ } \
+ }
+
+ #define ADD_STR_VALUE( ptr, ptr_size, data) \
+- *len = (int) _asn1_strlen(data) + 1; \
+- if (ptr_size < (int) _asn1_strlen(ptr)+(*len)) { \
++ *len += _asn1_strlen(data); \
++ if (ptr_size < (int) *len) { \
++ (*len)++; \
+ return ASN1_MEM_ERROR; \
+ } else { \
+ /* this strcat is checked */ \
+- _asn1_strcat(ptr, data); \
++ if (ptr) _asn1_strcat (ptr, data); \
+ }
+
+ /**
+@@ -786,7 +793,9 @@ asn1_read_value (asn1_node root, const c
+ case TYPE_OBJECT_ID:
+ if (node->type & CONST_ASSIGN)
+ {
+- value[0] = 0;
++ *len = 0;
++ if (value)
++ value[0] = 0;
+ p = node->down;
+ while (p)
+ {
+@@ -800,7 +809,7 @@ asn1_read_value (asn1_node root, const c
+ }
+ p = p->right;
+ }
+- *len = _asn1_strlen (value) + 1;
++ (*len)++;
+ }
+ else if ((node->type & CONST_DEFAULT) && (node->value == NULL))
+ {
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-cross-compile.patch b/net-libs/gnutls/files/gnutls-2.12.23-cross-compile.patch
new file mode 100644
index 000000000000..31178fcd8c46
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-cross-compile.patch
@@ -0,0 +1,69 @@
+use pkg-config to locate zlib rather than hardcoding system -L/-I paths
+
+for pthreads, just hardcode it enabled
+
+for gnutls, don't hardcode -L/-I all the time to the host paths
+
+--- a/lib/configure.ac
++++ b/lib/configure.ac
+@@ -70,26 +70,23 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],
+ AC_MSG_CHECKING([whether to include zlib compression support])
+ if test x$ac_zlib != xno; then
+ AC_MSG_RESULT(yes)
+- AC_LIB_HAVE_LINKFLAGS(z,, [#include <zlib.h>], [compress (0, 0, 0, 0);])
+- if test "$ac_cv_libz" != yes; then
+- AC_MSG_WARN(
+-***
+-*** ZLIB was not found. You will not be able to use ZLIB compression.)
+- fi
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+-PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n)
+-
+ if test x$ac_zlib != xno; then
++ PKG_CHECK_MODULES(ZLIB, zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n)
+ if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then
++ LTLIBZ=$ZLIB_LIBS
++ AC_DEFINE([HAVE_LIBZ], [1], [zlib is enabled])
++ AC_SUBST(LTLIBZ)
+ if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
+ GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
+ else
+ GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib"
+ fi
+ else
++ AC_LIB_HAVE_LINKFLAGS(z,, [#include <zlib.h>], [compress (0, 0, 0, 0);])
+ GNUTLS_ZLIB_LIBS_PRIVATE="$LTLIBZ"
+ fi
+ fi
+@@ -124,10 +121,12 @@ fi
+ lgl_INIT
+
+ AC_CHECK_FUNCS(getrusage,,)
+-AC_LIB_HAVE_LINKFLAGS(pthread,, [#include <pthread.h>], [pthread_mutex_lock (0);])
++LTLIBPTHREAD='-pthread'
++AC_DEFINE([HAVE_LIBPTHREAD], [1], [pthread enabled])
++AC_SUBST(LTLIBPTHREAD)
+
+-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
+-LIBGNUTLS_CFLAGS="-I${includedir}"
++LIBGNUTLS_LIBS="-lgnutls $LIBS"
++LIBGNUTLS_CFLAGS=""
+ AC_SUBST(LIBGNUTLS_LIBS)
+ AC_SUBST(LIBGNUTLS_CFLAGS)
+
+--- a/libextra/configure.ac
++++ b/libextra/configure.ac
+@@ -41,8 +41,8 @@ LIBGNUTLS_EXTRA_HOOKS
+
+ xgl_INIT
+
+-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
+-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
++LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
++LIBGNUTLS_EXTRA_CFLAGS=""
+ AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
+ AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
+
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-gdoc-perl-5.18.patch b/net-libs/gnutls/files/gnutls-2.12.23-gdoc-perl-5.18.patch
new file mode 100644
index 000000000000..a89e8f253058
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-gdoc-perl-5.18.patch
@@ -0,0 +1,137 @@
+--- gnutls-2.12.23.orig/doc/scripts/gdoc 2011-04-08 02:30:44.000000000 +0200
++++ gnutls-2.12.23/doc/scripts/gdoc 2014-03-10 01:53:28.899566076 +0200
+@@ -7,6 +7,8 @@
+ ## Copyright (c) 2001, 2002 Nikos Mavrogiannopoulos
+ ## added -tex
+ ## Copyright (c) 1998 Michael Zucchi
++## Copyright (c) 2013 Adam Sampson
++## made highlighting not depend on hash order, for Perl 5.18
+
+ # This program is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -143,44 +145,44 @@
+ # One for each output format
+
+ # these work fairly well
+-%highlights_html = ( $type_constant, "<i>\$2</i>",
+- $type_func, "<b>\$1</b>",
+- $type_struct, "<i>\$1</i>",
+- $type_param, "<tt><b>\$1</b></tt>" );
++@highlights_html = ( [$type_constant, "<i>\$2</i>"],
++ [$type_func, "<b>\$1</b>"],
++ [$type_struct, "<i>\$1</i>"],
++ [$type_param, "<tt><b>\$1</b></tt>"] );
+ $blankline_html = "<p>";
+
+-%highlights_texinfo = ( $type_constant, "\\\@code{\$2}",
+- $type_func, "\\\@code{\$1}",
+- $type_struct, "\\\@code{\$1}",
+- $type_param, "\\\@code{\$1}" );
++@highlights_texinfo = ( [$type_constant, "\\\@code{\$2}"],
++ [$type_func, "\\\@code{\$1}"],
++ [$type_struct, "\\\@code{\$1}"],
++ [$type_param, "\\\@code{\$1}"] );
+ $blankline_texinfo = "";
+
+-%highlights_tex = ( $type_constant, "{\\\\it \$2}",
+- $type_func, "{\\\\bf \$1}",
+- $type_struct, "{\\\\it \$1}",
+- $type_param, "{\\\\bf \$1}" );
++@highlights_tex = ( [$type_constant, "{\\\\it \$2}"],
++ [$type_func, "{\\\\bf \$1}"],
++ [$type_struct, "{\\\\it \$1}"],
++ [$type_param, "{\\\\bf \$1}"] );
+ $blankline_tex = "\\\\";
+
+ # sgml, docbook format
+-%highlights_sgml = ( $type_constant, "<replaceable class=\"option\">\$2</replaceable>",
+- $type_func, "<function>\$1</function>",
+- $type_struct, "<structname>\$1</structname>",
+- $type_env, "<envar>\$1</envar>",
+- $type_param, "<parameter>\$1</parameter>" );
++@highlights_sgml = ( [$type_constant, "<replaceable class=\"option\">\$2</replaceable>"],
++ [$type_func, "<function>\$1</function>"],
++ [$type_struct, "<structname>\$1</structname>"],
++ [$type_env, "<envar>\$1</envar>"],
++ [$type_param, "<parameter>\$1</parameter>"] );
+ $blankline_sgml = "</para><para>\n";
+
+ # these are pretty rough
+-%highlights_man = ( $type_constant, "\\\\fB\$2\\\\fP",
+- $type_func, "\\\\fB\$1\\\\fP",
+- $type_struct, "\\\\fB\$1\\\\fP",
+- $type_param, "\\\\fI\$1\\\\fP" );
++@highlights_man = ( [$type_constant, "\\\\fB\$2\\\\fP"],
++ [$type_func, "\\\\fB\$1\\\\fP"],
++ [$type_struct, "\\\\fB\$1\\\\fP"],
++ [$type_param, "\\\\fI\$1\\\\fP"] );
+ $blankline_man = "";
+
+ # text-mode
+-%highlights_text = ( $type_constant, "\$2",
+- $type_func, "\$1",
+- $type_struct, "\$1",
+- $type_param, "\$1" );
++@highlights_text = ( [$type_constant, "\$2"],
++ [$type_func, "\$1"],
++ [$type_struct, "\$1"],
++ [$type_param, "\$1"] );
+ $blankline_text = "";
+
+
+@@ -201,7 +203,7 @@
+
+ $verbose = 0;
+ $output_mode = "man";
+-%highlights = %highlights_man;
++@highlights = @highlights_man;
+ $blankline = $blankline_man;
+ $modulename = "API Documentation";
+ $sourceversion = strftime "%Y-%m-%d", localtime;
+@@ -210,27 +212,27 @@
+ $cmd = shift @ARGV;
+ if ($cmd eq "-html") {
+ $output_mode = "html";
+- %highlights = %highlights_html;
++ @highlights = @highlights_html;
+ $blankline = $blankline_html;
+ } elsif ($cmd eq "-man") {
+ $output_mode = "man";
+- %highlights = %highlights_man;
++ @highlights = @highlights_man;
+ $blankline = $blankline_man;
+ } elsif ($cmd eq "-tex") {
+ $output_mode = "tex";
+- %highlights = %highlights_tex;
++ @highlights = @highlights_tex;
+ $blankline = $blankline_tex;
+ } elsif ($cmd eq "-texinfo") {
+ $output_mode = "texinfo";
+ %highlights = %highlights_texinfo;
+- $blankline = $blankline_texinfo;
++ @blankline = @blankline_texinfo;
+ } elsif ($cmd eq "-text") {
+ $output_mode = "text";
+ %highlights = %highlights_text;
+- $blankline = $blankline_text;
++ @blankline = @blankline_text;
+ } elsif ($cmd eq "-docbook") {
+ $output_mode = "sgml";
+- %highlights = %highlights_sgml;
++ @highlights = @highlights_sgml;
+ $blankline = $blankline_sgml;
+ } elsif ($cmd eq "-listfunc") {
+ $output_mode = "listfunc";
+@@ -322,9 +324,10 @@
+ my $line;
+ my $ret = "";
+
+- foreach $pattern (keys %highlights) {
++ foreach $highlight (@highlights) {
++ my ($pattern, $replace) = @$highlight;
+ # print "scanning pattern $pattern ($highlights{$pattern})\n";
+- $contents =~ s:$pattern:repstr($pattern, $highlights{$pattern}, $1, $2, $3, $4):gse;
++ $contents =~ s:$pattern:repstr($pattern, $replace, $1, $2, $3, $4):gse;
+ }
+ foreach $line (split "\n", $contents) {
+ if ($line eq ""){
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch b/net-libs/gnutls/files/gnutls-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch
new file mode 100644
index 000000000000..6d04ccbdcd8d
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch
@@ -0,0 +1,30 @@
+From 4b3252d59ef2d73118e2de6743ba58e2cbafa008 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 8 Mar 2014 22:13:51 +0200
+Subject: [PATCH] tests: getaddrinfo: skip if no network
+
+When running tests under network sandbox, there is no connectivity to
+the DNS, in this case function returns system error and ECONNREFUSED
+this should result in skipping test.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ tests/test-getaddrinfo.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gl/tests/test-getaddrinfo.c b/gl/tests/test-getaddrinfo.c
+index acf9cd6..b155410 100644
+--- a/gl/tests/test-getaddrinfo.c
++++ b/gl/tests/test-getaddrinfo.c
+@@ -85,7 +85,7 @@ simple (char const *host, char const *service)
+ /* EAI_AGAIN is returned if no network is available. Don't fail
+ the test merely because someone is down the country on their
+ in-law's farm. */
+- if (res == EAI_AGAIN)
++ if (res == EAI_AGAIN || (res == EAI_SYSTEM && err == ECONNREFUSED))
+ {
+ skip++;
+ fprintf (stderr, "skipping getaddrinfo test: no network?\n");
+--
+1.8.3.2
+
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch b/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch
new file mode 100644
index 000000000000..16981cf2e91b
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch
@@ -0,0 +1,44 @@
+From 043fe2c28a5f6b3ec6202090faaf7933b247e40c Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Mon, 17 Jun 2013 13:27:55 +0300
+Subject: [PATCH] build: fix hppa compile
+
+gentoo#471914
+
+O_SYNC : 262144
+O_DSYNC: 262144
+O_RSYNC: 524288
+---
+ gl/tests/test-fcntl-h.c | 2 +-
+ lib/gl/tests/test-fcntl-h.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gl/tests/test-fcntl-h.c b/gl/tests/test-fcntl-h.c
+index a6c9621..9e13491 100644
+--- a/gl/tests/test-fcntl-h.c
++++ b/gl/tests/test-fcntl-h.c
+@@ -111,7 +111,7 @@ main (void)
+ #if O_RSYNC && O_RSYNC != O_DSYNC
+ case O_RSYNC:
+ #endif
+-#if O_SYNC && O_SYNC != O_RSYNC
++#if O_SYNC && O_SYNC != O_RSYNC && O_SYNC != O_DSYNC
+ case O_SYNC:
+ #endif
+ #if O_TTY_INIT
+diff --git a/lib/gl/tests/test-fcntl-h.c b/lib/gl/tests/test-fcntl-h.c
+index a6c9621..9e13491 100644
+--- a/lib/gl/tests/test-fcntl-h.c
++++ b/lib/gl/tests/test-fcntl-h.c
+@@ -111,7 +111,7 @@ main (void)
+ #if O_RSYNC && O_RSYNC != O_DSYNC
+ case O_RSYNC:
+ #endif
+-#if O_SYNC && O_SYNC != O_RSYNC
++#if O_SYNC && O_SYNC != O_RSYNC && O_SYNC != O_DSYNC
+ case O_SYNC:
+ #endif
+ #if O_TTY_INIT
+--
+1.8.1.5
+
diff --git a/net-libs/gnutls/gnutls-2.12.23-r6.ebuild b/net-libs/gnutls/gnutls-2.12.23-r6.ebuild
new file mode 100644
index 000000000000..cc0fcb211d19
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.12.23-r6.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools libtool eutils versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+# LGPL-2.1 for libgnutls library and GPL-3 for libgnutls-extra library.
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bindist +cxx doc examples guile lzo +nettle nls pkcs11 static-libs test zlib"
+
+RDEPEND=">=dev-libs/libtasn1-0.3.4
+ guile? ( >=dev-scheme/guile-1.8[networking] )
+ nettle? ( >=dev-libs/nettle-2.1[gmp] )
+ !nettle? ( >=dev-libs/libgcrypt-1.4.0:0 )
+ nls? ( virtual/libintl )
+ pkcs11? ( >=app-crypt/p11-kit-0.11 )
+ zlib? ( >=sys-libs/zlib-1.2.3.1 )
+ !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/libtool
+ doc? ( dev-util/gtk-doc )
+ nls? ( sys-devel/gettext )
+ test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+pkg_setup() {
+ if use lzo && use bindist; then
+ ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
+ fi
+}
+
+src_prepare() {
+ # tests/suite directory is not distributed
+ sed -i -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' \
+ configure.ac || die
+
+ sed -i -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+ doc/Makefile.am || die
+
+ for dir in . lib libextra; do
+ sed -i -e '/^AM_INIT_AUTOMAKE/s/-Werror//' "${dir}/configure.ac" || die
+ done
+
+ epatch "${FILESDIR}"/${PN}-2.12.20-AF_UNIX.patch
+ epatch "${FILESDIR}"/${PN}-2.12.20-libadd.patch
+ epatch "${FILESDIR}"/${PN}-2.12.20-guile-parallelmake.patch
+ epatch "${FILESDIR}"/${P}-hppa.patch
+ epatch "${FILESDIR}"/${P}-gl-tests-getaddrinfo-skip-if-no-network.patch
+ epatch "${FILESDIR}"/${P}-gdoc-perl-5.18.patch
+ epatch "${FILESDIR}"/${P}-CVE-2013-2116.patch
+ epatch "${FILESDIR}"/${P}-CVE-2014-0092.patch
+ epatch "${FILESDIR}"/${P}-CVE-2014-1959.patch
+ epatch "${FILESDIR}"/${P}-CVE-2014-3466.patch
+ epatch "${FILESDIR}"/${P}-CVE-2014-3467.patch
+ epatch "${FILESDIR}"/${P}-CVE-2014-3468.patch
+ epatch "${FILESDIR}"/${P}-CVE-2014-3469.patch
+ epatch "${FILESDIR}"/${P}-cross-compile.patch
+
+ # support user patches
+ epatch_user
+
+ eautoreconf
+
+ # Use sane .so versioning on FreeBSD.
+ elibtoolize
+}
+
+src_configure() {
+ local myconf
+ use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
+ [[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
+
+ econf \
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ --without-libgcrypt-prefix \
+ --without-libnettle-prefix \
+ --without-libpth-prefix \
+ --without-libreadline-prefix \
+ $(use_enable cxx) \
+ $(use_enable doc gtk-doc) \
+ $(use_enable doc gtk-doc-pdf) \
+ $(use_enable guile) \
+ $(use_with !nettle libgcrypt) \
+ $(use_enable nls) \
+ $(use_with pkcs11 p11-kit) \
+ $(use_enable static-libs static) \
+ $(use_with zlib) \
+ ${myconf}
+}
+
+src_test() {
+ if has_version dev-util/valgrind && [[ ${VALGRIND_TESTS} != 1 ]]; then
+ elog
+ elog "You can set VALGRIND_TESTS=\"1\" to enable Valgrind tests."
+ elog
+ fi
+
+ # parallel testing often fails
+ emake -j1 check
+}
+
+src_install() {
+ default
+
+ prune_libtool_files
+
+ if use doc; then
+ dodoc doc/gnutls.{pdf,ps}
+ dohtml doc/gnutls.html
+ fi
+
+ if use examples; then
+ docinto examples
+ dodoc doc/examples/*.c
+ fi
+}
diff --git a/net-libs/gnutls/gnutls-3.3.15.ebuild b/net-libs/gnutls/gnutls-3.3.15.ebuild
new file mode 100644
index 000000000000..4f21b35a3355
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.15.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools libtool eutils multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
+ >=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
+ <dev-libs/nettle-3[gmp,${MULTILIB_USEDEP}]
+ >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+ sys-devel/autogen
+ crywrap? ( net-dns/libidn )
+ dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+ guile? ( >=dev-scheme/guile-1.8:*[networking] )
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/automake-1.11.6
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ doc? ( dev-util/gtk-doc )
+ nls? ( sys-devel/gettext )
+ test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+pkg_setup() {
+ # bug#520818
+ export TZ=UTC
+}
+
+src_prepare() {
+ sed -i \
+ -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+ doc/Makefile.am || die
+
+ # force regeneration of autogen-ed files
+ local file
+ for file in $(grep -l AutoGen-ed src/*.c) ; do
+ rm src/$(basename ${file} .c).{c,h} || die
+ done
+
+ # force regeneration of makeinfo files
+ # have no idea why on some system these files are not
+ # accepted as-is, see bug#520818
+ for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
+ rm "${file}" || die
+ done
+
+ # support user patches
+ epatch_user
+
+ eautoreconf
+
+ # Use sane .so versioning on FreeBSD.
+ elibtoolize
+
+ # bug 497472
+ use cxx || epunt_cxx
+}
+
+multilib_src_configure() {
+ LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+ # TPM needs to be tested before being enabled
+ # hardware-accell is disabled on OSX because the asm files force
+ # GNU-stack (as doesn't support that) and when that's removed ld
+ # complains about duplicate symbols
+ ECONF_SOURCE=${S} \
+ econf \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --disable-valgrind-tests \
+ --without-included-libtasn1 \
+ --enable-heartbeat-support \
+ $(use_enable cxx) \
+ $(use_enable dane libdane) \
+ $(multilib_native_use_enable doc gtk-doc) \
+ $(multilib_native_use_enable doc gtk-doc-pdf) \
+ $(multilib_native_use_enable guile) \
+ $(multilib_native_use_enable crywrap) \
+ $(use_enable nls) \
+ $(use_enable openssl openssl-compatibility) \
+ $(use_enable static-libs static) \
+ $(use_with pkcs11 p11-kit) \
+ $(use_with zlib) \
+ --without-tpm \
+ --with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+ $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/reference/html doc/reference/html || die
+ fi
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ default
+
+ # symlink certtool for use in other ABIs
+ if use test; then
+ ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
+ fi
+ else
+ emake -C gl
+ emake -C lib
+ emake -C extra
+ use dane && emake -C libdane
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ # parallel testing often fails
+ emake -j1 check
+ else
+ # use native ABI tools
+ ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
+ "${BUILD_DIR}"/src/ || die
+
+ emake -C gl -j1 check
+ emake -C tests -j1 check
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+ else
+ emake -C lib DESTDIR="${D}" install
+ emake -C extra DESTDIR="${D}" install
+ use dane && emake -C libdane DESTDIR="${D}" install
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --all
+
+ dodoc doc/certtool.cfg
+
+ if use doc; then
+ dodoc doc/gnutls.pdf
+ dohtml doc/gnutls.html
+ else
+ rm -fr "${ED}/usr/share/doc/${PF}/html"
+ fi
+
+ if use examples; then
+ docinto examples
+ dodoc doc/examples/*.c
+ fi
+}
diff --git a/net-libs/gnutls/gnutls-3.3.16-r1.ebuild b/net-libs/gnutls/gnutls-3.3.16-r1.ebuild
new file mode 100644
index 000000000000..1337f5f652ee
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.16-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools libtool eutils multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
+ >=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
+ >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+ sys-devel/autogen
+ crywrap? ( net-dns/libidn )
+ dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+ guile? ( >=dev-scheme/guile-1.8:*[networking] )
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/automake-1.11.6
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ doc? (
+ sys-apps/texinfo
+ dev-util/gtk-doc
+ )
+ nls? ( sys-devel/gettext )
+ test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+pkg_setup() {
+ # bug#520818
+ export TZ=UTC
+}
+
+src_prepare() {
+ sed -i \
+ -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+ doc/Makefile.am || die
+
+ # force regeneration of autogen-ed files
+ local file
+ for file in $(grep -l AutoGen-ed src/*.c) ; do
+ rm src/$(basename ${file} .c).{c,h} || die
+ done
+
+ # force regeneration of makeinfo files
+ # have no idea why on some system these files are not
+ # accepted as-is, see bug#520818
+ for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
+ rm "${file}" || die
+ done
+
+ # support user patches
+ epatch_user
+
+ eautoreconf
+
+ # Use sane .so versioning on FreeBSD.
+ elibtoolize
+
+ # bug 497472
+ use cxx || epunt_cxx
+}
+
+multilib_src_configure() {
+ LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+ # TPM needs to be tested before being enabled
+ # hardware-accell is disabled on OSX because the asm files force
+ # GNU-stack (as doesn't support that) and when that's removed ld
+ # complains about duplicate symbols
+ ECONF_SOURCE=${S} \
+ econf \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --disable-valgrind-tests \
+ --without-included-libtasn1 \
+ --enable-heartbeat-support \
+ $(use_enable cxx) \
+ $(use_enable dane libdane) \
+ $(multilib_native_use_enable doc) \
+ $(multilib_native_use_enable doc gtk-doc) \
+ $(multilib_native_use_enable guile) \
+ $(multilib_native_use_enable crywrap) \
+ $(use_enable nls) \
+ $(use_enable openssl openssl-compatibility) \
+ $(use_enable static-libs static) \
+ $(use_with pkcs11 p11-kit) \
+ $(use_with zlib) \
+ --without-tpm \
+ --with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+ $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/reference/html doc/reference/html || die
+ fi
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ default
+
+ # symlink certtool for use in other ABIs
+ if use test; then
+ ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
+ fi
+ else
+ emake -C gl
+ emake -C lib
+ emake -C extra
+ use dane && emake -C libdane
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ # parallel testing often fails
+ emake -j1 check
+ else
+ # use native ABI tools
+ ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
+ "${BUILD_DIR}"/src/ || die
+
+ emake -C gl -j1 check
+ emake -C tests -j1 check
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+ else
+ emake -C lib DESTDIR="${D}" install
+ emake -C extra DESTDIR="${D}" install
+ use dane && emake -C libdane DESTDIR="${D}" install
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --all
+
+ dodoc doc/certtool.cfg
+
+ if use doc; then
+ dohtml doc/gnutls.html
+ else
+ rm -fr "${ED}/usr/share/doc/${PF}/html"
+ fi
+
+ if use examples; then
+ docinto examples
+ dodoc doc/examples/*.c
+ fi
+}
diff --git a/net-libs/gnutls/gnutls-3.4.3-r1.ebuild b/net-libs/gnutls/gnutls-3.4.3-r1.ebuild
new file mode 100644
index 000000000000..5a601f952467
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.4.3-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools libtool eutils multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test +tools zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
+ >=dev-libs/nettle-3.1[gmp,${MULTILIB_USEDEP}]
+ >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+ tools? ( sys-devel/autogen )
+ crywrap? ( net-dns/libidn )
+ dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+ guile? ( >=dev-scheme/guile-1.8:*[networking] )
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/automake-1.11.6
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ doc? (
+ sys-apps/texinfo
+ dev-util/gtk-doc
+ )
+ nls? ( sys-devel/gettext )
+ test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+pkg_setup() {
+ # bug#520818
+ export TZ=UTC
+}
+
+src_prepare() {
+ sed -i \
+ -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+ doc/Makefile.am || die
+
+ # force regeneration of autogen-ed files
+ local file
+ for file in $(grep -l AutoGen-ed src/*.c) ; do
+ rm src/$(basename ${file} .c).{c,h} || die
+ done
+
+ # force regeneration of makeinfo files
+ # have no idea why on some system these files are not
+ # accepted as-is, see bug#520818
+ for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
+ rm "${file}" || die
+ done
+
+ # support user patches
+ epatch_user
+
+ eautoreconf
+
+ # Use sane .so versioning on FreeBSD.
+ elibtoolize
+
+ # bug 497472
+ use cxx || epunt_cxx
+}
+
+multilib_src_configure() {
+ LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+ # TPM needs to be tested before being enabled
+ # hardware-accell is disabled on OSX because the asm files force
+ # GNU-stack (as doesn't support that) and when that's removed ld
+ # complains about duplicate symbols
+ ECONF_SOURCE=${S} \
+ econf \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --disable-valgrind-tests \
+ --without-included-libtasn1 \
+ --enable-heartbeat-support \
+ $(use_enable cxx) \
+ $(use_enable dane libdane) \
+ $(multilib_native_use_enable tools) \
+ $(multilib_native_use_enable doc) \
+ $(multilib_native_use_enable doc gtk-doc) \
+ $(multilib_native_use_enable guile) \
+ $(multilib_native_use_enable crywrap) \
+ $(multilib_native_use_enable test tests) \
+ $(use_enable nls) \
+ $(use_enable openssl openssl-compatibility) \
+ $(use_enable static-libs static) \
+ $(use_with pkcs11 p11-kit) \
+ $(use_with zlib) \
+ --without-tpm \
+ --with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+ $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --all
+
+ dodoc doc/certtool.cfg
+
+ if use doc; then
+ dohtml doc/gnutls.html
+ else
+ rm -fr "${ED}/usr/share/doc/${PF}/html"
+ fi
+
+ if use examples; then
+ docinto examples
+ dodoc doc/examples/*.c
+ fi
+}
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
new file mode 100644
index 000000000000..33c4adde8c14
--- /dev/null
+++ b/net-libs/gnutls/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>crypto</herd>
+ <use>
+ <flag name="bindist">
+ Disallow building LZO support, because of a license
+ incompatibility with <pkg>dev-libs/lzo</pkg>
+ </flag>
+ <flag name="crywrap" restrict="&gt;=net-libs/gnutls-3.2.10">
+ Build the crywrap TLS proxy service
+ </flag>
+ <flag name="dane" restrict="&gt;=net-libs/gnutls-3.1.3">
+ Build libgnutls-dane, implementing DNS-based Authentication of
+ Named Entities. Requires <pkg>net-dns/unbound</pkg>
+ </flag>
+ <flag name="nettle" restrict="&lt;net-libs/gnutls-3">
+ Use <pkg>dev-libs/nettle</pkg> as crypto backend
+ </flag>
+ <flag name="openssl">
+ Build openssl compatibility libraries
+ </flag>
+ <flag name="pkcs11">
+ Add support for PKCS#11 through <pkg>app-crypt/p11-kit</pkg>
+ </flag>
+ <flag name="tools">
+ Build extra tools
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/gsnmp/Manifest b/net-libs/gsnmp/Manifest
new file mode 100644
index 000000000000..1b7e09fac471
--- /dev/null
+++ b/net-libs/gsnmp/Manifest
@@ -0,0 +1 @@
+DIST gsnmp-0.3.0.tar.gz 423137 SHA256 e428b61071b8ba2971fc8737ed2987210b04a71ffde307900df12c06a0bed0f9 SHA512 dcba2eb5ae31704fe6dc3e0b98f3032666b7b2be1efdff0f60a3cf4d0e0c3384563d72e5289a8d10c447f00da73f646a1963ffe08b46c7bc165972ac1b07c8b1 WHIRLPOOL 1ada5531cf66c623f9d1c32ecc5f60cd6f86c8cd8dc2cf75b1bf23be1369ee0f085e3dd98e6495cb85c47a2a8f4f40a414230c96d6f9161fc592841323554af5
diff --git a/net-libs/gsnmp/files/gsnmp-0.3.0-g_access.patch b/net-libs/gsnmp/files/gsnmp-0.3.0-g_access.patch
new file mode 100644
index 000000000000..505f7d166a9d
--- /dev/null
+++ b/net-libs/gsnmp/files/gsnmp-0.3.0-g_access.patch
@@ -0,0 +1,10 @@
+--- a/src/transport.c
++++ b/src/transport.c
+@@ -32,6 +32,7 @@
+ #include "transport.h"
+ #include "dispatch.h"
+ #include "pdu.h" /* xxx only needed for debugging flags... */
++#include <glib/gstdio.h> /* g_access() */
+
+
+ static GUdpSocket *udp_ipv4_socket = NULL;
diff --git a/net-libs/gsnmp/files/gsnmp-0.3.0-pkg_config.patch b/net-libs/gsnmp/files/gsnmp-0.3.0-pkg_config.patch
new file mode 100644
index 000000000000..2e837caa820d
--- /dev/null
+++ b/net-libs/gsnmp/files/gsnmp-0.3.0-pkg_config.patch
@@ -0,0 +1,31 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,10 +21,18 @@
+
+ AC_PROG_LIBTOOL
+
++PKG_PROG_PKG_CONFIG
++
+ dnl Checks for libraries.
+
+-AM_PATH_GLIB_2_0(2.0.0)
+-AM_PATH_GNET_2_0(2.0.4)
++PKG_CHECK_MODULES(GLIB, glib-2.0 > 2.0.0,[
++ LIBS="$LIBS $GLIB_LIBS"
++ CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS"
++ ], AC_MSG_ERROR[Could not find glib])
++PKG_CHECK_MODULES(GNET, gnet-2.0 > 2.0.4,[
++ LIBS="$LIBS $GNET_LIBS"
++ CPPFLAGS="$CPPFLAGS $GNET_CFLAGS"
++ ], AC_MSG_ERROR[Could not find gnet])
+
+ dnl Checks for header files.
+ dnl AC_HEADER_STDC
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,5 +1,3 @@
+-AM_CPPFLAGS = $(GNET_CFLAGS)
+-
+ lib_LTLIBRARIES = libgsnmp.la
+ libgsnmp_la_SOURCES = ber.c ber.h \
+ pdu.c pdu.h \
diff --git a/net-libs/gsnmp/files/gsnmp-0.3.0-underquoting.patch b/net-libs/gsnmp/files/gsnmp-0.3.0-underquoting.patch
new file mode 100644
index 000000000000..877aeceb0b0e
--- /dev/null
+++ b/net-libs/gsnmp/files/gsnmp-0.3.0-underquoting.patch
@@ -0,0 +1,11 @@
+--- a/gsnmp.m4
++++ b/gsnmp.m4
+@@ -1,7 +1,7 @@
+ dnl AM_PATH_GSNMP()
+ dnl
+
+-AC_DEFUN(AM_PATH_GSNMP,
++AC_DEFUN([AM_PATH_GSNMP],
+ [
+ PKG_CHECK_MODULES(GSNMP, glib-2.0 >= 2.0.1)
+ ])
diff --git a/net-libs/gsnmp/gsnmp-0.3.0.ebuild b/net-libs/gsnmp/gsnmp-0.3.0.ebuild
new file mode 100644
index 000000000000..de484916524a
--- /dev/null
+++ b/net-libs/gsnmp/gsnmp-0.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="An SNMP library based on glib and gnet"
+HOMEPAGE="http://cnds.eecs.jacobs-university.de/users/schoenw/articles/software/index.html"
+SRC_URI="ftp://ftp.ibr.cs.tu-bs.de/pub/local/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~amd64-linux ~ppc x86"
+IUSE="static-libs"
+
+DEPEND="
+ dev-libs/glib:2
+ net-libs/gnet
+"
+RDEPEND="${DEPEND}"
+
+DOCS="README"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-g_access.patch \
+ "${FILESDIR}"/${P}-pkg_config.patch \
+ "${FILESDIR}"/${P}-underquoting.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ prune_libtool_files
+}
diff --git a/net-libs/gsnmp/metadata.xml b/net-libs/gsnmp/metadata.xml
new file mode 100644
index 000000000000..9ca15ca788e8
--- /dev/null
+++ b/net-libs/gsnmp/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+</pkgmetadata>
+
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
new file mode 100644
index 000000000000..09473c22e02a
--- /dev/null
+++ b/net-libs/gsoap/Manifest
@@ -0,0 +1,5 @@
+DIST gsoap_2.7.17.zip 10224444 SHA256 d3af1ce9464b28cacdf1dfbe09b689f8927cbcf3948479996aef52a39afa2c16 SHA512 efb5332e90cbed6013ac2f16b940404cc4de9e84bc85e671cb3588bc6620cd86c8db646a4f3cd77bb3b866dfcc8a793186736ab2241bb8cbaca8d313345d14ac WHIRLPOOL 955e845b5a8b9af1697ca8bcdbb77813f149f7ff162ec51e680c398dab9934c36418572004b7bd24200476b6d45b623f294053b932da2fce94f415becd369af7
+DIST gsoap_2.8.12.zip 19974348 SHA256 51eef118544fa846f4d2dea2eedf91c84c46a1abeafc5eee3dcff783f4015a00 SHA512 7f162936d8d331d94b0aa52042c512167198a8de5a279747f49494b0f17442feb4db2ac5abff54e46350562e774b6bdddc577049f7cb59807cab29b12d797a87 WHIRLPOOL 7557396a154405606b2b2a962ac5f19d4853a792c8f96333576e6229506c9fedd8c5652cc1560566dfb51203362063566d2780becb1e1bb0ca2714fabe0a0330
+DIST gsoap_2.8.19.zip 20628629 SHA256 11571e4274bb678cd979fb6e80caa0f74d41e1b17848fdb5192497553bb2f8fe SHA512 890f46976322cc409081c3fe9731452244c0c1efba9061b2d2d42a9449c0290be7801bf88c90dbce4aedf1118e2f888e83891d8d6c3c40e2add304f68480fc5a WHIRLPOOL 8113c7c80fcd4d39f340a5950a050980a09194a62e50665b9a661efa5eaeb624cc5031412057f50a44dd465e32e7bda188121b92c480bb00ca34ccf5678e2d43
+DIST gsoap_2.8.21.zip 20633048 SHA256 ddda90866288c7c3d50851b276bfa12e0ef2d4af6d280719aad94b1da0ea109a SHA512 c46f6b6c0ef6055df483408038d0bce822dcee42ff581e0a6350000402916a8ce227fd5b34685a09f95189086584a4aad3b2c5b4e86fea70bcfa50b726fd04f9 WHIRLPOOL 3e38a3f8263a4de01727c9562e4da6156946839dbeb8caad5d6ef665b195b8b1b692bcca8cb88b58e80c1c224190fa29cc0e6c2eee7117cd6b8b875619fe41c3
+DIST gsoap_2.8.22.zip 20806602 SHA256 2fdf14e6e4dece9409db53a3c4676a0b25711279bc2a8d8949a46c2d9907308b SHA512 b7a1b44d21e98b90efc68efa5a61ac69a4a312a3ca87ac4379d6ea15d4d81393fc5921212363f99a8cb1f7a28a736f5869c49318e94110de3df36ce20fc11822 WHIRLPOOL 0e7de5379382702c076a74fea875b4dd9bd1aec54c847919c5831afa8a14e1663aa4d97fd1c8088a7b7aaa9b32485561b2b519802f3a4984cfa87f7a8167fd05
diff --git a/net-libs/gsoap/files/gsoap-2.7-fix-pre-iso-headers.patch b/net-libs/gsoap/files/gsoap-2.7-fix-pre-iso-headers.patch
new file mode 100644
index 000000000000..5762d5282211
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.7-fix-pre-iso-headers.patch
@@ -0,0 +1,98 @@
+--- gsoap/samples/factorytest/factorytest.cpp.orig 2009-03-04 01:16:22.300484305 +0100
++++ gsoap/samples/factorytest/factorytest.cpp 2009-03-04 01:15:47.656485143 +0100
+@@ -49,7 +49,7 @@
+ #include "soapH.h"
+ #include "factorytest.nsmap"
+
+-#include <iostream.h>
++#include <iostream>
+
+ // default factory service endpoint:
+ const char *factory = "http://localhost:18085";
+@@ -167,7 +167,7 @@
+ int main(int argc, char **argv)
+ { if (argc > 1)
+ factory = argv[1]; // use factory from command line arg by default
+- cout << "Connecting to factory " << factory << endl;
++ std::cout << "Connecting to factory " << factory << std::endl;
+ Adder adder; // create unique new remote adder object
+ Counter counter1("myCounter"); // new counter object "myCounter" (created if not exists)
+ Counter counter2("myCounter"); // lookup and use counter "myCounter" (this is an alias to counter1!)
+@@ -175,22 +175,22 @@
+ counter1.set(adder.get());
+ adder.add(3.0);
+ counter1.inc();
+- cout << "Adder=" << adder.get() << endl;
+- cout << "Counter=" << counter2.get() << endl; // counter2 is an alias for counter1 so this prints the value of counter1
+- cout << "Sleep for 90 seconds to test factory server purging objects:" << endl;
++ std::cout << "Adder=" << adder.get() << std::endl;
++ std::cout << "Counter=" << counter2.get() << std::endl; // counter2 is an alias for counter1 so this prints the value of counter1
++ std::cout << "Sleep for 90 seconds to test factory server purging objects:" << std::endl;
+ // counter is periodically incremented which keeps it alive
+ sleep(30);
+ counter1.inc();
+- cout << "Counter=" << counter2.get() << endl;
++ std::cout << "Counter=" << counter2.get() << std::endl;
+ sleep(30);
+ counter1.inc();
+- cout << "Counter=" << counter2.get() << endl;
++ std::cout << "Counter=" << counter2.get() << std::endl;
+ sleep(30);
+ counter1.inc();
+- cout << "Counter=" << counter2.get() << endl;
++ std::cout << "Counter=" << counter2.get() << std::endl;
+ // after 90 secs, the adder should be gone
+- cout << "Adder is no longer available:" << endl;
++ std::cout << "Adder is no longer available:" << std::endl;
+ adder.add(3.0);
+- cout << "Adder status = " << adder.status << endl;
++ std::cout << "Adder status = " << adder.status << std::endl;
+ return 0;
+ }
+--- gsoap/samples/lu/luclient.cpp.orig 2009-03-04 01:16:48.632483467 +0100
++++ gsoap/samples/lu/luclient.cpp 2009-03-04 01:17:54.550483188 +0100
+@@ -32,7 +32,7 @@
+ */
+
+ #include "soapH.h"
+-#include <iostream.h>
++#include <iostream>
+
+ const char luserver[] = "http://websrv.cs.fsu.edu/~engelen/luserver.cgi";
+
+@@ -51,14 +51,14 @@
+ a[3].resize(2,3); // 2-element vector indexed from 2 to 3
+ a[3][2] = 1;
+ a[3][3] = 2;
+- cout << "* Demonstration example *" << endl;
+- cout << "Matrix:" << endl;
++ std::cout << "* Demonstration example *" << std::endl;
++ std::cout << "Matrix:" << std::endl;
+ a.print();
+ vector b(soap, 3);
+ b[1] = 1;
+ b[2] = 2;
+ b[3] = 3;
+- cout << "Vector:" << endl;
++ std::cout << "Vector:" << std::endl;
+ b.print();
+ vector x(soap);
+ if (argc < 2)
+@@ -71,7 +71,7 @@
+ soap_print_fault_location(soap, stderr);
+ }
+ else
+- { cout << "Solution vector from service:" << endl;
++ { std::cout << "Solution vector from service:" << std::endl;
+ x.print();
+ }
+ matrix a1(soap);
+@@ -80,7 +80,7 @@
+ soap_print_fault_location(soap, stderr);
+ }
+ else
+- { cout << "Inverse matrix matrix from service:" << endl;
++ { std::cout << "Inverse matrix matrix from service:" << std::endl;
+ a1.print();
+ }
+ soap_destroy(soap);
diff --git a/net-libs/gsoap/files/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch b/net-libs/gsoap/files/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch
new file mode 100644
index 000000000000..673deb17c35f
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch
@@ -0,0 +1,12 @@
+--- gsoap-2.7/gsoap/Makefile.am 2008-01-27 15:02:36.000000000 -0600
++++ gsoap-2.7mf/gsoap/Makefile.am 2008-01-28 10:24:26.000000000 -0600
+@@ -12,6 +12,9 @@ CLEANFILES=soapcpp2 stdsoap2_cpp.cpp std
+ AM_CXXFLAGS=$(SOAPCPP2_DEBUG) -D$(platform)
+ AM_CFLAGS=$(SOAPCPP2_DEBUG) -D$(platform)
+
++# Install all soapcpp2 and wsdl2h files into /usr/share/gsoap
++nobase_pkgdata_DATA = import/* plugin/* WS/* custom/* extras/*
++
+ ## we cannot build stdsoap2.o from 2 different sources (stdsoap2.cpp and stdsoap2.c), so we need an intermediate target:
+ stdsoap2_ck.c: stdsoap2.cpp
+ $(LN_S) $(srcdir)/stdsoap2.cpp stdsoap2_ck.c
diff --git a/net-libs/gsoap/gsoap-2.7.17.ebuild b/net-libs/gsoap/gsoap-2.7.17.ebuild
new file mode 100644
index 000000000000..ae852ab59b52
--- /dev/null
+++ b/net-libs/gsoap/gsoap-2.7.17.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit autotools eutils
+
+MY_P="${PN}-2.7"
+
+DESCRIPTION="A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services"
+HOMEPAGE="http://gsoap2.sourceforge.net"
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
+
+LICENSE="GPL-2 gSOAP"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc debug examples +ssl"
+
+DEPEND="app-arch/unzip
+ sys-devel/flex
+ sys-devel/bison
+ sys-libs/zlib
+ ssl? ( dev-libs/openssl )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Fix Pre-ISO headers
+ epatch "${FILESDIR}/${PN}-2.7-fix-pre-iso-headers.patch"
+ epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
+
+ # causes compilation of app-emulation/virtualbox-ose[vboxwebsrv] to
+ # break (bug #320901):
+ #epatch "${FILESDIR}/${PN}-2.7.15-use_libtool.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable ssl openssl) \
+ $(use_enable examples samples)
+}
+
+src_compile() {
+ emake -j1 || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "Install failed"
+
+ # yes, we also install the license-file since
+ # it contains info about how to apply the licenses
+ dodoc *.txt
+
+ dohtml changelog.html
+
+ rm -rf "${D}"/usr/lib*/*.la
+
+ if use examples; then
+ rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o
+ insinto /usr/share/doc/${PF}/examples
+ doins -r gsoap/samples/*
+ fi
+
+ if use doc; then
+ dohtml -r gsoap/doc/*
+ fi
+}
diff --git a/net-libs/gsoap/gsoap-2.8.12.ebuild b/net-libs/gsoap/gsoap-2.8.12.ebuild
new file mode 100644
index 000000000000..923f02d8c311
--- /dev/null
+++ b/net-libs/gsoap/gsoap-2.8.12.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils
+
+MY_P="${PN}-2.8"
+
+DESCRIPTION="A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services"
+HOMEPAGE="http://gsoap2.sourceforge.net"
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
+
+LICENSE="GPL-2 gSOAP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug examples ipv6 gnutls +ssl"
+
+DEPEND="app-arch/unzip
+ sys-devel/flex
+ sys-devel/bison
+ sys-libs/zlib
+ gnutls? ( net-libs/gnutls )
+ ssl? ( dev-libs/openssl )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Fix Pre-ISO headers
+ epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
+
+ # Fix configure.in for >=automake-1.13
+ sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.in || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=
+ use ssl || myconf+="--disable-ssl "
+ use gnutls && myconf+="--enable-gnutls "
+ use ipv6 && myconf+="--enable-ipv6 "
+ econf \
+ ${myconf} \
+ $(use_enable debug) \
+ $(use_enable examples samples)
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # yes, we also install the license-file since
+ # it contains info about how to apply the licenses
+ dodoc *.txt
+
+ dohtml changelog.html
+
+ find "${D}"/usr/ -name "*.la" -exec rm {} \;
+
+ if use examples; then
+ rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o
+ insinto /usr/share/doc/${PF}/examples
+ doins -r gsoap/samples/*
+ fi
+
+ if use doc; then
+ dohtml -r gsoap/doc/*
+ fi
+}
diff --git a/net-libs/gsoap/gsoap-2.8.19.ebuild b/net-libs/gsoap/gsoap-2.8.19.ebuild
new file mode 100644
index 000000000000..3962e714be54
--- /dev/null
+++ b/net-libs/gsoap/gsoap-2.8.19.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils
+
+MY_P="${PN}-2.8"
+
+DESCRIPTION="A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services"
+HOMEPAGE="http://gsoap2.sourceforge.net"
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
+
+LICENSE="GPL-2 gSOAP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug examples ipv6 gnutls +ssl"
+
+DEPEND="app-arch/unzip
+ sys-devel/flex
+ sys-devel/bison
+ sys-libs/zlib
+ gnutls? ( net-libs/gnutls )
+ ssl? ( dev-libs/openssl )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Fix Pre-ISO headers
+ epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=
+ use ssl || myconf+="--disable-ssl "
+ use gnutls && myconf+="--enable-gnutls "
+ use ipv6 && myconf+="--enable-ipv6 "
+ econf \
+ ${myconf} \
+ $(use_enable debug) \
+ $(use_enable examples samples)
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # yes, we also install the license-file since
+ # it contains info about how to apply the licenses
+ dodoc *.txt
+
+ dohtml changelog.html
+
+ find "${D}"/usr/ -name "*.la" -exec rm {} \;
+
+ if use examples; then
+ rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o
+ insinto /usr/share/doc/${PF}/examples
+ doins -r gsoap/samples/*
+ fi
+
+ if use doc; then
+ dohtml -r gsoap/doc/*
+ fi
+}
diff --git a/net-libs/gsoap/gsoap-2.8.21.ebuild b/net-libs/gsoap/gsoap-2.8.21.ebuild
new file mode 100644
index 000000000000..3962e714be54
--- /dev/null
+++ b/net-libs/gsoap/gsoap-2.8.21.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils
+
+MY_P="${PN}-2.8"
+
+DESCRIPTION="A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services"
+HOMEPAGE="http://gsoap2.sourceforge.net"
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
+
+LICENSE="GPL-2 gSOAP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug examples ipv6 gnutls +ssl"
+
+DEPEND="app-arch/unzip
+ sys-devel/flex
+ sys-devel/bison
+ sys-libs/zlib
+ gnutls? ( net-libs/gnutls )
+ ssl? ( dev-libs/openssl )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Fix Pre-ISO headers
+ epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=
+ use ssl || myconf+="--disable-ssl "
+ use gnutls && myconf+="--enable-gnutls "
+ use ipv6 && myconf+="--enable-ipv6 "
+ econf \
+ ${myconf} \
+ $(use_enable debug) \
+ $(use_enable examples samples)
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # yes, we also install the license-file since
+ # it contains info about how to apply the licenses
+ dodoc *.txt
+
+ dohtml changelog.html
+
+ find "${D}"/usr/ -name "*.la" -exec rm {} \;
+
+ if use examples; then
+ rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o
+ insinto /usr/share/doc/${PF}/examples
+ doins -r gsoap/samples/*
+ fi
+
+ if use doc; then
+ dohtml -r gsoap/doc/*
+ fi
+}
diff --git a/net-libs/gsoap/gsoap-2.8.22.ebuild b/net-libs/gsoap/gsoap-2.8.22.ebuild
new file mode 100644
index 000000000000..7a558be8fc6c
--- /dev/null
+++ b/net-libs/gsoap/gsoap-2.8.22.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils
+
+MY_P="${PN}-2.8"
+
+DESCRIPTION="A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services"
+HOMEPAGE="http://gsoap2.sourceforge.net"
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
+
+LICENSE="GPL-2 gSOAP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug examples ipv6 gnutls +ssl"
+
+DEPEND="app-arch/unzip
+ sys-devel/flex
+ sys-devel/bison
+ sys-libs/zlib
+ gnutls? ( net-libs/gnutls )
+ ssl? ( dev-libs/openssl )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Fix Pre-ISO headers
+ epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=
+ use ssl || myconf+="--disable-ssl "
+ use gnutls && myconf+="--enable-gnutls "
+ use ipv6 && myconf+="--enable-ipv6 "
+ econf \
+ ${myconf} \
+ $(use_enable debug) \
+ $(use_enable examples samples)
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # yes, we also install the license-file since
+ # it contains info about how to apply the licenses
+ dodoc *.txt
+
+ dohtml changelog.html
+
+ find "${D}"/usr/ -name "*.la" -exec rm {} \;
+
+ if use examples; then
+ rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o
+ insinto /usr/share/doc/${PF}/examples
+ doins -r gsoap/samples/*
+ fi
+
+ if use doc; then
+ dohtml -r gsoap/doc/*
+ fi
+}
diff --git a/net-libs/gsoap/metadata.xml b/net-libs/gsoap/metadata.xml
new file mode 100644
index 000000000000..1611f0c734c3
--- /dev/null
+++ b/net-libs/gsoap/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>swapon@gmail.com</email>
+ <name>Alessio Cassibba</name>
+ </maintainer>
+ <maintainer>
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+ <maintainer>
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">gsoap2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
new file mode 100644
index 000000000000..a1df3c5ffebe
--- /dev/null
+++ b/net-libs/gssdp/Manifest
@@ -0,0 +1,2 @@
+DIST gssdp-0.14.10.tar.xz 291236 SHA256 b9b3be6354d6a0dcc7c29a7da4120847350011e5614383626552e15c28f3058c SHA512 ee974794fa82388f305c24802ca2a42fe8d3abcfff98a7e810470f772a8adec596b7d81a5e991763043f37b7cac7e6b4a16642e58d440adef2989b7ca27fc489 WHIRLPOOL f37ca8b781fdc442a8a9b08a57efce95563fa96d350d4aee4f9f71fa9f425a65aefdf5561f35dc5dbd7d590212d533175380631629fce5fd998d91e42676ac1e
+DIST gssdp-0.14.11.tar.xz 291872 SHA256 7bf5aeaf2119fe0bec5f3632ecf39dae15bc85276c72c2ad8dd4b0e345c6535a SHA512 1954f048b073338a744cc3d8b31c3e006a52ab2223d1b4adbeed5c563fb4cd0bd51bb4dfa018b0fd200e175e4c12d11b9a1de43a5109c5c647dcc26398dd774b WHIRLPOOL 069647057f4feaffeff6dd5fadd4a51ba2a3fba742a6b2c022292bcdafdea72dc5db5405c6417db4e7962824105978c487ed2cffe30ca347282565bff18c4887
diff --git a/net-libs/gssdp/gssdp-0.14.10.ebuild b/net-libs/gssdp/gssdp-0.14.10.ebuild
new file mode 100644
index 000000000000..df05bc4b6902
--- /dev/null
+++ b/net-libs/gssdp/gssdp-0.14.10.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 multilib-minimal vala
+
+DESCRIPTION="A GObject-based API for handling resource discovery and announcement over SSDP"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2"
+SLOT="0/3"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="+introspection +gtk"
+
+RDEPEND="
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=net-libs/libsoup-2.44.2:2.4[${MULTILIB_USEDEP},introspection?]
+ gtk? ( >=x11-libs/gtk+-3.0:3 )
+ introspection? (
+ $(vala_depend)
+ >=dev-libs/gobject-introspection-0.6.7 )
+ !<net-libs/gupnp-vala-0.10.3
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.10
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+ # Disable functional test as it requires port that might be used by rygel to
+ # be free of use
+ sed 's/\(check_PROGRAMS.*\)test-functional$(EXEEXT)/\1/' \
+ -i "${S}"/tests/gtest/Makefile.in || die
+
+ use introspection && vala_src_prepare
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(multilib_native_use_enable introspection) \
+ $(multilib_native_use_with gtk) \
+ --disable-static
+
+ if multilib_is_native_abi; then
+ # fix gtk-doc
+ ln -s "${S}"/doc/html doc/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
diff --git a/net-libs/gssdp/gssdp-0.14.11.ebuild b/net-libs/gssdp/gssdp-0.14.11.ebuild
new file mode 100644
index 000000000000..2c1d02ff1ca8
--- /dev/null
+++ b/net-libs/gssdp/gssdp-0.14.11.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 multilib-minimal vala
+
+DESCRIPTION="A GObject-based API for handling resource discovery and announcement over SSDP"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2"
+SLOT="0/3"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="+introspection +gtk"
+
+RDEPEND="
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=net-libs/libsoup-2.44.2:2.4[${MULTILIB_USEDEP},introspection?]
+ gtk? ( >=x11-libs/gtk+-3.0:3 )
+ introspection? (
+ $(vala_depend)
+ >=dev-libs/gobject-introspection-0.6.7 )
+ !<net-libs/gupnp-vala-0.10.3
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.10
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+ # Disable functional test as it requires port that might be used by rygel to
+ # be free of use
+ sed 's/\(check_PROGRAMS.*\)test-functional$(EXEEXT)/\1/' \
+ -i "${S}"/tests/gtest/Makefile.in || die
+
+ use introspection && vala_src_prepare
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(multilib_native_use_enable introspection) \
+ $(multilib_native_use_with gtk) \
+ --disable-static
+
+ if multilib_is_native_abi; then
+ # fix gtk-doc
+ ln -s "${S}"/doc/html doc/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
diff --git a/net-libs/gssdp/metadata.xml b/net-libs/gssdp/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/net-libs/gssdp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
new file mode 100644
index 000000000000..05d09aee3241
--- /dev/null
+++ b/net-libs/gtk-vnc/Manifest
@@ -0,0 +1,2 @@
+DIST gtk-vnc-0.5.3.tar.xz 408336 SHA256 d490a6c8f40e550d43aef0043ce3bec498ec220d5eb3dc5cdcff8fd561149caf SHA512 a5d81fcb8ee04f033a3aec2eed334e4237c8f4d7334e4875a149b5b385b0f0f0948d2d5227fbbfdccec8d192ba8bbc5f93dd83bb0d6604da25675662a9858cf2 WHIRLPOOL c2b6dc272843e0fce795fb4e082330f252a6f8413806e77b4ace78d63fead48634e647df96e2d6436b3c7a16013f6c2d18d377c762607ed2fd4dbd21e3f62fe3
+DIST gtk-vnc-0.5.4.tar.xz 418104 SHA256 488aa97a76ce6868160699cd45d4a0ee0fe6f0ad4631737c6ddd84450f6c9ce7 SHA512 068f7e29d40c677c9453364e33ab3a57e155dd0715299c8dee3f9933ecdb2e3bc4aea6dd722f5bc846d9b883e4f5a6de7b46742f004b348a551100ea7720da61 WHIRLPOOL 4d29f394a3ac5ea10584369f4a2290274a4be95c5d68c13e84e7ce990bf907243f16afc9b610ba973eebb3d137ca0fc4dce04df5f79afa1327a1c7aadcafaf5b
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.5.3.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.5.3.ebuild
new file mode 100644
index 000000000000..8427711aee6d
--- /dev/null
+++ b/net-libs/gtk-vnc/gtk-vnc-0.5.3.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome.org python-r1 vala
+
+DESCRIPTION="VNC viewer widget for GTK"
+HOMEPAGE="https://live.gnome.org/gtk-vnc"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="examples +gtk3 +introspection pulseaudio python sasl vala"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ vala? ( gtk3 introspection )
+"
+
+# libview is used in examples/gvncviewer -- no need
+# glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
+COMMON_DEPEND="
+ >=dev-libs/glib-2.30.1:2
+ >=dev-libs/libgcrypt-1.4.2:0
+ dev-libs/libgpg-error
+ >=net-libs/gnutls-1.4
+ >=x11-libs/cairo-1.2
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/libX11
+ gtk3? ( >=x11-libs/gtk+-2.91.3:3 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.4 )
+ pulseaudio? ( media-sound/pulseaudio )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygtk-2:2[${PYTHON_USEDEP}] )
+ sasl? ( dev-libs/cyrus-sasl )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+ >=dev-lang/perl-5
+ >=dev-util/intltool-0.40
+ sys-devel/gettext
+ virtual/pkgconfig
+ vala? (
+ $(vala_depend)
+ >=dev-libs/gobject-introspection-0.9.4 )
+"
+# eautoreconf requires gnome-common
+
+GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
+GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
+
+src_prepare() {
+ mkdir -p "${GTK2_BUILDDIR}" || die
+ mkdir -p "${GTK3_BUILDDIR}" || die
+ prepare_python() {
+ mkdir -p "${BUILD_DIR}" || die
+ }
+ if use python; then
+ python_foreach_impl prepare_python
+ fi
+
+ # Remove a few files that were autogenerated during distcheck.
+ # Having these around in srcdir breaks out of tree build since they're
+ # expected to be in builddir, which is correct for trunk builds since
+ # they're generated files, not source files. Funny false dichotomy.
+ rm -vf "${S}"/src/{vncconnectionenums.[ch],vncdisplayenums.[ch]}
+
+ # Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk, upstream bug#????
+ sed -e 's/codegendir pygtk-2.0/codegendir pygobject-2.0/g' \
+ -i src/Makefile.* || die
+
+ # libtool seems unable to find this via VPATH so help it
+ sed -r "s:(gtkvnc_la_LIBADD =) libgtk-vnc-.*\.la:\1 ${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la:" \
+ -i src/Makefile.{am,in} || die
+
+ vala_src_prepare
+}
+
+src_configure() {
+ local myconf
+ myconf="
+ $(use_with examples) \
+ $(use_enable introspection) \
+ $(use_with pulseaudio) \
+ $(use_with sasl) \
+ --with-coroutine=gthread \
+ --without-libview \
+ --disable-static \
+ --disable-vala"
+
+ cd "${GTK2_BUILDDIR}" || die
+ einfo "Running configure in ${GTK2_BUILDDIR}"
+ ECONF_SOURCE="${S}" econf ${myconf} \
+ --with-python=no \
+ --with-gtk=2.0
+
+ configure_python() {
+ ECONF_SOURCE="${S}" econf ${myconf} \
+ $(use_with python) \
+ --with-gtk=2.0
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir configure_python
+ fi
+
+ if use gtk3; then
+ cd "${GTK3_BUILDDIR}" || die
+ einfo "Running configure in ${GTK3_BUILDDIR}"
+ # Python support is via gobject-introspection
+ # Ex: from gi.repository import GtkVnc
+ ECONF_SOURCE="${S}" econf ${myconf} \
+ $(use_enable vala) \
+ --with-python=no \
+ --with-gtk=3.0
+ fi
+}
+
+src_compile() {
+ cd "${GTK2_BUILDDIR}" || die
+ einfo "Running make in ${GTK2_BUILDDIR}"
+ emake
+
+ compile_python() {
+ cd "${BUILD_DIR}"/src || die
+ # CPPFLAGS set to help find includes for gvnc.override
+ emake gtkvnc.la \
+ VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
+ CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src"
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir compile_python
+ fi
+
+ if use gtk3; then
+ cd "${GTK3_BUILDDIR}" || die
+ einfo "Running make in ${GTK3_BUILDDIR}"
+ emake
+ fi
+}
+
+src_test() {
+ cd "${GTK2_BUILDDIR}" || die
+ einfo "Running make check in ${GTK2_BUILDDIR}"
+ default
+
+ if use gtk3; then
+ cd "${GTK3_BUILDDIR}" || die
+ einfo "Running make check in ${GTK3_BUILDDIR}"
+ default
+ fi
+}
+
+src_install() {
+ # Parallel installation fails sometimes, bug #328273, upstream bug #651923
+ # Upstream is still unable to reproduce, try again to use parallel with this new version
+ dodoc AUTHORS ChangeLog NEWS README
+
+ cd "${GTK2_BUILDDIR}" || die
+ einfo "Running make install in ${GTK2_BUILDDIR}"
+# MAKEOPTS="${MAKEOPTS} -j1" default
+ default
+
+ install_python() {
+ cd "${BUILD_DIR}"/src || die
+ emake install-pyexecLTLIBRARIES DESTDIR="${D}" \
+ VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
+ CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src"
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir install_python
+ fi
+
+ if use gtk3; then
+ cd "${GTK3_BUILDDIR}" || die
+ einfo "Running make install in ${GTK3_BUILDDIR}"
+ #MAKEOPTS="${MAKEOPTS} -j1" default
+ default
+ fi
+
+ prune_libtool_files
+}
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.5.4.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.5.4.ebuild
new file mode 100644
index 000000000000..11b6c5af24ca
--- /dev/null
+++ b/net-libs/gtk-vnc/gtk-vnc-0.5.4.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 python-r1 vala
+
+DESCRIPTION="VNC viewer widget for GTK"
+HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="examples +gtk3 +introspection pulseaudio python sasl vala"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ vala? ( gtk3 introspection )
+"
+
+# libview is used in examples/gvncviewer -- no need
+# glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
+COMMON_DEPEND="
+ >=dev-libs/glib-2.30.1:2
+ >=dev-libs/libgcrypt-1.4.2:0
+ dev-libs/libgpg-error
+ >=net-libs/gnutls-2.12
+ >=x11-libs/cairo-1.2
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/libX11
+ gtk3? ( >=x11-libs/gtk+-2.91.3:3 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.4 )
+ pulseaudio? ( media-sound/pulseaudio )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygtk-2:2[${PYTHON_USEDEP}] )
+ sasl? ( dev-libs/cyrus-sasl )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+ >=dev-lang/perl-5
+ >=dev-util/intltool-0.40
+ sys-devel/gettext
+ virtual/pkgconfig
+ vala? (
+ $(vala_depend)
+ >=dev-libs/gobject-introspection-0.9.4 )
+"
+# eautoreconf requires gnome-common
+
+GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
+GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
+
+src_prepare() {
+ mkdir -p "${GTK2_BUILDDIR}" || die
+ mkdir -p "${GTK3_BUILDDIR}" || die
+ prepare_python() {
+ mkdir -p "${BUILD_DIR}" || die
+ }
+ if use python; then
+ python_foreach_impl prepare_python
+ fi
+
+ # Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk, upstream bug#744393
+ sed -e 's/codegendir pygtk-2.0/codegendir pygobject-2.0/g' \
+ -i src/Makefile.* || die
+
+ # libtool seems unable to find this via VPATH so help it
+ sed -r "s:(gtkvnc_la_LIBADD =) libgtk-vnc-.*\.la:\1 ${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la:" \
+ -i src/Makefile.{am,in} || die
+
+ vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf
+ myconf="
+ $(use_with examples) \
+ $(use_enable introspection) \
+ $(use_with pulseaudio) \
+ $(use_with sasl) \
+ --with-coroutine=gthread \
+ --without-libview \
+ --disable-static \
+ --disable-vala"
+
+ cd "${GTK2_BUILDDIR}" || die
+ einfo "Running configure in ${GTK2_BUILDDIR}"
+ ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+ --with-python=no \
+ --with-gtk=2.0
+
+ configure_python() {
+ ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+ $(use_with python) \
+ --with-gtk=2.0
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir configure_python
+ fi
+
+ if use gtk3; then
+ cd "${GTK3_BUILDDIR}" || die
+ einfo "Running configure in ${GTK3_BUILDDIR}"
+ # Python support is via gobject-introspection
+ # Ex: from gi.repository import GtkVnc
+ ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+ $(use_enable vala) \
+ --with-python=no \
+ --with-gtk=3.0
+ fi
+}
+
+src_compile() {
+ cd "${GTK2_BUILDDIR}" || die
+ einfo "Running make in ${GTK2_BUILDDIR}"
+ gnome2_src_compile
+
+ compile_python() {
+ cd "${BUILD_DIR}"/src || die
+ # CPPFLAGS set to help find includes for gvnc.override
+ emake gtkvnc.la \
+ VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
+ CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src"
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir compile_python
+ fi
+
+ if use gtk3; then
+ cd "${GTK3_BUILDDIR}" || die
+ einfo "Running make in ${GTK3_BUILDDIR}"
+ gnome2_src_compile
+ fi
+}
+
+src_test() {
+ cd "${GTK2_BUILDDIR}" || die
+ einfo "Running make check in ${GTK2_BUILDDIR}"
+ default
+
+ if use gtk3; then
+ cd "${GTK3_BUILDDIR}" || die
+ einfo "Running make check in ${GTK3_BUILDDIR}"
+ default
+ fi
+}
+
+src_install() {
+ cd "${GTK2_BUILDDIR}" || die
+ einfo "Running make install in ${GTK2_BUILDDIR}"
+ gnome2_src_install
+
+ install_python() {
+ cd "${BUILD_DIR}"/src || die
+ emake install-pyexecLTLIBRARIES DESTDIR="${D}" \
+ VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
+ CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src"
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir install_python
+ fi
+
+ if use gtk3; then
+ cd "${GTK3_BUILDDIR}" || die
+ einfo "Running make install in ${GTK3_BUILDDIR}"
+ gnome2_src_install
+ fi
+}
diff --git a/net-libs/gtk-vnc/metadata.xml b/net-libs/gtk-vnc/metadata.xml
new file mode 100644
index 000000000000..3a15c3288b0d
--- /dev/null
+++ b/net-libs/gtk-vnc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <herd>virtualization</herd>
+ <use>
+ <flag name="gtk3">Build the gtk3 gtk-vnc library and other gtk3 assets</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/gupnp-av/Manifest b/net-libs/gupnp-av/Manifest
new file mode 100644
index 000000000000..f047682b21da
--- /dev/null
+++ b/net-libs/gupnp-av/Manifest
@@ -0,0 +1,2 @@
+DIST gupnp-av-0.12.6.tar.xz 348264 SHA256 e0553d60dd7c7277c65c02a68a270c4dcb9036a4c7075c902fc8111c6a5e6a44 SHA512 0eee23c8b30eae445cb9732d030d89dd6538f2683ed57482ceebc611b8a0524b60760bc76a1b26a9d2d8845dfa836183c636a798c165102f0ecdcd3ba7d9121e WHIRLPOOL c401829e74395697a6ed1e5d9e183794f3875d718517ee3ccd50f83bd30e4f69190cc7396b87f48a3add8c2384164c3141d3cead6b1eeb695c185d0b41a29f2d
+DIST gupnp-av-0.12.7.tar.xz 349292 SHA256 35e775bc4f7801d65dcb710905a6b8420ce751a239b5651e6d830615dc906ea8 SHA512 21af09a74409c696124b7d92746ba72a46f804df65ca968034cbfe10f0c73b18446b7cceceb8e62e4d1689f699ef9a785c465cb8caf9294ec8e9bc38e86d16c2 WHIRLPOOL 4c102cb8ebab50e377159b12e0d633718fa60365f2099a8e7c0680367c41e3d7dbace96abb4790600ad2d5d1c67123883ad50e2dd978f9a0e3be16b08af56f60
diff --git a/net-libs/gupnp-av/gupnp-av-0.12.6.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.6.ebuild
new file mode 100644
index 000000000000..fd60afe33890
--- /dev/null
+++ b/net-libs/gupnp-av/gupnp-av-0.12.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.22" #532568
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 vala
+
+DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles"
+HOMEPAGE="http://gupnp.org/"
+
+LICENSE="LGPL-2"
+SLOT="0/2" # subslot: soname version
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+introspection"
+
+RDEPEND="
+ >=dev-libs/glib-2.16:2
+ >=net-libs/gssdp-0.9.2[introspection?]
+ >=net-libs/libsoup-2.28.2:2.4[introspection?]
+ dev-libs/libxml2
+ >=net-libs/gupnp-0.19[introspection?]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ !net-libs/gupnp-vala
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.10
+ virtual/pkgconfig
+ introspection? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use introspection && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ --disable-static
+}
diff --git a/net-libs/gupnp-av/gupnp-av-0.12.7.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.7.ebuild
new file mode 100644
index 000000000000..c9e36a65ea61
--- /dev/null
+++ b/net-libs/gupnp-av/gupnp-av-0.12.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.22"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 vala
+
+DESCRIPTION="Utility library aiming to ease the handling UPnP A/V profiles"
+HOMEPAGE="http://gupnp.org/"
+
+LICENSE="LGPL-2"
+SLOT="0/2" # subslot: soname version
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+introspection"
+
+RDEPEND="
+ >=dev-libs/glib-2.16:2
+ >=net-libs/gssdp-0.9.2[introspection?]
+ >=net-libs/libsoup-2.28.2:2.4[introspection?]
+ dev-libs/libxml2
+ >=net-libs/gupnp-0.19[introspection?]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ !net-libs/gupnp-vala
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.10
+ virtual/pkgconfig
+ introspection? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use introspection && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ --disable-static
+}
diff --git a/net-libs/gupnp-av/metadata.xml b/net-libs/gupnp-av/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/net-libs/gupnp-av/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
new file mode 100644
index 000000000000..44609a2bc67c
--- /dev/null
+++ b/net-libs/gupnp-igd/Manifest
@@ -0,0 +1,3 @@
+DIST gupnp-igd-0.2.2.tar.xz 262216 SHA256 73b6a98a0f13b29b34c3bfc07f99f78b1319211cb95a8585752873af2b9067d3 SHA512 5e876b5e759f483b270d85f2125ede5db304b3664f22a6b4e68943ba5dbc6fe597e59ef44f23e284d15ee00809c28fc6194b44faa345cc6aec62927958a53583 WHIRLPOOL 71d33882f94fdab4b517df1abcf5e8bb1944a7dcde150cd69954fd32ca2b208a95d2324f9d4215be7fd1016d72eb376c3332f2e84216afe0d8d25a18be4d7fbc
+DIST gupnp-igd-0.2.3.tar.xz 269920 SHA256 ccaf49f9d4f38ac646f1b00341d4db767291e56592286da0e0eb0835811f462d SHA512 74b4a6e34fe89b7fa92125664bb09354601fe0b476b909fc6c233027ec58914619c88e5bd951a675d7ccfc33d01b0fdddb21eb915d38c7ff824364dc62c319ac WHIRLPOOL badd5a9a5f6e73a6b9db41e5604fa7e3bd911026bd317b61e782750422a7ea1065bd0287c9925fdbf5f74ee1483efdaf66a30b7977f5a480f264419494177eb0
+DIST gupnp-igd-0.2.4.tar.xz 272004 SHA256 38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44 SHA512 4da8d401935c4237661310aec0acb38e9c9fe54aeb6b2ef1c9533a8576dbd2d9f9db3b50c4e86b7efc81c80059a10ea52f73517dab23f3cdc0f91a5c0944dab8 WHIRLPOOL c1536fa137dd2e7101f68b047fc1cdf9459ee6d822da964e12b3d995ee18d9f8c07b26c1eeb394dc6de91b9d54e18ff3e35155492ca43223d51d3b27e7fb4a55
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.1.11-disable_static_modules.patch b/net-libs/gupnp-igd/files/gupnp-igd-0.1.11-disable_static_modules.patch
new file mode 100644
index 000000000000..48534925d21f
--- /dev/null
+++ b/net-libs/gupnp-igd/files/gupnp-igd-0.1.11-disable_static_modules.patch
@@ -0,0 +1,10 @@
+--- python/Makefile.am
++++ python/Makefile.am
+@@ -27,7 +28,7 @@
+
+ igd_la_LDFLAGS = \
+- -module -avoid-version
++ -module -avoid-version -shared
+
+ pygupnp-igd.c: $(srcdir)/pygupnp-igd.override $(srcdir)/pygupnp-igd.defs
+ $(PYCODEGEN) \
diff --git a/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch b/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
new file mode 100644
index 000000000000..0e1dfb48a388
--- /dev/null
+++ b/net-libs/gupnp-igd/files/gupnp-igd-0.2.2-underlinking.patch
@@ -0,0 +1,16 @@
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c4f7d47..f13b398 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,7 +10,7 @@ AC_STDC_HEADERS
+ AC_PROG_LIBTOOL
+ AC_FUNC_MMAP
+
+-PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0)
++PKG_CHECK_MODULES(LIBGUPNP, gobject-2.0 >= 2.14 gupnp-1.0 >= 0.18 gthread-2.0 gssdp-1.0)
+
+ # glib-genmarshal
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..f26439b12497
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.2-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils gnome.org python-r1
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+introspection python"
+
+RDEPEND="
+ net-libs/gssdp
+ >=net-libs/gupnp-0.18
+ >=dev-libs/glib-2.16:2
+ introspection? ( >=dev-libs/gobject-introspection-0.10 )
+ python? (
+ >=dev-libs/gobject-introspection-0.10
+ >=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+# The only existing test is broken
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-underlinking.patch
+ "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
+ )
+
+src_prepare() {
+ rm missing || die
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+ # Python bindings are built/installed manually.
+ if use python; then
+ sed -e "/PYTHON_SUBDIR =/s/ python//" -i Makefile.am Makefile.in || die
+ fi
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-static
+ --disable-gtk-doc
+ $(use_enable introspection)
+ $(use_enable python)
+ )
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+
+ if use python; then
+ python_copy_sources
+
+ building() {
+ cd "${BUILD_DIR}"/python || die
+ emake \
+ PYTHON_INCLUDES="-I$(python_get_includedir)" \
+ pyexecdir="$(python_get_sitedir)"
+ }
+ python_foreach_impl building
+ fi
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ if use python; then
+ installation() {
+ cd "${BUILD_DIR}"/python || die
+ emake \
+ DESTDIR="${D}" \
+ pyexecdir="$(python_get_sitedir)" \
+ install
+ }
+ python_foreach_impl installation
+ fi
+}
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..66f9d29c865e
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.3-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=true
+
+inherit eutils gnome.org multilib-minimal python-r1
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection python"
+
+RDEPEND="
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=net-libs/gssdp-0.14.7[${MULTILIB_USEDEP}]
+ >=net-libs/gupnp-0.20.10[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.10 )
+ python? (
+ >=dev-libs/gobject-introspection-0.10
+ >=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+# The only existing test is broken
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
+)
+
+multilib_src_configure() {
+ local myconf=(
+ --disable-static
+ --disable-gtk-doc
+ $(multilib_native_use_enable introspection)
+ # python is built separately
+ --disable-python
+ )
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/html doc/html || die
+
+ python_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}" \
+ --enable-python
+ }
+
+ use python && python_parallel_foreach_impl python_configure
+ fi
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi && use python; then
+ local native_builddir=${BUILD_DIR}
+
+ python_compile() {
+ emake -C "${BUILD_DIR}"/python \
+ VPATH="${S}/python:${native_builddir}/python" \
+ igd_la_LIBADD="\$(PYGUPNP_IGD_LIBS) ${native_builddir}/libgupnp-igd/libgupnp-igd-1.0.la"
+ }
+
+ python_foreach_impl python_compile
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi && use python; then
+ local native_builddir=${BUILD_DIR}
+
+ python_install() {
+ emake -C "${BUILD_DIR}"/python \
+ VPATH="${S}/python:${native_builddir}/python" \
+ DESTDIR="${D}" install
+ }
+
+ python_foreach_impl python_install
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild
new file mode 100644
index 000000000000..6b565a6a685d
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=true
+
+inherit eutils gnome.org python-r1 multilib-minimal
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86"
+IUSE="+introspection python"
+
+RDEPEND="
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=net-libs/gssdp-0.14.7[${MULTILIB_USEDEP}]
+ >=net-libs/gupnp-0.20.10[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.10 )
+ python? (
+ >=dev-libs/gobject-introspection-0.10
+ >=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+# The only existing test is broken
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.1.11-disable_static_modules.patch
+)
+
+multilib_src_configure() {
+ local myconf=(
+ --disable-static
+ --disable-gtk-doc
+ $(multilib_native_use_enable introspection)
+ # python is built separately
+ --disable-python
+ )
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/html doc/html || die
+
+ python_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}" \
+ --enable-python
+ }
+
+ use python && python_parallel_foreach_impl python_configure
+ fi
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi && use python; then
+ local native_builddir=${BUILD_DIR}
+
+ python_compile() {
+ emake -C "${BUILD_DIR}"/python \
+ VPATH="${S}/python:${native_builddir}/python" \
+ igd_la_LIBADD="\$(PYGUPNP_IGD_LIBS) ${native_builddir}/libgupnp-igd/libgupnp-igd-1.0.la"
+ }
+
+ python_foreach_impl python_compile
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi && use python; then
+ local native_builddir=${BUILD_DIR}
+
+ python_install() {
+ emake -C "${BUILD_DIR}"/python \
+ VPATH="${S}/python:${native_builddir}/python" \
+ DESTDIR="${D}" install
+ }
+
+ python_foreach_impl python_install
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/net-libs/gupnp-igd/metadata.xml b/net-libs/gupnp-igd/metadata.xml
new file mode 100644
index 000000000000..45183de7300e
--- /dev/null
+++ b/net-libs/gupnp-igd/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<herd>net-p2p</herd>
+</pkgmetadata>
diff --git a/net-libs/gupnp-ui/Manifest b/net-libs/gupnp-ui/Manifest
new file mode 100644
index 000000000000..389a8888c9c8
--- /dev/null
+++ b/net-libs/gupnp-ui/Manifest
@@ -0,0 +1 @@
+DIST gupnp-ui-0.1.1.tar.gz 362414 SHA256 54446978d10507b58bb171671a8fe50cff5a7cf1ad8457bf2b5b45837a7bda38
diff --git a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
new file mode 100644
index 000000000000..6ccd7ffb44cc
--- /dev/null
+++ b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+DESCRIPTION="Collection of simple GTK+ widgets on top of GUPnP"
+HOMEPAGE="http://gupnp.org"
+SRC_URI="http://gupnp.org/sources/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+ net-libs/gupnp"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ --disable-gtk-doc
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc AUTHORS NEWS README
+}
diff --git a/net-libs/gupnp-ui/metadata.xml b/net-libs/gupnp-ui/metadata.xml
new file mode 100644
index 000000000000..7289824cb876
--- /dev/null
+++ b/net-libs/gupnp-ui/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-p2p</herd>
+</pkgmetadata>
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
new file mode 100644
index 000000000000..e0abbeae75db
--- /dev/null
+++ b/net-libs/gupnp/Manifest
@@ -0,0 +1,2 @@
+DIST gupnp-0.20.13.tar.xz 395356 SHA256 d779b094f13097a5900689b3587e5b495d79112d0855ed842577acba25c902b3 SHA512 dfc73a50f93dba84042652556a3fad870137fda3659fac4fe735c3d2cecf94d6908382d88cf85122840dd61017b9348f97edb6ded6d876d5e35058d70f9b8dc1 WHIRLPOOL 5d3cb3f9411324d73d33728e137c7b75c16386a5c57470c5213c3393582b6ebdd9889d6e5cc702128bb1c0f8514958b3bf70607cbd38dfe957b11bd03dda3009
+DIST gupnp-0.20.14.tar.xz 396764 SHA256 77ffb940ba77c4a6426d09d41004c75d92652dcbde86c84ac1c847dbd9ad59bd SHA512 56d0ee6c2ef8a3c82c61793cf2ce81cd0dd86a0975c1366678337f80178e64f473fbe985e41f7e04225b150edf44e74a9ff96fe687d5710ab90f0b033750edf4 WHIRLPOOL b7de86ff4e364f775699932669dc6c58cb25cde1b8825de72243dc04828400a685c21a12d43a7a36aa1c2cfe64089c47c9ca9298f174a09ba17dcdf75422c809
diff --git a/net-libs/gupnp/gupnp-0.20.13.ebuild b/net-libs/gupnp/gupnp-0.20.13.ebuild
new file mode 100644
index 000000000000..b4a0b6d68550
--- /dev/null
+++ b/net-libs/gupnp/gupnp-0.20.13.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+# FIXME: Claims to works with python3 but appears to be wishful thinking
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 multilib-minimal python-r1 vala
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2"
+SLOT="0/4"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86"
+IUSE="connman +introspection kernel_linux networkmanager"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ?? ( connman networkmanager )"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=net-libs/gssdp-0.14.7:0=[introspection?,${MULTILIB_USEDEP}]
+ >=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+ || (
+ >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+ <sys-libs/e2fsprogs-libs-1.41.8[${MULTILIB_USEDEP}] )
+ introspection? (
+ >=dev-libs/gobject-introspection-0.6.4
+ $(vala_depend) )
+ connman? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ networkmanager? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ !net-libs/gupnp-vala
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+ use introspection && vala_src_prepare
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ local backend=unix
+ use kernel_linux && backend=linux
+ use connman && backend=connman
+ use networkmanager && backend=network-manager
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(multilib_native_use_enable introspection) \
+ --disable-static \
+ --with-context-manager=${backend}
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/html doc/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ python_parallel_foreach_impl python_doscript tools/gupnp-binding-tool
+}
diff --git a/net-libs/gupnp/gupnp-0.20.14.ebuild b/net-libs/gupnp/gupnp-0.20.14.ebuild
new file mode 100644
index 000000000000..364f6f1a263e
--- /dev/null
+++ b/net-libs/gupnp/gupnp-0.20.14.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+# FIXME: Claims to works with python3 but appears to be wishful thinking
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 multilib-minimal python-r1 vala
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2"
+SLOT="0/4"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="connman +introspection kernel_linux networkmanager"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ?? ( connman networkmanager )"
+
+# prefix: uuid dependency can be adapted to non-linux platforms
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=net-libs/gssdp-0.14.7:0=[introspection?,${MULTILIB_USEDEP}]
+ >=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+ || (
+ >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+ <sys-libs/e2fsprogs-libs-1.41.8[${MULTILIB_USEDEP}] )
+ introspection? (
+ >=dev-libs/gobject-introspection-0.6.4
+ $(vala_depend) )
+ connman? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ networkmanager? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ !net-libs/gupnp-vala
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+ use introspection && vala_src_prepare
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ local backend=unix
+ use kernel_linux && backend=linux
+ use connman && backend=connman
+ use networkmanager && backend=network-manager
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(multilib_native_use_enable introspection) \
+ --disable-static \
+ --with-context-manager=${backend}
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/html doc/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ python_parallel_foreach_impl python_doscript tools/gupnp-binding-tool
+}
diff --git a/net-libs/gupnp/metadata.xml b/net-libs/gupnp/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/net-libs/gupnp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/h323plus/Manifest b/net-libs/h323plus/Manifest
new file mode 100644
index 000000000000..2a704d77c3d3
--- /dev/null
+++ b/net-libs/h323plus/Manifest
@@ -0,0 +1 @@
+DIST h323plus-v1_25_0.tar.gz 4193136 SHA256 1f4c10f4a087493fdc62e1b27041966f2fa2163941db99b1afe1551968fef190 SHA512 f0b8b26a0062eadc183af60d25302f95d06720dffe23f0bc0c9568ce34d7aae10acef434da9e09839fe19fcdc9f7f5d47396eb7c684ef55e457556abb66a682d WHIRLPOOL d3267238a8eea5537bff1e5b55c84adb3b011ed51f21da1c451f8f28e8bdc537b94a8f294e85cf07ed2d54e53ac6cdc279c365714e556261c8fb799d5ba9a154
diff --git a/net-libs/h323plus/files/h323plus-1.25.0-ptlib-2.10.10.patch b/net-libs/h323plus/files/h323plus-1.25.0-ptlib-2.10.10.patch
new file mode 100644
index 000000000000..74856a099c0f
--- /dev/null
+++ b/net-libs/h323plus/files/h323plus-1.25.0-ptlib-2.10.10.patch
@@ -0,0 +1,15 @@
+Fix macro definition for ptlib-2.10.10 compatibility
+http://lists.packetizer.com/pipermail/h323plus/2012-December/002543.html
+
+diff -ur a/include/openh323buildopts.h.in b/include/openh323buildopts.h.in
+--- a/include/openh323buildopts.h.in 2012-09-21 05:53:21.000000000 +0200
++++ b/include/openh323buildopts.h.in 2013-03-05 19:26:25.251373540 +0100
+@@ -35,7 +35,7 @@
+ #include <ptbuildopts.h>
+ #include <ptlib/../../revision.h>
+
+-#if PTLIB_MAJOR == 2 && PTLIB_MINOR < 10
++#if PTLIB_MAJOR == 2 && PTLIB_MINOR <= 10
+ #define PTLIB_VER ( PTLIB_MAJOR*100 + PTLIB_MINOR*10 + PTLIB_BUILD )
+ #else
+ #define PTLIB_VER ( PTLIB_MAJOR*1000 + PTLIB_MINOR*10 + PTLIB_BUILD )
diff --git a/net-libs/h323plus/files/h323plus-1.25.0-ptrace-debugoptionlist.patch b/net-libs/h323plus/files/h323plus-1.25.0-ptrace-debugoptionlist.patch
new file mode 100644
index 000000000000..7e800f490f19
--- /dev/null
+++ b/net-libs/h323plus/files/h323plus-1.25.0-ptrace-debugoptionlist.patch
@@ -0,0 +1,13 @@
+diff -ur a/src/h323pluginmgr.cxx b/src/h323pluginmgr.cxx
+--- a/src/h323pluginmgr.cxx 2012-11-29 17:23:26.000000000 +0100
++++ b/src/h323pluginmgr.cxx 2013-02-22 18:56:33.100356993 +0100
+@@ -1543,7 +1543,9 @@
+ PopulateMediaFormatOptions(codecDefn, fmt);
+ PopulateMediaFormatFromGenericData(fmt,
+ (PluginCodec_H323GenericCodecData *)codecDefn->h323CapabilityData);
++#if PTRACING
+ OpalMediaFormat::DebugOptionList(fmt);
++#endif
+ return true;
+ }
+
diff --git a/net-libs/h323plus/files/h323plus-1.25.0-ptrace-param.patch b/net-libs/h323plus/files/h323plus-1.25.0-ptrace-param.patch
new file mode 100644
index 000000000000..c69e703f42c0
--- /dev/null
+++ b/net-libs/h323plus/files/h323plus-1.25.0-ptrace-param.patch
@@ -0,0 +1,18 @@
+diff -ur a/src/rtp.cxx b/src/rtp.cxx
+--- a/src/rtp.cxx 2012-12-10 18:56:08.000000000 +0100
++++ b/src/rtp.cxx 2013-02-22 18:54:35.360358638 +0100
+@@ -1164,9 +1164,13 @@
+ return e_ProcessPacket;
+ }
+
+-
++#if PTRACING
+ void RTP_Session::OnRxSenderReport(const SenderReport & PTRACE_PARAM(sender),
+ const ReceiverReportArray & PTRACE_PARAM(reports))
++#else
++void RTP_Session::OnRxSenderReport(const SenderReport & sender,
++ const ReceiverReportArray & reports)
++#endif
+ {
+ userData->OnRxSenderReport(sessionID,sender,reports);
+
diff --git a/net-libs/h323plus/h323plus-1.25.0-r1.ebuild b/net-libs/h323plus/h323plus-1.25.0-r1.ebuild
new file mode 100644
index 000000000000..76bac758253a
--- /dev/null
+++ b/net-libs/h323plus/h323plus-1.25.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_P="${PN}-v${PV//./_}"
+
+DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol, successor to OpenH323"
+HOMEPAGE="http://www.h323plus.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV//./_}.tar.gz"
+
+IUSE="aec debug +sound +video"
+SLOT="0/${PV}"
+LICENSE="MPL-1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
+
+DEPEND=">=net-libs/ptlib-2.6.4:=[wav]
+ aec? ( >=media-libs/speex-1.2_rc1 )
+ sound? (
+ media-sound/gsm
+ dev-libs/ilbc-rfc3951
+ )
+ video? (
+ media-libs/libtheora
+ virtual/ffmpeg
+ )"
+RDEPEND="${DEPEND}
+ !net-libs/openh323"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.25.0-ptrace-param.patch
+ epatch "${FILESDIR}"/${PN}-1.25.0-ptrace-debugoptionlist.patch
+ epatch "${FILESDIR}"/${PN}-1.25.0-ptlib-2.10.10.patch
+}
+
+src_configure() {
+ # TODO: support for h.263/h.264/sbc(bluetooth)/celt/spandsp
+ #export OPENH323DIR=${S}
+ econf \
+ PTLIB_CONFIG="${EPREFIX}/usr/bin/ptlib-config" \
+ $(use_enable video) \
+ $(use_enable sound audio) \
+ $(use_enable aec) \
+ $(use_enable debug asntracing)
+ # revision.h does not exist in ptlib(?)
+ sed -i "/revision.h/d" include/openh323buildopts.h || die
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ AR="$(tc-getAR)"
+ # these should point to the right directories,
+ # openh323.org apps and others need this
+ sed -i -e "s:^OH323_LIBDIR = \$(OPENH323DIR).*:OH323_LIBDIR = /usr/$(get_libdir):" \
+ openh323u.mak || die
+ sed -i -e "s:^OH323_INCDIR = \$(OPENH323DIR).*:OH323_INCDIR = /usr/include/openh323:" \
+ openh323u.mak || die
+ # this is hardcoded now?
+ sed -i -e "s:^\(OPENH323DIR[ \t]\+=\) "${S}":\1 /usr/share/openh323:" \
+ openh323u.mak || die
+}
diff --git a/net-libs/h323plus/metadata.xml b/net-libs/h323plus/metadata.xml
new file mode 100644
index 000000000000..f34428bcd21b
--- /dev/null
+++ b/net-libs/h323plus/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="aec">Enable acoustic echo cancellation</flag>
+ <flag name="sound">Enable audio codecs</flag>
+ <flag name="video">Enable video codecs</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">h323plus</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
new file mode 100644
index 000000000000..2d8af53de859
--- /dev/null
+++ b/net-libs/http-parser/Manifest
@@ -0,0 +1,4 @@
+DIST http-parser-2.3.tar.gz 42538 SHA256 3bfe6b4ab7656c86e48b4a43a7a08aee7fd72c17b213655166f6a3cb8d21d5e2 SHA512 63ec361dd0bdb2d30676b430fc122eb4df5a6ff90a6a188ee9975ea9c46263f0322ebf51fb1816643d1b8d58bfd8793d7c6e2f6bd96778539095517ea320de2e WHIRLPOOL 8bc4d67857d2ac57bcac46c012f521c374f2875b7a4edb987189571b27ccb8ea5544b0b7eeba56b1f3f1a7bb1680a9a33821aab3863e373be12f3eba85371c66
+DIST http-parser-2.4.1.tar.gz 44724 SHA256 4a2597c37b874ce46b30764960d158d18cae2b4cd46458ce3cad98aa106427c9 SHA512 f56b84f0af57cefa46daa10ac2e7b3015c185fa4c55615efa33f9131871a980b5c06ffad1699302ebe847c9325b41403520e0ef4d34bf5f6c48c6edabf1f4cb8 WHIRLPOOL 1873e97df046b10ed7a7da9ad3ba43055634af230b0b4391a8a814bb00455f8864ead809ba2555715e63b9a74202287b2a3c68ced884edf152e794bf70a0cfeb
+DIST http-parser-2.4.2.tar.gz 44814 SHA256 d93d6cd4d587355bc714d6a79f4e5676d7dd2ccd2fafb21606c87268ea440cbf SHA512 fa2ac6a27807252a8e2ca61e307b92fa7004424dbea69d9ffbd2297f47e0c2af740033126aeb6b11ea172e03c2fbf957c0ab0387836647920c3a9304d07f68ab WHIRLPOOL cbf45915f622ad07ee095f3a592c565847f427575ab0a062ce7d8dbfe3b8b92d4ec97787c3dec4710b7dec4f5b4cde49ece80063b29399c2f44acc14816c08ff
+DIST http-parser-2.5.0.tar.gz 46070 SHA256 e3b4ba58f4e6ee5fbec781df020e5cb74c3a799a07f059e1e125127a0b801481 SHA512 da94b21f313d09f0557e61574e1187d06ef3bc4e8115c6f8120eac8d26ba6db51469ee5ddb6da5a0c05f49279838e5028afff6a15790708cdca147b3bc66e18f WHIRLPOOL 933ab2f8065fd2e7734d61284a042579edea40f0a0dea6b339a1ba07d9e50f2cd5e14f081d9889b728024171f2faeff7aab97b43c531fbd6badd882026261254
diff --git a/net-libs/http-parser/files/http-parser-2.1-flags.patch b/net-libs/http-parser/files/http-parser-2.1-flags.patch
new file mode 100644
index 000000000000..fe9a59369c15
--- /dev/null
+++ b/net-libs/http-parser/files/http-parser-2.1-flags.patch
@@ -0,0 +1,32 @@
+commit 3752e633e23284133decc8ca8481e4416a317fbc
+Author: hasufell <hasufell@gentoo.org>
+Date: Sun Jun 30 12:27:04 2013 +0200
+
+ respect system flags
+
+diff --git a/Makefile b/Makefile
+index 64e5c2f..2e20723 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,9 +7,9 @@ CPPFLAGS_DEBUG += $(CPPFLAGS_DEBUG_EXTRA)
+ CPPFLAGS_FAST = $(CPPFLAGS) -DHTTP_PARSER_STRICT=0
+ CPPFLAGS_FAST += $(CPPFLAGS_FAST_EXTRA)
+
+-CFLAGS += -Wall -Wextra -Werror
+-CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA)
+-CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
++CFLAGS += -Wall -Wextra
++CFLAGS_DEBUG = $(CFLAGS) $(CFLAGS_DEBUG_EXTRA)
++CFLAGS_FAST = $(CFLAGS) $(CFLAGS_FAST_EXTRA)
+ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
+
+ test: test_g test_fast
+@@ -44,7 +44,7 @@ libhttp_parser.o: http_parser.c http_parser.h Makefile
+ $(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o
+
+ library: libhttp_parser.o
+- $(CC) -shared -o libhttp_parser.so libhttp_parser.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o libhttp_parser.so libhttp_parser.o
+
+ package: http_parser.o
+ $(AR) rcs libhttp_parser.a http_parser.o
diff --git a/net-libs/http-parser/files/http-parser-2.3-flags.patch b/net-libs/http-parser/files/http-parser-2.3-flags.patch
new file mode 100644
index 000000000000..3dc9b3305ad7
--- /dev/null
+++ b/net-libs/http-parser/files/http-parser-2.3-flags.patch
@@ -0,0 +1,32 @@
+commit 3752e633e23284133decc8ca8481e4416a317fbc
+Author: hasufell <hasufell@gentoo.org>
+Date: Sun Jun 30 12:27:04 2013 +0200
+
+ respect system flags
+
+diff --git a/Makefile b/Makefile
+index 64e5c2f..2e20723 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,9 +7,9 @@ CPPFLAGS_DEBUG += $(CPPFLAGS_DEBUG_EXTRA)
+ CPPFLAGS_FAST = $(CPPFLAGS) -DHTTP_PARSER_STRICT=0
+ CPPFLAGS_FAST += $(CPPFLAGS_FAST_EXTRA)
+
+-CFLAGS += -Wall -Wextra -Werror
+-CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA)
+-CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
++CFLAGS += -Wall -Wextra
++CFLAGS_DEBUG = $(CFLAGS) $(CFLAGS_DEBUG_EXTRA)
++CFLAGS_FAST = $(CFLAGS) $(CFLAGS_FAST_EXTRA)
+ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
+
+ test: test_g test_fast
+@@ -44,7 +44,7 @@ libhttp_parser.o: http_parser.c http_parser.h Makefile
+ $(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o
+
+ library: libhttp_parser.o
+- $(CC) $(LDFLAGS_LIB) -o $(SONAME) $<
++ $(CC) $(CFLAGS) $(LDFLAGS_LIB) -o $(SONAME) $<
+
+ package: http_parser.o
+ $(AR) rcs libhttp_parser.a http_parser.o
diff --git a/net-libs/http-parser/http-parser-2.3.ebuild b/net-libs/http-parser/http-parser-2.3.ebuild
new file mode 100644
index 000000000000..c82c8a441a65
--- /dev/null
+++ b/net-libs/http-parser/http-parser-2.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SONAMEVER="2.3"
+SONAME="libhttp_parser.so.${SONAMEVER}"
+
+inherit eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="A parser for HTTP messages written in C. It parses both requests and responses"
+HOMEPAGE="https://github.com/joyent/http-parser"
+SRC_URI="https://github.com/joyent/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${SONAMEVER}"
+KEYWORDS="amd64 ~arm ppc x86"
+IUSE="static-libs"
+
+src_prepare() {
+ tc-export CC AR
+ epatch "${FILESDIR}"/${P}-flags.patch
+ multilib_copy_sources
+}
+
+multilib_src_compile() {
+ emake library
+ use static-libs && emake package
+}
+
+multilib_src_install() {
+ doheader http_parser.h
+ dolib.so ${SONAME}
+ dosym ${SONAME} /usr/$(get_libdir)/libhttp_parser.so
+ use static-libs && dolib.a libhttp_parser.a
+}
+
+multilib_src_install_all() {
+ dodoc README.md
+}
diff --git a/net-libs/http-parser/http-parser-2.4.1.ebuild b/net-libs/http-parser/http-parser-2.4.1.ebuild
new file mode 100644
index 000000000000..4488f386b134
--- /dev/null
+++ b/net-libs/http-parser/http-parser-2.4.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SONAME="libhttp_parser.so.${PV}"
+
+inherit eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="http request/response parser for c"
+HOMEPAGE="https://github.com/joyent/http-parser"
+SRC_URI="https://github.com/joyent/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+
+ sed -i -e 's: -Werror::' \
+ -e 's:-O3 ::' \
+ Makefile || die
+ tc-export CC AR
+ multilib_copy_sources
+}
+
+multilib_src_compile() {
+ emake library
+ use static-libs && emake package
+}
+
+multilib_src_install() {
+ doheader http_parser.h
+ dolib.so ${SONAME}
+ dosym ${SONAME} /usr/$(get_libdir)/libhttp_parser.so
+ use static-libs && dolib.a libhttp_parser.a
+}
+
+multilib_src_install_all() {
+ dodoc README.md
+}
diff --git a/net-libs/http-parser/http-parser-2.4.2.ebuild b/net-libs/http-parser/http-parser-2.4.2.ebuild
new file mode 100644
index 000000000000..4488f386b134
--- /dev/null
+++ b/net-libs/http-parser/http-parser-2.4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SONAME="libhttp_parser.so.${PV}"
+
+inherit eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="http request/response parser for c"
+HOMEPAGE="https://github.com/joyent/http-parser"
+SRC_URI="https://github.com/joyent/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+
+ sed -i -e 's: -Werror::' \
+ -e 's:-O3 ::' \
+ Makefile || die
+ tc-export CC AR
+ multilib_copy_sources
+}
+
+multilib_src_compile() {
+ emake library
+ use static-libs && emake package
+}
+
+multilib_src_install() {
+ doheader http_parser.h
+ dolib.so ${SONAME}
+ dosym ${SONAME} /usr/$(get_libdir)/libhttp_parser.so
+ use static-libs && dolib.a libhttp_parser.a
+}
+
+multilib_src_install_all() {
+ dodoc README.md
+}
diff --git a/net-libs/http-parser/http-parser-2.5.0.ebuild b/net-libs/http-parser/http-parser-2.5.0.ebuild
new file mode 100644
index 000000000000..63b5c576261a
--- /dev/null
+++ b/net-libs/http-parser/http-parser-2.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SONAME="libhttp_parser.so.${PV}"
+
+inherit eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="http request/response parser for c"
+HOMEPAGE="https://github.com/joyent/http-parser"
+SRC_URI="https://github.com/joyent/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+ sed -i -e 's: -Werror::' \
+ -e 's:-O3 ::' \
+ Makefile || die
+ tc-export CC AR
+ multilib_copy_sources
+}
+
+multilib_src_compile() {
+ emake library
+ use static-libs && emake package
+}
+
+multilib_src_install() {
+ doheader http_parser.h
+ dolib.so ${SONAME}
+ dosym ${SONAME} /usr/$(get_libdir)/libhttp_parser.so
+ use static-libs && dolib.a libhttp_parser.a
+}
+
+multilib_src_install_all() {
+ dodoc README.md
+}
diff --git a/net-libs/http-parser/metadata.xml b/net-libs/http-parser/metadata.xml
new file mode 100644
index 000000000000..28beb72899b5
--- /dev/null
+++ b/net-libs/http-parser/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>bugs@bergstroem.nu</email>
+ <name>Johan Bergström</name>
+ <description>Proxied Maintainer</description>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">joyent/http-parser</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/hubbub/Manifest b/net-libs/hubbub/Manifest
new file mode 100644
index 000000000000..31e72ebbc5f7
--- /dev/null
+++ b/net-libs/hubbub/Manifest
@@ -0,0 +1 @@
+DIST hubbub-0.1.2-src.tar.gz 812684 SHA256 95a1d5a71055b28a8e4ce4dc8516b8f0ed691c5ee03525bf73600495657f1b52 SHA512 c6fee003376a75fcca18ee630308320ae155df0149ceee48ad16bb69420c6a8a053bcfee17d6b315b137408284755028f37782d017873b16304ed041ea7934eb WHIRLPOOL 74c5038eabcf60b641a594300a551c139b4882439b08a70caaf4c22de868f7253dff4abab9eb3e517da86accc73882099ec8f854dcf37d1a7232731ba9d607bc
diff --git a/net-libs/hubbub/files/hubbub-0.1.2-error.patch b/net-libs/hubbub/files/hubbub-0.1.2-error.patch
new file mode 100644
index 000000000000..a8abcafe5b83
--- /dev/null
+++ b/net-libs/hubbub/files/hubbub-0.1.2-error.patch
@@ -0,0 +1,317 @@
+--- hubbub-0.1.2/test/csdetect.c
++++ hubbub-0.1.2/test/csdetect.c
+@@ -108,7 +108,7 @@
+ static int testnum;
+
+ assert(hubbub_charset_extract(data, len,
+- &mibenum, &source) == HUBBUB_OK);
++ &mibenum, &source) == (parserutils_error)HUBBUB_OK);
+
+ assert(mibenum != 0);
+
+--- hubbub-0.1.2/test/parser.c
++++ hubbub-0.1.2/test/parser.c
+@@ -24,7 +24,7 @@
+ hubbub_parser *parser;
+ hubbub_parser_optparams params;
+ FILE *fp;
+- size_t len, origlen;
++ size_t len;
+ uint8_t *buf = alloca(CHUNK_SIZE);
+ const char *charset;
+ hubbub_charset_source cssource;
+@@ -46,7 +46,7 @@
+ }
+
+ fseek(fp, 0, SEEK_END);
+- origlen = len = ftell(fp);
++ len = ftell(fp);
+ fseek(fp, 0, SEEK_SET);
+
+ while (len > 0) {
+--- hubbub-0.1.2/test/tokeniser.c
++++ hubbub-0.1.2/test/tokeniser.c
+@@ -26,7 +26,7 @@
+ hubbub_tokeniser *tok;
+ hubbub_tokeniser_optparams params;
+ FILE *fp;
+- size_t len, origlen;
++ size_t len;
+ #define CHUNK_SIZE (4096)
+ uint8_t buf[CHUNK_SIZE];
+
+@@ -44,7 +44,7 @@
+ params.token_handler.handler = token_handler;
+ params.token_handler.pw = NULL;
+ assert(hubbub_tokeniser_setopt(tok, HUBBUB_TOKENISER_TOKEN_HANDLER,
+- &params) == HUBBUB_OK);
++ &params) == (hubbub_error)HUBBUB_OK);
+
+ fp = fopen(argv[1], "rb");
+ if (fp == NULL) {
+@@ -53,7 +53,7 @@
+ }
+
+ fseek(fp, 0, SEEK_END);
+- origlen = len = ftell(fp);
++ len = ftell(fp);
+ fseek(fp, 0, SEEK_SET);
+
+ while (len > 0) {
+@@ -63,7 +63,7 @@
+ break;
+
+ assert(parserutils_inputstream_append(stream,
+- buf, bytes_read) == HUBBUB_OK);
++ buf, bytes_read) == (parserutils_error)HUBBUB_OK);
+
+
+ len -= bytes_read;
+
+--- hubbub-0.1.2/test/tokeniser2.c
++++ hubbub-0.1.2/test/tokeniser2.c
+@@ -83,11 +83,9 @@
+ printf("Test: %s\n",
+ json_object_get_string(val));
+ } else if (strcmp(key, "input") == 0) {
+- int len;
+ ctx.input = (const uint8_t *)
+- json_object_get_string_len(val,
+- &len);
+- ctx.input_len = len;
++ json_object_get_string(val);
++ ctx.input_len = json_object_get_string_len(val);
+ } else if (strcmp(key, "output") == 0) {
+ ctx.output = json_object_get_array(val);
+ ctx.output_index = 0;
+@@ -151,7 +149,7 @@
+ ctx->last_start_tag);
+
+ assert(parserutils_inputstream_append(stream,
+- buf, len - 1) == HUBBUB_OK);
++ buf, len - 1) == (parserutils_error)HUBBUB_OK);
+
+ assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
+ }
+@@ -173,7 +171,7 @@
+ params.content_model.model =
+ HUBBUB_CONTENT_MODEL_PCDATA;
+ } else {
+- char *cm = json_object_get_string(
++ const char *cm = json_object_get_string(
+ (struct json_object *)
+ array_list_get_idx(ctx->content_model, i));
+
+@@ -196,10 +194,10 @@
+ &params) == HUBBUB_OK);
+
+ assert(parserutils_inputstream_append(stream,
+- ctx->input, ctx->input_len) == HUBBUB_OK);
++ ctx->input, ctx->input_len) == (parserutils_error)HUBBUB_OK);
+
+ assert(parserutils_inputstream_append(stream, NULL, 0) ==
+- HUBBUB_OK);
++ (parserutils_error)HUBBUB_OK);
+
+ printf("Input: '%.*s' (%d)\n", (int) ctx->input_len,
+ (const char *) ctx->input,
+@@ -271,11 +269,11 @@
+ switch (token->type) {
+ case HUBBUB_TOKEN_DOCTYPE:
+ {
+- char *expname = json_object_get_string(
++ const char *expname = json_object_get_string(
+ array_list_get_idx(items, 1));
+- char *exppub = json_object_get_string(
++ const char *exppub = json_object_get_string(
+ array_list_get_idx(items, 2));
+- char *expsys = json_object_get_string(
++ const char *expsys = json_object_get_string(
+ array_list_get_idx(items, 3));
+ bool expquirks = !json_object_get_boolean(
+ array_list_get_idx(items, 4));
+@@ -332,7 +330,7 @@
+ break;
+ case HUBBUB_TOKEN_START_TAG:
+ {
+- char *expname = json_object_get_string(
++ const char *expname = json_object_get_string(
+ array_list_get_idx(items, 1));
+ struct lh_entry *expattrs = json_object_get_object(
+ array_list_get_idx(items, 2))->head;
+@@ -366,7 +364,7 @@
+
+ for (i = 0; i < token->data.tag.n_attributes; i++) {
+ char *expname = (char *) expattrs->k;
+- char *expval = json_object_get_string(
++ const char *expval = json_object_get_string(
+ (struct json_object *) expattrs->v);
+ const char *gotname = (const char *)
+ token->data.tag.attributes[i].name.ptr;
+@@ -395,7 +393,7 @@
+ break;
+ case HUBBUB_TOKEN_END_TAG:
+ {
+- char *expname = json_object_get_string(
++ const char *expname = json_object_get_string(
+ array_list_get_idx(items, 1));
+ const char *tagname = (const char *)
+ token->data.tag.name.ptr;
+@@ -412,7 +410,7 @@
+ break;
+ case HUBBUB_TOKEN_COMMENT:
+ {
+- char *expstr = json_object_get_string(
++ const char *expstr = json_object_get_string(
+ array_list_get_idx(items, 1));
+ const char *gotstr = (const char *)
+ token->data.comment.ptr;
+@@ -427,9 +425,10 @@
+ break;
+ case HUBBUB_TOKEN_CHARACTER:
+ {
+- int expstrlen;
+- char *expstr = json_object_get_string_len(
+- array_list_get_idx(items, 1), &expstrlen);
++ int expstrlen = json_object_get_string_len(
++ array_list_get_idx(items, 1));
++ const char *expstr = json_object_get_string(
++ array_list_get_idx(items, 1));
+ const char *gotstr = (const char *)
+ token->data.character.ptr;
+ size_t len = min(token->data.character.len,
+--- hubbub-0.1.2/test/tokeniser3.c
++++ hubbub-0.1.2/test/tokeniser3.c
+@@ -81,11 +81,9 @@
+ printf("Test: %s\n",
+ json_object_get_string(val));
+ } else if (strcmp(key, "input") == 0) {
+- int len;
+ ctx.input = (const uint8_t *)
+- json_object_get_string_len(val,
+- &len);
+- ctx.input_len = len;
++ json_object_get_string(val);
++ ctx.input_len = json_object_get_string_len(val);
+ } else if (strcmp(key, "output") == 0) {
+ ctx.output = json_object_get_array(val);
+ ctx.output_index = 0;
+@@ -148,7 +146,7 @@
+ ctx->last_start_tag);
+
+ assert(parserutils_inputstream_append(stream,
+- buf, len - 1) == HUBBUB_OK);
++ buf, len - 1) == (parserutils_error)HUBBUB_OK);
+
+ assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
+ }
+@@ -170,7 +168,7 @@
+ params.content_model.model =
+ HUBBUB_CONTENT_MODEL_PCDATA;
+ } else {
+- char *cm = json_object_get_string(
++ const char *cm = json_object_get_string(
+ (struct json_object *)
+ array_list_get_idx(ctx->content_model, i));
+
+@@ -197,13 +197,13 @@
+ for (j = 0; j < ctx->input_len; j++) {
+ assert(parserutils_inputstream_append(stream,
+ ctx->input + j, 1) ==
+- HUBBUB_OK);
++ (parserutils_error)HUBBUB_OK);
+
+ assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
+ }
+
+ assert(parserutils_inputstream_append(stream, NULL, 0) ==
+- HUBBUB_OK);
++ (parserutils_error)HUBBUB_OK);
+
+ assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
+
+@@ -273,11 +271,11 @@
+ switch (token->type) {
+ case HUBBUB_TOKEN_DOCTYPE:
+ {
+- char *expname = json_object_get_string(
++ const char *expname = json_object_get_string(
+ array_list_get_idx(items, 1));
+- char *exppub = json_object_get_string(
++ const char *exppub = json_object_get_string(
+ array_list_get_idx(items, 2));
+- char *expsys = json_object_get_string(
++ const char *expsys = json_object_get_string(
+ array_list_get_idx(items, 3));
+ bool expquirks = !json_object_get_boolean(
+ array_list_get_idx(items, 4));
+@@ -337,7 +335,7 @@
+ break;
+ case HUBBUB_TOKEN_START_TAG:
+ {
+- char *expname = json_object_get_string(
++ const char *expname = json_object_get_string(
+ array_list_get_idx(items, 1));
+ struct lh_entry *expattrs = json_object_get_object(
+ array_list_get_idx(items, 2))->head;
+@@ -371,7 +369,7 @@
+
+ for (i = 0; i < token->data.tag.n_attributes; i++) {
+ char *expname = (char *) expattrs->k;
+- char *expval = json_object_get_string(
++ const char *expval = json_object_get_string(
+ (struct json_object *) expattrs->v);
+ const char *gotname = (const char *)
+ token->data.tag.attributes[i].name.ptr;
+@@ -400,7 +398,7 @@
+ break;
+ case HUBBUB_TOKEN_END_TAG:
+ {
+- char *expname = json_object_get_string(
++ const char *expname = json_object_get_string(
+ array_list_get_idx(items, 1));
+ const char *tagname = (const char *)
+ token->data.tag.name.ptr;
+@@ -417,7 +415,7 @@
+ break;
+ case HUBBUB_TOKEN_COMMENT:
+ {
+- char *expstr = json_object_get_string(
++ const char *expstr = json_object_get_string(
+ array_list_get_idx(items, 1));
+ const char *gotstr = (const char *)
+ token->data.comment.ptr;
+@@ -432,9 +430,10 @@
+ break;
+ case HUBBUB_TOKEN_CHARACTER:
+ {
+- int expstrlen;
+- char *expstr = json_object_get_string_len(
+- array_list_get_idx(items, 1), &expstrlen);
++ int expstrlen = json_object_get_string_len(
++ array_list_get_idx(items, 1));
++ const char *expstr = json_object_get_string(
++ array_list_get_idx(items, 1));
+ const char *gotstr = (const char *)
+ token->data.character.ptr;
+ size_t len = min(token->data.character.len,
+--- hubbub-0.1.2/test/tree.c
++++ hubbub-0.1.2/test/tree.c
+@@ -88,7 +88,7 @@
+ hubbub_parser *parser;
+ hubbub_parser_optparams params;
+ FILE *fp;
+- size_t len, origlen;
++ size_t len;
+ uint8_t *buf = alloca(CHUNK_SIZE);
+ const char *charset;
+ hubbub_charset_source cssource;
+@@ -123,7 +123,7 @@
+ }
+
+ fseek(fp, 0, SEEK_END);
+- origlen = len = ftell(fp);
++ len = ftell(fp);
+ fseek(fp, 0, SEEK_SET);
+
+ while (len > 0) {
diff --git a/net-libs/hubbub/files/hubbub-0.1.2-glibc-2.20.patch b/net-libs/hubbub/files/hubbub-0.1.2-glibc-2.20.patch
new file mode 100644
index 000000000000..55c38ffddff6
--- /dev/null
+++ b/net-libs/hubbub/files/hubbub-0.1.2-glibc-2.20.patch
@@ -0,0 +1,17 @@
+--- work/hubbub-0.1.2/Makefile
++++ work/hubbub-0.1.2/Makefile
+@@ -13,13 +13,7 @@
+ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
+ -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+ -Wmissing-declarations -Wnested-externs -pedantic
+-# BeOS/Haiku/AmigaOS have standard library errors that issue warnings.
+-ifneq ($(TARGET),beos)
+- ifneq ($(TARGET),amiga)
+- WARNFLAGS := $(WARNFLAGS) -Werror
+- endif
+-endif
+-CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
++CFLAGS := -D_DEFAULT -I$(CURDIR)/include/ \
+ -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
+ ifneq ($(GCCVER),2)
+ CFLAGS := $(CFLAGS) -std=c99
diff --git a/net-libs/hubbub/hubbub-0.1.2-r1.ebuild b/net-libs/hubbub/hubbub-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..12d2d41e78fb
--- /dev/null
+++ b/net-libs/hubbub/hubbub-0.1.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit netsurf
+
+DESCRIPTION="HTML5 compliant parsing library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
+SRC_URI="http://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="debug doc static-libs test"
+
+RDEPEND="<dev-libs/libparserutils-0.2
+ !net-libs/libhubbub"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ virtual/libiconv
+ doc? ( app-doc/doxygen )
+ test? ( dev-lang/perl
+ dev-libs/json-c )"
+
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}"/${P}-glibc-2.20.patch )
+
+src_install() {
+ netsurf_src_install
+
+ dodoc README docs/{Architecture,Macros,Todo,Treebuilder,Updated}
+ use doc && dohtml build/docs/html/*
+}
diff --git a/net-libs/hubbub/hubbub-0.1.2.ebuild b/net-libs/hubbub/hubbub-0.1.2.ebuild
new file mode 100644
index 000000000000..7448df011007
--- /dev/null
+++ b/net-libs/hubbub/hubbub-0.1.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="HTML5 compliant parsing library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
+SRC_URI="http://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="debug doc static-libs test"
+
+RDEPEND="<dev-libs/libparserutils-0.2
+ !net-libs/libhubbub"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ virtual/libiconv
+ doc? ( app-doc/doxygen )
+ test? ( dev-lang/perl
+ dev-libs/json-c )"
+
+RESTRICT=test
+
+pkg_setup(){
+ netsurf_src_prepare() {
+ sed -e "/^CCOPT :=/s:=.*:=:" \
+ -e "/^CCNOOPT :=/s:=.*:=:" \
+ -e "/^CCDBG :=/s:=.*:=:" \
+ -i build/makefiles/Makefile.{gcc,clang} || die
+ sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
+ -i Makefile || die
+ sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
+ -i ${NETSURF_PKGCONFIG:-${PN}}.pc.in || die
+ }
+ netsurf_src_configure() {
+ echo "Q := " >> Makefile.config
+ echo "CC := $(tc-getCC)" >> Makefile.config
+ echo "AR := $(tc-getAR)" >> Makefile.config
+ }
+
+ netsurf_make() {
+ emake COMPONENT_TYPE=lib-shared BUILD=$(usex debug debug release) "$@"
+ use static-libs && \
+ emake COMPONENT_TYPE=lib-static BUILD=$(usex debug debug release) "$@"
+ }
+}
+
+src_prepare() {
+ NETSURF_PKGCONFIG=lib${PN}
+ netsurf_src_prepare
+
+ epatch "${FILESDIR}"/${P}-error.patch
+}
+
+src_configure() {
+ netsurf_src_configure
+}
+
+src_compile() {
+ netsurf_make
+
+ use doc && emake docs
+}
+
+src_test() {
+ netsurf_make test
+}
+
+src_install() {
+ netsurf_make DESTDIR="${D}" PREFIX=/usr install
+
+ dodoc README docs/{Architecture,Macros,Todo,Treebuilder,Updated}
+ use doc && dohtml build/docs/html/*
+}
diff --git a/net-libs/hubbub/metadata.xml b/net-libs/hubbub/metadata.xml
new file mode 100644
index 000000000000..59acc2cc580e
--- /dev/null
+++ b/net-libs/hubbub/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/net-libs/iax/Manifest b/net-libs/iax/Manifest
new file mode 100644
index 000000000000..250a8db5884f
--- /dev/null
+++ b/net-libs/iax/Manifest
@@ -0,0 +1 @@
+DIST iax-0.2.2.tar.gz 139379 SHA256 7c3caf939a821440407931a13838dd0dfea21fbec373d1985e2604df5d149cb8 SHA512 f86fc56c9f31665e849e8528d2852e06abd803e8d02fa6098d68eefecccc263ded97d1870e9ee157ec1610fefc92b8f14f2d858fbce115c5da83a6dec1eea210 WHIRLPOOL c5b3c1148b93fc2411f316e80aad73c1c5eb83ad8c01dd6ecabf6d62b64f4cafd20bb83bfb1ba7a197e27afc71ba48c4ac8571489f48c298783f8f94865518ed
diff --git a/net-libs/iax/files/0.2.2-debug.patch b/net-libs/iax/files/0.2.2-debug.patch
new file mode 100644
index 000000000000..68efdfdd237a
--- /dev/null
+++ b/net-libs/iax/files/0.2.2-debug.patch
@@ -0,0 +1,21 @@
+diff -uNr iax-0.2.2.ORIG/configure.in iax-0.2.2/configure.in
+--- iax-0.2.2.ORIG/configure.in 2014-05-13 13:23:35.083867921 +0100
++++ iax-0.2.2/configure.in 2014-05-13 13:24:25.879870451 +0100
+@@ -25,6 +25,8 @@
+ fi
+
+ if test "$enable_extreme_debug" = yes ; then
++ AC_DEFINE(DEBUG_SUPPORT)
++ AC_DEFINE(DEBUG_DEFAULT)
+ AC_DEFINE(EXTREME_DEBUG)
+ fi
+
+diff -uNr iax-0.2.2.ORIG/src/Makefile.am iax-0.2.2/src/Makefile.am
+--- iax-0.2.2.ORIG/src/Makefile.am 2014-05-13 13:23:35.082867921 +0100
++++ iax-0.2.2/src/Makefile.am 2014-05-13 13:24:32.439870777 +0100
+@@ -1,5 +1,4 @@
+ CFLAGS += -g -Wall -Wstrict-prototypes -I .
+-CFLAGS += -DDEBUG_SUPPORT -DDEBUG_DEFAULT
+ CFLAGS += $(UCFLAGS)
+
+
diff --git a/net-libs/iax/files/0.2.2-memset.patch b/net-libs/iax/files/0.2.2-memset.patch
new file mode 100644
index 000000000000..08408eef98f7
--- /dev/null
+++ b/net-libs/iax/files/0.2.2-memset.patch
@@ -0,0 +1,12 @@
+diff -uNr iax-0.2.2.ORIG/src/md5.c iax-0.2.2/src/md5.c
+--- iax-0.2.2.ORIG/src/md5.c 2014-05-13 13:26:51.570877706 +0100
++++ iax-0.2.2/src/md5.c 2014-05-13 13:27:08.567878553 +0100
+@@ -165,7 +165,7 @@
+ MD5Transform(ctx->buf, (uint32 *) ctx->in);
+ byteReverse((unsigned char *) ctx->buf, 4);
+ memcpy(digest, ctx->buf, 16);
+- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
++ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
+ }
+
+ #ifndef ASM_MD5
diff --git a/net-libs/iax/files/0.2.2-sandbox.patch b/net-libs/iax/files/0.2.2-sandbox.patch
new file mode 100644
index 000000000000..2dc141a73b18
--- /dev/null
+++ b/net-libs/iax/files/0.2.2-sandbox.patch
@@ -0,0 +1,19 @@
+diff -uNr iax-0.2.2.ORIG/src/Makefile.am iax-0.2.2/src/Makefile.am
+--- iax-0.2.2.ORIG/src/Makefile.am 2014-05-13 12:45:58.343755528 +0100
++++ iax-0.2.2/src/Makefile.am 2014-05-13 12:46:30.044757107 +0100
+@@ -9,10 +9,9 @@
+ EXTRA_DIST = md5.h frame.h iax-client.h iax.h
+
+ install:
+- mkdir -p $(includedir)/iax
+- install -m 644 md5.h $(includedir)/iax
+- install -m 644 frame.h $(includedir)/iax
+- install -m 644 iax.h $(includedir)/iax
+- install -m 644 iax-client.h $(includedir)/iax
+- /sbin/ldconfig
++ mkdir -p $(DESTDIR)$(includedir)/iax
++ install -m 644 md5.h $(DESTDIR)$(includedir)/iax
++ install -m 644 frame.h $(DESTDIR)$(includedir)/iax
++ install -m 644 iax.h $(DESTDIR)$(includedir)/iax
++ install -m 644 iax-client.h $(DESTDIR)$(includedir)/iax
+
diff --git a/net-libs/iax/iax-0.2.2-r1.ebuild b/net-libs/iax/iax-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..34a200fa188f
--- /dev/null
+++ b/net-libs/iax/iax-0.2.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+DESCRIPTION="IAX (Inter Asterisk eXchange) Library"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/libiax/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="debug snomhack"
+
+src_prepare() {
+ if ! use debug; then
+ sed -i -e "s:-DDEBUG_SUPPORT -DDEBUG_DEFAULT ::" src/Makefile.in \
+ || die "sed failed"
+ fi
+
+ # use users CFLAGS and LDFLAGS
+ sed -i -e "s:CFLAGS =:CFLAGS+=:" src/Makefile.in || die "sed failed"
+ sed -i -e "s:\(libiax_la_LDFLAGS = \):\1@LDFLAGS@:" src/Makefile.in \
+ || die "sed failed"
+
+ # fix sandbox violations
+ sed -i -e "s:\(\$(includedir)/iax\):\$(DESTDIR)\1:" src/Makefile.in \
+ || die "sed failed"
+ sed -ie -e "/\/sbin\/ldconfig/d" src/Makefile.in || die "sed failed"
+}
+
+src_configure() {
+ econf \
+ $(use_enable debug extreme-debug) \
+ $(use_enable snomhack)
+}
+
+src_install () {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+}
diff --git a/net-libs/iax/iax-0.2.2-r3.ebuild b/net-libs/iax/iax-0.2.2-r3.ebuild
new file mode 100644
index 000000000000..00bf6148f81a
--- /dev/null
+++ b/net-libs/iax/iax-0.2.2-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="IAX (Inter Asterisk eXchange) Library"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/libiax/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug snomhack"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PV}-debug.patch"
+ epatch "${FILESDIR}/${PV}-memset.patch"
+ epatch "${FILESDIR}/${PV}-sandbox.patch"
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable debug extreme-debug) \
+ $(use_enable snomhack)
+}
+
+src_install () {
+ default
+ dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+}
diff --git a/net-libs/iax/iax-0.2.2.ebuild b/net-libs/iax/iax-0.2.2.ebuild
new file mode 100644
index 000000000000..c7ba31de0f91
--- /dev/null
+++ b/net-libs/iax/iax-0.2.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+IUSE=""
+
+DESCRIPTION="IAX (Inter Asterisk eXchange) Library"
+HOMEPAGE="http://www.digium.com/"
+LICENSE="LGPL-2"
+DEPEND=""
+RDEPEND=""
+SLOT="0"
+SRC_URI="http://www.digium.com/pub/libiax/${P}.tar.gz"
+
+D_PREFIX=/usr
+
+KEYWORDS="x86 ppc"
+
+src_compile() {
+ ./configure --prefix=${D_PREFIX} --enable-autoupdate
+
+ export UCFLAGS="${CFLAGS}"
+
+ emake || die
+}
+
+src_install () {
+ make prefix="${D}"/${D_PREFIX} install
+ dodoc NEWS AUTHORS README
+}
diff --git a/net-libs/iax/metadata.xml b/net-libs/iax/metadata.xml
new file mode 100644
index 000000000000..34479aea5739
--- /dev/null
+++ b/net-libs/iax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>chainsaw@gentoo.org</email></maintainer>
+ <use>
+ <flag name='snomhack'>Use slower memset for SNOM phoneem</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/iojs/Manifest b/net-libs/iojs/Manifest
new file mode 100644
index 000000000000..814f2d6b729b
--- /dev/null
+++ b/net-libs/iojs/Manifest
@@ -0,0 +1,5 @@
+DIST iojs-v2.3.3.tar.xz 12520388 SHA256 a9001633cc8baa282cea08e8712ef6b3df605d0c83ef3cbdae56ce0f3126488d SHA512 9547d3891eb28afb782d86304c827696d660b2c0c8abeb568a133b24277a4e7356a24868ceed79ee2b89069dbcffddc12e204e5d79ee20b9d23c326a780df743 WHIRLPOOL 789291f029f08854badc69195a687516c23262d21c9cb87f0f7a814bd422a3e192086df835ec03914c7baa31f7bb13fd78755921706df8c4c05d8f908fbebbd0
+DIST iojs-v2.3.4.tar.xz 12518296 SHA256 cf8bdbcf8598a47c514ddd964dcbee40d6cd118f9954ee4afbec9163312e43a2 SHA512 e4ceaaba1ec4c298bc7d0394e82636f6356a7d0e1d946e6d688ac2b42777eebad1db0fef76d5d8b0ba870585853b204b727db0d605ed05bc8cc3a4ce4c571fd8 WHIRLPOOL fed18530766e7f51c4ed5c2fffcd6c465c5c6b3f9762ff1253cd200aff7011775132df44e9af6fb28b45f85054bd0b1e5ad8f2c0ebe9533557940cd0d5356837
+DIST iojs-v2.4.0.tar.xz 12618052 SHA256 0081746e2e4b49c95ddbbaa6394960af2c719465c3ddab3bee58637b574eca45 SHA512 dc43fa6bf1f9d4e241bbdecdde2cae23592b045fdce9d25cb44459bea680b68c0675e641f87b0beb9fbeeee5e686e928e556ec3f3baa581346449df9c142873d WHIRLPOOL 3454970892fde236ae2d86fa98b9d997a1609146c112ae2818b8fd034d984dadeb5d34b26fdd60640e515fc1d8872f6b95d9e99433a10424f5cb75e1f65ffb78
+DIST iojs-v2.5.0.tar.xz 12520540 SHA256 0ad1bca083cbdf9a67fc55e1b1d47d8cc3bc6473e4a3af083c9f67ace3e7e75e SHA512 e0ebf870abe1ab4d0a6cc4a440c80b3bebb6762e886195ccf728f62c67c551ec7069da13d928659ed525874b003f0365e3f82811eec951912a11c2eed3e8a6a9 WHIRLPOOL 2b4b25b5467245e04611fae70ee0d4dbbf04822c4853450ba245d80e96e91499e426a05b1505289261993b7e0105b49e7b6af034bce575865c1ef5c698dfdcfb
+DIST iojs-v3.0.0.tar.xz 12627740 SHA256 e003d162c923c4a4c3c2b122b59168dc7685c832c6fa876e969bfc2f406f9c16 SHA512 08d96c51f10924d50993575d5a1e86507b95951c3ed471a67ca439620858afc235b1e70ca737bd7233838f024ea9147d1388a5f9f616cc71b5cccfe132f40f75 WHIRLPOOL 87f05d4b544d44a67b9e3ce4dbaf70f81b8668c8b90f0aa05f10a0f15a8744e8c9fd519dcbc3fed721d16fdad63babb167bc03cb8f0389c06f6de9aa9ceeb71b
diff --git a/net-libs/iojs/files/iojs-1.2.0-pkgconfig.patch b/net-libs/iojs/files/iojs-1.2.0-pkgconfig.patch
new file mode 100644
index 000000000000..8eaa0236278b
--- /dev/null
+++ b/net-libs/iojs/files/iojs-1.2.0-pkgconfig.patch
@@ -0,0 +1,56 @@
+configure: fix pkg_config usage
+
+Cross compilation did pick up wrong libraries as it was using the system
+pkg-config.
+
+patch by Paul McClave <pmcclave@chromium.org>
+
+--- a/configure
++++ b/configure
+@@ -299,12 +299,13 @@
+
+
+ def pkg_config(pkg):
+- cmd = os.popen('pkg-config --libs %s' % pkg, 'r')
++ pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
++ cmd = os.popen(pkg_config + ' --libs %s' % pkg, 'r')
+ libs = cmd.readline().strip()
+ ret = cmd.close()
+ if (ret): return None
+
+- cmd = os.popen('pkg-config --cflags %s' % pkg, 'r')
++ cmd = os.popen(pkg_config + ' --cflags %s' % pkg, 'r')
+ cflags = cmd.readline().strip()
+ ret = cmd.close()
+ if (ret): return None
+@@ -553,15 +554,21 @@
+ def configure_libz(o):
+ o['variables']['node_shared_zlib'] = b(options.shared_zlib)
+
+- # assume shared_zlib if one of these is set?
+- if options.shared_zlib_libpath:
+- o['libraries'] += ['-L%s' % options.shared_zlib_libpath]
+- if options.shared_zlib_libname:
+- o['libraries'] += ['-l%s' % options.shared_zlib_libname]
+- elif options.shared_zlib:
+- o['libraries'] += ['-lz']
+- if options.shared_zlib_includes:
+- o['include_dirs'] += [options.shared_zlib_includes]
++ if options.shared_zlib:
++ (libs, cflags) = pkg_config('zlib') or ('-lz', '')
++
++ if options.shared_zlib_libpath:
++ o['libraries'] += ['-L%s' % options.shared_zlib_libpath]
++
++ if options.shared_zlib_libname:
++ o['libraries'] += ['-l%s' % options.shared_zlib_libname]
++ else:
++ o['libraries'] += libs.split()
++
++ if options.shared_zlib_includes:
++ o['include_dirs'] += [options.shared_zlib_includes]
++ else:
++ o['cflags'] += cflags.split()
+
+
+ def configure_http_parser(o):
diff --git a/net-libs/iojs/files/iojs-1.7.1-pkgconfig.patch b/net-libs/iojs/files/iojs-1.7.1-pkgconfig.patch
new file mode 100644
index 000000000000..c57eef0815bf
--- /dev/null
+++ b/net-libs/iojs/files/iojs-1.7.1-pkgconfig.patch
@@ -0,0 +1,48 @@
+diff --git configure configure
+index 67440a2..2a3b05f 100755
+--- configure
++++ configure
+@@ -326,12 +326,13 @@ def b(value):
+
+
+ def pkg_config(pkg):
+- cmd = os.popen('pkg-config --libs %s' % pkg, 'r')
++ pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
++ cmd = os.popen(pkg_config + ' --libs %s' % pkg, 'r')
+ libs = cmd.readline().strip()
+ ret = cmd.close()
+ if (ret): return None
+
+- cmd = os.popen('pkg-config --cflags %s' % pkg, 'r')
++ cmd = os.popen(pkg_config + ' --cflags %s' % pkg, 'r')
+ cflags = cmd.readline().strip()
+ ret = cmd.close()
+ if (ret): return None
+@@ -603,14 +604,21 @@ def configure_node(o):
+
+ def configure_libz(o):
+ o['variables']['node_shared_zlib'] = b(options.shared_zlib)
++ if b(options.shared_zlib) == 'true':
++ (libs, cflags) = pkg_config('zlib') or ('-lz', '')
+
+- if b(options.shared_zlib) == True:
+- o['libraries'] += ['-l%s' % options.shared_zlib_libname]
+- if options.shared_zlib_libpath:
+- o['libraries'] += ['-L%s' % options.shared_zlib_libpath]
+- if options.shared_zlib_includes:
+- o['include_dirs'] += [options.shared_zlib_includes]
++ if options.shared_zlib_libpath:
++ o['libraries'] += ['-L%s' % options.shared_zlib_libpath]
+
++ if options.shared_zlib_libname:
++ o['libraries'] += ['-l%s' % options.shared_zlib_libname]
++ else:
++ o['libraries'] += libs.split()
++
++ if options.shared_zlib_includes:
++ o['include_dirs'] += [options.shared_zlib_includes]
++ else:
++ o['cflags'] += cflags.split()
+
+ def configure_http_parser(o):
+ o['variables']['node_shared_http_parser'] = b(options.shared_http_parser)
diff --git a/net-libs/iojs/files/iojs-1.8.1-pkgconfig.patch b/net-libs/iojs/files/iojs-1.8.1-pkgconfig.patch
new file mode 100644
index 000000000000..788195b5821d
--- /dev/null
+++ b/net-libs/iojs/files/iojs-1.8.1-pkgconfig.patch
@@ -0,0 +1,39 @@
+--- configure 2015-04-21 10:37:04.000000000 +1000
++++ configure.new 2015-04-21 12:47:46.340709492 +1000
+@@ -326,12 +326,13 @@
+
+
+ def pkg_config(pkg):
+- cmd = os.popen('pkg-config --libs %s' % pkg, 'r')
++ pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
++ cmd = os.popen(pkg_config + ' --libs %s' % pkg, 'r')
+ libs = cmd.readline().strip()
+ ret = cmd.close()
+ if (ret): return None
+
+- cmd = os.popen('pkg-config --cflags %s' % pkg, 'r')
++ cmd = os.popen(pkg_config + ' --cflags %s' % pkg, 'r')
+ cflags = cmd.readline().strip()
+ ret = cmd.close()
+ if (ret): return None
+@@ -657,13 +658,18 @@
+
+ def configure_libz(o):
+ o['variables']['node_shared_zlib'] = b(options.shared_zlib)
++ (libs, cflags) = pkg_config('zlib') or ('-lz', '')
+
+- if options.shared_zlib:
+- o['libraries'] += ['-l%s' % options.shared_zlib_libname]
+ if options.shared_zlib_libpath:
+ o['libraries'] += ['-L%s' % options.shared_zlib_libpath]
+ if options.shared_zlib_includes:
+ o['include_dirs'] += [options.shared_zlib_includes]
++ else:
++ o['cflags'] += cflags.split()
++ if options.shared_zlib_libname:
++ o['libraries'] += ['-l%s' % options.shared_zlib_libname]
++ else:
++ o['libraries'] += libs.split()
+
+
+ def configure_http_parser(o):
diff --git a/net-libs/iojs/iojs-2.3.3.ebuild b/net-libs/iojs/iojs-2.3.3.ebuild
new file mode 100644
index 000000000000..c3cb0d12858a
--- /dev/null
+++ b/net-libs/iojs/iojs-2.3.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV="v${PV}"
+MY_P="${PN}-${MY_PV}"
+
+inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="An npm compatible platform originally based on node.js"
+HOMEPAGE="http://iojs.org/"
+SRC_URI="http://iojs.org/dist/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="bundled-libs debug icu +npm snapshot +ssl"
+
+RDEPEND="icu? ( dev-libs/icu )
+ ${PYTHON_DEPS}
+ !bundled-libs? (
+ >=net-libs/http-parser-2.5
+ >=dev-libs/libuv-1.6.1
+ >=dev-libs/openssl-1.0.2c[-bindist]
+ )"
+DEPEND="${RDEPEND}
+ !!net-libs/nodejs"
+S="${WORKDIR}/${MY_P}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+ if ! test-flag-CXX -std=c++11 ; then
+ die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+ fi
+}
+
+src_prepare() {
+ tc-export CC CXX PKG_CONFIG
+ export V=1 # Verbose build
+ export BUILDTYPE=Release
+
+ # fix compilation on Darwin
+ # http://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+ # make sure we use python2.* while using gyp
+ sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+ sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+ # less verbose install output (stating the same as portage, basically)
+ sed -i -e "/print/d" tools/install.py || die
+
+ # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+ local LIBDIR=$(get_libdir)
+ sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+ sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+ sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+ # Avoid a test that I've only been able to reproduce from emerge. It doesnt
+ # seem sandbox related either (invoking it from a sandbox works fine).
+ # The issue is that no stdin handle is openened when asked for one.
+ # It doesn't really belong upstream , so it'll just be removed until someone
+ # with more gentoo-knowledge than me (jbergstroem) figures it out.
+ rm test/parallel/test-stdout-close-unref.js || die
+
+ # debug builds. change install path, remove optimisations and override buildtype
+ if use debug; then
+ sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+ BUILDTYPE=Debug
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf=()
+ local myarch=""
+ use bundled-libs || myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
+ use npm || myconf+=( --without-npm )
+ use icu && myconf+=( --with-intl=system-icu )
+ use snapshot && myconf+=( --with-snapshot )
+ use ssl || myconf+=( --without-ssl )
+ use debug && myconf+=( --debug )
+
+ case ${ABI} in
+ x86) myarch="ia32";;
+ amd64) myarch="x64";;
+ x32) myarch="x32";;
+ arm) myarch="arm";;
+ arm64) myarch="arm64";;
+ *) die "Unrecognized ARCH ${ARCH}";;
+ esac
+
+ "${PYTHON}" configure \
+ --prefix="${EPREFIX}"/usr \
+ --dest-cpu=${myarch} \
+ --without-dtrace \
+ "${myconf[@]}" || die
+}
+
+src_compile() {
+ emake -C out mksnapshot
+ pax-mark m "out/${BUILDTYPE}/mksnapshot"
+ emake -C out
+}
+
+src_install() {
+ local LIBDIR="${ED}/usr/$(get_libdir)"
+ emake install DESTDIR="${ED}" PREFIX=/usr
+ use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
+ rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+ find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
+
+ # set up a symlink structure that npm expects..
+ dodir /usr/include/node/deps/{v8,uv}
+ dosym . /usr/include/node/src
+ for var in deps/{uv,v8}/include; do
+ dosym ../.. /usr/include/node/${var}
+ done
+
+ pax-mark -m "${ED}"/usr/bin/iojs
+}
+
+src_test() {
+ out/${BUILDTYPE}/cctest || die
+ declare -xl TESTTYPE="${BUILDTYPE}"
+ "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+ einfo "When using node-gyp to install native modules, you can avoid"
+ einfo "having to download the full tarball by doing the following:"
+ einfo ""
+ einfo "node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/iojs/iojs-2.3.4.ebuild b/net-libs/iojs/iojs-2.3.4.ebuild
new file mode 100644
index 000000000000..c3cb0d12858a
--- /dev/null
+++ b/net-libs/iojs/iojs-2.3.4.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV="v${PV}"
+MY_P="${PN}-${MY_PV}"
+
+inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="An npm compatible platform originally based on node.js"
+HOMEPAGE="http://iojs.org/"
+SRC_URI="http://iojs.org/dist/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="bundled-libs debug icu +npm snapshot +ssl"
+
+RDEPEND="icu? ( dev-libs/icu )
+ ${PYTHON_DEPS}
+ !bundled-libs? (
+ >=net-libs/http-parser-2.5
+ >=dev-libs/libuv-1.6.1
+ >=dev-libs/openssl-1.0.2c[-bindist]
+ )"
+DEPEND="${RDEPEND}
+ !!net-libs/nodejs"
+S="${WORKDIR}/${MY_P}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+ if ! test-flag-CXX -std=c++11 ; then
+ die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+ fi
+}
+
+src_prepare() {
+ tc-export CC CXX PKG_CONFIG
+ export V=1 # Verbose build
+ export BUILDTYPE=Release
+
+ # fix compilation on Darwin
+ # http://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+ # make sure we use python2.* while using gyp
+ sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+ sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+ # less verbose install output (stating the same as portage, basically)
+ sed -i -e "/print/d" tools/install.py || die
+
+ # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+ local LIBDIR=$(get_libdir)
+ sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+ sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+ sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+ # Avoid a test that I've only been able to reproduce from emerge. It doesnt
+ # seem sandbox related either (invoking it from a sandbox works fine).
+ # The issue is that no stdin handle is openened when asked for one.
+ # It doesn't really belong upstream , so it'll just be removed until someone
+ # with more gentoo-knowledge than me (jbergstroem) figures it out.
+ rm test/parallel/test-stdout-close-unref.js || die
+
+ # debug builds. change install path, remove optimisations and override buildtype
+ if use debug; then
+ sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+ BUILDTYPE=Debug
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf=()
+ local myarch=""
+ use bundled-libs || myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
+ use npm || myconf+=( --without-npm )
+ use icu && myconf+=( --with-intl=system-icu )
+ use snapshot && myconf+=( --with-snapshot )
+ use ssl || myconf+=( --without-ssl )
+ use debug && myconf+=( --debug )
+
+ case ${ABI} in
+ x86) myarch="ia32";;
+ amd64) myarch="x64";;
+ x32) myarch="x32";;
+ arm) myarch="arm";;
+ arm64) myarch="arm64";;
+ *) die "Unrecognized ARCH ${ARCH}";;
+ esac
+
+ "${PYTHON}" configure \
+ --prefix="${EPREFIX}"/usr \
+ --dest-cpu=${myarch} \
+ --without-dtrace \
+ "${myconf[@]}" || die
+}
+
+src_compile() {
+ emake -C out mksnapshot
+ pax-mark m "out/${BUILDTYPE}/mksnapshot"
+ emake -C out
+}
+
+src_install() {
+ local LIBDIR="${ED}/usr/$(get_libdir)"
+ emake install DESTDIR="${ED}" PREFIX=/usr
+ use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
+ rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+ find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
+
+ # set up a symlink structure that npm expects..
+ dodir /usr/include/node/deps/{v8,uv}
+ dosym . /usr/include/node/src
+ for var in deps/{uv,v8}/include; do
+ dosym ../.. /usr/include/node/${var}
+ done
+
+ pax-mark -m "${ED}"/usr/bin/iojs
+}
+
+src_test() {
+ out/${BUILDTYPE}/cctest || die
+ declare -xl TESTTYPE="${BUILDTYPE}"
+ "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+ einfo "When using node-gyp to install native modules, you can avoid"
+ einfo "having to download the full tarball by doing the following:"
+ einfo ""
+ einfo "node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/iojs/iojs-2.4.0.ebuild b/net-libs/iojs/iojs-2.4.0.ebuild
new file mode 100644
index 000000000000..048bc5cea18d
--- /dev/null
+++ b/net-libs/iojs/iojs-2.4.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV="v${PV}"
+MY_P="${PN}-${MY_PV}"
+
+inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="An npm compatible platform originally based on node.js"
+HOMEPAGE="http://iojs.org/"
+SRC_URI="http://iojs.org/dist/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="debug icu +npm snapshot +ssl"
+
+RDEPEND="icu? ( dev-libs/icu )
+ ${PYTHON_DEPS}
+ >=net-libs/http-parser-2.5
+ >=dev-libs/libuv-1.6.1
+ >=dev-libs/openssl-1.0.2d[-bindist]"
+DEPEND="${RDEPEND}
+ !!net-libs/nodejs"
+S="${WORKDIR}/${MY_P}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+ if ! test-flag-CXX -std=c++11 ; then
+ die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+ fi
+}
+
+src_prepare() {
+ tc-export CC CXX PKG_CONFIG
+ export V=1 # Verbose build
+ export BUILDTYPE=Release
+
+ # fix compilation on Darwin
+ # http://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+ # make sure we use python2.* while using gyp
+ sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+ sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+ # less verbose install output (stating the same as portage, basically)
+ sed -i -e "/print/d" tools/install.py || die
+
+ # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+ local LIBDIR=$(get_libdir)
+ sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+ sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+ sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+ # Avoid a test that I've only been able to reproduce from emerge. It doesnt
+ # seem sandbox related either (invoking it from a sandbox works fine).
+ # The issue is that no stdin handle is openened when asked for one.
+ # It doesn't really belong upstream , so it'll just be removed until someone
+ # with more gentoo-knowledge than me (jbergstroem) figures it out.
+ rm test/parallel/test-stdout-close-unref.js || die
+
+ # debug builds. change install path, remove optimisations and override buildtype
+ if use debug; then
+ sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+ BUILDTYPE=Debug
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ local myarch=""
+ local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
+ use npm || myconf+=( --without-npm )
+ use icu && myconf+=( --with-intl=system-icu )
+ use snapshot && myconf+=( --with-snapshot )
+ use ssl || myconf+=( --without-ssl )
+ use debug && myconf+=( --debug )
+
+ case ${ABI} in
+ x86) myarch="ia32";;
+ amd64) myarch="x64";;
+ x32) myarch="x32";;
+ arm) myarch="arm";;
+ arm64) myarch="arm64";;
+ *) die "Unrecognized ARCH ${ARCH}";;
+ esac
+
+ "${PYTHON}" configure \
+ --prefix="${EPREFIX}"/usr \
+ --dest-cpu=${myarch} \
+ --without-dtrace \
+ "${myconf[@]}" || die
+}
+
+src_compile() {
+ emake -C out mksnapshot
+ pax-mark m "out/${BUILDTYPE}/mksnapshot"
+ emake -C out
+}
+
+src_install() {
+ local LIBDIR="${ED}/usr/$(get_libdir)"
+ emake install DESTDIR="${ED}" PREFIX=/usr
+ use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
+ rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+ find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
+
+ # set up a symlink structure that npm expects..
+ dodir /usr/include/node/deps/{v8,uv}
+ dosym . /usr/include/node/src
+ for var in deps/{uv,v8}/include; do
+ dosym ../.. /usr/include/node/${var}
+ done
+
+ pax-mark -m "${ED}"/usr/bin/iojs
+}
+
+src_test() {
+ out/${BUILDTYPE}/cctest || die
+ declare -xl TESTTYPE="${BUILDTYPE}"
+ "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+ einfo "When using node-gyp to install native modules, you can avoid"
+ einfo "having to download the full tarball by doing the following:"
+ einfo ""
+ einfo "node-gyp --nodedir /usr/include/node <command>"
+} \ No newline at end of file
diff --git a/net-libs/iojs/iojs-2.5.0.ebuild b/net-libs/iojs/iojs-2.5.0.ebuild
new file mode 100644
index 000000000000..048bc5cea18d
--- /dev/null
+++ b/net-libs/iojs/iojs-2.5.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV="v${PV}"
+MY_P="${PN}-${MY_PV}"
+
+inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="An npm compatible platform originally based on node.js"
+HOMEPAGE="http://iojs.org/"
+SRC_URI="http://iojs.org/dist/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="debug icu +npm snapshot +ssl"
+
+RDEPEND="icu? ( dev-libs/icu )
+ ${PYTHON_DEPS}
+ >=net-libs/http-parser-2.5
+ >=dev-libs/libuv-1.6.1
+ >=dev-libs/openssl-1.0.2d[-bindist]"
+DEPEND="${RDEPEND}
+ !!net-libs/nodejs"
+S="${WORKDIR}/${MY_P}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+ if ! test-flag-CXX -std=c++11 ; then
+ die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+ fi
+}
+
+src_prepare() {
+ tc-export CC CXX PKG_CONFIG
+ export V=1 # Verbose build
+ export BUILDTYPE=Release
+
+ # fix compilation on Darwin
+ # http://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+ # make sure we use python2.* while using gyp
+ sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+ sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+ # less verbose install output (stating the same as portage, basically)
+ sed -i -e "/print/d" tools/install.py || die
+
+ # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+ local LIBDIR=$(get_libdir)
+ sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+ sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+ sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+ # Avoid a test that I've only been able to reproduce from emerge. It doesnt
+ # seem sandbox related either (invoking it from a sandbox works fine).
+ # The issue is that no stdin handle is openened when asked for one.
+ # It doesn't really belong upstream , so it'll just be removed until someone
+ # with more gentoo-knowledge than me (jbergstroem) figures it out.
+ rm test/parallel/test-stdout-close-unref.js || die
+
+ # debug builds. change install path, remove optimisations and override buildtype
+ if use debug; then
+ sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+ BUILDTYPE=Debug
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ local myarch=""
+ local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
+ use npm || myconf+=( --without-npm )
+ use icu && myconf+=( --with-intl=system-icu )
+ use snapshot && myconf+=( --with-snapshot )
+ use ssl || myconf+=( --without-ssl )
+ use debug && myconf+=( --debug )
+
+ case ${ABI} in
+ x86) myarch="ia32";;
+ amd64) myarch="x64";;
+ x32) myarch="x32";;
+ arm) myarch="arm";;
+ arm64) myarch="arm64";;
+ *) die "Unrecognized ARCH ${ARCH}";;
+ esac
+
+ "${PYTHON}" configure \
+ --prefix="${EPREFIX}"/usr \
+ --dest-cpu=${myarch} \
+ --without-dtrace \
+ "${myconf[@]}" || die
+}
+
+src_compile() {
+ emake -C out mksnapshot
+ pax-mark m "out/${BUILDTYPE}/mksnapshot"
+ emake -C out
+}
+
+src_install() {
+ local LIBDIR="${ED}/usr/$(get_libdir)"
+ emake install DESTDIR="${ED}" PREFIX=/usr
+ use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
+ rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+ find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
+
+ # set up a symlink structure that npm expects..
+ dodir /usr/include/node/deps/{v8,uv}
+ dosym . /usr/include/node/src
+ for var in deps/{uv,v8}/include; do
+ dosym ../.. /usr/include/node/${var}
+ done
+
+ pax-mark -m "${ED}"/usr/bin/iojs
+}
+
+src_test() {
+ out/${BUILDTYPE}/cctest || die
+ declare -xl TESTTYPE="${BUILDTYPE}"
+ "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+ einfo "When using node-gyp to install native modules, you can avoid"
+ einfo "having to download the full tarball by doing the following:"
+ einfo ""
+ einfo "node-gyp --nodedir /usr/include/node <command>"
+} \ No newline at end of file
diff --git a/net-libs/iojs/iojs-3.0.0.ebuild b/net-libs/iojs/iojs-3.0.0.ebuild
new file mode 100644
index 000000000000..048bc5cea18d
--- /dev/null
+++ b/net-libs/iojs/iojs-3.0.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_PV="v${PV}"
+MY_P="${PN}-${MY_PV}"
+
+inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="An npm compatible platform originally based on node.js"
+HOMEPAGE="http://iojs.org/"
+SRC_URI="http://iojs.org/dist/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="debug icu +npm snapshot +ssl"
+
+RDEPEND="icu? ( dev-libs/icu )
+ ${PYTHON_DEPS}
+ >=net-libs/http-parser-2.5
+ >=dev-libs/libuv-1.6.1
+ >=dev-libs/openssl-1.0.2d[-bindist]"
+DEPEND="${RDEPEND}
+ !!net-libs/nodejs"
+S="${WORKDIR}/${MY_P}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+ if ! test-flag-CXX -std=c++11 ; then
+ die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+ fi
+}
+
+src_prepare() {
+ tc-export CC CXX PKG_CONFIG
+ export V=1 # Verbose build
+ export BUILDTYPE=Release
+
+ # fix compilation on Darwin
+ # http://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+ # make sure we use python2.* while using gyp
+ sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+ sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+ # less verbose install output (stating the same as portage, basically)
+ sed -i -e "/print/d" tools/install.py || die
+
+ # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+ local LIBDIR=$(get_libdir)
+ sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+ sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+ sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+ # Avoid a test that I've only been able to reproduce from emerge. It doesnt
+ # seem sandbox related either (invoking it from a sandbox works fine).
+ # The issue is that no stdin handle is openened when asked for one.
+ # It doesn't really belong upstream , so it'll just be removed until someone
+ # with more gentoo-knowledge than me (jbergstroem) figures it out.
+ rm test/parallel/test-stdout-close-unref.js || die
+
+ # debug builds. change install path, remove optimisations and override buildtype
+ if use debug; then
+ sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+ BUILDTYPE=Debug
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ local myarch=""
+ local myconf+=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
+ use npm || myconf+=( --without-npm )
+ use icu && myconf+=( --with-intl=system-icu )
+ use snapshot && myconf+=( --with-snapshot )
+ use ssl || myconf+=( --without-ssl )
+ use debug && myconf+=( --debug )
+
+ case ${ABI} in
+ x86) myarch="ia32";;
+ amd64) myarch="x64";;
+ x32) myarch="x32";;
+ arm) myarch="arm";;
+ arm64) myarch="arm64";;
+ *) die "Unrecognized ARCH ${ARCH}";;
+ esac
+
+ "${PYTHON}" configure \
+ --prefix="${EPREFIX}"/usr \
+ --dest-cpu=${myarch} \
+ --without-dtrace \
+ "${myconf[@]}" || die
+}
+
+src_compile() {
+ emake -C out mksnapshot
+ pax-mark m "out/${BUILDTYPE}/mksnapshot"
+ emake -C out
+}
+
+src_install() {
+ local LIBDIR="${ED}/usr/$(get_libdir)"
+ emake install DESTDIR="${ED}" PREFIX=/usr
+ use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
+ rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+ find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete || die
+
+ # set up a symlink structure that npm expects..
+ dodir /usr/include/node/deps/{v8,uv}
+ dosym . /usr/include/node/src
+ for var in deps/{uv,v8}/include; do
+ dosym ../.. /usr/include/node/${var}
+ done
+
+ pax-mark -m "${ED}"/usr/bin/iojs
+}
+
+src_test() {
+ out/${BUILDTYPE}/cctest || die
+ declare -xl TESTTYPE="${BUILDTYPE}"
+ "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+ einfo "When using node-gyp to install native modules, you can avoid"
+ einfo "having to download the full tarball by doing the following:"
+ einfo ""
+ einfo "node-gyp --nodedir /usr/include/node <command>"
+} \ No newline at end of file
diff --git a/net-libs/iojs/metadata.xml b/net-libs/iojs/metadata.xml
new file mode 100644
index 000000000000..7038ab4d15c4
--- /dev/null
+++ b/net-libs/iojs/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>bugs@bergstroem.nu</email>
+ <name>Johan Bergström</name>
+ </maintainer>
+ <maintainer>
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+ <upstream>
+ <maintainer status="active">
+ <email>bugs@bergstroem.nu</email>
+ <name>Johan Bergström</name>
+ </maintainer>
+ <doc lang="en">https://iojs.org/api/</doc>
+ <changelog>https://github.com/iojs/io.js/blob/v1.x/CHANGELOG.md</changelog>
+ <bugs-to>https://github.com/iojs/io.js/issues</bugs-to>
+ </upstream>
+ <use>
+ <flag name='bundled-libs'>Use bundled libs instead of system libs</flag>
+ <flag name='npm'>Enable NPM package manager</flag>
+ <flag name='snapshot'>Enable snapshot creation for faster startup</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/jreen/Manifest b/net-libs/jreen/Manifest
new file mode 100644
index 000000000000..9bf027380f89
--- /dev/null
+++ b/net-libs/jreen/Manifest
@@ -0,0 +1 @@
+DIST jreen-1.2.0.tar.gz 279435 SHA256 cee3762015357bfd88f7f3eb71dd7f90ddf37fdff07c5cf99881fda051c5fe1b SHA512 36b5fb892c16fd113574904671c8d5d3da6b50e0ea128b8e24715cb517c97212adcc8641a2a230ba1edd4c7735f46211ea4729f9e27fbea14e292ad098c78b0c WHIRLPOOL 90f0904e35345a21db8fda314455421762e7e7d5f3150bc94d73a70b4337690e16cc69a70f1a4fc2000507172544813b265c34720d7f292fb4f1537dc9df676f
diff --git a/net-libs/jreen/jreen-1.2.0.ebuild b/net-libs/jreen/jreen-1.2.0.ebuild
new file mode 100644
index 000000000000..1289f636d288
--- /dev/null
+++ b/net-libs/jreen/jreen-1.2.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/euroelessar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 ~ppc x86"
+else
+ GIT_ECLASS="git-r3"
+ EGIT_REPO_URI=( "git://github.com/euroelessar/${PN}" )
+ KEYWORDS=""
+fi
+
+inherit cmake-utils multibuild ${GIT_ECLASS}
+
+DESCRIPTION="Qt XMPP library"
+HOMEPAGE="https://github.com/euroelessar/jreen"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +qt4 qt5"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+DEPEND="
+ media-libs/speex
+ net-libs/libgsasl
+ sys-libs/zlib
+ qt4? (
+ >=dev-qt/qtcore-4.6.0:4
+ >=dev-qt/qtgui-4.6.0:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5
+ )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README )
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=()
+ if use qt4; then
+ MULTIBUILD_VARIANTS+=( qt4 )
+ fi
+ if use qt5; then
+ MULTIBUILD_VARIANTS+=( qt5 )
+ fi
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=()
+
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+ mycmakeargs+=( -DJREEN_FORCE_QT4=ON )
+ fi
+ if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+ mycmakeargs+=( -DJREEN_FORCE_QT4=OFF )
+ fi
+
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
+}
+
+src_test() {
+ multibuild_foreach_variant cmake-utils_src_test
+}
diff --git a/net-libs/jreen/metadata.xml b/net-libs/jreen/metadata.xml
new file mode 100644
index 000000000000..1f5e912b0a8f
--- /dev/null
+++ b/net-libs/jreen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+ <upstream>
+ <remote-id type="github">euroelessar/jreen</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
new file mode 100644
index 000000000000..e2ae753e3749
--- /dev/null
+++ b/net-libs/ldns/Manifest
@@ -0,0 +1 @@
+DIST ldns-1.6.17.tar.gz 1315403 SHA256 8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd SHA512 5de42b4b8622591db51efb0956735deee9cd5e0bee12249a03b65c5b45d7c51bf9c2edb310ef9d7431af49aef77d968bfa2455a7dedfa80cde3d433436c83785 WHIRLPOOL 08c8a13df3dbeccd5dc5ceeb52730a61ab231e70a85524e826f9275bbcde6e09d6e2fc5234303a6bceb431d2b91f510140ce61a2b59d77afbb2759a0627c7cb7
diff --git a/net-libs/ldns/ldns-1.6.17.ebuild b/net-libs/ldns/ldns-1.6.17.ebuild
new file mode 100644
index 000000000000..97e28ad61c0e
--- /dev/null
+++ b/net-libs/ldns/ldns-1.6.17.ebuild
@@ -0,0 +1,91 @@
+# 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 multilib-minimal python-single-r1
+
+DESCRIPTION="a library with the aim to simplify DNS programming in C"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="dane doc +ecdsa gost python +ssl static-libs vim-syntax"
+
+# configure will die if ecdsa is enabled and ssl is not
+REQUIRED_USE="ecdsa? ( ssl )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dane? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ ecdsa? ( >=dev-libs/openssl-1.0.1h-r2:0[-bindist,${MULTILIB_USEDEP}] )
+ gost? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ python? ( ${PYTHON_DEPS} )
+ ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ python? ( dev-lang/swig )
+ doc? ( app-doc/doxygen )
+"
+
+RESTRICT="test" # 1.6.9 has no test directory
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/ldns-config
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable ssl sha2) \
+ $(use_enable gost) \
+ $(use_enable ecdsa) \
+ $(use_enable dane) \
+ $(use_with ssl ssl "${EPREFIX}"/usr) \
+ $(multilib_native_use_with python pyldns) \
+ $(multilib_native_use_with python pyldnsx) \
+ --without-drill \
+ --without-examples \
+ --disable-rpath
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi && use doc ; then
+ emake doxygen
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi && use doc ; then
+ dohtml -r doc/html/.
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc Changelog README*
+
+ prune_libtool_files --modules
+ use python && python_optimize
+
+ if use vim-syntax ; then
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins libdns.vim
+ fi
+
+ einfo
+ elog "Install net-dns/ldns-utils if you want drill and examples"
+ einfo
+}
diff --git a/net-libs/ldns/metadata.xml b/net-libs/ldns/metadata.xml
new file mode 100644
index 000000000000..64529819b96a
--- /dev/null
+++ b/net-libs/ldns/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+ <longdescription lang="en">
+ ldns is a library with the aim to simplify DNS programming in C. All
+ lowlevel DNS/DNSSEC operations are supported. We also define a higher
+ level API which allows a programmer to (for instance) create or sign
+ packets.
+ </longdescription>
+ <use>
+ <flag name='dane'>Enable DNS-based Authentication of Named Entities (DANE) support</flag>
+ <flag name='ecdsa'>Enable ECDSA support</flag>
+ <flag name='gost'>Enable GOST support</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/liba53/liba53-9999.ebuild b/net-libs/liba53/liba53-9999.ebuild
new file mode 100644
index 000000000000..c7947d1efd57
--- /dev/null
+++ b/net-libs/liba53/liba53-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit git-2
+
+DESCRIPTION="A5/3 Call encryption library"
+HOMEPAGE="https://github.com/RangeNetworks/liba53"
+EGIT_REPO_URI="https://github.com/RangeNetworks/${PN}.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+ mkdir -p "${D}/usr/lib" "${D}/usr/include"
+ default
+}
diff --git a/net-libs/liba53/metadata.xml b/net-libs/liba53/metadata.xml
new file mode 100644
index 000000000000..811555c03253
--- /dev/null
+++ b/net-libs/liba53/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>radio</herd>
+ <upstream>
+ <remote-id type="github">RangeNetworks/liba53</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libasr/Manifest b/net-libs/libasr/Manifest
new file mode 100644
index 000000000000..ac5b2eb89f58
--- /dev/null
+++ b/net-libs/libasr/Manifest
@@ -0,0 +1,2 @@
+DIST libasr-1.0.1.tar.gz 403110 SHA256 262471e312d623e4951a133ed4c16a74d57f0a02554ca4ed7b4b575456620182 SHA512 94afed300327622e597d3678525b0d30a0a4a812966040a92a7b7b73beebb2209c7e6931cea07841aba745e14cda6df0dea9a7e098a94121768850e1d0e8d5ef WHIRLPOOL 7b946c6ab05b59417a58910a08436cfa7dfb2e85cf86151c58dfe3c8c15fd0e2f21f6f7915796d1246f54a43586a11818fb8842ce1278f18396d673f30c05477
+DIST libasr-201505061057.tar.gz 405953 SHA256 50ad9ed14ab0eb2abd27cfd45047f49b5470ec48717e2d024b017fa43c69f69d SHA512 f3a5630fea9493c1638de7508cbf4c8d99db8bc5873dd874e48e05378ca551e6982590fb3ede6ea73ed5384eaf8968ebee0919a7c9ea463384d3f94f5c880f16 WHIRLPOOL 0de07edea847340cf5d67799b4a2e96cf407f9310d0c36d3a125a787eaf38bf0a57b7fa412143f8c3e2dc476148c07f58bd47897bc20ee99f36cfc17ca8d0a97
diff --git a/net-libs/libasr/libasr-1.0.1.201505061057.ebuild b/net-libs/libasr/libasr-1.0.1.201505061057.ebuild
new file mode 100644
index 000000000000..efa335489a46
--- /dev/null
+++ b/net-libs/libasr/libasr-1.0.1.201505061057.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator
+
+DESCRIPTION="Async Resolver Library from OpenBSD/OpenSMTPD"
+HOMEPAGE="https://github.com/OpenSMTPD/libasr"
+SRC_URI="https://www.opensmtpd.org/archives/${PN}-$(get_version_component_range 4-).tar.gz"
+
+LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 4-)"
diff --git a/net-libs/libasr/libasr-1.0.1.ebuild b/net-libs/libasr/libasr-1.0.1.ebuild
new file mode 100644
index 000000000000..fd8eb9d49d98
--- /dev/null
+++ b/net-libs/libasr/libasr-1.0.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Async Resolver Library from OpenBSD/OpenSMTPD"
+HOMEPAGE="https://github.com/OpenSMTPD/libasr"
+SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz"
+
+LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/net-libs/libasr/metadata.xml b/net-libs/libasr/metadata.xml
new file mode 100644
index 000000000000..ff9249ab2967
--- /dev/null
+++ b/net-libs/libasr/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>zx2c4@gentoo.org</email>
+ <name>Jason A. Donenfeld</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">OpenSMTPD/libasr</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libasyncns/Manifest b/net-libs/libasyncns/Manifest
new file mode 100644
index 000000000000..6a6341e79516
--- /dev/null
+++ b/net-libs/libasyncns/Manifest
@@ -0,0 +1 @@
+DIST libasyncns-0.8.tar.gz 341591 SHA256 4f1a66e746cbe54ff3c2fbada5843df4fbbbe7481d80be003e8d11161935ab74 SHA512 2daad3a2d9eb875e0575843d9e9e2787be6cbba89211fd073fa8898ff80e0a891c7da1a7b0ef70f306318cb3a963ecd65d53d24d08b5f6b98e7cd2a3b3bdcda7 WHIRLPOOL b57b449bf96584667e0d411f4b491c2e52f0fd9c129ad579f82878e3ec612bec636f1a4792f9c63c3174e30938acbc1ed70eb81391903259ea63b79dfaa7e0d8
diff --git a/net-libs/libasyncns/files/libasyncns-0.8-libdir.patch b/net-libs/libasyncns/files/libasyncns-0.8-libdir.patch
new file mode 100644
index 000000000000..44deca5dca2c
--- /dev/null
+++ b/net-libs/libasyncns/files/libasyncns-0.8-libdir.patch
@@ -0,0 +1,10 @@
+--- libasyncns-0.8/libasyncns.pc.in.orig 2011-03-27 03:45:59.804339219 +0100
++++ libasyncns-0.8/libasyncns.pc.in 2011-03-27 03:46:12.368119660 +0100
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${prefix}/include
+
+ Name: libasyncns
diff --git a/net-libs/libasyncns/libasyncns-0.8-r3.ebuild b/net-libs/libasyncns/libasyncns-0.8-r3.ebuild
new file mode 100644
index 000000000000..847c3477ce91
--- /dev/null
+++ b/net-libs/libasyncns/libasyncns-0.8-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic libtool multilib multilib-minimal
+
+DESCRIPTION="C library for executing name service queries asynchronously"
+HOMEPAGE="http://0pointer.de/lennart/projects/libasyncns/"
+SRC_URI="http://0pointer.de/lennart/projects/libasyncns/${P}.tar.gz"
+
+SLOT="0"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc debug"
+
+RDEPEND=""
+DEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+ # fix libdir in pkgconfig file
+ epatch "${FILESDIR}/${P}-libdir.patch"
+ elibtoolize
+}
+
+multilib_src_configure() {
+ # libasyncns uses assert()
+ use debug || append-cppflags -DNDEBUG
+
+ ECONF_SOURCE=${S} \
+ econf \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ --disable-dependency-tracking \
+ --disable-lynx \
+ --disable-static
+}
+
+multilib_src_compile() {
+ emake || die "emake failed"
+
+ if multilib_is_native_abi && use doc; then
+ doxygen doxygen/doxygen.conf || die "doxygen failed"
+ fi
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ if multilib_is_native_abi && use doc; then
+ docinto apidocs
+ dohtml html/*
+ fi
+}
+
+multilib_src_install_all() {
+ find "${D}" -name '*.la' -delete
+}
diff --git a/net-libs/libasyncns/metadata.xml b/net-libs/libasyncns/metadata.xml
new file mode 100644
index 000000000000..ff62877c67ae
--- /dev/null
+++ b/net-libs/libasyncns/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
new file mode 100644
index 000000000000..ef232502ea2c
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -0,0 +1,6 @@
+DIST bitcoin-0.10.0.ljr20150311.patches.tar.xz 34836 SHA256 353b82a933d234daaaed3f807f940a701646c7c9669867fbf5cdb48a1065312c SHA512 dc2a24f141d591f288e846f29a3263dea463f77dda22b92f91e781a8500c695be8b6f497251b6c960e1acdf43e839a7f0bc06fb7a18cdbda90b3d6a61f21c4af WHIRLPOOL 3b898c529e7967750dabcbb235657c19bab0ce75b6f47017ae7bdc7943acb8001cc19eff2d319e1ad405037ecf0674759a575116b1b0c1f32fde89a98f0052a3
+DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c1f64664ae810aa67da7535f11859034dcc7067546713 SHA512 edf7c8aa81c8890da61224eddde61cec62058514fa76a50ab25cc7db272f6c656f5c46f8b9468f6059eb7c1be624de834867c0a7c1c2559a5231b763e40c13a2 WHIRLPOOL 2b8d878bf3d599393da177403e2199e63bb2634d14438079b5c8821c07441e26fb8b5cd150281c9923534f474763d9f3c2cab9424ab7a319de059c1b3bb49c4e
+DIST bitcoin-0.11.0.ljr20150711.patches.tar.xz 79740 SHA256 2f9608ee18f10fccaeda239baf82fd74180a562eb92aec72f7959c7211228bbb SHA512 cafa5cf0b7a56894b07e949bb401016c46456f6043da86f54023f930e9836a420c88ca9e94067edcf2150495cb637b1938478332f7f7669394ea90351f3b4623 WHIRLPOOL 1bab46c50b7bc8709359ea98a9a75f4b476dd81540421f6696b4085f4acf8fd3d040e591230df1f83625ada89d0d178040f747ae02f76d1dd73787c86e73dac4
+DIST bitcoin-v0.10.0.tgz 5022212 SHA256 ecff92e184fac4a96684085590a67554a27db72d0ac235b7cc054887644c0b70 SHA512 f362a9d4ba405c02b2d01024a61b68f984dd6e441ef2254d05bf65cfe803c8b084bd3b14a76a3472251d96087e450091f95f26a691c248836c6d0b43dece8255 WHIRLPOOL 2185413c6d073b0dcb30001c8fb56301390206680ffc6d705ed99e102e68e5c4c1d08c495c38703631696fa9a4a3784befd71acfbec0e94b164bbbfde76158c3
+DIST bitcoin-v0.10.1.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5ac0b1b4b2b5949b97082af256 SHA512 f89330b93f22ba5f393c9a7a48ce28196be0e16468e5d99c459e889c458cc3a7c3f6e4537996571aa8ccb0ebb2eedf80ad028da136a2e08e2f8631f69ac5f2fc WHIRLPOOL 0cfb182f355151cde75601d2260cc92801e2dc1231ae2fca67610e699bb5f0cae826b09f456ca8afa283730954f11a8b180f43ae5a5297d129093fc0f9f53b4e
+DIST bitcoin-v0.11.0.tgz 5898627 SHA256 a52cb63e96a13626243c78662ea659c90277728b8f40d27846e82fdf81ce58e3 SHA512 bf1e05e115ecc375bfe9e342bf65db74784926e599a05f42f33b43781775d0469826228876269fcdc8a469bce45cb3dd4513e1f9dda5d36cc40adbb9aaf6f054 WHIRLPOOL ca2f3feb9815ad9bfac0b573bc0a3a7bb55bb7467724d84a6baf6a469983625727bb0fd01722a0be74e2df0a29833aadc152d036819be660270733b57089e9bf
diff --git a/net-libs/libbitcoinconsensus/files/0.9.0-sys_leveldb.patch b/net-libs/libbitcoinconsensus/files/0.9.0-sys_leveldb.patch
new file mode 100644
index 000000000000..60e9f2b20941
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/files/0.9.0-sys_leveldb.patch
@@ -0,0 +1,34 @@
+commit c38e0af3e021eb0b2aba846c77b06ca71de06b11 (personal-github/sys_leveldb, sys_leveldb)
+Author: Luke Dashjr <luke-jr+git@utopios.org>
+Date: Mon Sep 9 03:06:17 2013 +0000
+
+ configure: Add unsupported --with-system-leveldb configure flag
+
+diff --git a/configure.ac b/configure.ac
+index 3ed4549..5a5852d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -332,10 +332,22 @@ AC_TRY_COMPILE([#include <sys/socket.h>],
+ [ AC_MSG_RESULT(no)]
+ )
+
++dnl Check for leveldb, only if explicitly requested
+ LEVELDB_CPPFLAGS=
+ LIBLEVELDB=
+ LIBMEMENV=
+-AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
++AC_ARG_WITH([system-leveldb],
++ [AS_HELP_STRING([--with-system-leveldb],
++ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
++ [system_leveldb=$withval],
++ [system_leveldb=no]
++)
++if test x$system_leveldb != xno; then
++ LEVELDB_CPPFLAGS=
++ LIBLEVELDB=-lleveldb
++ LIBMEMENV=-lmemenv
++fi
++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno])
+ AC_SUBST(LEVELDB_CPPFLAGS)
+ AC_SUBST(LIBLEVELDB)
+ AC_SUBST(LIBMEMENV)
diff --git a/net-libs/libbitcoinconsensus/files/9999-sys_libsecp256k1.patch b/net-libs/libbitcoinconsensus/files/9999-sys_libsecp256k1.patch
new file mode 100644
index 000000000000..77ed10675e30
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/files/9999-sys_libsecp256k1.patch
@@ -0,0 +1,80 @@
+diff --git a/configure.ac b/configure.ac
+index 6784521..3598bab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -634,6 +634,12 @@ AC_ARG_WITH([daemon],
+
+ BITCOIN_QT_INIT
+
++PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true])
++AC_ARG_WITH([libsecp256k1-verify],[],[use_libsecp256k1=$withval],[use_libsecp256k1=yes])
++if test "x$use_libsecp256k1" = "xyes"; then
++ AC_DEFINE(USE_SECP256K1,1,[USE_SECP256K1])
++fi
++
+ if test x$use_pkgconfig = xyes; then
+
+ if test x"$PKG_CONFIG" = "x"; then
+@@ -869,9 +875,6 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
+ unset PKG_CONFIG_LIBDIR
+ PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
+
+-ac_configure_args="${ac_configure_args} --disable-shared --with-pic"
+-AC_CONFIG_SUBDIRS([src/secp256k1])
+-
+ AC_OUTPUT
+
+ dnl Taken from https://wiki.debian.org/RpathIssue
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0d45203..3a44a16 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,3 @@
+-DIST_SUBDIRS = secp256k1
+ AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
+
+
+@@ -20,7 +19,7 @@ endif
+ BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
+ BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
+
+-BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
++BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS)
+
+ LIBBITCOIN_SERVER=libbitcoin_server.a
+ LIBBITCOIN_WALLET=libbitcoin_wallet.a
+@@ -30,10 +29,7 @@ LIBBITCOIN_UTIL=libbitcoin_util.a
+ LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
+ LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a
+ LIBBITCOINQT=qt/libbitcoinqt.a
+-LIBSECP256K1=secp256k1/libsecp256k1.la
+-
+-$(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
+- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
++LIBSECP256K1=$(libsecp256k1_LIBS)
+
+ # Make is not made aware of per-object dependencies to avoid limiting building parallelization
+ # But to build the less dependent modules first, we manually select their order here:
+@@ -364,7 +360,7 @@ libbitcoinconsensus_la_LDFLAGS = -no-undefined $(RELDFLAGS)
+ libbitcoinconsensus_la_LIBADD = $(CRYPTO_LIBS)
+ libbitcoinconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCOIN_INTERNAL
+ if USE_LIBSECP256K1
+-libbitcoinconsensus_la_LIBADD += secp256k1/libsecp256k1.la
++libbitcoinconsensus_la_LIBADD += $(LIBSECP256K1)
+ endif
+ endif
+
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 5fd2afe..014092a 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -104,9 +104,6 @@ bitcoin_test_check: $(TEST_BINARY) FORCE
+ bitcoin_test_clean : FORCE
+ rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+
+-check-local:
+- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+-
+ %.json.h: %.json
+ @$(MKDIR_P) $(@D)
+ @echo "namespace json_tests{" > $@
diff --git a/net-libs/libbitcoinconsensus/files/9999-syslibs.patch b/net-libs/libbitcoinconsensus/files/9999-syslibs.patch
new file mode 100644
index 000000000000..2cdf2ab9837b
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/files/9999-syslibs.patch
@@ -0,0 +1,243 @@
+diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4
+index 66f106c..5f0a3b1 100644
+--- a/build-aux/m4/bitcoin_subdir_to_include.m4
++++ b/build-aux/m4/bitcoin_subdir_to_include.m4
+@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[
+ AC_MSG_RESULT([default])
+ else
+ echo "#include <$2$3.h>" >conftest.cpp
+- newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`]
++ newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d])
+ AC_MSG_RESULT([${newinclpath}])
+ if test "x${newinclpath}" != "x"; then
+ eval "$1=\"\$$1\"' -I${newinclpath}'"
+diff --git a/configure.ac b/configure.ac
+index 37fe47e..14e5c34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -170,6 +170,18 @@ AC_ARG_WITH([utils],
+ [build_bitcoin_utils=$withval],
+ [build_bitcoin_utils=yes])
+
++AC_ARG_ENABLE([util-cli],
++ [AS_HELP_STRING([--enable-util-cli],
++ [build bitcoin-cli])],
++ [build_bitcoin_cli=$enableval],
++ [build_bitcoin_cli=$build_bitcoin_utils])
++
++AC_ARG_ENABLE([util-tx],
++ [AS_HELP_STRING([--enable-util-tx],
++ [build bitcoin-tx])],
++ [build_bitcoin_tx=$enableval],
++ [build_bitcoin_tx=$build_bitcoin_utils])
++
+ AC_ARG_WITH([libs],
+ [AS_HELP_STRING([--with-libs],
+ [build libraries (default=yes)])],
+@@ -488,14 +500,65 @@ if test x$use_reduce_exports = xyes; then
+ [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])])
+ fi
+
++dnl Check for leveldb, only if explicitly requested
+ LEVELDB_CPPFLAGS=
+ LIBLEVELDB=
+ LIBMEMENV=
+-AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
++AC_ARG_WITH([system-leveldb],
++ [AS_HELP_STRING([--with-system-leveldb],
++ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
++ [system_leveldb=$withval],
++ [system_leveldb=no]
++)
++if test x$system_leveldb != xno; then
++ LEVELDB_CPPFLAGS=
++ AC_CHECK_LIB([leveldb],[main],[
++ LIBLEVELDB=-lleveldb
++ ],[
++ AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway])
++ ])
++ TEMP_LIBS="$LIBS"
++ LIBS="$LIBS $LIBLEVELDB"
++ AC_CHECK_LIB([memenv],[main],[
++ LIBMEMENV=-lmemenv
++ ],[
++ AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway])
++ ])
++ LIBS="$TEMP_LIBS"
++ AC_CHECK_HEADER([leveldb/filter_policy.h],[],[
++ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++ ])
++ AC_CHECK_HEADER([leveldb/helpers/memenv.h],[
++ AC_MSG_CHECKING([for memenv.h path])
++ BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv])
++ ],[
++ AC_CHECK_HEADER([memenv.h],[],[
++ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++ ])
++ ])
++fi
++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno])
+ AC_SUBST(LEVELDB_CPPFLAGS)
+ AC_SUBST(LIBLEVELDB)
+ AC_SUBST(LIBMEMENV)
+
++dnl Check for libsecp256k1, only if explicitly requested
++AC_ARG_WITH([system-libsecp256k1],
++ [AS_HELP_STRING([--with-system-libsecp256k1],
++ [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])],
++ [system_libsecp256k1=$withval],
++ [system_libsecp256k1=no]
++)
++if test x$system_libsecp256k1 != xno; then
++ PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true])
++else
++ libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include'
++ libsecp256k1_LIBS='secp256k1/libsecp256k1.la'
++fi
++AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno])
++AC_SUBST(libsecp256k1_CFLAGS)
++AC_SUBST(libsecp256k1_LIBS)
++
+ if test x$enable_wallet != xno; then
+ dnl Check for libdb_cxx only if wallet enabled
+ BITCOIN_FIND_BDB48
+@@ -515,7 +578,7 @@ BITCOIN_QT_INIT
+ dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
+ BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])
+
+-if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
+ use_boost=no
+ else
+ use_boost=yes
+@@ -701,9 +764,13 @@ AC_MSG_CHECKING([whether to build bitcoind])
+ AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
+ AC_MSG_RESULT($build_bitcoind)
+
+-AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)])
+-AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
+-AC_MSG_RESULT($build_bitcoin_utils)
++AC_MSG_CHECKING([whether to build bitcoin-cli])
++AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
++AC_MSG_RESULT($build_bitcoin_cli)
++
++AC_MSG_CHECKING([whether to build bitcoin-tx])
++AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes])
++AC_MSG_RESULT($build_bitcoin_tx)
+
+ AC_MSG_CHECKING([whether to build libraries])
+ AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
+@@ -826,7 +893,7 @@ else
+ AC_MSG_RESULT([no])
+ fi
+
+-if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then
+ AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests])
+ fi
+
+@@ -895,8 +962,10 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
+ unset PKG_CONFIG_LIBDIR
+ PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
+
++if test x$system_libsecp256k1 = xno; then
+ ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no"
+ AC_CONFIG_SUBDIRS([src/secp256k1])
++fi
+
+ AC_OUTPUT
+
+diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh
+index 9b31865..5bb187c 100755
+--- a/qa/pull-tester/rpc-tests.sh
++++ b/qa/pull-tester/rpc-tests.sh
+@@ -57,7 +57,7 @@ testScriptsExt=(
+ extArg="-extended"
+ passOn=${@#$extArg}
+
+-if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then
++if [ "x${ENABLE_BITCOIND}${ENABLE_CLI}${ENABLE_WALLET}" = "x111" ]; then
+ for (( i = 0; i < ${#testScripts[@]}; i++ ))
+ do
+ if [ -z "$1" ] || [ "${1:0:1}" == "-" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ]
+diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in
+index 10f4d33..e0e407d 100755
+--- a/qa/pull-tester/tests-config.sh.in
++++ b/qa/pull-tester/tests-config.sh.in
+@@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@"
+
+ # These will turn into comments if they were disabled when configuring.
+ @ENABLE_WALLET_TRUE@ENABLE_WALLET=1
+-@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1
++@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1
+ @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1
+
+ REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}"
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1c2f770..4d60ddf 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,6 @@
++if EMBEDDED_LIBSECP256K1
+ DIST_SUBDIRS = secp256k1
++endif
+ AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
+
+
+@@ -20,7 +22,7 @@ endif
+ BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
+ BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
+
+-BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
++BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS)
+
+ LIBBITCOIN_SERVER=libbitcoin_server.a
+ LIBBITCOIN_WALLET=libbitcoin_wallet.a
+@@ -30,10 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a
+ LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
+ LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a
+ LIBBITCOINQT=qt/libbitcoinqt.a
++if EMBEDDED_LIBSECP256K1
+ LIBSECP256K1=secp256k1/libsecp256k1.la
++else
++LIBSECP256K1=$(libsecp256k1_LIBS)
++endif
+
++if EMBEDDED_LIBSECP256K1
+ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
+ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
++endif
+
+ # Make is not made aware of per-object dependencies to avoid limiting building parallelization
+ # But to build the less dependent modules first, we manually select their order here:
+@@ -63,8 +71,11 @@ if BUILD_BITCOIND
+ bin_PROGRAMS += bitcoind
+ endif
+
+-if BUILD_BITCOIN_UTILS
+- bin_PROGRAMS += bitcoin-cli bitcoin-tx
++if BUILD_BITCOIN_CLI
++ bin_PROGRAMS += bitcoin-cli
++endif
++if BUILD_BITCOIN_TX
++ bin_PROGRAMS += bitcoin-tx
+ endif
+
+ .PHONY: FORCE
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 0997148..14b4deb 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -111,10 +111,12 @@ bitcoin_test_check: $(TEST_BINARY) FORCE
+ bitcoin_test_clean : FORCE
+ rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+
++if EMBEDDED_LIBSECP256K1
+ check-local:
+ @echo "Running test/bitcoin-util-test.py..."
+ $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py
+ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
++endif
+
+ %.json.h: %.json
+ @$(MKDIR_P) $(@D)
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.0.ebuild
new file mode 100644
index 000000000000..7cc6b5ec4bff
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="047a89831760ff124740fe9f58411d57ee087078"
+BITCOINCORE_LJR_DATE="20150311"
+BITCOINCORE_IUSE="test"
+inherit bitcoincore eutils
+
+DESCRIPTION="Bitcoin Core consensus library"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+src_configure() {
+ bitcoincore_conf \
+ --with-libs
+}
+
+src_install() {
+ bitcoincore_src_install
+ prune_libtool_files
+}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.1.ebuild
new file mode 100644
index 000000000000..0e8ac59cbc2f
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.10.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="d8ac90184254fea3a7f4991fd0529dfbd750aea0"
+BITCOINCORE_LJR_DATE="20150428"
+BITCOINCORE_IUSE="test"
+inherit bitcoincore eutils
+
+DESCRIPTION="Bitcoin Core consensus library"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+src_configure() {
+ bitcoincore_conf \
+ --with-libs
+}
+
+src_install() {
+ bitcoincore_src_install
+ prune_libtool_files
+}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.0.ebuild
new file mode 100644
index 000000000000..10f8dbf09000
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="d26f951802c762de04fb68e1a112d611929920ba"
+BITCOINCORE_LJR_DATE="20150711"
+BITCOINCORE_IUSE="ljr test"
+inherit bitcoincore eutils
+
+DESCRIPTION="Bitcoin Core consensus library"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+src_configure() {
+ bitcoincore_conf \
+ --with-libs
+}
+
+src_install() {
+ bitcoincore_src_install
+ dodoc doc/bips.md
+ prune_libtool_files
+}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-9999.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-9999.ebuild
new file mode 100644
index 000000000000..287ed610c271
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+BITCOINCORE_IUSE="test"
+inherit bitcoincore eutils
+
+DESCRIPTION="Bitcoin Core consensus library"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+
+src_configure() {
+ bitcoincore_conf \
+ --with-libs
+}
+
+src_install() {
+ bitcoincore_src_install
+ dodoc doc/bips.md
+ prune_libtool_files
+}
diff --git a/net-libs/libbitcoinconsensus/metadata.xml b/net-libs/libbitcoinconsensus/metadata.xml
new file mode 100644
index 000000000000..f420d75fe9d9
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+ <maintainer>
+ <email>luke_gentoo_bitcoin@dashjr.org</email>
+ <name>Luke Dashjr</name>
+ </maintainer>
+ <use>
+ <flag name='ljr'>Enable Luke Dashjr's patches</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/libblkmaker/Manifest b/net-libs/libblkmaker/Manifest
new file mode 100644
index 000000000000..d7bb7a35c2b2
--- /dev/null
+++ b/net-libs/libblkmaker/Manifest
@@ -0,0 +1,4 @@
+DIST libblkmaker-0.3.2.tgz 17893 SHA256 161dc59400eaaff210a0910b7b4c4feadad3b151422ec2ffc927ef183f8cf661 SHA512 e45c50c11676995171f6fb27346a42843a2c035c391ab84b5e565f5fff109a4ced6cdafb6c662572eb7243b25d2014400e9516cdbbd0d65f4ea31da7d0e74bdf WHIRLPOOL d1704692e844e59a5dac5760c96ab2b5d5c1df2bac6ac3e448e918ec88630cd281ef489e36d7559801608537ee9e761eb687b48c01dc5d31439dc533fedb3af7
+DIST libblkmaker-0.4.2-github.tgz 13708 SHA256 3eb6f855efb56cd87e8c2e8b52089337379c15cd33d4049c8090b39d92d5453e SHA512 b5ac42ed1be14b10a93828c3c34f1d176d9128a8cb263bda1a55cd5c9d7157f8b501a3943ee60705f572aae7bec7098a9353032499457dbbec80c105796a95cf WHIRLPOOL a84111c6d38443269cdc627663d228871be0d5435ad28cafb3b74596f85c57f1700e5e54d60dd8a875534d4eda8fd14dc483b6aa5e3619e9d0df8b2ec3a7aea5
+DIST libblkmaker-0.5.0-github.tgz 13577 SHA256 06cf13c3de8f191ce16f40b2f2af940826d92bf2b25544b3b1bc8648b04f0a42 SHA512 64f90a652485f8c192a0d1e6184e44a0d4372907954f0abd855973099436f87a1c02a0ee383b86b22825427c7df5f46b06a9be9c55747942281cd6fc0e1aa33a WHIRLPOOL 992f9d3d5a2fe6e95f4198df97c32fc43007b336a962c13f04f8a751794e2c70bd6be05706324f6e79bfb30c598aa46b20f9b25187d93acfab398ba158a474d3
+DIST libblkmaker-0.5.1-github.tgz 13655 SHA256 f9d1ccdc2931ed7fe8248b2541e0e0cbf85da3434e2adf41e1ddeffdcec185bd SHA512 45dd0638b3d1188131d9104a86230f87910fcde225198f4d23cc69f31fc1a86077d83a89780a9ddf686dd286bcbfcb59e1a94f4dfe4e6397236a76bef50f9b14 WHIRLPOOL 5e62a57f2726ac5389c36e5072ba0fd778294eb1dadd517172b91e270a16a8c3edbc4b92c3ff6fb9a8bd8e2280face5ed1f09d216eeaf5d098ec06f6e56c4676
diff --git a/net-libs/libblkmaker/libblkmaker-0.3.2.ebuild b/net-libs/libblkmaker/libblkmaker-0.3.2.ebuild
new file mode 100644
index 000000000000..ab25439c559d
--- /dev/null
+++ b/net-libs/libblkmaker/libblkmaker-0.3.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="C implementation of getblocktemplate (BIP 22)"
+HOMEPAGE="https://gitorious.org/bitcoin/libblkmaker"
+LICENSE="MIT"
+
+SRC_URI="https://gitorious.org/bitcoin/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="
+ >=dev-libs/jansson-2.0.0
+"
+RDEPEND="${DEPEND}
+ !<net-misc/bfgminer-3.0.3
+"
+
+S="${WORKDIR}/bitcoin-libblkmaker/"
+
+src_prepare() {
+ ./autogen.sh || die
+}
diff --git a/net-libs/libblkmaker/libblkmaker-0.4.2.ebuild b/net-libs/libblkmaker/libblkmaker-0.4.2.ebuild
new file mode 100644
index 000000000000..5ca11fc8bb94
--- /dev/null
+++ b/net-libs/libblkmaker/libblkmaker-0.4.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="C implementation of getblocktemplate (BIP 22)"
+HOMEPAGE="https://gitorious.org/bitcoin/libblkmaker"
+HOMEPAGE="https://github.com/bitcoin/libblkmaker"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/bitcoin/libblkmaker/archive/v${PV}.tar.gz -> ${P}-github.tgz"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-libs/jansson-2.0.0
+"
+RDEPEND="${DEPEND}
+ !<net-misc/bfgminer-3.0.3
+"
+
+src_prepare() {
+ ./autogen.sh || die
+}
diff --git a/net-libs/libblkmaker/libblkmaker-0.5.0.ebuild b/net-libs/libblkmaker/libblkmaker-0.5.0.ebuild
new file mode 100644
index 000000000000..a7397bad1c21
--- /dev/null
+++ b/net-libs/libblkmaker/libblkmaker-0.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="C implementation of getblocktemplate (BIP 22)"
+HOMEPAGE="https://github.com/bitcoin/libblkmaker"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/bitcoin/libblkmaker/archive/v${PV}.tar.gz -> ${P}-github.tgz"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-libs/jansson-2.0.0
+ dev-libs/libbase58
+"
+RDEPEND="${DEPEND}
+ !<net-misc/bfgminer-3.0.3
+"
+
+src_prepare() {
+ ./autogen.sh || die
+}
diff --git a/net-libs/libblkmaker/libblkmaker-0.5.1.ebuild b/net-libs/libblkmaker/libblkmaker-0.5.1.ebuild
new file mode 100644
index 000000000000..a7397bad1c21
--- /dev/null
+++ b/net-libs/libblkmaker/libblkmaker-0.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="C implementation of getblocktemplate (BIP 22)"
+HOMEPAGE="https://github.com/bitcoin/libblkmaker"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/bitcoin/libblkmaker/archive/v${PV}.tar.gz -> ${P}-github.tgz"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-libs/jansson-2.0.0
+ dev-libs/libbase58
+"
+RDEPEND="${DEPEND}
+ !<net-misc/bfgminer-3.0.3
+"
+
+src_prepare() {
+ ./autogen.sh || die
+}
diff --git a/net-libs/libblkmaker/metadata.xml b/net-libs/libblkmaker/metadata.xml
new file mode 100644
index 000000000000..10b989126152
--- /dev/null
+++ b/net-libs/libblkmaker/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+ <maintainer>
+ <email>luke-jr+gentoobugs@utopios.org</email>
+ <name>Luke Dashjr</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">bitcoin/libblkmaker</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libbluedevil/Manifest b/net-libs/libbluedevil/Manifest
new file mode 100644
index 000000000000..b80a2b1ac255
--- /dev/null
+++ b/net-libs/libbluedevil/Manifest
@@ -0,0 +1,2 @@
+DIST libbluedevil-2.0-rc1.tar.xz 174436 SHA256 d3107ae9e31b235b78cb5de8903ce390f6958e680a5d5363efb1bc61f883abd0 SHA512 eb11027fd42a79c02d592ece09c71ff1ebe02e11985030024bb2b099cb409f511b6b6e3fffc85fca2c093884a99b1e3739bdb66f5018ee83f1c6b1320e4574a7 WHIRLPOOL fe23a5f4c1db8cbba0f61a34564a8057e8bfbc8c25e2c115fc8f9d3a0b9430d52ccf579b628a34e89994a9dbb9edb2c59c4e7abaf356ba7137f8372739d3161e
+DIST libbluedevil-2.1.tar.xz 31848 SHA256 0ccdaa2c0e1ae4c62cefa08cfd5f6d8e6bd38b722404d35c772f7d06f3028e5c SHA512 514a33b5e59642e4a2c9fc1d920658c1a02e6b931acdf5dbabc94f8d1e8bfcc6862b8f53eb6c37351248702d9807fa1644f92585f2737b12c76d9b3521e4fd7f WHIRLPOOL b04a72b392d9707b85f9d6ab4a4855262ccc333b0f0c9a24b700548f1c7d88695616078f4fe7c57ea6860a77968320e4bc1f8e69a34dd34c106d95c5d551592b
diff --git a/net-libs/libbluedevil/libbluedevil-2.0_rc1.ebuild b/net-libs/libbluedevil/libbluedevil-2.0_rc1.ebuild
new file mode 100644
index 000000000000..e1e41e82295e
--- /dev/null
+++ b/net-libs/libbluedevil/libbluedevil-2.0_rc1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+MY_P=${PN}-${PV/_/-}
+DESCRIPTION="Qt wrapper for bluez used in the KDE bluetooth stack"
+HOMEPAGE="http://projects.kde.org/projects/playground/libs/libbluedevil"
+SRC_URI="mirror://kde/unstable/${PN}/${PV/_/-}/src/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
+SLOT="4"
+IUSE="debug"
+
+RDEPEND=">=net-wireless/bluez-5"
+
+S=${WORKDIR}/${MY_P}
diff --git a/net-libs/libbluedevil/libbluedevil-2.1.ebuild b/net-libs/libbluedevil/libbluedevil-2.1.ebuild
new file mode 100644
index 000000000000..cbcd54800985
--- /dev/null
+++ b/net-libs/libbluedevil/libbluedevil-2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="Qt wrapper for bluez used in the KDE bluetooth stack"
+HOMEPAGE="http://projects.kde.org/projects/playground/libs/libbluedevil"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+IUSE="debug"
+
+RDEPEND=">=net-wireless/bluez-5"
diff --git a/net-libs/libbluedevil/metadata.xml b/net-libs/libbluedevil/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/net-libs/libbluedevil/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/net-libs/libbt/Manifest b/net-libs/libbt/Manifest
new file mode 100644
index 000000000000..88bf4f3d311e
--- /dev/null
+++ b/net-libs/libbt/Manifest
@@ -0,0 +1,2 @@
+DIST libbt-1.05.tar.gz 322880 SHA256 d4d770120c7e5df6957b2b40e1edb6695106142360d5caac521b31a4c59fa1c7
+DIST libbt-1.06.tar.gz 334835 SHA256 89f7887ef892158fec2691efaf26036dab2a239ab87881473ae405f2f2d13560
diff --git a/net-libs/libbt/files/1.05-btlist.patch b/net-libs/libbt/files/1.05-btlist.patch
new file mode 100644
index 000000000000..e4eca5ae01db
--- /dev/null
+++ b/net-libs/libbt/files/1.05-btlist.patch
@@ -0,0 +1,10 @@
+--- src/btlist.c.orig
++++ src/btlist.c
+@@ -13,6 +13,7 @@
+
+ #include "config.h"
+
++#include <sys/types.h>
+ #include <openssl/sha.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/net-libs/libbt/files/libbt-1.05-build.patch b/net-libs/libbt/files/libbt-1.05-build.patch
new file mode 100644
index 000000000000..cd82787e6e0b
--- /dev/null
+++ b/net-libs/libbt/files/libbt-1.05-build.patch
@@ -0,0 +1,14 @@
+fix building with newer glibc
+
+http://bugs.gentoo.org/248034
+
+--- src/peer.c
++++ src/peer.c
+@@ -35,6 +35,7 @@
+ #include <time.h>
+ #include <poll.h>
+ #include <assert.h>
++#include <limits.h>
+
+ #include "bterror.h"
+ #include "btmessage.h"
diff --git a/net-libs/libbt/files/libbt-1.06-build.patch b/net-libs/libbt/files/libbt-1.06-build.patch
new file mode 100644
index 000000000000..de778a75f165
--- /dev/null
+++ b/net-libs/libbt/files/libbt-1.06-build.patch
@@ -0,0 +1,53 @@
+http://bugs.gentoo.org/152489
+http://bugs.gentoo.org/248034
+http://bugs.gentoo.org/315213
+
+--- src/btlist.c
++++ src/btlist.c
+@@ -13,6 +13,7 @@
+
+ #include "config.h"
+
++#include <sys/types.h>
+ #include <openssl/sha.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- src/peer.c
++++ src/peer.c
+@@ -35,6 +35,7 @@
+ #include <time.h>
+ #include <poll.h>
+ #include <assert.h>
++#include <limits.h>
+
+ #include "bterror.h"
+ #include "btmessage.h"
+--- src/udpproto.c 2009-12-07 15:03:54.000000000 +0100
++++ src/udpproto.c 2009-12-07 15:04:10.000000000 +0100
+@@ -4,6 +4,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <limits.h>
+
+ #include <arpa/inet.h>
+
+--- src/Makefile.in 2009-12-07 15:57:24.000000000 +0100
++++ src/Makefile.in 2009-12-07 15:57:34.000000000 +0100
+@@ -30,7 +30,7 @@
+ CPPFLAGS:=@CPPFLAGS@
+ CFLAGS+=-g -Wall -I../include -I$(top_srcdir)/include
+
+-LIBS:=@LIBS@ `curl-config --libs` -lm
++LIBS:=@LIBS@ `curl-config --libs` -lm -lcrypto
+ LDFLAGS:=-g -L. @LDFLAGS@
+ VERSION=1.06
+ MAKEDEPEND=@MAKEDEPEND@
+--- Makefile.in 2009-12-07 17:36:18.000000000 +0100
++++ Makefile.in 2009-12-07 17:36:28.000000000 +0100
+@@ -1,4 +1,4 @@
+-all: depend compile
++all: compile
+
+ compile:
+ cd src && ${MAKE}
diff --git a/net-libs/libbt/libbt-1.05.ebuild b/net-libs/libbt/libbt-1.05.ebuild
new file mode 100644
index 000000000000..e82ba6389b18
--- /dev/null
+++ b/net-libs/libbt/libbt-1.05.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils autotools
+
+DESCRIPTION="implementation of the BitTorrent core protocols in C"
+HOMEPAGE="http://libbt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+ net-misc/curl
+ >=sys-apps/util-linux-2.16.2
+ !x11-wm/blackbox"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-build.patch #248034
+ epatch "${FILESDIR}"/${PV}-btlist.patch # 152489
+ sed -i -e '/CFLAGS/s|:=|+=|' src/Makefile.in || die
+ # fix force as-needed. Bug #315213
+ sed -i -e "/^LIBS/s:-lm:& -lcrypto:" src/Makefile.in || die
+ eautoreconf
+}
+
+src_install() {
+ dobin src/btlist src/btget src/btcheck || die
+ doman man/*
+ insinto /usr/include/libbt
+ doins include/*
+ dolib src/libbt.a
+ dodoc CHANGELOG CREDITS README docs/*
+}
diff --git a/net-libs/libbt/libbt-1.06.ebuild b/net-libs/libbt/libbt-1.06.ebuild
new file mode 100644
index 000000000000..165802c74c76
--- /dev/null
+++ b/net-libs/libbt/libbt-1.06.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="implementation of the BitTorrent core protocols in C"
+HOMEPAGE="http://libbt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+ net-misc/curl
+ >=sys-apps/util-linux-2.16.2"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-build.patch
+ eautoreconf
+}
+
+src_install() {
+ dobin src/bt{check,get,list} || die
+
+ insinto /usr/include/libbt
+ doins include/*.h || die
+ newlib.a src/libbt.a libbt-static.a || die
+
+ doman man/*.1
+ dodoc CHANGELOG CREDITS README docs/*.txt
+}
diff --git a/net-libs/libbt/metadata.xml b/net-libs/libbt/metadata.xml
new file mode 100644
index 000000000000..9a425c41b63b
--- /dev/null
+++ b/net-libs/libbt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-p2p</herd>
+ <upstream>
+ <remote-id type="sourceforge">libbt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
new file mode 100644
index 000000000000..66ade0f2b863
--- /dev/null
+++ b/net-libs/libbtbb/Manifest
@@ -0,0 +1 @@
+DIST libbtbb-2014-02-R4.tar.gz 165417 SHA256 6e79a2d8530596e34ad13fcce43dcf8b30b165d4629d5bf9c3eb7f8817980524 SHA512 9ab5ca45f9a88c78f8238c73eabbd04c69723e4ac9171551e3e073eff06acd5ad4197ea4f87036ae066aebb0d15705249899d2b7475e56bd224c83df6f0bd8d5 WHIRLPOOL 30fdc8948f5d1dd057887369f12a5660b1faabe14933ad876c00161fbd43dcebc80f512e370d4b8f56525a8bdcad057a4da8c545814276a65a691bb8e85383fb
diff --git a/net-libs/libbtbb/libbtbb-2014.02.4.ebuild b/net-libs/libbtbb/libbtbb-2014.02.4.ebuild
new file mode 100644
index 000000000000..5ad431a258ac
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2014.02.4.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib cmake-utils
+
+DESCRIPTION="A library to decode Bluetooth baseband packets"
+HOMEPAGE="http://libbtbb.sourceforge.net/"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ MY_PV=${PV/\./-}
+ MY_PV=${MY_PV/./-R}
+ S=${WORKDIR}/${PN}-${MY_PV}
+ SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="+pcap +wireshark-plugins"
+
+RDEPEND="
+ wireshark-plugins? (
+ >=net-analyzer/wireshark-1.8.3-r1:=
+ )
+"
+DEPEND="${RDEPEND}
+ wireshark-plugins? ( dev-libs/glib
+ virtual/pkgconfig )"
+
+get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
+
+which_plugins() {
+ if has_version '>=net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb"
+ elif has_version '<net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb btle btsm"
+ fi
+}
+
+src_prepare(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_prepare
+
+ if use wireshark-plugins; then
+ which_plugins
+ for i in ${plugins}
+ do
+ sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_prepare
+ done
+ fi
+}
+
+src_configure() {
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ local mycmakeargs=(
+ -DDISABLE_PYTHON=true
+ -DPACKAGE_MANAGER=true
+ $(cmake-utils_use pcap PCAPDUMP)
+ )
+ cmake-utils_src_configure
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
+ )
+ cmake-utils_src_configure
+ done
+ fi
+}
+
+src_compile(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_compile
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_compile
+ done
+ fi
+}
+
+src_test(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_test
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_test
+ done
+ fi
+}
+
+src_install(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_install
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_install
+ done
+ fi
+}
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
new file mode 100644
index 000000000000..ef145c7e7031
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib cmake-utils
+
+DESCRIPTION="A library to decode Bluetooth baseband packets"
+HOMEPAGE="http://libbtbb.sourceforge.net/"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ MY_PV=${PV/\./-}
+ MY_PV=${MY_PV/./-R}
+ S=${WORKDIR}/${PN}-${MY_PV}
+ SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="+pcap +wireshark-plugins"
+
+RDEPEND="
+ pcap? ( net-libs/libpcap )
+ wireshark-plugins? (
+ >=net-analyzer/wireshark-1.8.3-r1:=
+ )
+"
+DEPEND="${RDEPEND}
+ wireshark-plugins? ( dev-libs/glib
+ virtual/pkgconfig )"
+
+get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
+
+which_plugins() {
+ if has_version '>=net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb"
+ elif has_version '<net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb btle btsm"
+ fi
+}
+
+src_prepare(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_prepare
+
+ if use wireshark-plugins; then
+ which_plugins
+ for i in ${plugins}
+ do
+ sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_prepare
+ done
+ fi
+}
+
+src_configure() {
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ local mycmakeargs=(
+ -DDISABLE_PYTHON=true
+ -DPACKAGE_MANAGER=true
+ $(cmake-utils_use pcap PCAPDUMP)
+ $(cmake-utils_use pcap USE_PCAP)
+ )
+ cmake-utils_src_configure
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
+ )
+ cmake-utils_src_configure
+ done
+ fi
+}
+
+src_compile(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_compile
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_compile
+ done
+ fi
+}
+
+src_test(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_test
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_test
+ done
+ fi
+}
+
+src_install(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_install
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_install
+ done
+ fi
+}
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml
new file mode 100644
index 000000000000..bbfb071d6a07
--- /dev/null
+++ b/net-libs/libbtbb/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>zerochaos@gentoo.org</email>
+ <name>Rick Farina</name>
+ </maintainer>
+ <use>
+ <flag name="pcap">Add support for network packet capture via net-libs/libpcap</flag>
+ <flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">greatscottgadgets/libbtbb</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libcapi/Manifest b/net-libs/libcapi/Manifest
new file mode 100644
index 000000000000..66216a1ed8ab
--- /dev/null
+++ b/net-libs/libcapi/Manifest
@@ -0,0 +1 @@
+DIST libcapi20-3.0.7.tar.bz2 474174 SHA256 f36c7d1d8a46dd76b1e3443d6f5478ad16177d3f91c9f67bc654608167020293 SHA512 c14e493f34fbd8477aed8efc0e6ee8dc07c6007be75610d59a15ce23f48cd5cd53da1b1ac64c11e7516df5aff40877c76ce7a6d72b5c7b1d24beee7592a51bbe WHIRLPOOL 7ba7530ea680a22d0538af8d14e66b51735c7e125f9450d845794a96c964dcf968daf4a02afd1b2a00e66b9898d5b6d00074aab418363c100815a2301d7ab3b4
diff --git a/net-libs/libcapi/files/libcapi-3.0.7-remove-libcapi20dyn.patch b/net-libs/libcapi/files/libcapi-3.0.7-remove-libcapi20dyn.patch
new file mode 100644
index 000000000000..1e8d9a88afac
--- /dev/null
+++ b/net-libs/libcapi/files/libcapi-3.0.7-remove-libcapi20dyn.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile.am b/Makefile.am
+index 46f308c..df8ea69 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,6 @@ MAINTAINERCLEANFILES = configure aclocal.m4 Makefile.in config.h.in
+ stamp-h.in
+ include_HEADERS = capi20.h capiutils.h capicmd.h capi_mod.h capi_debug.h
+ lib_LTLIBRARIES = libcapi20.la
+-lib_LIBRARIES = libcapi20dyn.a
+
+ libcapi20_la_SOURCES = capi20.c capifunc.c convert.c capi_defs.h compat/byteswap.h
+ libcapi20_la_LDFLAGS = -version-info ${LIBCAPI_VERSION}:${LIBCAPI_VERSION_RELEASE}:${LIBCAPI_VERSION_AGE} -lc -rdynamic
+@@ -35,8 +34,6 @@ lib_capi_mod_rcapi_la_CFLAGS = -fno-strict-aliasing
+ lib_capi_mod_rcapi_la_LDFLAGS = -shared -version-info @CAPI_MODULE_LOADER_VERSION@:0:0 -no-undefined
+ lib_capi_mod_rcapi_la_LIBADD = libcapi20.la
+
+-libcapi20dyn_a_SOURCES = capidyn.c
+-libcapi20dyn_a_CFLAGS = -fPIC
+ libcapi20_la_LIBADD = $(LIBADD_DL)
+
+ if WIN32
diff --git a/net-libs/libcapi/libcapi-3.0.7-r1.ebuild b/net-libs/libcapi/libcapi-3.0.7-r1.ebuild
new file mode 100644
index 000000000000..20351c76ae66
--- /dev/null
+++ b/net-libs/libcapi/libcapi-3.0.7-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-multilib
+
+DESCRIPTION="CAPI library used by AVM products"
+HOMEPAGE="http://www.tabos.org/ffgtk"
+SRC_URI="http://www.tabos.org/ffgtk/download/libcapi20-${PV}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/capi20"
+
+RDEPEND="!net-dialup/capi4k-utils"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-remove-libcapi20dyn.patch" )
diff --git a/net-libs/libcapi/metadata.xml b/net-libs/libcapi/metadata.xml
new file mode 100644
index 000000000000..756ddd4a6227
--- /dev/null
+++ b/net-libs/libcapi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-dialup</herd>
+</pkgmetadata>
diff --git a/net-libs/libcrafter/Manifest b/net-libs/libcrafter/Manifest
new file mode 100644
index 000000000000..ec7e1fff2596
--- /dev/null
+++ b/net-libs/libcrafter/Manifest
@@ -0,0 +1 @@
+DIST 0.3.tar.gz 104051 SHA256 4608b10470aaa5a711b13b7c9db93fc6c3daca8c26ae7e81b0d7aa8af3a497aa SHA512 7c396ba942b304dddfaa569adb44697f75568d3ef2ed48dda758e281f3b7c172439309033bbf5498069a4a61a952f93e41af99b129ce874ce76b5ec08da58116 WHIRLPOOL 9444ba34eb9c0f4072bb52d1bc1a0712e274c344af61059f60f626a4465476d65606918bb759e236c97bb8c49733e498f9fa8593862058fb0e0aa397bf489eea
diff --git a/net-libs/libcrafter/libcrafter-0.3.ebuild b/net-libs/libcrafter/libcrafter-0.3.ebuild
new file mode 100644
index 000000000000..ad131de1f696
--- /dev/null
+++ b/net-libs/libcrafter/libcrafter-0.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A high level C++ network packet sniffing and crafting library"
+HOMEPAGE="https://github.com/pellegre/libcrafter"
+SRC_URI="https://github.com/pellegre/${PN}/archive/version-${PV}.tar.gz -> ${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+ net-libs/libpcap
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+S=${WORKDIR}/${PN}-version-${PV}/${PN}
+
+src_prepare() {
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ prune_libtool_files
+}
diff --git a/net-libs/libcrafter/libcrafter-9999.ebuild b/net-libs/libcrafter/libcrafter-9999.ebuild
new file mode 100644
index 000000000000..8c799d96fc9a
--- /dev/null
+++ b/net-libs/libcrafter/libcrafter-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils git-r3
+
+DESCRIPTION="a high level library for C++ designed to make easier the creation and decoding of network packets"
+HOMEPAGE="https://code.google.com/p/libcrafter/"
+EGIT_REPO_URI="https://github.com/pellegre/${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="static-libs"
+
+RDEPEND="
+ net-libs/libpcap
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ prune_libtool_files
+}
diff --git a/net-libs/libcrafter/metadata.xml b/net-libs/libcrafter/metadata.xml
new file mode 100644
index 000000000000..5ecde58044f6
--- /dev/null
+++ b/net-libs/libcrafter/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription lang='en'>
+Libcrafter is a high level library for C++ designed to facilitate the creation
+and decoding of network packets. It is able to craft or decode packets of most
+common networks protocols, send them on the wire, capture them and match
+requests and replies.
+It enables the creation of networking tools in a few lines with a interface
+very similar to <pkg>net-analyzer/scapy</pkg>.
+A packet is described as layers that you stack one upon the other. Fields of
+each layer have useful default values that you can overload.
+
+The library is designed to be used in multithreaded programs where you can
+combine several tasks simultaneously. For example, you can easily design
+something that sniffs, mangles, and sends at the same time you are doing an
+ARP-Spoofing attack.
+It also contains a very naive implementation of the TCP/IP stack (fragmentation
+is no handled yet) at user level that enables working with TCP streams. This
+facilitates the creation of tools for data injection on arbitrary connections,
+IP spoofing and TCP/IP session hijacking.
+
+Supported protocols are:
+
+Ethernet, SLL (Linux cooked-mode capture), ARP, DHCP, DHCP options, IP, IP
+options, IPv6, ICMP, ICMPv6, ICMP extensions, ICMPv6 extensions, TCP, TCP
+options, UDP and DNS
+</longdescription>
+</pkgmetadata>
diff --git a/net-libs/libdexter/Manifest b/net-libs/libdexter/Manifest
new file mode 100644
index 000000000000..aa10622a7549
--- /dev/null
+++ b/net-libs/libdexter/Manifest
@@ -0,0 +1 @@
+DIST libdexter-0.2.1.tar.bz2 449775 SHA256 73b37398c693f0a6d827ab6ef2fa6a33390b7d7bafc21c330c75c0a89a77fb7c SHA512 3dac039d37c1b01a4b6288e1e6212846a7ccf57ccb0483e0f2d7b00cdae930b49ac3c9202f080881da7b35f7adbc318305a8736bb48fc21f0d224794d4a76a79 WHIRLPOOL 994b9efaa76c007e9162e6dd15a02d96d92ee153a92b07208a4fb7a4d0f74a4f2716b4c66da56f2823658c28e83747b602e993018f0f9a3b961fa95cfdb0e42a
diff --git a/net-libs/libdexter/libdexter-0.2.1-r1.ebuild b/net-libs/libdexter/libdexter-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..6642f080f389
--- /dev/null
+++ b/net-libs/libdexter/libdexter-0.2.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils eutils
+
+DESCRIPTION="A plugin-based, distributed sampling library"
+HOMEPAGE="http://libdexter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libdexter/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# gnutls disabled as will break with gnutls-3, bug #456306
+IUSE="tcpd" #gnutls
+
+#gnutls? ( >=net-libs/gnutls-1.4.4:= )
+RDEPEND="
+ tcpd? ( sys-apps/tcp-wrappers:= )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=dev-libs/glib-2.30:2
+"
+
+src_prepare() {
+ gnome2_disable_deprecation_warning
+}
+
+src_configure() {
+ econf \
+ $(use_enable tcpd tcp-wrappers) \
+ --disable-tls
+# $(use_enable gnutls tls)
+}
+
+src_install() {
+ default
+ prune_libtool_files --modules
+}
diff --git a/net-libs/libdexter/metadata.xml b/net-libs/libdexter/metadata.xml
new file mode 100644
index 000000000000..f7d5ca70f416
--- /dev/null
+++ b/net-libs/libdexter/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">libdexter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libdmapsharing/Manifest b/net-libs/libdmapsharing/Manifest
new file mode 100644
index 000000000000..fb15c994ef30
--- /dev/null
+++ b/net-libs/libdmapsharing/Manifest
@@ -0,0 +1,2 @@
+DIST libdmapsharing-2.9.30.tar.gz 745913 SHA256 6c3917aac7de23999094a5d1ee463cd1b07053a8fcd5c6137b4284447b707e40 SHA512 6c47f8882e14d5a753725884f4e98ee203e29a11cc5882e2beb4b4d1a495e20283be4d7801e45e4078d21ccc6b6601d8d95e262d229adc7b728f8bdbd949154e WHIRLPOOL 3e5b65e9388a438efabeb59bb9961ab997b37711f12fcad19c24b0d07fc1cfe7a81f00f7af7916b3d142072a3dab0cadfe50452e0b1cbd51b028ec2c0e413ab4
+DIST libdmapsharing-2.9.31.tar.gz 746372 SHA256 9c933ee15c89bc4ea0c3455d341ceb66e9f7705c94c32d485bc4b162f4f55b29 SHA512 36e2771f546ff42e437b6e3f0bb2cd11d5e75a34479f07277aa5f044f074bd0a2d20ff45660ebc73956c2ce64b5bd0bd50288cc1c875dc98ee0b44ed93f17b38 WHIRLPOOL 0a8f7b09818947bdadaf87ea05d158ca5de2945e7eb077dff1ecd31a616c86203a0de4694e2b19d0a60a887e3113c566f50765a46514cdf7a93ec55fc9bf5b29
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.30.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.30.ebuild
new file mode 100644
index 000000000000..1a1d37143a88
--- /dev/null
+++ b/net-libs/libdmapsharing/libdmapsharing-2.9.30.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A library that implements the DMAP family of protocols"
+HOMEPAGE="http://www.flyn.org/projects/libdmapsharing"
+SRC_URI="http://www.flyn.org/projects/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="3.0/2"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+introspection test"
+
+# Vala/libgee/gtk+:2 is only used when maintainer-mode is enabled
+# Doesn't seem to be used for anything...
+# TODO: implement tests (requires dev-libs/check)
+RDEPEND="
+ >=dev-libs/glib-2.36:2
+ x11-libs/gdk-pixbuf:2
+
+ >=net-dns/avahi-0.6
+ >=net-libs/libsoup-2.32:2.4
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+
+ sys-libs/zlib
+
+ introspection? ( >=dev-libs/gobject-introspection-1.30 )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+ test? ( dev-libs/check )
+"
+
+src_prepare() {
+ # Remove useless CFLAGS alteration in configure
+ sed -e 's/CFLAGS -O2/CFLAGS/' \
+ -i configure.ac configure || die
+}
+
+src_configure() {
+ econf \
+ --disable-gtk-doc \
+ --disable-maintainer-mode \
+ --with-mdns=avahi \
+ $(use_enable introspection) \
+ $(use_enable test tests)
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.31.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.31.ebuild
new file mode 100644
index 000000000000..75cf4e844028
--- /dev/null
+++ b/net-libs/libdmapsharing/libdmapsharing-2.9.31.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A library that implements the DMAP family of protocols"
+HOMEPAGE="http://www.flyn.org/projects/libdmapsharing"
+SRC_URI="http://www.flyn.org/projects/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="3.0/2"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+introspection test"
+
+# Vala/libgee/gtk+:2 is only used when maintainer-mode is enabled
+# Doesn't seem to be used for anything...
+# TODO: implement tests (requires dev-libs/check)
+RDEPEND="
+ >=dev-libs/glib-2.36:2
+ x11-libs/gdk-pixbuf:2
+ >=net-dns/avahi-0.6
+ >=net-libs/libsoup-2.32:2.4
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ sys-libs/zlib
+ introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+ test? ( dev-libs/check )
+"
+
+src_prepare() {
+ # Remove useless CFLAGS alteration in configure
+ sed -e 's/CFLAGS -O2/CFLAGS/' \
+ -i configure.ac configure || die
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --with-mdns=avahi \
+ $(use_enable introspection) \
+ $(use_enable test tests)
+}
diff --git a/net-libs/libdmapsharing/metadata.xml b/net-libs/libdmapsharing/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/net-libs/libdmapsharing/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
new file mode 100644
index 000000000000..397707b0f8de
--- /dev/null
+++ b/net-libs/libdom/Manifest
@@ -0,0 +1,4 @@
+DIST libdom-0.1.1-src.tar.gz 837694 SHA256 e86c11e313cdfbbe9674ad14125093240e23a2fa9e6f05b996d6b655e40c2dd4 SHA512 60406f3d6804e5a9630219bcd245476a926135b94ff58b1399377d6a2514a156505cbe802067e87ee883aa3f996b004731e00cb5f78bbef16fba1bc55b440c63 WHIRLPOOL cf623463be4968ba5385854bf01dedc4314d3d2e4f3b0e46d763d9c50849bf0b9fb2299794dd48af770c15721aa2a643fffed03948395e49393c3451da68a378
+DIST libdom-0.1.2-src.tar.gz 838332 SHA256 9cd3cf4487735c3cc5d63c5fdee05384eee65318476105646767b34d6e07e9e8 SHA512 f4b7ba24e470cb02c89314dadaefc44c86710e47963b3a845bd9ef284d52480ee758e67391fa2b24758228f67d15887dec9b12b1a2f72e567e7f9a83a12daf99 WHIRLPOOL b55c7677b86cdb84340bb22dcd18b1e11b1ddbefaf768b9eca742b1028fe62f8939bce3c000a6e11b75764bf153adf0ebef8fa2717f5b5f6f3da8b8426f00f03
+DIST netsurf-buildsystem-1.2.tar.gz 38914 SHA256 3903a4a1551c9c202e1d2047344c4f3598c8d9d6c35ebf8cc2e18874bd0c9d61 SHA512 963e8a5033e8ef70595507f24fea3d9697eefb50ad7f92a6d3c913501c7026f12ec6d48f92b75e352b32f212f6216b8d8455aff25fa8d8d0fc12a3b19a875a1c WHIRLPOOL e56a520ae284089d0f36f06a6891ebb5b208ca847c74340c18581340e457c20ae9365999dc13284f438b965dcd7e85f04b93d1c1f22cadf6f7c1e2cef81d528c
+DIST netsurf-buildsystem-1.3.tar.gz 37906 SHA256 10bbe95ba07476208da6047bd3c74685b6e61ba9904975b5d5c9a2c79a84ac79 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5 WHIRLPOOL c8131d0ffb79b208b63bef94606735968584edfff8cb24b4c83cd747c5d65c2811004626840798047ffddf84556ef7d8e23242f60d01a4a046323df3c78b0980
diff --git a/net-libs/libdom/files/libdom-0.1.1-glibc2.20.patch b/net-libs/libdom/files/libdom-0.1.1-glibc2.20.patch
new file mode 100644
index 000000000000..8a8f4e31349e
--- /dev/null
+++ b/net-libs/libdom/files/libdom-0.1.1-glibc2.20.patch
@@ -0,0 +1,19 @@
+--- libdom-0.1.1/Makefile
++++ libdom-0.1.1/Makefile
+@@ -15,15 +15,11 @@
+ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
+ -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+ -Wmissing-declarations -Wnested-externs
+-# BeOS/Haiku standard library headers generate warnings
+-ifneq ($(TARGET),beos)
+- WARNFLAGS := $(WARNFLAGS) -Werror
+-endif
+ # AmigaOS needs this to avoid warnings
+ ifeq ($(TARGET),amiga)
+ CFLAGS := -U__STRICT_ANSI__ $(CFLAGS)
+ endif
+-CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
++CFLAGS := -D_DEFAULT_SOURCE -I$(CURDIR)/include/ \
+ -I$(CURDIR)/src -I$(CURDIR)/binding $(WARNFLAGS) $(CFLAGS)
+ # Some gcc2 versions choke on -std=c99, and it doesn't know about it anyway
+ ifneq ($(GCCVER),2)
diff --git a/net-libs/libdom/files/libdom-0.1.2-glibc2.20.patch b/net-libs/libdom/files/libdom-0.1.2-glibc2.20.patch
new file mode 100644
index 000000000000..bc843d143223
--- /dev/null
+++ b/net-libs/libdom/files/libdom-0.1.2-glibc2.20.patch
@@ -0,0 +1,19 @@
+--- libdom-0.1.2/Makefile
++++ libdom-0.1.2/Makefile
+@@ -15,15 +15,11 @@
+ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
+ -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+ -Wmissing-declarations -Wnested-externs
+-# BeOS/Haiku standard library headers generate warnings
+-ifneq ($(HOST),i586-pc-haiku)
+- WARNFLAGS := $(WARNFLAGS) -Werror
+-endif
+ # AmigaOS needs this to avoid warnings
+ ifeq ($(findstring amigaos,$(HOST)),amigaos)
+ CFLAGS := -U__STRICT_ANSI__ $(CFLAGS)
+ endif
+-CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
++CFLAGS := -D_DEFAULT_SOURCE -I$(CURDIR)/include/ \
+ -I$(CURDIR)/src -I$(CURDIR)/binding $(WARNFLAGS) $(CFLAGS)
+ # Some gcc2 versions choke on -std=c99, and it doesn't know about it anyway
+ ifneq ($(GCCVER),2)
diff --git a/net-libs/libdom/libdom-0.1.1.ebuild b/net-libs/libdom/libdom-0.1.1.ebuild
new file mode 100644
index 000000000000..77c9045107ac
--- /dev/null
+++ b/net-libs/libdom/libdom-0.1.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+NETSURF_BUILDSYSTEM=buildsystem-1.2
+inherit netsurf
+
+DESCRIPTION="implementation of the W3C DOM, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~m68k-mint"
+IUSE="expat test xml"
+
+RDEPEND=">=dev-libs/libparserutils-0.2.0-r1[static-libs?,${MULTILIB_USEDEP}]
+ >=dev-libs/libwapcaplet-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
+ >=net-libs/libhubbub-0.3.0-r1[static-libs?,${MULTILIB_USEDEP}]
+ xml? (
+ expat? ( >=dev-libs/expat-2.1.0-r3[static-libs?,${MULTILIB_USEDEP}] )
+ !expat? ( >=dev-libs/libxml2-2.9.1-r4[static-libs?,${MULTILIB_USEDEP}] )
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( dev-perl/XML-XPath
+ dev-perl/libxml-perl
+ dev-perl/Switch )"
+
+REQUIRED_USE="test? ( xml )"
+
+PATCHES=( "${FILESDIR}"/${P}-glibc2.20.patch )
+
+src_configure() {
+ netsurf_src_configure
+
+ netsurf_makeconf+=(
+ WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no)
+ WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no)
+ )
+}
diff --git a/net-libs/libdom/libdom-0.1.2-r1.ebuild b/net-libs/libdom/libdom-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..eb2b219ba4b0
--- /dev/null
+++ b/net-libs/libdom/libdom-0.1.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+NETSURF_BUILDSYSTEM=buildsystem-1.3
+inherit netsurf
+
+DESCRIPTION="implementation of the W3C DOM, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~m68k-mint"
+IUSE="expat test xml"
+
+RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
+ >=dev-libs/libwapcaplet-0.2.2-r1[static-libs?,${MULTILIB_USEDEP}]
+ >=net-libs/libhubbub-0.3.1-r1[static-libs?,${MULTILIB_USEDEP}]
+ xml? (
+ expat? ( >=dev-libs/expat-2.1.0-r3[static-libs?,${MULTILIB_USEDEP}] )
+ !expat? ( >=dev-libs/libxml2-2.9.1-r4[static-libs?,${MULTILIB_USEDEP}] )
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( dev-perl/XML-XPath
+ dev-perl/libxml-perl
+ dev-perl/Switch )"
+
+REQUIRED_USE="test? ( xml )"
+
+PATCHES=( "${FILESDIR}"/${P}-glibc2.20.patch )
+
+src_configure() {
+ netsurf_src_configure
+
+ netsurf_makeconf+=(
+ WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no)
+ WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no)
+ )
+}
diff --git a/net-libs/libdom/metadata.xml b/net-libs/libdom/metadata.xml
new file mode 100644
index 000000000000..59acc2cc580e
--- /dev/null
+++ b/net-libs/libdom/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/net-libs/libeXosip/Manifest b/net-libs/libeXosip/Manifest
new file mode 100644
index 000000000000..7f7798196b6e
--- /dev/null
+++ b/net-libs/libeXosip/Manifest
@@ -0,0 +1,2 @@
+DIST libeXosip2-3.5.0.tar.gz 472081 SHA256 46010e62a6f675df13e5be759d033b6bce1bd5882eebb4acd553f9dd3b461afc SHA512 67e04cd53aedaa25f7fd9b79923e075ecc4773dff0b5fd0ce0db01ebf22c09da62c6a686bf9afd6c90e6f086ee24301736c1e0d95c8b98e062ff414ad8a20016 WHIRLPOOL 08f586e826df0313f3ff3526da391930f40ff1a4c858957d5979d2c7b2f8b9b881072ec7a856c16e2a08c53af00fa061eef6fe96032bc204cf1fb601a7ccee2a
+DIST libeXosip2-4.0.0.tar.gz 526339 SHA256 5267a82a9c05990bfde629eb7f73b24a8812a2ecc4614600e022257dfac8b2e5 SHA512 8e286e1e533c12bce26a164e42286c3239556860863a877438f63a694e47055f17fb98eb0f2ed91cac72f0645e8bf4dd9b922b5065357f16c0bacafc99406f51 WHIRLPOOL 35b0ad25ce415fbfde40eda93fb6e5a694136b25d4c327356db848e0ad354891729bafe81babd74e9a11de6a45f051f029acb802d9f4aaeb894f3462d05bcc75
diff --git a/net-libs/libeXosip/files/libeXosip-3.3.0-automagic-openssl.patch b/net-libs/libeXosip/files/libeXosip-3.3.0-automagic-openssl.patch
new file mode 100644
index 000000000000..862d2187b601
--- /dev/null
+++ b/net-libs/libeXosip/files/libeXosip-3.3.0-automagic-openssl.patch
@@ -0,0 +1,22 @@
+https://savannah.nongnu.org/patch/index.php?7090
+
+--- configure.in 2010-02-11 18:29:40 +0000
++++ configure.in 2010-02-11 18:30:26 +0000
+@@ -192,8 +192,6 @@
+ AC_CHECK_LIB(socket,sendto,[EXOSIP_LIB="$EXOSIP_LIB -lsocket"])
+ AC_CHECK_LIB(rt,clock_gettime,[EXOSIP_LIB="$EXOSIP_LIB -lrt"])
+
+-AC_CHECK_LIB(ssl,SSL_CTX_new,[EXOSIP_LIB="$EXOSIP_LIB -lssl"])
+-
+ case $OS in
+ openbsd*)
+ ;;
+@@ -363,6 +361,7 @@
+
+ if test "$enable_openssl" = "yes" ; then
+ AC_CHECK_HEADERS(openssl/ssl.h)
++ AC_CHECK_LIB(ssl,SSL_CTX_new,[EXOSIP_LIB="$EXOSIP_LIB -lssl"])
+ fi
+
+ AC_ARG_ENABLE(srvrec,
+
diff --git a/net-libs/libeXosip/libeXosip-3.5.0.ebuild b/net-libs/libeXosip/libeXosip-3.5.0.ebuild
new file mode 100644
index 000000000000..9b36577cc24f
--- /dev/null
+++ b/net-libs/libeXosip/libeXosip-3.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils
+
+MY_PV=${PV%.?}-${PV##*.}
+MY_PV=${PV}
+MY_P=${PN}2-${MY_PV}
+DESCRIPTION="library that hides the complexity of using the SIP protocol for multimedia session establishement"
+HOMEPAGE="http://savannah.nongnu.org/projects/exosip/"
+SRC_URI="http://download.savannah.nongnu.org/releases/exosip/${MY_P}.tar.gz"
+
+KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-macos"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="+srv ssl"
+
+DEPEND=">=net-libs/libosip-3.2.0
+ <net-libs/libosip-4
+ ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ econf \
+ --enable-mt \
+ $(use_enable ssl openssl) \
+ $(use_enable srv srvrec)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/net-libs/libeXosip/libeXosip-4.0.0.ebuild b/net-libs/libeXosip/libeXosip-4.0.0.ebuild
new file mode 100644
index 000000000000..915c6f48d2b4
--- /dev/null
+++ b/net-libs/libeXosip/libeXosip-4.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils versionator
+
+MY_PV=${PV%.?}-${PV##*.}
+MY_PV=${PV}
+MY_P=${PN}2-${MY_PV}
+DESCRIPTION="library that hides the complexity of using the SIP protocol for multimedia session establishement"
+HOMEPAGE="http://savannah.nongnu.org/projects/exosip/"
+SRC_URI="http://download.savannah.nongnu.org/releases/exosip/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos"
+SLOT="0/$(get_version_component_range 1-2)"
+LICENSE="GPL-2"
+IUSE="+srv ssl"
+
+DEPEND=">=net-libs/libosip-4.0.0:=
+ ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ econf \
+ --enable-mt \
+ $(use_enable ssl openssl) \
+ $(use_enable srv srvrec)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/net-libs/libeXosip/metadata.xml b/net-libs/libeXosip/metadata.xml
new file mode 100644
index 000000000000..f3711a31a6e3
--- /dev/null
+++ b/net-libs/libeXosip/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+<use>
+ <flag name='srv'>enable support for SRV records DNS queries</flag>
+</use>
+</pkgmetadata>
diff --git a/net-libs/libecap/Manifest b/net-libs/libecap/Manifest
new file mode 100644
index 000000000000..93104d941c48
--- /dev/null
+++ b/net-libs/libecap/Manifest
@@ -0,0 +1,2 @@
+DIST libecap-0.2.0.tar.gz 337696 SHA256 19e195d60cf67ec3b49fe4d109823d753546b5da115230499ad1a9cb65ca92d2 SHA512 5d39444ec79846b14a7f4292e51bb880befd2cbf581b257d5087517cfae1dce55e4439a90c08e0b8f5b3e8b2431dde8c6fab771c826489024f17625cfc8c777e WHIRLPOOL 2bf13955d9bb8ed598fa30cf004f79fe697a701623ea72556064614f66a1b29992ab5bab5442f50960e712ea938049574f624d39cc5fb0a5881523ece6fa445b
+DIST libecap-1.0.0.tar.gz 343468 SHA256 64c7bb52e04d218903dbc6c7cc4c62cfc22a6db468d1e0f8dac58e0f8620c4be SHA512 7d34b5a9b6843d6b09efc4fa390c7a2d3dda7a2ae5e82d5021295e436ca9afb7c1f70bc6f25a68e4c430fb6e33ee9f602655c9c830fccd46a8f554774813b452 WHIRLPOOL 2f727ac0ef2a7919775df0e8856bc72e8867db3768af27f70d3871f940bce8a6e8aaa3471c913a3c68a7ff04d86c611b1a526b63d448dd054c40d823dd8524f2
diff --git a/net-libs/libecap/libecap-0.2.0.ebuild b/net-libs/libecap/libecap-0.2.0.ebuild
new file mode 100644
index 000000000000..ac6355275541
--- /dev/null
+++ b/net-libs/libecap/libecap-0.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools-utils eutils toolchain-funcs
+
+DESCRIPTION="API for implementing ICAP content analysis and adaptation"
+HOMEPAGE="http://www.e-cap.org/"
+SRC_URI="http://www.measurement-factory.com/tmp/ecap/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0.2"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="static-libs"
+
+RDEPEND="!net-libs/libecap:0"
+
+DOCS=( CREDITS NOTICE README change.log )
+
+src_prepare() {
+ default
+
+ # Respect AR. (bug #457734)
+ tc-export AR
+}
diff --git a/net-libs/libecap/libecap-1.0.0.ebuild b/net-libs/libecap/libecap-1.0.0.ebuild
new file mode 100644
index 000000000000..5c75816a348e
--- /dev/null
+++ b/net-libs/libecap/libecap-1.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools-utils eutils toolchain-funcs
+
+DESCRIPTION="API for implementing ICAP content analysis and adaptation"
+HOMEPAGE="http://www.e-cap.org/"
+SRC_URI="http://www.measurement-factory.com/tmp/ecap/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="1"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="static-libs"
+
+RDEPEND="!net-libs/libecap:0
+ !net-libs/libecap:0.2"
+
+DOCS=( CREDITS NOTICE README change.log )
+
+src_prepare() {
+ default
+
+ # Respect AR. (bug #457734)
+ tc-export AR
+}
diff --git a/net-libs/libecap/metadata.xml b/net-libs/libecap/metadata.xml
new file mode 100644
index 000000000000..20e615c307c4
--- /dev/null
+++ b/net-libs/libecap/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>eras@gentoo.org</email></maintainer>
+<longdescription>eCAP is a software interface that allows a network application, such as an HTTP proxy or an ICAP server, to outsource content analysis and adaptation to a loadable module</longdescription>
+</pkgmetadata>
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
new file mode 100644
index 000000000000..d947fb770f8a
--- /dev/null
+++ b/net-libs/libesmtp/Manifest
@@ -0,0 +1 @@
+DIST libesmtp-1.0.6.tar.bz2 365506 SHA256 d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda WHIRLPOOL 6bce1e05ca48c300917c1d079ce31f95d2e0d7b2339af9d69a126e63af94ff9585d5add3b6ab9d22c6e889fd2bb5ce50af32adbb246ed67ecd7a340b97f7d97f
diff --git a/net-libs/libesmtp/files/libesmtp-1.0-openssl.patch b/net-libs/libesmtp/files/libesmtp-1.0-openssl.patch
new file mode 100644
index 000000000000..2a7df7ea375f
--- /dev/null
+++ b/net-libs/libesmtp/files/libesmtp-1.0-openssl.patch
@@ -0,0 +1,13 @@
+--- ntlm/ntlmdes.c 2003-09-17 19:27:03.000000000 +0000
++++ ntlm/ntlmdes.c 2003-09-17 19:27:40.000000000 +0000
+@@ -60,8 +60,8 @@
+ des_ecb_encrypt (iv, result, ks, DES_ENCRYPT);
+
+ /* paranoia */
+- memset (key, 0, sizeof key);
+- memset (ks, 0, sizeof ks);
++ memset (&key, 0, sizeof key);
++ memset (&ks, 0, sizeof ks);
+ }
+
+ /* Copy and convert to upper case. If supplied string is shorter than the
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..e98e61f21b23
--- /dev/null
+++ b/net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit libtool
+
+DESCRIPTION="lib that implements the client side of the SMTP protocol"
+HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/"
+SRC_URI="http://www.stafford.uklinux.net/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="debug ntlm ssl static-libs threads"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable static-libs static) \
+ --enable-all \
+ $(use_enable ntlm) \
+ $(use_enable threads pthreads) \
+ $(use_enable debug) \
+ $(use_with ssl openssl)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog NEWS Notes README TODO
+ insinto /usr/share/doc/${PF}/xml
+ doins doc/api.xml
+}
diff --git a/net-libs/libesmtp/libesmtp-1.0.6.ebuild b/net-libs/libesmtp/libesmtp-1.0.6.ebuild
new file mode 100644
index 000000000000..e8664b956e32
--- /dev/null
+++ b/net-libs/libesmtp/libesmtp-1.0.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit libtool
+
+DESCRIPTION="lib that implements the client side of the SMTP protocol"
+HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/"
+SRC_URI="http://www.stafford.uklinux.net/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="debug ssl static-libs threads"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable static-libs static) \
+ --enable-all \
+ $(use_enable threads pthreads) \
+ $(use_enable debug) \
+ $(use_with ssl openssl)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog NEWS Notes README TODO
+ insinto /usr/share/doc/${PF}/xml
+ doins doc/api.xml
+}
diff --git a/net-libs/libesmtp/metadata.xml b/net-libs/libesmtp/metadata.xml
new file mode 100644
index 000000000000..90c529dd9ca8
--- /dev/null
+++ b/net-libs/libesmtp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+<use>
+ <flag name="ntlm">Enable support for NTLM authentication</flag>
+</use>
+</pkgmetadata>
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
new file mode 100644
index 000000000000..4c33ea657aaf
--- /dev/null
+++ b/net-libs/libetpan/Manifest
@@ -0,0 +1,2 @@
+DIST libetpan-1.1.tar.gz 1657767 SHA256 ce3ac567d0f07e5b2d1fdb0045042a8295ec477cd933de1a391fd48139c1f75e SHA512 fbcaf0e467d6f7541148aa60e89e1275f3cdb2b1039b8e6eaeba476e4b4411f44acfc01936eb7c4ab92cc0a574f3dcc4836e57bdf38861008bed0d015211f82b WHIRLPOOL a8c714937d797f4e8cabb59edf2b5880723e0bc6d4947ac78a3bd31f7b2e94f36c6699f7186f527b1075460f65dbb10d7c083442b6646cba1dbf2de68dd7c291
+DIST libetpan-1.5.tar.gz 6139416 SHA256 42c4d858c3c1762c3e348889fbbf6cc5e5c5e654170d1df1ebb9c14aa4579736 SHA512 7b0a3adff7d7b3a7e3ea1d1a330ef6fea5ed86077a9ccf3fb5e51548d337c6c1f1fbb9ca81560b478335a9acf34e08bfef1895a05c5a69c37e3b87651c255fd5 WHIRLPOOL c408cbef9cc4e9bfec07a6e87a5afa96ea241770564c11f625776e4d692484c75ad01724c10923e38927d344616f4d396fa652d63d8cdcb2451d2a075dd0909e
diff --git a/net-libs/libetpan/files/libetpan-1.0-ldflags.patch b/net-libs/libetpan/files/libetpan-1.0-ldflags.patch
new file mode 100644
index 000000000000..215128283f35
--- /dev/null
+++ b/net-libs/libetpan/files/libetpan-1.0-ldflags.patch
@@ -0,0 +1,18 @@
+--- configure.ac.orig 2010-04-20 20:29:01.136283062 +0200
++++ configure.ac 2010-04-20 20:29:45.884283632 +0200
+@@ -455,11 +455,11 @@
+ for flag in "pthreads" "pthread"; do
+ if test "x$checkpthread" = "xyes"; then
+ AC_MSG_CHECKING([for pthread_create with -$flag])
+- OLDFLAGS="$LDFLAGS"
+- LDFLAGS="-$flag $LDFLAGS"
+- AC_TRY_LINK([], [pthread_create();],
++ OLDLIBS="$LIBS"
++ LIBS="$LIBS -l$flag"
++ AC_TRY_LINK([], [pthread_create();],
+ [pthflag=yes; checkpthread=no],
+- [pthflag=no; LDFLAGS="$OLDFLAGS"])
++ [pthflag=no; LIBS="$OLDLIBS"])
+ AC_MSG_RESULT($pthflag)
+ fi
+ done
diff --git a/net-libs/libetpan/files/libetpan-1.0-nonnull.patch b/net-libs/libetpan/files/libetpan-1.0-nonnull.patch
new file mode 100644
index 000000000000..0710cfdad94e
--- /dev/null
+++ b/net-libs/libetpan/files/libetpan-1.0-nonnull.patch
@@ -0,0 +1,12 @@
+http://sourceforge.net/mailarchive/forum.php?thread_name=k2vfc2c80ae1004051048n4a2b5ab0y85ab946c2a556544%40mail.gmail.com&forum_name=libetpan-devel
+--- src/low-level/nntp/Makefile.am 2011-06-14 15:37:14.511603732 +0300
++++ src/low-level/nntp/Makefile.am 2011-06-14 15:38:42.000000000 +0300
+@@ -35,6 +35,8 @@
+ AM_CPPFLAGS = -I$(top_builddir)/include \
+ -I$(top_srcdir)/src/data-types
+
++CFLAGS += -Wno-nonnull
++
+ noinst_LTLIBRARIES = libnntp.la
+
+ libnntp_la_SOURCES = \
diff --git a/net-libs/libetpan/libetpan-1.1.ebuild b/net-libs/libetpan/libetpan-1.1.ebuild
new file mode 100644
index 000000000000..dfea485a1df0
--- /dev/null
+++ b/net-libs/libetpan/libetpan-1.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
+HOMEPAGE="http://libetpan.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="berkdb debug gnutls ipv6 liblockfile sasl ssl static-libs"
+
+DEPEND="berkdb? ( sys-libs/db )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( ssl? ( dev-libs/openssl ) )
+ sasl? ( dev-libs/cyrus-sasl )
+ liblockfile? ( net-libs/liblockfile )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.0-nonnull.patch
+
+ sed -i \
+ -e "s/-O2 -g//" \
+ -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
+ configure.ac
+
+ eautoreconf
+}
+
+src_configure() {
+ local sslconf
+
+ if use ssl; then
+ if use gnutls; then
+ sslconf="--with-gnutls --without-openssl"
+ else
+ sslconf="--without-gnutls --with-openssl"
+ fi
+ else
+ if use gnutls; then
+ sslconf="--with-gnutls --without-openssl"
+ else
+ sslconf="--without-gnutls --without-openssl"
+ fi
+ fi
+
+ # in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
+ # libtool recognises it as valid shell (bug #300211)
+ use prefix && export CONFIG_SHELL=${BASH}
+ # The configure script contains an error, in that it doesn't check the
+ # argument of --enable-{debug,optim}, hence --disable-debug results in
+ # --enable-debug=no, which isn't checked and debugging flags are blindly
+ # injected. So, avoid passing --disable-debug when we don't need it.
+ econf \
+ $(use debug && echo --enable-debug) \
+ $(use_enable berkdb db) \
+ $(use_with sasl) \
+ $(use_enable ipv6) \
+ $(use_enable liblockfile lockfile) \
+ $(use_enable static-libs static) \
+ ${sslconf}
+}
+
+src_install() {
+ default
+ use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+ echo
+ ewarn "The soname for libetpan has changed after libetpan-1.1."
+ ewarn "If you have upgraded from that or earlier version, it is recommended to run"
+ ewarn "revdep-rebuild to fix any linking errors caused by this change."
+ echo
+}
diff --git a/net-libs/libetpan/libetpan-1.5.ebuild b/net-libs/libetpan/libetpan-1.5.ebuild
new file mode 100644
index 000000000000..0b90ba5c872c
--- /dev/null
+++ b/net-libs/libetpan/libetpan-1.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
+HOMEPAGE="http://libetpan.sourceforge.net/"
+SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="berkdb debug gnutls ipv6 liblockfile sasl ssl static-libs"
+
+DEPEND="berkdb? ( sys-libs/db )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( ssl? ( dev-libs/openssl ) )
+ sasl? ( dev-libs/cyrus-sasl )
+ liblockfile? ( net-libs/liblockfile )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.0-nonnull.patch
+
+ sed -i \
+ -e "s/-O2 -g//" \
+ -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
+ configure.ac
+
+ eautoreconf
+}
+
+src_configure() {
+ local sslconf
+
+ if use ssl; then
+ if use gnutls; then
+ sslconf="--with-gnutls --without-openssl"
+ else
+ sslconf="--without-gnutls --with-openssl"
+ fi
+ else
+ if use gnutls; then
+ sslconf="--with-gnutls --without-openssl"
+ else
+ sslconf="--without-gnutls --without-openssl"
+ fi
+ fi
+
+ # in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
+ # libtool recognises it as valid shell (bug #300211)
+ use prefix && export CONFIG_SHELL=${BASH}
+ # The configure script contains an error, in that it doesn't check the
+ # argument of --enable-{debug,optim}, hence --disable-debug results in
+ # --enable-debug=no, which isn't checked and debugging flags are blindly
+ # injected. So, avoid passing --disable-debug when we don't need it.
+ econf \
+ $(use debug && echo --enable-debug) \
+ $(use_enable berkdb db) \
+ $(use_with sasl) \
+ $(use_enable ipv6) \
+ $(use_enable liblockfile lockfile) \
+ $(use_enable static-libs static) \
+ ${sslconf}
+}
+
+src_install() {
+ default
+ use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/net-libs/libetpan/metadata.xml b/net-libs/libetpan/metadata.xml
new file mode 100644
index 000000000000..218dc03e567f
--- /dev/null
+++ b/net-libs/libetpan/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-mail</herd>
+ <longdescription lang="en">
+ libEtPan ! is a mail purpose library. It will be used for low-level mail
+ handling : network protocols (IMAP/NNTP/POP3/SMTP over TCP/IP and
+ SSL/TCP/IP, already implemented), local storage (mbox/MH/maildir),
+ message / MIME parser
+ </longdescription>
+ <use>
+ <flag name="liblockfile">Enable support for liblockfile library</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">dinhviethoa/libetpan</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libflowmanager/Manifest b/net-libs/libflowmanager/Manifest
new file mode 100644
index 000000000000..45a3ae232315
--- /dev/null
+++ b/net-libs/libflowmanager/Manifest
@@ -0,0 +1 @@
+DIST libflowmanager-2.0.4.tar.gz 339982 SHA256 80fbb93113fab98727b42c9b96ea09c0d817a49f884717dd27f27325e93b733c SHA512 18955416f80c7c18b949812f771000dc98c936ef556af263ef60d09f21de312a186296b5dc88c59a9298df2318d1f3be866e1ee9b34dcc5fac2dbabf2dae95a9 WHIRLPOOL 606e1b0e74602dfa7369445e3f67d705f82d38ba145c560afc28efeb927d62311e008f9a7d56957b163311e9933d89060cf5b54766f71a985333226cb9594a1e
diff --git a/net-libs/libflowmanager/libflowmanager-2.0.4.ebuild b/net-libs/libflowmanager/libflowmanager-2.0.4.ebuild
new file mode 100644
index 000000000000..eb8acf37037e
--- /dev/null
+++ b/net-libs/libflowmanager/libflowmanager-2.0.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="A library designed to facilitate performing flow-based measurement tasks using packet-based inputs"
+HOMEPAGE="http://research.wand.net.nz/software/libflowmanager.php"
+SRC_URI="http://research.wand.net.nz/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND=">=net-libs/libtrace-3.0.6"
+RDEPEND="${DEPEND}"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/net-libs/libflowmanager/metadata.xml b/net-libs/libflowmanager/metadata.xml
new file mode 100644
index 000000000000..78692635ad22
--- /dev/null
+++ b/net-libs/libflowmanager/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>netmon</herd>
+</pkgmetadata>
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
new file mode 100644
index 000000000000..85b3cfca19d6
--- /dev/null
+++ b/net-libs/libgadu/Manifest
@@ -0,0 +1,3 @@
+DIST libgadu-1.11.4.tar.gz 210937 SHA256 95d445a6fefa7b9c7af2f552f090cf6760e3fc7b5c563ec563f11a9fe1f408d5 SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639 WHIRLPOOL 4f13869f871e1a57f9aeccb9530c222960bee515065090a72a141d4a3212493df9007af7494598a26ee86a7e0cde18c8fd1b253024944b71538ca93bc94640f0
+DIST libgadu-1.12.0.tar.gz 290361 SHA256 536862af3beeeb9a3d17bc73c880204200a8aa1e1cbbf97e01486e024b955037 SHA512 62d1db0e0a59ce7e9a27a2002eea26e69b476a5bddeec129ec6e37d6141dc74e51b177a2cacd232031253d19d223f20ae68df1981f1f673485447950a0bc6670 WHIRLPOOL 1d4cf9634dc652368ce79f276f61a48faae7759d874f906c10e0fce24b0ff76542bfa0df632eb715536c5e775352c180422cca94dfcfae9ebb5b85cbc87409c5
+DIST libgadu-1.12.1.tar.gz 296079 SHA256 15a2c017274ab69b05919b1f4c1bbcec0ceab46cbe1024c5fcce63c58c660310 SHA512 4786bcc517dcead278fed05c35e254d963ee42f029b09a59bfe01052cbe438fa4a0d86c17dcfa2ee39d2365f28864f887d28772a5e70ce2ece190714bec45590 WHIRLPOOL dffc9439bf5bb79dbd3fec276535004c05d885f75649824c8538f155512869a558cf6760ae7e2329032f66cab6ec53463d9a30ce164c92d7a76e779c2ac3a6b8
diff --git a/net-libs/libgadu/files/libgadu-1.12.0-tests.patch b/net-libs/libgadu/files/libgadu-1.12.0-tests.patch
new file mode 100644
index 000000000000..56e1da45b096
--- /dev/null
+++ b/net-libs/libgadu/files/libgadu-1.12.0-tests.patch
@@ -0,0 +1,12 @@
+diff -ruN libgadu-1.12.0/test/manual/lib/base64.c my/test/manual/lib/base64.c
+--- libgadu-1.12.0/test/manual/lib/base64.c 2014-06-13 20:41:37.000000000 +0200
++++ my/test/manual/lib/base64.c 2014-08-13 03:08:00.612006311 +0200
+@@ -30,7 +30,7 @@
+ #include <openssl/bio.h>
+ #include <openssl/buffer.h>
+
+-char *gg_base64_encode(const char *input, ssize_t len)
++char *gg_base64_encode2(const char *input, ssize_t len)
+ {
+ BIO *bmem, *b64;
+ BUF_MEM *bptr;
diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild
new file mode 100644
index 000000000000..4c4d50eaf2d1
--- /dev/null
+++ b/net-libs/libgadu/libgadu-1.11.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils
+
+DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol"
+HOMEPAGE="http://toxygen.net/libgadu/"
+SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+# Bug 373215, last checked 2012.01.28
+RESTRICT="test"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+SLOT="0"
+IUSE="doc gnutls ssl static-libs threads"
+
+REQUIRED_USE="
+ gnutls? ( ssl )
+"
+COMMON_DEPEND="
+ sys-libs/zlib
+ ssl? (
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( >=dev-libs/openssl-0.9.6m )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ doc? ( app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}
+ !=net-im/kadu-0.6.0.2
+ !=net-im/kadu-0.6.0.1
+"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+DOCS=(AUTHORS ChangeLog NEWS README)
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with threads pthread)
+ )
+
+ if use ssl; then
+ myeconfargs+=(
+ $(use_with gnutls gnutls)
+ $(use_with !gnutls openssl)
+ )
+ else
+ myeconfargs+=(
+ --without-gnutls
+ --without-openssl
+ )
+ fi
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ use doc && HTML_DOCS=(docs/html/)
+ autotools-utils_src_install
+}
diff --git a/net-libs/libgadu/libgadu-1.12.0.ebuild b/net-libs/libgadu/libgadu-1.12.0.ebuild
new file mode 100644
index 000000000000..eb92d78b9d6f
--- /dev/null
+++ b/net-libs/libgadu/libgadu-1.12.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils
+
+DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol"
+HOMEPAGE="http://toxygen.net/libgadu/"
+SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+SLOT="0"
+IUSE="doc gnutls ssl static-libs test threads"
+
+REQUIRED_USE="
+ gnutls? ( ssl )
+"
+COMMON_DEPEND="
+ >=dev-libs/protobuf-c-0.15
+ sys-libs/zlib
+ ssl? (
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( >=dev-libs/openssl-0.9.6m )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ dev-libs/expat
+ dev-libs/libxml2:2
+ net-misc/curl
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !=net-im/kadu-0.6.0.2
+ !=net-im/kadu-0.6.0.1
+"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+ "${FILESDIR}/${P}-tests.patch"
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README)
+
+src_configure() {
+ local myeconfargs=(
+ --with-protobuf
+ $(use_enable test tests)
+ $(use_with threads pthread)
+ )
+
+ if use ssl; then
+ myeconfargs+=(
+ $(use_with gnutls gnutls)
+ $(use_with !gnutls openssl)
+ )
+ else
+ myeconfargs+=(
+ --without-gnutls
+ --without-openssl
+ )
+ fi
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ use doc && HTML_DOCS=(docs/html/)
+ autotools-utils_src_install
+}
diff --git a/net-libs/libgadu/libgadu-1.12.1.ebuild b/net-libs/libgadu/libgadu-1.12.1.ebuild
new file mode 100644
index 000000000000..ab1b7289dbbc
--- /dev/null
+++ b/net-libs/libgadu/libgadu-1.12.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils
+
+DESCRIPTION="This library implements the client side of the Gadu-Gadu protocol"
+HOMEPAGE="http://toxygen.net/libgadu/"
+SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+SLOT="0"
+IUSE="doc gnutls ssl static-libs test threads"
+
+REQUIRED_USE="
+ gnutls? ( ssl )
+"
+COMMON_DEPEND="
+ >=dev-libs/protobuf-c-0.15
+ sys-libs/zlib
+ ssl? (
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( >=dev-libs/openssl-0.9.6m )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ dev-libs/expat
+ dev-libs/libxml2:2
+ net-misc/curl
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !=net-im/kadu-0.6.0.2
+ !=net-im/kadu-0.6.0.1
+"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.12.0-tests.patch"
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README)
+
+src_configure() {
+ local myeconfargs=(
+ --with-protobuf
+ $(use_enable test tests)
+ $(use_with threads pthread)
+ )
+
+ if use ssl; then
+ myeconfargs+=(
+ $(use_with gnutls gnutls)
+ $(use_with !gnutls openssl)
+ )
+ else
+ myeconfargs+=(
+ --without-gnutls
+ --without-openssl
+ )
+ fi
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ use doc && HTML_DOCS=(docs/html/)
+ autotools-utils_src_install
+}
diff --git a/net-libs/libgadu/metadata.xml b/net-libs/libgadu/metadata.xml
new file mode 100644
index 000000000000..4784a7025da3
--- /dev/null
+++ b/net-libs/libgadu/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-im</herd>
+ <maintainer>
+ <email>reavertm@gentoo.org</email>
+ <name>Maciej Mrozowski</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">wojtekka/libgadu</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libgcal/Manifest b/net-libs/libgcal/Manifest
new file mode 100644
index 000000000000..ff2505849e14
--- /dev/null
+++ b/net-libs/libgcal/Manifest
@@ -0,0 +1 @@
+DIST libgcal-0.9.6.tar.bz2 555942 SHA256 3197d76c462438d0a761c47d199e402b9d9f05f86a7f9c304313a79ecc5a1503 SHA512 be2e0592a19531fa202017e529dad765a1bd6f9205ffdaba33bfd32231ad5eafb0237081fda8c5bbbe605e07204fc7895e2168b72718dde6cc660c97c08bbf26 WHIRLPOOL f4a4f7df4da7e231af6cd292a4f642017d5fd734eb4c16bdefbb45cad5a32fe0f5ba3f53d4277c250a8782c56acd03e5499f093e662d193a9ad3f2eb80b1791b
diff --git a/net-libs/libgcal/libgcal-0.9.6-r1.ebuild b/net-libs/libgcal/libgcal-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..b0e8a441f2bc
--- /dev/null
+++ b/net-libs/libgcal/libgcal-0.9.6-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="C/C++ interface to the Google Data API"
+HOMEPAGE="http://code.google.com/p/libgcal/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test"
+
+# Some tests fail
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/libxml2:2
+ >=net-misc/curl-7.18.2
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-libs/check )
+"
+
+DOCS=( README )
+
+src_configure() {
+ mycmakeargs=(
+ -DENABLE_TESTS=OFF
+ $(cmake-utils_use debug CURL_DEBUG)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && cmake-utils_src_compile docs
+}
+
+src_install() {
+ use doc && HTML_DOCS=( "${BUILD_DIR}/docs/doxygen/html/" )
+ cmake-utils_src_install
+}
+
+src_test() {
+ mycmakeargs+=(-DENABLE_TESTS=ON)
+ cmake-utils_src_configure
+ cmake-utils_src_make test
+}
diff --git a/net-libs/libgcal/metadata.xml b/net-libs/libgcal/metadata.xml
new file mode 100644
index 000000000000..f4bf8ee894eb
--- /dev/null
+++ b/net-libs/libgcal/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="google-code">libgcal</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libgfbgraph/Manifest b/net-libs/libgfbgraph/Manifest
new file mode 100644
index 000000000000..af899262d5cd
--- /dev/null
+++ b/net-libs/libgfbgraph/Manifest
@@ -0,0 +1,2 @@
+DIST gfbgraph-0.2.2.tar.xz 263792 SHA256 66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4 SHA512 13f685804516b8561426386ee6c05063b838aab1451d06a586b9cc2c50cbc4fb4651b9546c779dfe4dd4a80f5c78bf8464e44f13ffa5632ec11b2d7442fa50a0 WHIRLPOOL feb4f5ac6e905e2d344f3b44e568afa9014f3215ab3c39955a27597d24069e34184e3ec30b3c2aec9ec42ab787e34d81f03286bf4903b2b9f9e5e40ebc533edc
+DIST gfbgraph-0.2.3.tar.xz 270772 SHA256 da1179083cde2b649d7491c745250a00d292e390fd620b7dd2dd95a122dae0b6 SHA512 4e03beb4172a591c7d1eb4cfac56009b0d25183168f73344d24ac47554334d1edf2c5087c523025cee5d565182a02dc7ef72adc66cff1e4ad53a1d0990d3afb8 WHIRLPOOL a81075deaf0cdef21d8b9994b96d508cafe48ab00bbf0632baacf688508b4ec678cb3073c4e83b1a0b64f2c5c032b57a4189eca42f34c278ceda8ebe8b11e172
diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.2.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.2.ebuild
new file mode 100644
index 000000000000..c80c16898b84
--- /dev/null
+++ b/net-libs/libgfbgraph/libgfbgraph-0.2.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="gfbgraph"
+
+inherit gnome2
+
+DESCRIPTION="A GObject library for Facebook Graph API"
+HOMEPAGE="https://git.gnome.org/browse/libgfbgraph/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.2"
+KEYWORDS="amd64 x86"
+IUSE="+introspection"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/json-glib
+ net-libs/libsoup:2.4
+ net-libs/gnome-online-accounts
+ net-libs/rest:0.7
+ introspection? ( >=dev-libs/gobject-introspection-1.30 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.14
+ virtual/pkgconfig
+"
+
+# FIXME: most tests seem to fail
+RESTRICT="test"
+
+src_configure() {
+ gnome2_src_configure --disable-static
+}
+
+src_install() {
+ gnome2_src_install
+ # Remove files installed in the wrong place
+ # Also, already done by portage
+ rm -rf "${ED}"/usr/doc
+}
diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.3.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.3.ebuild
new file mode 100644
index 000000000000..4a8ad2edf8e3
--- /dev/null
+++ b/net-libs/libgfbgraph/libgfbgraph-0.2.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="gfbgraph"
+
+inherit gnome2
+
+DESCRIPTION="A GObject library for Facebook Graph API"
+HOMEPAGE="https://git.gnome.org/browse/libgfbgraph/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/json-glib
+ net-libs/libsoup:2.4
+ net-libs/gnome-online-accounts
+ net-libs/rest:0.7
+ introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.14
+ virtual/pkgconfig
+"
+
+# FIXME: most tests seem to fail
+RESTRICT="test"
+
+src_configure() {
+ gnome2_src_configure --disable-static
+}
+
+src_install() {
+ gnome2_src_install
+ # Remove files installed in the wrong place
+ # Also, already done by portage
+ # https://bugzilla.gnome.org/show_bug.cgi?id=752581
+ rm -rf "${ED}"/usr/doc
+}
diff --git a/net-libs/libgfbgraph/metadata.xml b/net-libs/libgfbgraph/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/net-libs/libgfbgraph/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/libgmail/Manifest b/net-libs/libgmail/Manifest
new file mode 100644
index 000000000000..18419f60c677
--- /dev/null
+++ b/net-libs/libgmail/Manifest
@@ -0,0 +1 @@
+DIST libgmail-0.1.11.tar.gz 30433 SHA256 2d94f1230f591dfa6d1b726338063f28b89b2f82ba5b866ab077c86c598de43e SHA512 a6e08ff1c2a50930289eb4b79ccffe458ef64bc01e4eb5db83a9e8155b349187808743e8152a3437a6db0a9cdc96b0a3ccd24b2d8edc44ef5ffdc707c98c3114 WHIRLPOOL bd79e1e5c8fb44e8c31b085dc1f602589521099ae630e289997a60cf7252769e6829bf38584654b08d515501becf2d6555a20cca5ae9730363283571d5848bcf
diff --git a/net-libs/libgmail/libgmail-0.1.11-r1.ebuild b/net-libs/libgmail/libgmail-0.1.11-r1.ebuild
new file mode 100644
index 000000000000..3efe468f81bc
--- /dev/null
+++ b/net-libs/libgmail/libgmail-0.1.11-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to access Google's gmail service"
+HOMEPAGE="http://libgmail.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND="dev-python/clientcookie[${PYTHON_USEDEP}]
+ dev-python/mechanize[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
diff --git a/net-libs/libgmail/metadata.xml b/net-libs/libgmail/metadata.xml
new file mode 100644
index 000000000000..b5a8781360cf
--- /dev/null
+++ b/net-libs/libgmail/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-p2p</herd>
+ <upstream>
+ <remote-id type="sourceforge">libgmail</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libgrss/Manifest b/net-libs/libgrss/Manifest
new file mode 100644
index 000000000000..4e319d7b08bf
--- /dev/null
+++ b/net-libs/libgrss/Manifest
@@ -0,0 +1,2 @@
+DIST libgrss-0.5.0.tar.gz 439634 SHA256 a0b5d9cc18b90891c20b3645567b31edda1e6f61e6a4c2f314ac77490bb767b1 SHA512 189c49b7bdf029160e72d3d89c6779e193373e5a3af7f810041bf325d0b5543bb87b414d833a13e028a589b96a4d53bb223e88667d18d2c53f610d6086bb60ea WHIRLPOOL 5fe0b4c53e3d66ac95fdb7d9032454d62c80fd8640c5af48574e10eff15f997d767fa821fb16b4fd4eda8ede1563411ae821c9f2980f9861f3c93131fe7a130c
+DIST libgrss-0.7.0.tar.xz 362360 SHA256 6709c0f630a915ea7d5f1ac88ac173ef974d8d7406f43bd4be70d3e71fd554d9 SHA512 22a4f13ee979932575c6efd25bfd2fb184ea113aa34254d9e4bfb64cfbbd9b277dd235b8c9be037baf8c85bea7ba3bc1478ec3c7a3c87e63aeddb1774959c780 WHIRLPOOL 6b5c8a8a5140af90db1dba1368b6cec638a68fe1f3b2fee5e79b143e6d8d576df087e5be3d0a927afb602c4ebf9733d781ce0e65d7122e0c6d8eaeda26f7fcd0
diff --git a/net-libs/libgrss/files/libgrss-0.3.0-fix-slotting.patch b/net-libs/libgrss/files/libgrss-0.3.0-fix-slotting.patch
new file mode 100644
index 000000000000..a63ebb393bed
--- /dev/null
+++ b/net-libs/libgrss/files/libgrss-0.3.0-fix-slotting.patch
@@ -0,0 +1,125 @@
+From 3023bfdf7a8b6a1df13b8b937c60ee7c4bd1d9ae Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 1 Apr 2013 16:07:21 +0200
+Subject: [PATCH] Fix parallel installation for API version 0
+
+---
+ Makefile.am | 6 ++++--
+ configure.ac | 3 +++
+ doc/reference/Makefile.am | 4 ++--
+ libgrss.pc.in | 4 ++--
+ src/Makefile.am | 12 ++++++------
+ 5 files changed, 17 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index effacb1..b4a53e1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,11 +1,13 @@
+ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = src doc
+ EXTRA_DIST = autogen.sh
++CLEANFILES = libgrss-$(LIBGRSS_API_VERSION).pc
+
+ pcfiledir = $(libdir)/pkgconfig
+-pcfile_DATA = libgrss-0.pc
++
++pcfile_DATA = libgrss-$(LIBGRSS_API_VERSION).pc
+
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+
+-libgrss-0.pc: libgrss.pc
++libgrss-$(LIBGRSS_API_VERSION).pc: libgrss.pc
+ @cp -f $< $@
+diff --git a/configure.ac b/configure.ac
+index 64fe542..e036df6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,6 +1,7 @@
+ m4_define([libgrss_major_version], [0])
+ m4_define([libgrss_minor_version], [3])
+ m4_define([libgrss_micro_version], [0])
++m4_define([libgrss_api_version], [0])
+
+ m4_define([libgrss_version],
+ [libgrss_major_version.libgrss_minor_version.libgrss_micro_version])
+@@ -46,10 +47,12 @@ AC_CHECK_FUNCS([strptime localtime_r])
+ LIBGRSS_MAJOR_VERSION=libgrss_major_version
+ LIBGRSS_MINOR_VERSION=libgrss_minor_version
+ LIBGRSS_MICRO_VERSION=libgrss_micro_version
++LIBGRSS_API_VERSION=libgrss_api_version
+ LIBGRSS_VERSION=libgrss_version
+ AC_SUBST(LIBGRSS_MAJOR_VERSION)
+ AC_SUBST(LIBGRSS_MICRO_VERSION)
+ AC_SUBST(LIBGRSS_MINOR_VERSION)
++AC_SUBST(LIBGRSS_API_VERSION)
+ AC_SUBST(LIBGRSS_VERSION)
+
+ dnl libgrss checks
+diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
+index 644642d..eafbc65 100644
+--- a/doc/reference/Makefile.am
++++ b/doc/reference/Makefile.am
+@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = 1.6
+ # of using the various options.
+
+ # The name of the module, e.g. 'glib'.
+-DOC_MODULE=libgrss
++DOC_MODULE=libgrss-@LIBGRSS_API_VERSION@
+
+ # The top-level SGML file. You can change this if you want to.
+ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+@@ -71,7 +71,7 @@ expand_content_files=
+ # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+
+ INCLUDES=-I$(top_srcdir) $(LIBGRSS_CFLAGS)
+-GTKDOC_LIBS=$(top_builddir)/src/libgrss-1.0.la $(LIBGRSS_LIBS)
++GTKDOC_LIBS=$(top_builddir)/src/libgrss-@LIBGRSS_API_VERSION@.la $(LIBGRSS_LIBS)
+
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+ include $(top_srcdir)/gtk-doc.make
+diff --git a/libgrss.pc.in b/libgrss.pc.in
+index 2ce65c9..5d4e1b0 100644
+--- a/libgrss.pc.in
++++ b/libgrss.pc.in
+@@ -6,6 +6,6 @@ includedir=${exec_prefix}/include
+ Name: libgrss
+ Description: GObject RSS handling library
+ Version: @VERSION@
+-Libs: -L${libdir} -lgrss-1.0
+-Cflags: -I${includedir}/libgrss
++Libs: -L${libdir} -lgrss-@LIBGRSS_API_VERSION@
++Cflags: -I${includedir}/libgrss-@LIBGRSS_API_VERSION@
+ Requires: gobject-2.0 libxml-2.0 libsoup-2.4
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 93c9be7..ee48a16 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -56,18 +56,18 @@ feed-marshal.c: feed-marshal.list
+ echo "#include \"feed-marshal.h\"" > $@ && \
+ $(GLIB_GENMARSHAL) $< --prefix=feed_marshal --body >> $@
+
+-lib_LTLIBRARIES = libgrss-1.0.la
++lib_LTLIBRARIES = libgrss-0.la
+
+-libgrss_1_0_la_LIBADD = $(LIBGRSS_LIBS)
+-libgrss_1_0_la_SOURCES = \
++libgrss_0_la_LIBADD = $(LIBGRSS_LIBS)
++libgrss_0_la_SOURCES = \
+ $(sources_public_h) \
+ $(sources_private_h) \
+ $(sources_c) \
+ $(NULL)
+-libgrss_1_0_la_LDFLAGS = $(LDADD)
++libgrss_0_la_LDFLAGS = $(LDADD)
+
+-libgrssincludedir = $(includedir)/libgrss
+-libgrssinclude_DATA = $(sources_public_h)
++libgrss_0_ladir = $(includedir)/libgrss-@LIBGRSS_API_VERSION@
++libgrss_0_la_HEADERS = $(sources_public_h)
+
+ CLEANFILES = $(pcfile_DATA)
+
+--
+1.8.1.5
+
diff --git a/net-libs/libgrss/files/libgrss-0.5.0-fix-slotting.patch b/net-libs/libgrss/files/libgrss-0.5.0-fix-slotting.patch
new file mode 100644
index 000000000000..01146aeb0902
--- /dev/null
+++ b/net-libs/libgrss/files/libgrss-0.5.0-fix-slotting.patch
@@ -0,0 +1,124 @@
+From 4b93347fee20ea18196cab9f702be88ecd23f54e Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 1 Apr 2013 16:07:21 +0200
+Subject: [PATCH 1/2] Fix parallel installation for API version 0.5
+
+---
+ Makefile.am | 5 +++--
+ configure.ac | 3 +++
+ doc/reference/Makefile.am | 4 ++--
+ libgrss.pc.in | 4 ++--
+ src/Makefile.am | 12 ++++++------
+ 5 files changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8547d3b..a13acf4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,11 +1,12 @@
+ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = src doc
+ EXTRA_DIST = autogen.sh
++CLEANFILES = libgrss-$(LIBGRSS_API_VERSION).pc
+
+ pcfiledir = $(libdir)/pkgconfig
+-pcfile_DATA = libgrss-0.5.pc
++pcfile_DATA = libgrss-$(LIBGRSS_API_VERSION).pc
+
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+
+-libgrss-0.5.pc: libgrss.pc
++libgrss-$(LIBGRSS_API_VERSION).pc: libgrss.pc
+ @cp -f $< $@
+diff --git a/configure.ac b/configure.ac
+index 61effa3..443140b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,6 +1,7 @@
+ m4_define([libgrss_major_version], [0])
+ m4_define([libgrss_minor_version], [5])
+ m4_define([libgrss_micro_version], [0])
++m4_define([libgrss_api_version], [0.5])
+
+ m4_define([libgrss_version],
+ [libgrss_major_version.libgrss_minor_version.libgrss_micro_version])
+@@ -46,10 +47,12 @@ AC_CHECK_FUNCS([strptime localtime_r])
+ LIBGRSS_MAJOR_VERSION=libgrss_major_version
+ LIBGRSS_MINOR_VERSION=libgrss_minor_version
+ LIBGRSS_MICRO_VERSION=libgrss_micro_version
++LIBGRSS_API_VERSION=libgrss_api_version
+ LIBGRSS_VERSION=libgrss_version
+ AC_SUBST(LIBGRSS_MAJOR_VERSION)
+ AC_SUBST(LIBGRSS_MICRO_VERSION)
+ AC_SUBST(LIBGRSS_MINOR_VERSION)
++AC_SUBST(LIBGRSS_API_VERSION)
+ AC_SUBST(LIBGRSS_VERSION)
+
+ dnl libgrss checks
+diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
+index 644642d..eafbc65 100644
+--- a/doc/reference/Makefile.am
++++ b/doc/reference/Makefile.am
+@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = 1.6
+ # of using the various options.
+
+ # The name of the module, e.g. 'glib'.
+-DOC_MODULE=libgrss
++DOC_MODULE=libgrss-@LIBGRSS_API_VERSION@
+
+ # The top-level SGML file. You can change this if you want to.
+ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+@@ -71,7 +71,7 @@ expand_content_files=
+ # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+
+ INCLUDES=-I$(top_srcdir) $(LIBGRSS_CFLAGS)
+-GTKDOC_LIBS=$(top_builddir)/src/libgrss-1.0.la $(LIBGRSS_LIBS)
++GTKDOC_LIBS=$(top_builddir)/src/libgrss-@LIBGRSS_API_VERSION@.la $(LIBGRSS_LIBS)
+
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+ include $(top_srcdir)/gtk-doc.make
+diff --git a/libgrss.pc.in b/libgrss.pc.in
+index cdd0f6f..3d75924 100644
+--- a/libgrss.pc.in
++++ b/libgrss.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: libgrss
+ Description: GObject RSS handling library
+ Version: @VERSION@
+-Libs: -L${libdir} -lgrss-1.0
+-Cflags: -I${includedir}/libgrss
++Libs: -L${libdir} -lgrss-@LIBGRSS_API_VERSION@
++Cflags: -I${includedir}/libgrss-@LIBGRSS_API_VERSION@
+ Requires: gobject-2.0 libxml-2.0 libsoup-2.4
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8587d73..8e0bb5c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -74,18 +74,18 @@ feed-marshal.c: feed-marshal.list
+ echo "#include \"feed-marshal.h\"" > $@ && \
+ $(GLIB_GENMARSHAL) $< --prefix=feed_marshal --body >> $@
+
+-lib_LTLIBRARIES = libgrss-1.0.la
++lib_LTLIBRARIES = libgrss-0.5.la
+
+-libgrss_1_0_la_LIBADD = $(LIBGRSS_LIBS)
+-libgrss_1_0_la_SOURCES = \
++libgrss_0_5_la_LIBADD = $(LIBGRSS_LIBS)
++libgrss_0_5_la_SOURCES = \
+ $(sources_public_h) \
+ $(sources_private_h) \
+ $(sources_c) \
+ $(NULL)
+-libgrss_1_0_la_LDFLAGS = $(LDADD)
++libgrss_0_5_la_LDFLAGS = $(LDADD)
+
+-libgrssincludedir = $(includedir)/libgrss
+-libgrssinclude_DATA = $(sources_public_h)
++libgrss_0_5_ladir = $(includedir)/libgrss-@LIBGRSS_API_VERSION@
++libgrss_0_5_la_HEADERS = $(sources_public_h)
+
+ CLEANFILES = $(pcfile_DATA)
+
+--
+1.8.1.5
+
diff --git a/net-libs/libgrss/files/libgrss-0.5.0-headers.patch b/net-libs/libgrss/files/libgrss-0.5.0-headers.patch
new file mode 100644
index 000000000000..5e129d0eb9ab
--- /dev/null
+++ b/net-libs/libgrss/files/libgrss-0.5.0-headers.patch
@@ -0,0 +1,11 @@
+--- a/src/utils.h 2013-11-08 00:04:21.877945385 +0100
++++ b/src/utils.h 2013-11-08 00:05:45.397901242 +0100
+@@ -34,6 +34,8 @@
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/socket.h>
++#include <arpa/inet.h>
+
+ #include "libgrss.h"
+
diff --git a/net-libs/libgrss/libgrss-0.5.0-r1.ebuild b/net-libs/libgrss/libgrss-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..84980f2cf371
--- /dev/null
+++ b/net-libs/libgrss/libgrss-0.5.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="LibGRSS is a library for easy management of RSS/Atom/Pie feeds"
+HOMEPAGE="http://live.gnome.org/Libgrss"
+SRC_URI="http://gtk.mplat.es/libgrss/tarballs/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0.5"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.30.2:2
+ >=dev-libs/libxml2-2.7.8:2
+ >=net-libs/libsoup-2.36.1:2.4
+"
+DEPEND="${RDEPEND}
+ app-text/gnome-doc-utils
+ >=dev-util/gtk-doc-am-1.10
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Fix soname/.pc
+ epatch "${FILESDIR}"/${P}-fix-slotting.patch
+
+ # Fix build with newer glibc
+ epatch "${FILESDIR}"/${P}-headers.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
diff --git a/net-libs/libgrss/libgrss-0.7.0.ebuild b/net-libs/libgrss/libgrss-0.7.0.ebuild
new file mode 100644
index 000000000000..a2ffc549723d
--- /dev/null
+++ b/net-libs/libgrss/libgrss-0.7.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="LibGRSS is a library for easy management of RSS/Atom/Pie feeds"
+HOMEPAGE="http://live.gnome.org/Libgrss"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+ >=dev-libs/glib-2.42.1:2
+ >=dev-libs/libxml2-2.9.2:2
+ >=net-libs/libsoup-2.48:2.4
+ introspection? ( >=dev-libs/gobject-introspection-1.42 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.10
+ virtual/pkgconfig
+"
diff --git a/net-libs/libgrss/metadata.xml b/net-libs/libgrss/metadata.xml
new file mode 100644
index 000000000000..8eba7919544e
--- /dev/null
+++ b/net-libs/libgrss/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+ <upstream>
+ <bugs-to>http://bugs.gnome.org</bugs-to>
+ <changelog>http://git.gnome.org/browse/libgrss</changelog>
+ </upstream>
+ <maintainer>
+ <email>lxnay@gentoo.org</email>
+ <name>Fabio Erculiani</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
new file mode 100644
index 000000000000..1e6f3ea216ad
--- /dev/null
+++ b/net-libs/libgsasl/Manifest
@@ -0,0 +1 @@
+DIST libgsasl-1.8.0.tar.gz 1208417 SHA256 3adfb49f9c92a719dea855fd1840d698cde55d4648d332a69032ba8bea207720 SHA512 7e591d12404919559bf67590f862270ffcae2030a14097cdaf92820aa79619b3048541e9f83b3fcb98a84622c44a52ecaceeebb1be55b9e9f68fb1790ade8721 WHIRLPOOL 8ac141dad470a0f1df808093d99a56009b3e00593c9dd8a195f11a53b1bb24a3527e6986fd64ecc875842af305f9a72dd83d105070c0e3e0958622a3bb47cd97
diff --git a/net-libs/libgsasl/files/libgsasl-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-gss-extra.patch
new file mode 100644
index 000000000000..a0f134a229f8
--- /dev/null
+++ b/net-libs/libgsasl/files/libgsasl-gss-extra.patch
@@ -0,0 +1,21 @@
+Gentoo bug #359005
+--- gl/m4/gss-extra.m4.orig 2010-12-14 12:57:08.000000000 +0000
++++ gl/m4/gss-extra.m4 2011-11-05 21:11:54.000000000 +0000
+@@ -19,7 +19,16 @@
+ AC_CHECK_FUNCS([gss_decapsulate_token])
+ AC_CHECK_FUNCS([gss_oid_equal])
+ AC_CHECK_FUNCS([gss_inquire_mech_for_saslname])
+- AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE])
++ AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE])
++ AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
++ [#include <gssapi.h>
++ #ifdef GSS_C_NT_HOSTBASED_SERVICE
++ hostbased_service_gss_nt_yes
++ #endif],
++ [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
++ [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])
++ AC_MSG_RESULT([yes])],
++ AC_MSG_RESULT([no]))
+ if test "$gssapi_impl" != "gss"; then
+ AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
+ if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..c7db36782bf3
--- /dev/null
+++ b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="The GNU SASL library"
+HOMEPAGE="http://www.gnu.org/software/gsasl/"
+SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="idn gcrypt kerberos nls ntlm static-libs"
+DEPEND="
+ gcrypt? ( dev-libs/libgcrypt:0 )
+ idn? ( net-dns/libidn )
+ kerberos? ( virtual/krb5 )
+ nls? ( >=sys-devel/gettext-0.18.1 )
+ ntlm? ( net-libs/libntlm )
+"
+RDEPEND="${DEPEND}
+ !net-misc/gsasl"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-gss-extra.patch"
+ sed -i -e 's/ -Werror//' configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ local krb5_impl
+ if use kerberos; then
+ krb5_impl="--with-gssapi-impl="
+ krb5_impl+=$(has_version app-crypt/mit-krb5 && echo "mit" || echo "heimdal")
+ fi
+ econf \
+ $(use_with gcrypt libgcrypt) \
+ $(use_with idn stringprep) \
+ $(use_enable kerberos gssapi) \
+ ${krb5_impl} \
+ $(use_enable nls) \
+ $(use_enable ntlm) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ if ! use static-libs; then
+ rm -f "${D}"/usr/lib*/lib*.la
+ fi
+}
diff --git a/net-libs/libgsasl/metadata.xml b/net-libs/libgsasl/metadata.xml
new file mode 100644
index 000000000000..b11afc2a3576
--- /dev/null
+++ b/net-libs/libgsasl/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-mail</herd>
+<use>
+ <flag name='gcrypt'>Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto</flag>
+ <flag name='ntlm'>Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/net-libs/libgssglue/Manifest b/net-libs/libgssglue/Manifest
new file mode 100644
index 000000000000..0a099d1e9e54
--- /dev/null
+++ b/net-libs/libgssglue/Manifest
@@ -0,0 +1 @@
+DIST libgssglue-0.4.tar.gz 346984 SHA256 3f791a75502ba723e5e85e41e5e0c711bb89e2716b7c0ec6e74bd1df6739043a SHA512 25d514c08320e42851ff153d7691267a8454f205492faf942f566aa30c1ac1c83bd095732a1a0fcc010ba3a5d48b4c95a196ad05bc821598cc1fc3a2c4960d29 WHIRLPOOL 5f050ea5c429dcc97050e23e6b89bff175c5150916bc0a6b351faf31e4d962b6d81df1f4984ae5f9e44119550809a57818a5ccc6f65af77cbf5f73b19de28cb9
diff --git a/net-libs/libgssglue/files/libgssglue-0.3-protos.patch b/net-libs/libgssglue/files/libgssglue-0.3-protos.patch
new file mode 100644
index 000000000000..5aaf6d03aaac
--- /dev/null
+++ b/net-libs/libgssglue/files/libgssglue-0.3-protos.patch
@@ -0,0 +1,15 @@
+add missing prototype to header
+
+--- a/src/mglueP.h
++++ b/src/mglueP.h
+@@ -477,6 +477,10 @@ OM_uint32 generic_gss_str_to_oid
+ gss_OID * /* oid */
+ );
+
++OM_uint32
++generic_gss_copy_oid_set(OM_uint32 *minor_status,
++ const gss_OID_set_desc * const oidset,
++ gss_OID_set *new_oidset);
+
+ gss_OID gss_find_mechanism_from_name_type (gss_OID); /* name_type */
+
diff --git a/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch b/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch
new file mode 100644
index 000000000000..6a98569128d0
--- /dev/null
+++ b/net-libs/libgssglue/files/libgssglue-0.4-implicit-declarations.patch
@@ -0,0 +1,15 @@
+* g_initialize.c:275:5: warning: implicit declaration of function 'getuid' [-Wimplicit-function-declaration]
+* g_initialize.c:275:5: warning: implicit declaration of function 'geteuid' [-Wimplicit-function-declaration]
+
+--- src/g_initialize.c
++++ src/g_initialize.c
+@@ -29,6 +29,9 @@
+ #include "mglueP.h"
+ #include <stdlib.h>
+
++#include <unistd.h> /* getuid, geteuid */
++#include <sys/types.h> /* ditto */
++
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
diff --git a/net-libs/libgssglue/libgssglue-0.4.ebuild b/net-libs/libgssglue/libgssglue-0.4.ebuild
new file mode 100644
index 000000000000..8b2e70d9c22d
--- /dev/null
+++ b/net-libs/libgssglue/libgssglue-0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="exports a gssapi interface which calls other random gssapi libraries"
+HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
+SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="!app-crypt/libgssapi"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-0.3-protos.patch \
+ "${FILESDIR}"/${PN}-0.4-implicit-declarations.patch
+}
+
+src_configure() {
+ # No need to install static libraries, as it uses libdl
+ econf --disable-static
+}
+
+src_install() {
+ default
+ prune_libtool_files
+
+ insinto /etc
+ doins doc/gssapi_mech.conf
+}
diff --git a/net-libs/libgssglue/metadata.xml b/net-libs/libgssglue/metadata.xml
new file mode 100644
index 000000000000..ca66751dee2f
--- /dev/null
+++ b/net-libs/libgssglue/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-fs</herd>
+</pkgmetadata>
diff --git a/net-libs/libhackrf/Manifest b/net-libs/libhackrf/Manifest
new file mode 100644
index 000000000000..d69e61f55feb
--- /dev/null
+++ b/net-libs/libhackrf/Manifest
@@ -0,0 +1,3 @@
+DIST hackrf-2014.04.1.tar.xz 14375500 SHA256 83ef987d31d314d6d99a227a18c31c34a44e996a28841234e59e53c5d8ab5a72 SHA512 1929c7af1de0c9ad1afcf56d53c5db13ef362f3ef896f3549841eeea87aec5e1133c63da740688739278b13e772b70d510a4a1035440b5b6aad2e9438a694892 WHIRLPOOL 0fa45438b4aa84e3e16b975949cead0010f6271ec89b8e2f69fcfdbd5c5a722d803a6f7d017b272b3c71773768b32bbeae00a6a43879a9268c7d84315282a93a
+DIST hackrf-2014.08.1.tar.xz 14376904 SHA256 624c46163161896b8347a73e9edeb1188433f032df7cd00eda9a242c2a5bc98a SHA512 2bb2e9398479f635fc4cb73875d9728c689f5d29bfbdcaae661d98ecafe51d38ac8768dd4f38b87766195d9ed08757e76d790030edf6f6f572d547146287c073 WHIRLPOOL c33430279d0757e104f09ecafce2df859f33f8de9139dd6491a11d86ed3e241ba3ef298d1d0994113e695c46ab211daf573262815a8a1fc5349fd44642da3910
+DIST hackrf-2015.07.2.tar.xz 14415212 SHA256 5e3d9c36928b88cdbc0d66ee54e24e8682972dba478abfca0e31069515b870b6 SHA512 a4f7b7800ece9b260d5c8c374f5544aa55cd2e97e10c6a0b33cf476e2ad4811321ffb1308d9dfb2168b2624cd3af616d1c314ad86bcd6f4c3fd0897319fa2cbd WHIRLPOOL 8dfee4fb55be913f44d8ab905fc7c6b1fd703e16b01aa41191e97ab726a3b04d6a78670ae47c2d3bada64e38d42cabcf7f39b646fba55b436cbcab312be1f198
diff --git a/net-libs/libhackrf/libhackrf-2014.04.1.ebuild b/net-libs/libhackrf/libhackrf-2014.04.1.ebuild
new file mode 100644
index 000000000000..07879c74fe4c
--- /dev/null
+++ b/net-libs/libhackrf/libhackrf-2014.04.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="library for communicating with HackRF SDR platform"
+HOMEPAGE="http://greatscottgadgets.com/hackrf/"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
+ inherit git-2
+ KEYWORDS=""
+ EGIT_SOURCEDIR="${WORKDIR}/hackrf"
+ S="${WORKDIR}/hackrf/host/libhackrf"
+else
+ S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
+ SRC_URI="mirror://sourceforge/hackrf/hackrf-${PV}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/libhackrf/libhackrf-2014.08.1.ebuild b/net-libs/libhackrf/libhackrf-2014.08.1.ebuild
new file mode 100644
index 000000000000..739343b7afdb
--- /dev/null
+++ b/net-libs/libhackrf/libhackrf-2014.08.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils udev
+
+DESCRIPTION="library for communicating with HackRF SDR platform"
+HOMEPAGE="http://greatscottgadgets.com/hackrf/"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
+ inherit git-2
+ KEYWORDS=""
+ EGIT_SOURCEDIR="${WORKDIR}/hackrf"
+ S="${WORKDIR}/hackrf/host/libhackrf"
+else
+ S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
+ SRC_URI="mirror://sourceforge/hackrf/hackrf-${PV}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i 's#plugdev#usb#' 53-hackrf.rules
+}
+
+src_install() {
+ cmake-utils_src_install
+ udev_dorules 53-hackrf.rules
+}
+
+pkg_postinst() {
+ einfo "Users in the usb group can use hackrf."
+}
diff --git a/net-libs/libhackrf/libhackrf-2015.07.2.ebuild b/net-libs/libhackrf/libhackrf-2015.07.2.ebuild
new file mode 100644
index 000000000000..cac4656dc3fa
--- /dev/null
+++ b/net-libs/libhackrf/libhackrf-2015.07.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils udev
+
+DESCRIPTION="library for communicating with HackRF SDR platform"
+HOMEPAGE="http://greatscottgadgets.com/hackrf/"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
+ inherit git-2
+ KEYWORDS=""
+ EGIT_SOURCEDIR="${WORKDIR}/hackrf"
+ S="${WORKDIR}/hackrf/host/libhackrf"
+else
+ S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
+ SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="+udev"
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_configure(){
+ mycmakeargs=(
+ $(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
+ )
+ if use udev; then
+ mycmakeargs+=(
+ -DUDEV_RULES_GROUP=usb
+ -DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
+ )
+ fi
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ einfo "Users in the usb group can use hackrf."
+}
diff --git a/net-libs/libhackrf/libhackrf-9999.ebuild b/net-libs/libhackrf/libhackrf-9999.ebuild
new file mode 100644
index 000000000000..cac4656dc3fa
--- /dev/null
+++ b/net-libs/libhackrf/libhackrf-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils udev
+
+DESCRIPTION="library for communicating with HackRF SDR platform"
+HOMEPAGE="http://greatscottgadgets.com/hackrf/"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
+ inherit git-2
+ KEYWORDS=""
+ EGIT_SOURCEDIR="${WORKDIR}/hackrf"
+ S="${WORKDIR}/hackrf/host/libhackrf"
+else
+ S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
+ SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="+udev"
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_configure(){
+ mycmakeargs=(
+ $(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
+ )
+ if use udev; then
+ mycmakeargs+=(
+ -DUDEV_RULES_GROUP=usb
+ -DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
+ )
+ fi
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ einfo "Users in the usb group can use hackrf."
+}
diff --git a/net-libs/libhackrf/metadata.xml b/net-libs/libhackrf/metadata.xml
new file mode 100644
index 000000000000..f347a49f850f
--- /dev/null
+++ b/net-libs/libhackrf/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>radio</herd>
+ <maintainer>
+ <email>zerochaos@gentoo.org</email>
+ <name>Rick Farina</name>
+ </maintainer>
+ <longdescription lang="en">
+</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">hackrf</remote-id>
+ <remote-id type="github">mossmann/hackrf</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
new file mode 100644
index 000000000000..fb3d18e38355
--- /dev/null
+++ b/net-libs/libhubbub/Manifest
@@ -0,0 +1,4 @@
+DIST libhubbub-0.3.0-src.tar.gz 792069 SHA256 dbf3b55bf2531d2a8e70f370a9b396cc78bfd5a092f87beb10b05c04fd7cdaa7 SHA512 e34e74baca01039ba0435785ec5a33718d438d5bdedab37fa42f73be79f8e928642667811e40a97d7f9ffad7b6a0f3eb3a70982838611f83f085b1d9503e7894 WHIRLPOOL b6f8d86cafb8196d53f577072c4b2710bb2ff64d9c0e7bb0162da384992fc6f4b36dc3f639d2c6775488ed0a99db9a662d157c04c8184ad23db68005a6e5e16c
+DIST libhubbub-0.3.1-src.tar.gz 791945 SHA256 1f8b31e86d0d32735f247c071a7ade1a475606b7a3583d2132e567a310b62053 SHA512 79a40602cda351f16e81788903c8b77a6f4975fc6e6389b9b197bde8b20478e528acbd7b10bbb556c9ea78accf8088a7c461c239e457903615b159e8c5a881c8 WHIRLPOOL dfc0e20059c7f11d78d3006b1350328588a5651024a17672fb3cfe9717390654223a2366ab9fa64dc227634fc27ffb638d84fc50f286606aa4548c62d0dca4ea
+DIST netsurf-buildsystem-1.2.tar.gz 38914 SHA256 3903a4a1551c9c202e1d2047344c4f3598c8d9d6c35ebf8cc2e18874bd0c9d61 SHA512 963e8a5033e8ef70595507f24fea3d9697eefb50ad7f92a6d3c913501c7026f12ec6d48f92b75e352b32f212f6216b8d8455aff25fa8d8d0fc12a3b19a875a1c WHIRLPOOL e56a520ae284089d0f36f06a6891ebb5b208ca847c74340c18581340e457c20ae9365999dc13284f438b965dcd7e85f04b93d1c1f22cadf6f7c1e2cef81d528c
+DIST netsurf-buildsystem-1.3.tar.gz 37906 SHA256 10bbe95ba07476208da6047bd3c74685b6e61ba9904975b5d5c9a2c79a84ac79 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5 WHIRLPOOL c8131d0ffb79b208b63bef94606735968584edfff8cb24b4c83cd747c5d65c2811004626840798047ffddf84556ef7d8e23242f60d01a4a046323df3c78b0980
diff --git a/net-libs/libhubbub/files/libhubbub-0.3.0-glibc2.20.patch b/net-libs/libhubbub/files/libhubbub-0.3.0-glibc2.20.patch
new file mode 100644
index 000000000000..ad7beeb19270
--- /dev/null
+++ b/net-libs/libhubbub/files/libhubbub-0.3.0-glibc2.20.patch
@@ -0,0 +1,17 @@
+--- libhubbub-0.3.0/Makefile
++++ libhubbub-0.3.0/Makefile
+@@ -15,13 +15,7 @@
+ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
+ -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+ -Wmissing-declarations -Wnested-externs -pedantic
+-# BeOS/Haiku/AmigaOS have standard library errors that issue warnings.
+-ifneq ($(TARGET),beos)
+- ifneq ($(TARGET),amiga)
+- WARNFLAGS := $(WARNFLAGS) -Werror
+- endif
+-endif
+-CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
++CFLAGS := -D_DEFAULT_SOURCE -I$(CURDIR)/include/ \
+ -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
+ ifneq ($(GCCVER),2)
+ CFLAGS := $(CFLAGS) -std=c99
diff --git a/net-libs/libhubbub/files/libhubbub-0.3.1-glibc2.20.patch b/net-libs/libhubbub/files/libhubbub-0.3.1-glibc2.20.patch
new file mode 100644
index 000000000000..45ce36b08e9e
--- /dev/null
+++ b/net-libs/libhubbub/files/libhubbub-0.3.1-glibc2.20.patch
@@ -0,0 +1,17 @@
+--- libhubbub-0.3.1/Makefile
++++ libhubbub-0.3.1/Makefile
+@@ -15,13 +15,7 @@
+ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
+ -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+ -Wmissing-declarations -Wnested-externs -pedantic
+-# BeOS/Haiku/AmigaOS have standard library errors that issue warnings.
+-ifneq ($(BUILD),i586-pc-haiku)
+- ifneq ($(findstring amigaos,$(BUILD)),amigaos)
+- WARNFLAGS := $(WARNFLAGS) -Werror
+- endif
+-endif
+-CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
++CFLAGS := -D_DEFAULT_SOURCE -I$(CURDIR)/include/ \
+ -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
+ ifneq ($(GCCVER),2)
+ CFLAGS := $(CFLAGS) -std=c99
diff --git a/net-libs/libhubbub/libhubbub-0.3.0-r1.ebuild b/net-libs/libhubbub/libhubbub-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..9f442ff05093
--- /dev/null
+++ b/net-libs/libhubbub/libhubbub-0.3.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+NETSURF_BUILDSYSTEM=buildsystem-1.2
+inherit netsurf
+
+DESCRIPTION="HTML5 compliant parsing library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~m68k-mint"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/libparserutils-0.2.0-r1[static-libs?,${MULTILIB_USEDEP}]
+ !net-libs/hubbub"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( dev-lang/perl
+ >=dev-libs/json-c-0.10-r1[${MULTILIB_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-glibc2.20.patch )
+DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
+
+#RESTRICT=test
diff --git a/net-libs/libhubbub/libhubbub-0.3.1-r1.ebuild b/net-libs/libhubbub/libhubbub-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..113f38fccf6b
--- /dev/null
+++ b/net-libs/libhubbub/libhubbub-0.3.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+NETSURF_BUILDSYSTEM=buildsystem-1.3
+inherit netsurf
+
+DESCRIPTION="HTML5 compliant parsing library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~m68k-mint"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
+ !net-libs/hubbub"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( dev-lang/perl
+ >=dev-libs/json-c-0.10-r1[${MULTILIB_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-glibc2.20.patch )
+DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
+
+#RESTRICT=test
diff --git a/net-libs/libhubbub/metadata.xml b/net-libs/libhubbub/metadata.xml
new file mode 100644
index 000000000000..59acc2cc580e
--- /dev/null
+++ b/net-libs/libhubbub/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/net-libs/libident/Manifest b/net-libs/libident/Manifest
new file mode 100644
index 000000000000..618f11d4c90c
--- /dev/null
+++ b/net-libs/libident/Manifest
@@ -0,0 +1 @@
+DIST libident-0.32.tar.bz2 205831 SHA256 a88a24adc377322008aaf7bf7078e6d409f5327e9515ce0d755345dd249dce22 SHA512 5e5d0e3dd2514fa5af9dba02eca52cc8015d091fca05beeb23bae1c98d33a1a1313081cafc9e1e49d2beb5c524beaf1eb3679ff54330164aa170d74dbd84b244 WHIRLPOOL 9f3068e654e37f289d095cf744459c449fee42919f668444e363012c0e201b8206eb37ed40d13ad29dd456cc5eb924b00eda2857bbac4c1bf390624ac020d617
diff --git a/net-libs/libident/libident-0.32.ebuild b/net-libs/libident/libident-0.32.ebuild
new file mode 100644
index 000000000000..1b8602043f2e
--- /dev/null
+++ b/net-libs/libident/libident-0.32.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="A small library to interface to the Ident protocol server"
+HOMEPAGE="http://www.simphalempin.com/dev/libident/"
+SRC_URI="http://people.via.ecp.fr/~rem/libident/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 s390 ~sparc x86"
+IUSE=""
+
+DEPEND=""
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/net-libs/libident/metadata.xml b/net-libs/libident/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/net-libs/libident/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ <name>Default assignee for orphaned packages</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/libinfinity/Manifest b/net-libs/libinfinity/Manifest
new file mode 100644
index 000000000000..3aebbc490394
--- /dev/null
+++ b/net-libs/libinfinity/Manifest
@@ -0,0 +1 @@
+DIST libinfinity-0.5.4.tar.gz 1452217 SHA256 04004fc1097e0e45945180f844b1f7cef62db18390d752c8abca78253192f6c4 SHA512 3586865b0cbae7a7397fc819613eb336901daf9d99cc7bcab72e8b38ee10aa1df8b737872c83ff409b29eae8e3667ea81565d624e8357d7506f138677536b4ae WHIRLPOOL 20c5baf2b69f4b5d0a4846510e999f4f477ae3afe4df39e0e45f65c3c0d092ed52b21ff59fc712b265a8614286c1fce07510d3850b20dea6a32257d06407c373
diff --git a/net-libs/libinfinity/files/infinoted.confd b/net-libs/libinfinity/files/infinoted.confd
new file mode 100644
index 000000000000..81e62a4d9515
--- /dev/null
+++ b/net-libs/libinfinity/files/infinoted.confd
@@ -0,0 +1,12 @@
+# Config file for /etc/init.d/infinoted for Gentoo Linux
+
+USER="infinote"
+GROUP="infinote"
+UMASK="007"
+
+PIDFILE="/var/run/infinoted.pid"
+
+# Please read `infinoted --help` for other options.
+# This is a fast setup for local networks only (maybe not even those),
+# make sure you use appropriate security on untrusted networks.
+OPTIONS="--root-directory=/var/lib/infinote --security-policy=no-tls"
diff --git a/net-libs/libinfinity/files/infinoted.initd b/net-libs/libinfinity/files/infinoted.initd
new file mode 100644
index 000000000000..b8f3f1f849f2
--- /dev/null
+++ b/net-libs/libinfinity/files/infinoted.initd
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting infinoted"
+ start-stop-daemon \
+ --start --quiet --background --make-pidfile \
+ --pidfile /var/run/infinoted.pid \
+ --exec /usr/bin/infinoted \
+ --user ${USER} --group ${GROUP} --umask 007 \
+ -- ${OPTIONS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping infinoted"
+ start-stop-daemon \
+ --stop --quiet \
+ --pidfile /var/run/infinoted.pid
+ eend $?
+}
diff --git a/net-libs/libinfinity/libinfinity-0.5.4.ebuild b/net-libs/libinfinity/libinfinity-0.5.4.ebuild
new file mode 100644
index 000000000000..ec6cbbf0a489
--- /dev/null
+++ b/net-libs/libinfinity/libinfinity-0.5.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils eutils versionator user
+
+MY_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="An implementation of the Infinote protocol written in GObject-based C"
+HOMEPAGE="http://gobby.0x539.de/"
+SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="avahi doc gtk server static-libs"
+
+RDEPEND="dev-libs/glib:2
+ dev-libs/libxml2
+ net-libs/gnutls
+ sys-libs/pam
+ virtual/gsasl
+ avahi? ( net-dns/avahi )
+ gtk? ( x11-libs/gtk+:3 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+ doc? ( dev-util/gtk-doc )"
+
+DOCS=(AUTHORS NEWS README TODO)
+
+pkg_setup() {
+ if use server ; then
+ enewgroup infinote 100
+ enewuser infinote 100 /bin/bash /var/lib/infinote infinote
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable doc gtk-doc)
+ $(use_with gtk inftextgtk)
+ $(use_with gtk infgtk)
+ $(use_with gtk gtk3)
+ $(use_with server infinoted)
+ $(use_with avahi)
+ $(use_with avahi libdaemon)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ if use server ; then
+ newinitd "${FILESDIR}/infinoted.initd" infinoted
+ newconfd "${FILESDIR}/infinoted.confd" infinoted
+
+ keepdir /var/lib/infinote
+ fowners infinote:infinote /var/lib/infinote
+ fperms 770 /var/lib/infinote
+
+ dosym /usr/bin/infinoted-${MY_PV} /usr/bin/infinoted
+
+ elog "Add local users who should have local access to the documents"
+ elog "created by infinoted to the infinote group."
+ elog "The documents are saved in /var/lib/infinote per default."
+ fi
+}
diff --git a/net-libs/libinfinity/metadata.xml b/net-libs/libinfinity/metadata.xml
new file mode 100644
index 000000000000..e3f8eb8c5df2
--- /dev/null
+++ b/net-libs/libinfinity/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>dev-zero@gentoo.org</email>
+ <name>Tiziano Müller</name>
+ </maintainer>
+ <use>
+ <flag name='server'>
+ Build and install the server binary including init.d/conf.d-scripts.
+ Needed if you want to host an infinote server for gobby.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/libircclient/Manifest b/net-libs/libircclient/Manifest
new file mode 100644
index 000000000000..3ed2f27435b9
--- /dev/null
+++ b/net-libs/libircclient/Manifest
@@ -0,0 +1,2 @@
+DIST libircclient-1.6.tar.gz 392788 SHA256 6c511923023398bcd7627cf3305054befacf6874203cb0de36bdbe658779e953 SHA512 94a68f27fcb12c918fa347d4ee44747e08e016245048c81f179b9a45081bd336c329e7185a3bc46deb28c9c77e1eff5dc53de7e723b1ed5ee2c1d3cc57ce0548 WHIRLPOOL f0958c14f923b97e38d230e3d9a27aa08ef9162c0749ef0defb7b107083b27f3458dc652944672cae76527258b788045dcc040d33f055df70a5cab8e16da9ca1
+DIST libircclient-1.8.tar.gz 291803 SHA256 2cf8523ac683588f2785b08159a2df3e4d15939ee655c0024aa86334149de8f6 SHA512 f19e4b55cf49091ab2c83ff3d5cace2252daad6bf23cb61b7677b9c6055fe8a8a7d891f6e1e5962481c836f47b7dcd35ef563c8807737ac81e3c4cee253cfc4a WHIRLPOOL 39550aa403445ca333aeeca2108c6a5e67cbf2eb1f53d313aa4e970f39b702f3862698a0ce7956ad0c93034d9b0f59313b695a7666910872eb9505dd2e895e1b
diff --git a/net-libs/libircclient/files/libircclient-1.6-build.patch b/net-libs/libircclient/files/libircclient-1.6-build.patch
new file mode 100644
index 000000000000..d3d6c0f3edf9
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.6-build.patch
@@ -0,0 +1,13 @@
+--- libircclient-1.6/configure.in
++++ libircclient-1.6.new/configure.in
+@@ -61,9 +61,7 @@ AC_CHECK_FUNCS([localtime_r socket])
+ AC_CHECK_LIB(socket, socket, AC_DEFINE(HAVE_SOCKET) LIBS="$LIBS -lsocket")
+
+ if test "$use_debug" = "yes"; then
+- CFLAGS="${CFLAGS} -g -DENABLE_DEBUG"
+-else
+- CFLAGS="${CFLAGS} -O3"
++ CFLAGS="${CFLAGS} -DENABLE_DEBUG"
+ fi
+
+ # Choosing the target
diff --git a/net-libs/libircclient/files/libircclient-1.6-include.patch b/net-libs/libircclient/files/libircclient-1.6-include.patch
new file mode 100644
index 000000000000..c5bce1dfd947
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.6-include.patch
@@ -0,0 +1,10 @@
+--- libircclient-1.6.orig/include/libircclient.h
++++ libircclient-1.6/include/libircclient.h
+@@ -130,6 +130,7 @@
+ #define IN_INCLUDE_LIBIRC_H
+ #include "libirc_errors.h"
+ #include "libirc_events.h"
++#include "libirc_rfcnumeric.h"
+ #include "libirc_options.h"
+ #undef IN_INCLUDE_LIBIRC_H
+
diff --git a/net-libs/libircclient/files/libircclient-1.6-shared.patch b/net-libs/libircclient/files/libircclient-1.6-shared.patch
new file mode 100644
index 000000000000..44fe9ded64b6
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.6-shared.patch
@@ -0,0 +1,53 @@
+--- libircclient-1.6/src/Makefile.in
++++ libircclient-1.6/src/Makefile.in
+@@ -1,10 +1,13 @@
+ # $Id$
+ CC = @CC@
+-CFLAGS = -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
++CFLAGS = -fPIC -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
+ AR=@AR@ cr
+ RANLIB=@RANLIB@
++INSTALL = install
++LN = ln -sf
+ INCLUDES=-I../include
+ DESTDIR=
++APIVERSION = 1
+
+ OBJS = libircclient.o
+
+@@ -14,19 +17,24 @@
+ shared: libircclient.so
+ shared_mingw: libircclient.dll
+
+-install: lib
+- -mkdir -p $(DESTDIR)@prefix@/include
+- -mkdir -p $(DESTDIR)@prefix@/lib
+- cp ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
+- cp ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
+- cp ../include/libirc_events.h $(DESTDIR)@prefix@/include/libirc_events.h
+- cp ../include/libirc_options.h $(DESTDIR)@prefix@/include/libirc_options.h
+- cp ../include/libirc_rfcnumeric.h $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h
+- cp libircclient.so $(DESTDIR)@prefix@/lib/
+- cp libircclient.a $(DESTDIR)@prefix@/lib/
++install: install-headers install-static install-shared
++install-headers:
++ $(INSTALL) -d $(DESTDIR)@prefix@/include
++ $(INSTALL) -m0644 ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
++ $(INSTALL) -m0644 ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
++ $(INSTALL) -m0644 ../include/libirc_events.h $(DESTDIR)@prefix@/include/libirc_events.h
++ $(INSTALL) -m0644 ../include/libirc_options.h $(DESTDIR)@prefix@/include/libirc_options.h
++ $(INSTALL) -m0644 ../include/libirc_rfcnumeric.h $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h
++install-shared:
++ $(INSTALL) -d $(DESTDIR)@libdir@
++ $(INSTALL) -m0755 libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
++ $(LN) libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
++install-static:
++ $(INSTALL) -d $(DESTDIR)@libdir@
++ $(INSTALL) -m0644 libircclient.a $(DESTDIR)@libdir@/libircclient.a
+
+ libircclient.so: libircclient.o
+- $(CC) -shared -s -o libircclient.so libircclient.o @LIBS@
++ $(CC) $(CFLAGS) -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o $(LDFLAGS) @LIBS@
+
+ libircclient.dll: libircclient.o
+ $(CC) -shared -s -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@
diff --git a/net-libs/libircclient/files/libircclient-1.6-static.patch b/net-libs/libircclient/files/libircclient-1.6-static.patch
new file mode 100644
index 000000000000..4ecbb3362223
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.6-static.patch
@@ -0,0 +1,12 @@
+--- libircclient-1.6.orig/src/Makefile.in
++++ libircclient-1.6/src/Makefile.in
+@@ -9,6 +9,9 @@
+ DESTDIR=
+ APIVERSION = 1
+
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++
+ OBJS = libircclient.o
+
+ all: @TARGET@
diff --git a/net-libs/libircclient/files/libircclient-1.8-build.patch b/net-libs/libircclient/files/libircclient-1.8-build.patch
new file mode 100644
index 000000000000..86ea64efd55a
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.8-build.patch
@@ -0,0 +1,13 @@
+--- libircclient-1.7.orig/configure.in
++++ libircclient-1.7/configure.in
+@@ -61,9 +61,7 @@
+ AC_CHECK_LIB(socket, socket, AC_DEFINE(HAVE_SOCKET) LIBS="$LIBS -lsocket")
+
+ if test "$use_debug" = "yes"; then
+- CFLAGS="${CFLAGS} -g -DENABLE_DEBUG"
+-else
+- CFLAGS="${CFLAGS} -O3"
++ CFLAGS="${CFLAGS} -DENABLE_DEBUG"
+ fi
+
+ # Choosing the target
diff --git a/net-libs/libircclient/files/libircclient-1.8-include.patch b/net-libs/libircclient/files/libircclient-1.8-include.patch
new file mode 100644
index 000000000000..c5bce1dfd947
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.8-include.patch
@@ -0,0 +1,10 @@
+--- libircclient-1.6.orig/include/libircclient.h
++++ libircclient-1.6/include/libircclient.h
+@@ -130,6 +130,7 @@
+ #define IN_INCLUDE_LIBIRC_H
+ #include "libirc_errors.h"
+ #include "libirc_events.h"
++#include "libirc_rfcnumeric.h"
+ #include "libirc_options.h"
+ #undef IN_INCLUDE_LIBIRC_H
+
diff --git a/net-libs/libircclient/files/libircclient-1.8-shared.patch b/net-libs/libircclient/files/libircclient-1.8-shared.patch
new file mode 100644
index 000000000000..1fbc0e693502
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.8-shared.patch
@@ -0,0 +1,50 @@
+--- libircclient-1.7.orig/src/Makefile.in
++++ libircclient-1.7/src/Makefile.in
+@@ -1,8 +1,10 @@
+ # $Id$
+ CC = @CC@
+-CFLAGS = -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
++CFLAGS = -fPIC -Wall -DIN_BUILDING_LIBIRC @CFLAGS@
+ AR=@AR@ cr
+ RANLIB=@RANLIB@
++INSTALL=install
++LN=ln -sf
+ INCLUDES=-I../include
+ DESTDIR=
+ APIVERSION = 1
+@@ -15,19 +17,24 @@
+ shared: libircclient.so
+ shared_mingw: libircclient.dll
+
+-install:
+- -mkdir -p $(DESTDIR)@prefix@/include
+- -mkdir -p $(DESTDIR)@libdir@
+- cp ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
+- cp ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
+- cp ../include/libirc_events.h $(DESTDIR)@prefix@/include/libirc_events.h
+- cp ../include/libirc_options.h $(DESTDIR)@prefix@/include/libirc_options.h
+- cp ../include/libirc_rfcnumeric.h $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h
+- cp libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
+- ln -fs libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
++install: install-headers install-static install-shared
++install-headers:
++ $(INSTALL) -d $(DESTDIR)@prefix@/include
++ $(INSTALL) -m0644 ../include/libircclient.h $(DESTDIR)@prefix@/include/libircclient.h
++ $(INSTALL) -m0644 ../include/libirc_errors.h $(DESTDIR)@prefix@/include/libirc_errors.h
++ $(INSTALL) -m0644 ../include/libirc_events.h $(DESTDIR)@prefix@/include/libirc_events.h
++ $(INSTALL) -m0644 ../include/libirc_options.h $(DESTDIR)@prefix@/include/libirc_options.h
++ $(INSTALL) -m0644 ../include/libirc_rfcnumeric.h $(DESTDIR)@prefix@/include/libirc_rfcnumeric.h
++install-shared:
++ $(INSTALL) -d $(DESTDIR)@libdir@
++ $(INSTALL) -m0755 libircclient.so $(DESTDIR)@libdir@/libircclient.so.$(APIVERSION)
++ $(LN) libircclient.so.$(APIVERSION) $(DESTDIR)@libdir@/libircclient.so
++install-static:
++ $(INSTALL) -d $(DESTDIR)@libdir@
++ $(INSTALL) -m0644 libircclient.a $(DESTDIR)@libdir@/libircclient.a
+
+ libircclient.so: libircclient.o
+- $(CC) -shared -s -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o @LIBS@
++ $(CC) $(CFLAGS) -shared -Wl,-soname,libircclient.so.$(APIVERSION) -o libircclient.so libircclient.o $(LDFLAGS) @LIBS@
+
+ libircclient.dll: libircclient.o
+ $(CC) -shared -s -o libircclient.dll -Wl,-out-implib,libircclient.lib libircclient.o libircclient.def -lkernel32 -lwsock32 @LIBS@
diff --git a/net-libs/libircclient/files/libircclient-1.8-static.patch b/net-libs/libircclient/files/libircclient-1.8-static.patch
new file mode 100644
index 000000000000..b820a19c73d1
--- /dev/null
+++ b/net-libs/libircclient/files/libircclient-1.8-static.patch
@@ -0,0 +1,12 @@
+--- libircclient-1.7.orig/src/Makefile.in
++++ libircclient-1.7/src/Makefile.in
+@@ -9,6 +9,9 @@
+ DESTDIR=
+ APIVERSION = 1
+
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++
+ OBJS = libircclient.o
+
+ all: @TARGET@
diff --git a/net-libs/libircclient/libircclient-1.6-r2.ebuild b/net-libs/libircclient/libircclient-1.6-r2.ebuild
new file mode 100644
index 000000000000..66d2da4a8b34
--- /dev/null
+++ b/net-libs/libircclient/libircclient-1.6-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Small but powerful library implementing the client-server IRC protocol"
+HOMEPAGE="http://www.ulduzsoft.com/libircclient/"
+SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc ipv6 ssl static-libs threads"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-build.patch \
+ "${FILESDIR}"/${P}-shared.patch \
+ "${FILESDIR}"/${P}-include.patch \
+ "${FILESDIR}"/${P}-static.patch
+ eautoconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable threads) \
+ $(use_enable ipv6) \
+ $(use_enable ssl openssl) \
+ $(use_enable ssl threads)
+}
+
+src_compile() {
+ emake -C src $(usex static-libs "shared static" "shared")
+}
+
+src_install() {
+ emake -C src DESTDIR="${D}" $(usex static-libs "install" "install-shared")
+ insinto /usr/include/libircclient
+ doins include/*.h
+
+ dodoc Changelog THANKS
+ if use doc ; then
+ doman doc/man/man3/*
+ dohtml doc/html/*
+ fi
+}
diff --git a/net-libs/libircclient/libircclient-1.8.ebuild b/net-libs/libircclient/libircclient-1.8.ebuild
new file mode 100644
index 000000000000..1b5541aec5dc
--- /dev/null
+++ b/net-libs/libircclient/libircclient-1.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Small but powerful library implementing the client-server IRC protocol"
+HOMEPAGE="http://www.ulduzsoft.com/libircclient/"
+SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="doc ipv6 ssl static-libs threads"
+
+DEPEND="ssl? ( dev-libs/openssl:0 )"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-build.patch \
+ "${FILESDIR}"/${P}-shared.patch \
+ "${FILESDIR}"/${P}-static.patch \
+ "${FILESDIR}"/${P}-include.patch
+ mv configure.in configure.ac || die
+ eautoconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable threads) \
+ $(use_enable ipv6) \
+ $(use_enable ssl openssl) \
+ $(use_enable ssl threads)
+}
+
+src_compile() {
+ emake -C src $(usex static-libs "shared static" "shared")
+}
+
+src_install() {
+ emake -C src DESTDIR="${D}" install-shared $(usex static-libs "install-static" "")
+ insinto /usr/include/libircclient
+ doins include/*.h
+
+ dodoc Changelog THANKS
+ doman man/libircclient.1
+}
diff --git a/net-libs/libircclient/metadata.xml b/net-libs/libircclient/metadata.xml
new file mode 100644
index 000000000000..85eaa183f0ae
--- /dev/null
+++ b/net-libs/libircclient/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>games</herd>
+ <upstream>
+ <remote-id type="sourceforge">libircclient</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
new file mode 100644
index 000000000000..e9559f8d0017
--- /dev/null
+++ b/net-libs/libiscsi/Manifest
@@ -0,0 +1 @@
+DIST libiscsi-1.9.0.tar.gz 182123 SHA256 64d7d6fdb53f0cc4163a0f1dc6cc94618f34a52c4836cf25a42f3769dfd46bbf SHA512 cf88c0f32a21193499720d24f215fb02e7a46ef07999ef59cdad9cad14f92399b3d2e46e8e6f54574dc77225a5b437608216da242971e0d6f35c71830371415a WHIRLPOOL 63af85f03e032ff034b7ce3331f8cb74ffa79c4621efb9873e0b3c76f3f9620439c11216f33d1e97c784f98ecff516048e53f66d88d51dc81578e7e535135588
diff --git a/net-libs/libiscsi/files/libiscsi-1.9.0-0001-Allow-users-to-disable-Werror-at-configure-time.patch b/net-libs/libiscsi/files/libiscsi-1.9.0-0001-Allow-users-to-disable-Werror-at-configure-time.patch
new file mode 100644
index 000000000000..31868ceab099
--- /dev/null
+++ b/net-libs/libiscsi/files/libiscsi-1.9.0-0001-Allow-users-to-disable-Werror-at-configure-time.patch
@@ -0,0 +1,35 @@
+From 2d43a056a9e7b57bc03d580a850a8dca534e61d5 Mon Sep 17 00:00:00 2001
+From: Doug Goldstein <doug.goldstein@pikewerks.com>
+Date: Wed, 5 Jun 2013 14:28:48 -0500
+Subject: [PATCH] Allow users to disable -Werror at configure time
+
+Some users and distro packagers might not want to build with -Werror,
+this allows them to disable using -Werror but enables it in the default
+case so as to maintain the current behavior.
+---
+ configure.ac | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9d06e3a..6dce230 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,8 +11,14 @@ AC_CANONICAL_HOST
+ AM_CONDITIONAL(LD_ISCSI,
+ [expr "$host_os" : linux > /dev/null 2>&1])
+
++AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror],
++ [Disables building with -Werror by default])])
++
+ if test "$ac_cv_prog_gcc" = yes; then
+- WARN_CFLAGS="-Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Werror -Wno-strict-aliasing"
++ WARN_CFLAGS="-Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Wno-strict-aliasing"
++ if test "x$enable_werror" != "xno"; then
++ WARN_CFLAGS="$WARN_CFLAGS -Werror"
++ fi
+ fi
+ AC_SUBST(WARN_CFLAGS)
+
+--
+1.8.2.1
+
diff --git a/net-libs/libiscsi/libiscsi-1.9.0-r1.ebuild b/net-libs/libiscsi/libiscsi-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..21b1d600cb85
--- /dev/null
+++ b/net-libs/libiscsi/libiscsi-1.9.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="1"
+inherit eutils autotools-utils
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-2
+ SRC_URI=""
+ EGIT_REPO_URI="git://github.com/sahlberg/libiscsi.git"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/sahlberg/libiscsi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="iscsi client library and utilities"
+HOMEPAGE="https://github.com/sahlberg/libiscsi"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/ld_iscsi.so"
+
+myeconfargs=( "--disable-werror" )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-00*.patch
+
+ epatch_user
+
+ autotools-utils_src_prepare
+}
diff --git a/net-libs/libiscsi/libiscsi-1.9.0.ebuild b/net-libs/libiscsi/libiscsi-1.9.0.ebuild
new file mode 100644
index 000000000000..2be8c7b7e765
--- /dev/null
+++ b/net-libs/libiscsi/libiscsi-1.9.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="1"
+inherit autotools-utils
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-2
+ SRC_URI=""
+ EGIT_REPO_URI="git://github.com/sahlberg/libiscsi.git"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/sahlberg/libiscsi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="iscsi client library and utilities"
+HOMEPAGE="https://github.com/sahlberg/libiscsi"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/net-libs/libiscsi/libiscsi-9999.ebuild b/net-libs/libiscsi/libiscsi-9999.ebuild
new file mode 100644
index 000000000000..bfb4ad5d3496
--- /dev/null
+++ b/net-libs/libiscsi/libiscsi-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="1"
+inherit autotools-utils
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-2
+ SRC_URI=""
+ EGIT_REPO_URI="git://github.com/sahlberg/libiscsi.git"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/sahlberg/libiscsi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="iscsi client library and utilities"
+HOMEPAGE="https://github.com/sahlberg/libiscsi"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/net-libs/libiscsi/metadata.xml b/net-libs/libiscsi/metadata.xml
new file mode 100644
index 000000000000..71ac53483b26
--- /dev/null
+++ b/net-libs/libiscsi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>ryao@gentoo.org</email>
+ <name>Richard Yao</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">sahlberg/libiscsi</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest
new file mode 100644
index 000000000000..b9167818e299
--- /dev/null
+++ b/net-libs/libisds/Manifest
@@ -0,0 +1,2 @@
+DIST libisds-0.10.tar.xz 721260 SHA256 f2cb8bddbee79070bce599556ebbde42cacac1bc3ee405ab74c3b18a3dc3996f SHA512 9b317d2a4c4e957151b0d397119460a249edb3f1d76c089fa9628551dc4f858d7c5e82bc5b363017c1193ea6a764a3aa6685f4b76fdf2f1c6c5f72436d9231cd WHIRLPOOL cb7ea1c23c15c9779ba98b15ccb3df90894135963f519603ee219f0b4db14bda3c7b11b6f8e495977fd689b47cfe45628c261cac7ba05c081e8a24efd895e19c
+DIST libisds-0.7.tar.xz 685388 SHA256 db57ca7d8bdd306dfe5ec86d22afd36cb1b859a9e72bc3293d982842cb796701 SHA512 c250d7967aee997fbbb97ab077ff0d83cbf3a5aca4cfe7885453a1e25e17e3da0c119424787cb3010febea6076f62e9150ea8d91f6d955708023df25e5b5690b WHIRLPOOL 6b7c4b22411296d8c6b3a8c222da6404c915635dc7cb79d97f36123b0e033a337b93b0acb62dacff394a2d439d1622d078c6076cf34aa2f1838e4b57f7343c2a
diff --git a/net-libs/libisds/libisds-0.10.ebuild b/net-libs/libisds/libisds-0.10.ebuild
new file mode 100644
index 000000000000..a2d9233acbd8
--- /dev/null
+++ b/net-libs/libisds/libisds-0.10.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Client library for accessing ISDS Soap services"
+HOMEPAGE="http://xpisar.wz.cz/libisds/"
+SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
+KEYWORDS="~amd64 ~mips ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="+curl debug nls openssl static-libs test"
+
+COMMON_DEPEND="
+ dev-libs/expat
+ dev-libs/libxml2
+ curl? ( net-misc/curl[ssl] )
+ openssl? ( dev-libs/openssl:* )
+ !openssl? (
+ app-crypt/gpgme
+ dev-libs/libgcrypt:*
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( >=net-libs/gnutls-2.12.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !openssl? ( >=app-crypt/gnupg-2 )
+"
+
+DOCS=( NEWS README AUTHORS ChangeLog )
+
+src_prepare() {
+ base_src_prepare
+}
+
+src_configure() {
+ econf \
+ --disable-fatalwarnings \
+ $(use_with curl libcurl) \
+ $(use_enable curl curlreauthorizationbug) \
+ $(use_enable debug) \
+ $(use_enable nls) \
+ $(use_enable openssl openssl-backend) \
+ $(use_enable static-libs static) \
+ $(use_enable test)
+}
+
+src_install() {
+ base_src_install
+
+ prune_libtool_files --all
+}
diff --git a/net-libs/libisds/libisds-0.7.ebuild b/net-libs/libisds/libisds-0.7.ebuild
new file mode 100644
index 000000000000..ab818524b156
--- /dev/null
+++ b/net-libs/libisds/libisds-0.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+[[ ${PV} = 9999* ]] && inherit git-2 autotools
+EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
+inherit base eutils
+
+DESCRIPTION="Client library for accessing ISDS Soap services"
+HOMEPAGE="http://xpisar.wz.cz/libisds/"
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
+ KEYWORDS="~amd64 ~mips ~x86"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="+curl debug nls static-libs test"
+
+COMMON_DEPEND="
+ app-crypt/gpgme
+ dev-libs/expat
+ dev-libs/libgcrypt:0
+ dev-libs/libxml2
+ curl? ( net-misc/curl[ssl] )
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=app-crypt/gnupg-2
+"
+
+DOCS=( NEWS README AUTHORS ChangeLog )
+
+src_prepare() {
+ base_src_prepare
+ [[ ${PV} = 9999* ]] && eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-fatalwarnings \
+ $(use_with curl libcurl) \
+ $(use_enable curl curlreauthorizationbug) \
+ $(use_enable debug) \
+ $(use_enable nls) \
+ $(use_enable static-libs static) \
+ $(use_enable test)
+}
+
+src_install() {
+ base_src_install
+
+ prune_libtool_files --all
+}
diff --git a/net-libs/libisds/libisds-9999.ebuild b/net-libs/libisds/libisds-9999.ebuild
new file mode 100644
index 000000000000..ab818524b156
--- /dev/null
+++ b/net-libs/libisds/libisds-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+[[ ${PV} = 9999* ]] && inherit git-2 autotools
+EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
+inherit base eutils
+
+DESCRIPTION="Client library for accessing ISDS Soap services"
+HOMEPAGE="http://xpisar.wz.cz/libisds/"
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
+ KEYWORDS="~amd64 ~mips ~x86"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="+curl debug nls static-libs test"
+
+COMMON_DEPEND="
+ app-crypt/gpgme
+ dev-libs/expat
+ dev-libs/libgcrypt:0
+ dev-libs/libxml2
+ curl? ( net-misc/curl[ssl] )
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=app-crypt/gnupg-2
+"
+
+DOCS=( NEWS README AUTHORS ChangeLog )
+
+src_prepare() {
+ base_src_prepare
+ [[ ${PV} = 9999* ]] && eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-fatalwarnings \
+ $(use_with curl libcurl) \
+ $(use_enable curl curlreauthorizationbug) \
+ $(use_enable debug) \
+ $(use_enable nls) \
+ $(use_enable static-libs static) \
+ $(use_enable test)
+}
+
+src_install() {
+ base_src_install
+
+ prune_libtool_files --all
+}
diff --git a/net-libs/libisds/metadata.xml b/net-libs/libisds/metadata.xml
new file mode 100644
index 000000000000..9ac387cdd030
--- /dev/null
+++ b/net-libs/libisds/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<longdescription>
+ A library for accessing ISDS (Informační systém datových schránek
+ / Data Box Information System) SOAP services as defined in Czech ISDS Act
+ (300/2008 Coll.) and implied documents.
+</longdescription>
+<maintainer>
+ <email>petr.pisar@atlas.cz</email>
+ <name>Petr Pisar</name>
+ <description>Proxy-Maintainer. Assign bugs to him</description>
+</maintainer>
+<use>
+ <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto backend
+ instead of <pkg>app-crypt/gpgme</pkg> and
+ <pkg>dev-libs/libgcrypt</pkg></flag>
+</use>
+
+</pkgmetadata>
diff --git a/net-libs/libkfbapi/Manifest b/net-libs/libkfbapi/Manifest
new file mode 100644
index 000000000000..39641b6251d3
--- /dev/null
+++ b/net-libs/libkfbapi/Manifest
@@ -0,0 +1 @@
+DIST libkfbapi-1.0.tar.bz2 53930 SHA256 6edd25730367d3969910481a5b9021c6ed4eff8e4c92ac5b60a9035121008ebc SHA512 d9587752008aeecd061e27fa1415920b938cc71d117d59673ea9f0fe985be68fdf682ed9caf5caf8528b9486ad44d832b06e59c545a349aad1416f49df7d6a85 WHIRLPOOL b7387934425034c97a96be7156583daf3cde44d2cbad79ca9f0be267038980bf7917d375e79fba696cdd6a7a71937b1915aad7ccbbdf00524c1c336a760199f0
diff --git a/net-libs/libkfbapi/libkfbapi-1.0.ebuild b/net-libs/libkfbapi/libkfbapi-1.0.ebuild
new file mode 100644
index 000000000000..2bcd3d28aaf9
--- /dev/null
+++ b/net-libs/libkfbapi/libkfbapi-1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="ar be bs cs da de el en_GB eo es et fi fr ga gl hi hu it ja kk km
+lt mai mr nb nds nl nn oc pa pl pt pt_BR ro ru sk sl sv tr ug uk zh_TW"
+inherit kde4-base
+
+DESCRIPTION="Library for accessing Facebook services based on KDE technology"
+HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkfbapi"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs)
+ dev-libs/libxslt
+ dev-libs/qjson
+"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/libkfbapi/metadata.xml b/net-libs/libkfbapi/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/net-libs/libkfbapi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/net-libs/libkgapi/Manifest b/net-libs/libkgapi/Manifest
new file mode 100644
index 000000000000..8883b808bdb7
--- /dev/null
+++ b/net-libs/libkgapi/Manifest
@@ -0,0 +1 @@
+DIST libkgapi-2.2.0.tar.bz2 127026 SHA256 c02965b639c2496d489d4f1865e35473db6f1b5e9e84fb079988d33db629c2b4 SHA512 c5f37aacb89243d7985d7064aa8941d3d2a6c26685113e876b38c737ea2e1126b40b0f88b0908e7ea8a7bcb2fade1dc528c2f73f22890b9e892c6d18d9d3bb42 WHIRLPOOL 1aa1d5c661098793a6c6a112ed92198c044cd0ab9e320631e165dc2cbb510df6c7d0a96412b2147728aaba822e40c571c07ca2b88ad5f5a055c0755490774a08
diff --git a/net-libs/libkgapi/libkgapi-2.2.0.ebuild b/net-libs/libkgapi/libkgapi-2.2.0.ebuild
new file mode 100644
index 000000000000..868249988898
--- /dev/null
+++ b/net-libs/libkgapi/libkgapi-2.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="Library for accessing Google calendar and contact resources"
+HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkgapi"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs '' 4.14)
+ dev-libs/qjson
+"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/libkgapi/metadata.xml b/net-libs/libkgapi/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/net-libs/libkgapi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/net-libs/libkolab/Manifest b/net-libs/libkolab/Manifest
new file mode 100644
index 000000000000..00943c13fad1
--- /dev/null
+++ b/net-libs/libkolab/Manifest
@@ -0,0 +1,2 @@
+DIST libkolab-0.5.2.tar.gz 186423 SHA256 6a1673f7f7f620c87cbfde2e7b5e981395ea5829e1599b65e7cc539f3a7428ca SHA512 3a7b0765b944f2e871994da00637089762654b209d895a60f913af57b3074f3174dba793c637d3fe083ef7cc06075729710da2cd7e8eb3e16d9638647880c587 WHIRLPOOL 2a26733d47f20450f81c6ef1f132dcad6157d79e5e27ae3a0fa209660debba72b776498baeec6fe816fa3bf168d22362474d207587ddaca95715a5488b4b9dca
+DIST libkolab-0.5.3.tar.gz 186440 SHA256 a90c4d892850e1795aec97f14c887f41463d0cad573926cdafd17f972e9d2726 SHA512 889f51afc15c49651452f03b9a0d99668bb0b2e9c3c6bbf6abdb2af0286d12b2c9580d19850758ed66057e125efa367edc56721114d3d84687a3f985c1c326d9 WHIRLPOOL 8c8b405702fd12a12a620f5f2562e15a2fd509e2c45fff0907ae001ba4b1f4e41dd985063f79000fbbab63c68eb1c3589d783a8a608b555bd5c08ec9622e6ddf
diff --git a/net-libs/libkolab/libkolab-0.5.2.ebuild b/net-libs/libkolab/libkolab-0.5.2.ebuild
new file mode 100644
index 000000000000..27cb19d72149
--- /dev/null
+++ b/net-libs/libkolab/libkolab-0.5.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde4-base multilib
+
+DESCRIPTION="Advanced Kolab Object Handling Library"
+HOMEPAGE="http://kolab.org"
+SRC_URI="http://mirror.kolabsys.com/pub/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2+ LGPL-2.1+ LGPL-3+"
+SLOT="4"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
+IUSE="php python test"
+
+# Tests fail, last checked 0.5.2
+RESTRICT="test"
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)')
+ dev-lang/swig
+ >=net-libs/libkolabxml-1.0.0
+ php? ( dev-lang/php )
+ python? ( dev-lang/python )
+
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # not installed by upstream
+ sed -e "/add_subdirectory(utils)/d" -i CMakeLists.txt || die
+ kde4-base_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR=$(get_libdir)
+ $(cmake-utils_use test BUILD_TESTS)
+ $(cmake-utils_use python PYTHON_BINDINGS)
+ $(cmake-utils_use php PHP_BINDINGS)
+ )
+ kde4-base_src_configure
+}
diff --git a/net-libs/libkolab/libkolab-0.5.3.ebuild b/net-libs/libkolab/libkolab-0.5.3.ebuild
new file mode 100644
index 000000000000..3ee5ee8f5ea0
--- /dev/null
+++ b/net-libs/libkolab/libkolab-0.5.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde4-base multilib
+
+DESCRIPTION="Advanced Kolab Object Handling Library"
+HOMEPAGE="http://kolab.org"
+SRC_URI="http://mirror.kolabsys.com/pub/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2+ LGPL-2.1+ LGPL-3+"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="php python test"
+
+# Tests fail, last checked 0.5.3
+RESTRICT="test"
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)')
+ dev-lang/swig
+ >=net-libs/libkolabxml-1.0.0
+ php? ( dev-lang/php )
+ python? ( dev-lang/python )
+
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # not installed by upstream
+ sed -e "/add_subdirectory(utils)/d" -i CMakeLists.txt || die
+ kde4-base_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR=$(get_libdir)
+ $(cmake-utils_use test BUILD_TESTS)
+ $(cmake-utils_use python PYTHON_BINDINGS)
+ $(cmake-utils_use php PHP_BINDINGS)
+ )
+ kde4-base_src_configure
+}
diff --git a/net-libs/libkolab/metadata.xml b/net-libs/libkolab/metadata.xml
new file mode 100644
index 000000000000..8d36d5b01cd2
--- /dev/null
+++ b/net-libs/libkolab/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/net-libs/libkolabxml/Manifest b/net-libs/libkolabxml/Manifest
new file mode 100644
index 000000000000..aeb14cc104ef
--- /dev/null
+++ b/net-libs/libkolabxml/Manifest
@@ -0,0 +1,3 @@
+DIST libkolabxml-1.0.1.tar.gz 124465 SHA256 b0a310aca6ce61d3a3b18ddd5768d9491a908b55ef477b781a471eb5f495bfea SHA512 cfdd4e952cf1d59703659a053c732eadf88a32dcaee778de7410062886ff177648724f187d657c7168383a18af340b2fb96599024c90f54321f5116b252e0259 WHIRLPOOL b0f3a474e4cb7aa7b56ee94814e8cc9d04aa798c60a2dad2caeab2cfc5841b495600f65bad727928390edb2e02aac7839bfddd0b3e29f78127290736accc67ca
+DIST libkolabxml-1.0.3.tar.gz 125707 SHA256 8734f8cb34c870c97af6db8c6602a5b705c2f90931ee83fe7594d28d2ee67976 SHA512 f84560a2cd8d0bba9b959632b5ecb683a4d9e32f13f296702b8874fae372c1ab6a885d6a17ebd4d6fb5bd6f63f2d4e5bcc5e3ea18bdbcf66d8fa5b148f75ab4e WHIRLPOOL d45b8d8e2a8a4e35d9940ee486916fdc26ef5cf2f722dd516eb80f02d74ceb4dd9f4e3491124535d4c957ea1d751d2608d3ba8101326d661da15901a28862d49
+DIST libkolabxml-1.1.0.tar.gz 128174 SHA256 5743bc7cbee168932faeddefcea00eadddbc6eca90f39e76ca77f9a2ac53d462 SHA512 d5ef69a38920526895d90950b690aa611b4bd6d6228d1fe333ae86b36a60351206f30477b1d1a350944bd580890cf7bad0ba64ac3fcdd122f38fa338beaac4ff WHIRLPOOL 183f53eb21f5e441ec406192c67d8b05a00de4d3b0250de5975dfe90ea809fbd3e7b49cd7573d9c026ba05451f91f18ee1248ee1947d9bdd5da6d56367c30cac
diff --git a/net-libs/libkolabxml/libkolabxml-1.0.1.ebuild b/net-libs/libkolabxml/libkolabxml-1.0.1.ebuild
new file mode 100644
index 000000000000..407019142945
--- /dev/null
+++ b/net-libs/libkolabxml/libkolabxml-1.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+DESCRIPTION="Kolab XML format schema definitions library"
+HOMEPAGE="http://www.kolab.org"
+SRC_URI="http://mirror.kolabsys.com/pub/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 ZLIB LGPL-3+ public-domain"
+SLOT="4"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
+IUSE="csharp java python php test"
+
+RDEPEND="
+ >=dev-libs/boost-1.42.0:=
+ dev-libs/xerces-c
+ net-misc/curl
+"
+DEPEND="${RDEPEND}
+ dev-cpp/xsd
+ csharp? ( >=dev-lang/swig-2.0.7 dev-lang/mono )
+ java? ( >=dev-lang/swig-2.0.7 virtual/jre )
+ php? ( >=dev-lang/swig-2.0.7 dev-lang/php )
+ python? ( >=dev-lang/swig-2.0.7 dev-lang/python )
+ test? ( dev-qt/qttest:4 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR=$(get_libdir)
+ $(cmake-utils_use csharp CSHARP_BINDINGS)
+ $(cmake-utils_use java JAVA_BINDINGS)
+ $(cmake-utils_use python PYTHON_BINDINGS)
+ $(cmake-utils_use php PHP_BINDINGS)
+ $(cmake-utils_use_build test TESTS)
+ )
+ cmake-utils_src_configure
+}
diff --git a/net-libs/libkolabxml/libkolabxml-1.0.3.ebuild b/net-libs/libkolabxml/libkolabxml-1.0.3.ebuild
new file mode 100644
index 000000000000..f4b96cdb4240
--- /dev/null
+++ b/net-libs/libkolabxml/libkolabxml-1.0.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+DESCRIPTION="Kolab XML format schema definitions library"
+HOMEPAGE="http://www.kolab.org"
+SRC_URI="http://mirror.kolabsys.com/pub/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 ZLIB LGPL-3+ public-domain"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="csharp java python php test"
+
+RDEPEND="
+ >=dev-libs/boost-1.42.0:=
+ dev-libs/xerces-c
+ net-misc/curl
+"
+DEPEND="${RDEPEND}
+ dev-cpp/xsd
+ csharp? ( >=dev-lang/swig-2.0.7 dev-lang/mono )
+ java? ( >=dev-lang/swig-2.0.7 virtual/jre )
+ php? ( >=dev-lang/swig-2.0.7 dev-lang/php )
+ python? ( >=dev-lang/swig-2.0.7 dev-lang/python )
+ test? ( dev-qt/qttest:4 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR=$(get_libdir)
+ $(cmake-utils_use csharp CSHARP_BINDINGS)
+ $(cmake-utils_use java JAVA_BINDINGS)
+ $(cmake-utils_use python PYTHON_BINDINGS)
+ $(cmake-utils_use php PHP_BINDINGS)
+ $(cmake-utils_use_build test TESTS)
+ )
+ cmake-utils_src_configure
+}
diff --git a/net-libs/libkolabxml/libkolabxml-1.1.0.ebuild b/net-libs/libkolabxml/libkolabxml-1.1.0.ebuild
new file mode 100644
index 000000000000..05962fa7950a
--- /dev/null
+++ b/net-libs/libkolabxml/libkolabxml-1.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+DESCRIPTION="Kolab XML format schema definitions library"
+HOMEPAGE="http://www.kolab.org"
+SRC_URI="http://mirror.kolabsys.com/pub/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 ZLIB LGPL-3+ public-domain"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="csharp java python php test"
+
+RDEPEND="
+ >=dev-libs/boost-1.42.0:=
+ dev-libs/xerces-c
+ net-misc/curl
+"
+DEPEND="${RDEPEND}
+ dev-cpp/xsd
+ csharp? ( >=dev-lang/swig-2.0.7 dev-lang/mono )
+ java? ( >=dev-lang/swig-2.0.7 virtual/jre )
+ php? ( >=dev-lang/swig-2.0.7 dev-lang/php )
+ python? ( >=dev-lang/swig-2.0.7 dev-lang/python )
+ test? ( dev-qt/qttest:4 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR=$(get_libdir)
+ $(cmake-utils_use csharp CSHARP_BINDINGS)
+ $(cmake-utils_use java JAVA_BINDINGS)
+ $(cmake-utils_use python PYTHON_BINDINGS)
+ $(cmake-utils_use php PHP_BINDINGS)
+ $(cmake-utils_use_build test TESTS)
+ )
+ cmake-utils_src_configure
+}
diff --git a/net-libs/libkolabxml/metadata.xml b/net-libs/libkolabxml/metadata.xml
new file mode 100644
index 000000000000..10fdb56d0071
--- /dev/null
+++ b/net-libs/libkolabxml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<use>
+ <flag name="csharp">Enable C# language bindings</flag>
+</use>
+</pkgmetadata>
diff --git a/net-libs/libkpeople/Manifest b/net-libs/libkpeople/Manifest
new file mode 100644
index 000000000000..2259b6f66f8c
--- /dev/null
+++ b/net-libs/libkpeople/Manifest
@@ -0,0 +1 @@
+DIST libkpeople-0.3.0.tar.bz2 54677 SHA256 8097426149d68f9c8981b623879fa6509d59f99a3cf6dd58b4d652faba88c1fc SHA512 7e0cb8f397c0c18f51ad5d6516ae0d4dbbe16e2d3b1fab9f163253762d62178989eddfeaa3a61f58fc20f2bea3b962b6f39c120da6956390b94ff945d6aa5c52 WHIRLPOOL b0fdb0c3da20938c1003f119774829dbc5a21a26e36cc423f714b87bee3a4d6a532dbc1a387216403fa71dd5b3baa7b8e02b6b6d7b44c746ddb7d3ab0a83099c
diff --git a/net-libs/libkpeople/libkpeople-0.3.0.ebuild b/net-libs/libkpeople/libkpeople-0.3.0.ebuild
new file mode 100644
index 000000000000..e5f790c35977
--- /dev/null
+++ b/net-libs/libkpeople/libkpeople-0.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+KDE_LINGUAS="bs cs da de el fi fr hu ja lt nl pl pt pt_BR ro ru sk sl sv uk"
+inherit kde4-base
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+else
+ KEYWORDS=""
+fi
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://projects.kde.org/projects/playground/network/kpeople"
+
+LICENSE="LGPL-2.1"
+SLOT="4/4"
+IUSE="debug examples minimal semantic-desktop test"
+
+RDEPEND="
+ $(add_kdebase_dep kdepimlibs)
+ semantic-desktop? ( $(add_kdebase_dep baloo) )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+src_prepare() {
+ use minimal && comment_add_subdirectory po
+ kde4-base_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with examples)
+ $(cmake-utils_use_find_package semantic-desktop Baloo)
+ )
+
+ kde4-base_src_configure
+}
diff --git a/net-libs/libkpeople/metadata.xml b/net-libs/libkpeople/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/net-libs/libkpeople/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
new file mode 100644
index 000000000000..85a5e4865459
--- /dev/null
+++ b/net-libs/libktorrent/Manifest
@@ -0,0 +1 @@
+DIST libktorrent-1.3.1.tar.bz2 863105 SHA256 2fe11ccb4bf2028c3da11e52cde890f1b3a90560e548eac89a4f8e1558b09725 SHA512 63dd4a642da4808cfe414bf4767185daf3233def5259c3f9ab899be58f263c16362eaa5e01383bf9acd78a381bc3915a84965d17f1bd10054cf94851294b622b WHIRLPOOL 1ad34d8e4ad3ad1b8a810d3a2eec1bd13a978ef6be1230521789021160ff0814909052fe2b39efb212276b944d7a5560c0bc0e104eb62f5399062c0d5194348e
diff --git a/net-libs/libktorrent/libktorrent-1.3.1.ebuild b/net-libs/libktorrent/libktorrent-1.3.1.ebuild
new file mode 100644
index 000000000000..628b90d83226
--- /dev/null
+++ b/net-libs/libktorrent/libktorrent-1.3.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_SCM="git"
+if [[ ${PV} != 9999* ]]; then
+ inherit versionator
+ # upstream likes to skip that _ in beta releases
+ MY_PV="${PV/_/}"
+ KTORRENT_VERSION=$(($(get_major_version)+3)).$(get_version_component_range 2-3 ${MY_PV})
+ MY_P="${PN}-${MY_PV}"
+ KDE_HANDBOOK="optional"
+ KDE_DOC_DIRS="doc"
+
+ KDE_LINGUAS="ar ast be bg bs ca ca@valencia cs da de el en_GB eo es et eu
+ fi fr ga gl hi hne hr hu is it ja km ku lt lv ms nb nds nl nn oc pl
+ pt pt_BR ro ru se si sk sl sr sr@ijekavian sr@ijekavianlatin
+ sr@latin sv tr ug uk zh_CN zh_TW"
+ SRC_URI="http://ktorrent.org/downloads/${KTORRENT_VERSION}/${MY_P}.tar.bz2"
+ S="${WORKDIR}"/"${MY_P}"
+
+ KEYWORDS="amd64 ~arm ppc ppc64 x86"
+else
+ KEYWORDS=""
+fi
+VIRTUALX_REQUIRED="test"
+inherit kde4-base
+
+DESCRIPTION="A BitTorrent library based on KDE Platform"
+HOMEPAGE="http://ktorrent.org/"
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="debug"
+
+RDEPEND="
+ app-crypt/qca:2[qt4(+)]
+ dev-libs/gmp
+ dev-libs/libgcrypt:0
+"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ sys-devel/gettext
+"
+
+src_prepare() {
+ kde4-base_src_prepare
+ # do not build non-installed example binary
+ sed -i -e '/add_subdirectory(examples)/d' CMakeLists.txt || die
+}
diff --git a/net-libs/libktorrent/metadata.xml b/net-libs/libktorrent/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/net-libs/libktorrent/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/net-libs/libkvkontakte/Manifest b/net-libs/libkvkontakte/Manifest
new file mode 100644
index 000000000000..7d0959803022
--- /dev/null
+++ b/net-libs/libkvkontakte/Manifest
@@ -0,0 +1,5 @@
+DIST digikam-4.10.0.tar.bz2 69413654 SHA256 4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725 SHA512 a2f1d5f44719409ee45158106cc44541e7226e3c948b722045e104bc398f96233481d60e11dd198e96bfe3028201dac335be403ec74af1ef07e3137c3e9221a4 WHIRLPOOL 5d7997787c549318e5d7d677edc68ee2ebaa95c789b7d5f05e3ea5dea48d56afc23aa7bf3afa33f44353f4189644df7573683580486c0d248352ffb534215f37
+DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
+DIST digikam-4.7.0-1.tar.bz2 70151058 SHA256 230a5841754107d273c953ad4aeef2b57265c4623decc74a454c437175468002 SHA512 a9e162c83d83b2183a4e8f254b971993b884677e24676b3dd58dcf8e90ca87f1046c099ea33083ee0f58eedd13aee69a242fbc3d1eab70e285956393637f3dd4 WHIRLPOOL e454bd9c95b3aa9a4c9007065c8ee3e1da595b389fc868a6a21cacba761d8101d4be507c299fd7651d8ab0c0ddff5fb4038bf49f73213a8ec2b69bcdce02808b
+DIST libkvkontakte-4.11.0.tar.xz 54764 SHA256 12228fa26d7452b4a076d6d140ef897f5c54e4f75ac636b3272a2b5dc43ea9f3 SHA512 81f16ba1c4b0678fea163a4a40a6aebf80bbb0d78f7e8989bb5c91b69cc0806edbd952cb44dc3a06f6194dd9a8acfe06670aca59dcce74a0a288b93acad8d32b WHIRLPOOL 40f50901d222bec4810319526d0406bb3b8d307e6fe6f4acf899a655a3ab0535a2b900423d9506570edfa252f64c4b989f36dee224090e02a1e86e2535b95111
+DIST libkvkontakte-4.12.0.tar.xz 57696 SHA256 4229f0e6b21451d04b9ff5cdc965a2eb9b9dd4a73d51ac52ec7b53ad2ec6cd02 SHA512 4e69034e0af823634bbb451e12b4e8a64c9e4f3823c5b2f9f892cdbf65db2ee9b079f135bff66c413de5443d3e3d56053bd7394e679520a9da611713071b6709 WHIRLPOOL a8e2341c27e4b51307cc02b655d21372cea89dff454d7c385f0d6ac7d11bf02aa135296507fcb232ef03c95d5e8689f455be2e9adec809cf374b93971396c39e
diff --git a/net-libs/libkvkontakte/files/libkvkontakte-2.2.0-libdir.patch b/net-libs/libkvkontakte/files/libkvkontakte-2.2.0-libdir.patch
new file mode 100644
index 000000000000..9cde6a0b8ec8
--- /dev/null
+++ b/net-libs/libkvkontakte/files/libkvkontakte-2.2.0-libdir.patch
@@ -0,0 +1,24 @@
+diff -ruN digikam-2.2.0.orig/extra/libkvkontakte/CMakeLists.txt digikam-2.2.0/extra/libkvkontakte/CMakeLists.txt
+--- digikam-2.2.0.orig/extra/libkvkontakte/CMakeLists.txt 2011-10-03 12:34:05.000000000 +0200
++++ digikam-2.2.0/extra/libkvkontakte/CMakeLists.txt 2011-10-03 20:01:54.082572683 +0200
+@@ -11,11 +11,6 @@
+ # TODO: calculate the version id properly (here is currently a hack that won't work for 1.10.0):
+ set(LIBKVKONTAKTE_VERSION_ID "0x0${LIBKVKONTAKTE_VERSION_MAJOR}0${LIBKVKONTAKTE_VERSION_MINOR}0${LIBKVKONTAKTE_VERSION_PATCH}")
+
+-if(NOT LIB_INSTALL_DIR)
+- set(LIB_INSTALL_DIR lib${LIB_SUFFIX})
+-endif(NOT LIB_INSTALL_DIR)
+-set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/LibKVkontakte )
+-
+ # Use a versioned install directory for the headers so multiple versions can be installed in parallel
+ set(INCLUDE_INSTALL_DIR include )
+
+@@ -26,6 +21,8 @@
+ include(KDE4Defaults)
+ include(MacroLibrary)
+
++set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/LibKVkontakte )
++
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+
+ set(QJSON_VERSION_REQUIRED 0.7)
diff --git a/net-libs/libkvkontakte/libkvkontakte-4.10.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-4.10.0.ebuild
new file mode 100644
index 000000000000..5d11a5802de1
--- /dev/null
+++ b/net-libs/libkvkontakte/libkvkontakte-4.10.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV="${PV/_/-}"
+MY_P="digikam-${MY_PV}"
+
+KDE_MINIMAL="4.10"
+inherit kde4-base
+
+DESCRIPTION="Library for accessing the features of social networking site vkontakte.ru"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=">=dev-libs/qjson-0.7.0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
diff --git a/net-libs/libkvkontakte/libkvkontakte-4.11.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-4.11.0.ebuild
new file mode 100644
index 000000000000..b7c8a0ad134c
--- /dev/null
+++ b/net-libs/libkvkontakte/libkvkontakte-4.11.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="ar bs cs da de el en_GB es et fi fr gl hu it kk km ko nb nds nl pl
+pt pt_BR ro ru sk sl sv tr uk zh_TW"
+inherit kde4-base
+
+DESCRIPTION="Library for accessing the features of social networking site vkontakte.ru"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=">=dev-libs/qjson-0.7.0"
+RDEPEND="${DEPEND}"
+
+# accessing network
+RESTRICT="test"
diff --git a/net-libs/libkvkontakte/libkvkontakte-4.12.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-4.12.0.ebuild
new file mode 100644
index 000000000000..b7c8a0ad134c
--- /dev/null
+++ b/net-libs/libkvkontakte/libkvkontakte-4.12.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="ar bs cs da de el en_GB es et fi fr gl hu it kk km ko nb nds nl pl
+pt pt_BR ro ru sk sl sv tr uk zh_TW"
+inherit kde4-base
+
+DESCRIPTION="Library for accessing the features of social networking site vkontakte.ru"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=">=dev-libs/qjson-0.7.0"
+RDEPEND="${DEPEND}"
+
+# accessing network
+RESTRICT="test"
diff --git a/net-libs/libkvkontakte/libkvkontakte-4.4.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-4.4.0.ebuild
new file mode 100644
index 000000000000..a10ff6f61ed3
--- /dev/null
+++ b/net-libs/libkvkontakte/libkvkontakte-4.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS=""
+KDE_MINIMAL="4.10"
+CMAKE_MIN_VERSION=2.8
+inherit kde4-base
+
+MY_PV=${PV/_/-}
+MY_P="digikam-${MY_PV}"
+SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
+
+DESCRIPTION="Library for accessing the features of social networking site vkontakte.ru"
+HOMEPAGE="http://www.digikam.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+SLOT=4
+
+DEPEND=">=dev-libs/qjson-0.7.0"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-libdir.patch" )
+
+src_configure() {
+ mycmakeargs=(
+ -DFORCED_UNBUNDLE=ON
+ )
+ kde4-base_src_configure
+}
diff --git a/net-libs/libkvkontakte/libkvkontakte-4.7.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-4.7.0.ebuild
new file mode 100644
index 000000000000..64a2e583d90f
--- /dev/null
+++ b/net-libs/libkvkontakte/libkvkontakte-4.7.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV="${PV/_/-}"
+MY_P="digikam-${MY_PV}"
+
+KDE_MINIMAL="4.10"
+inherit kde4-base
+
+DESCRIPTION="Library for accessing the features of social networking site vkontakte.ru"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://kde/stable/digikam/${MY_P}-1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=">=dev-libs/qjson-0.7.0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
diff --git a/net-libs/libkvkontakte/metadata.xml b/net-libs/libkvkontakte/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/net-libs/libkvkontakte/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
new file mode 100644
index 000000000000..6a0458b09b61
--- /dev/null
+++ b/net-libs/liblockfile/Manifest
@@ -0,0 +1 @@
+DIST liblockfile_1.09.orig.tar.gz 32178 SHA256 16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a WHIRLPOOL 4365bd4f90207a97ec8421f60bcf2d61c4565eecc9435fd920b31ede3e182856783d21ad466632ea8d18e0378f3401637185235ef90e50d6bc10d093ae4d8a42
diff --git a/net-libs/liblockfile/files/Makefile.Darwin.in b/net-libs/liblockfile/files/Makefile.Darwin.in
new file mode 100644
index 000000000000..bdd320fe6d49
--- /dev/null
+++ b/net-libs/liblockfile/files/Makefile.Darwin.in
@@ -0,0 +1,80 @@
+#
+# Makefile.in Makefile for the liblockfile package (Darwin version)
+#
+# Gentoo version for Darwin, based on original:
+# version: @(#)Makefile.in 1.01 16-Apr-1999 miquels@cistron.nl
+#
+
+VER = 1.0
+NVER = 0.1
+
+CFLAGS = @CFLAGS@ -I.
+LDFLAGS = @LDFLAGS@
+CC = @CC@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+mandir = @mandir@
+nfslockdir = @nfslockdir@
+includedir = @includedir@
+
+MAILGROUP = @MAILGROUP@
+
+all: @TARGETS@
+install: @INSTALL_TARGETS@
+
+static: liblockfile.a dotlockfile
+shared: liblockfile.dylib dotlockfile
+nfslib: nfslock.$(VER).dylib
+
+liblockfile.a: lockfile.o
+ ar rv liblockfile.a lockfile.o
+
+liblockfile.dylib: liblockfile.a
+ $(CC) $(LDFLAGS) -fPIC -dynamiclib -install_name @libdir@/liblockfile.1.0.dylib \
+ -o liblockfile.dylib lockfile.o -lc
+
+nfslock.$(VER).dylib: nfslock.o
+ $(CC) $(LDFLAGS) -fPIC -dynamiclib -install_name nfslock.0.dylib \
+ -o nfslock.$(NVER).dylib nfslock.o
+
+dotlockfile: dotlockfile.o xlockfile.o
+ $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o
+
+lockfile.o: lockfile.c
+ $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"$(bindir)/dotlockfile\" \
+ -c lockfile.c
+
+xlockfile.o: lockfile.c
+ $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
+
+install_static: static install_common
+ install -m 644 liblockfile.a $(ROOT)$(libdir)
+
+install_shared: shared install_common
+ install -m 755 liblockfile.dylib \
+ $(ROOT)$(libdir)/liblockfile.$(VER).dylib
+ ln -s liblockfile.$(VER).dylib $(ROOT)$(libdir)/liblockfile.dylib
+
+install_common:
+ install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
+ if [ "$(MAILGROUP)" != "" ]; then\
+ install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
+ else \
+ install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
+ fi
+ install -m 644 *.1 $(ROOT)$(mandir)/man1
+ install -m 644 *.3 $(ROOT)$(mandir)/man3
+
+install_nfslib: nfslib
+ install -m 755 nfslock.$(VER).dylib $(ROOT)$(nfslockdir)
+
+clean:
+ rm -f *.a *.o *.dylib dotlockfile
+
+distclean: clean
+ rm -f Makefile autoconf.h maillock.h \
+ config.cache config.log config.status
+
diff --git a/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch b/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch
new file mode 100644
index 000000000000..1a8d0eb18cbe
--- /dev/null
+++ b/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch
@@ -0,0 +1,18 @@
+Index: liblockfile-1.06/Makefile.in
+===================================================================
+--- liblockfile-1.06.orig/Makefile.in
++++ liblockfile-1.06/Makefile.in
+@@ -32,11 +32,11 @@ liblockfile.a: lockfile.o
+ ar rv liblockfile.a lockfile.o
+
+ liblockfile.so: liblockfile.a
+- $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
++ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
+ -o liblockfile.so lockfile.o -lc
+
+ nfslock.so.$(VER): nfslock.o
+- $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
++ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,nfslock.so.0 \
+ -o nfslock.so.$(NVER) nfslock.o
+
+ dotlockfile: dotlockfile.o xlockfile.o
diff --git a/net-libs/liblockfile/files/liblockfile-orphan-file.patch b/net-libs/liblockfile/files/liblockfile-orphan-file.patch
new file mode 100644
index 000000000000..4a8c75ac4129
--- /dev/null
+++ b/net-libs/liblockfile/files/liblockfile-orphan-file.patch
@@ -0,0 +1,19 @@
+diff -ur liblockfile-1.06-orig/Makefile.in liblockfile-1.06/Makefile.in
+--- liblockfile-1.06-orig/Makefile.in 2006-11-28 06:19:09.000000000 +0100
++++ liblockfile-1.06/Makefile.in 2006-11-28 06:24:30.000000000 +0100
+@@ -5,6 +5,7 @@
+ #
+
+ VER = 1.0
++MVER = 1
+ NVER = 0.1
+
+ CFLAGS = @CFLAGS@ -I.
+@@ -55,6 +56,7 @@
+ install_shared: shared install_common
+ install -m 755 liblockfile.so \
+ $(ROOT)$(libdir)/liblockfile.so.$(VER)
++ ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so.$(MVER)
+ ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
+ if test "$(ROOT)" = ""; then @LDCONFIG@; fi
+
diff --git a/net-libs/liblockfile/liblockfile-1.09.ebuild b/net-libs/liblockfile/liblockfile-1.09.ebuild
new file mode 100644
index 000000000000..8d7481ade6d4
--- /dev/null
+++ b/net-libs/liblockfile/liblockfile-1.09.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils multilib autotools user
+
+DESCRIPTION="Implements functions designed to lock the standard mailboxes"
+HOMEPAGE="http://www.debian.org/"
+SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+pkg_setup() {
+ enewgroup mail 12
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.06-respectflags.patch
+ epatch "${FILESDIR}"/${PN}-orphan-file.patch
+
+ # I don't feel like making the Makefile portable
+ [[ ${CHOST} == *-darwin* ]] \
+ && cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
+
+ eautoreconf
+}
+
+src_configure() {
+ local grp=mail
+ if use prefix ; then
+ # we never want to use LDCONFIG
+ export LDCONFIG=${EPREFIX}/bin/true
+ # in unprivileged installs this is "mail"
+ grp=$(id -g)
+ fi
+ econf --with-mailgroup=${grp} --enable-shared
+}
+
+src_install() {
+ dodir /usr/{bin,include,$(get_libdir)} /usr/share/man/{man1,man3}
+ emake ROOT="${D}" install
+ dodoc README Changelog
+}
diff --git a/net-libs/liblockfile/metadata.xml b/net-libs/liblockfile/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/net-libs/liblockfile/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/net-libs/libmapi/Manifest b/net-libs/libmapi/Manifest
new file mode 100644
index 000000000000..44ceaf06a730
--- /dev/null
+++ b/net-libs/libmapi/Manifest
@@ -0,0 +1 @@
+DIST openchange-1.0-BORG.tar.gz 1979219 SHA256 f18c1fdb0dec10ea6a469cb7be5fc24010a44d8c5de42a23da5b0c864f343bb4 SHA512 20c3923bcbbbb09aeebe686727f0fd1d6d5e0d23e815e4c1c945077dd34b646bc80a64f103c830f95e2b26111685400c050717c5bed21ab79167fc913f88a54e WHIRLPOOL 92ffe9e36a0c8c60768d6a5a79b2ac6295f3cacedb245188103254105bcb93526d920739196b2d8738d38e81afe52acfa7096d2abf716b14ab785326a045436d
diff --git a/net-libs/libmapi/files/openchange-1.0-BORG-fix-soname-QA.patch b/net-libs/libmapi/files/openchange-1.0-BORG-fix-soname-QA.patch
new file mode 100644
index 000000000000..0579ddd0663c
--- /dev/null
+++ b/net-libs/libmapi/files/openchange-1.0-BORG-fix-soname-QA.patch
@@ -0,0 +1,18 @@
+--- Makefile~ 2012-03-15 13:50:43.000000000 +0000
++++ Makefile 2012-10-10 12:12:29.318900417 +0000
+@@ -212,6 +212,7 @@
+ $(INSTALL) -d $(DESTDIR)$(libdir)
+ $(INSTALL) -m 0755 libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
+ ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT)
++ ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
+ ifeq ($(MANUALLY_CREATE_SYMLINKS), yes)
+ ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
+ endif
+@@ -400,6 +401,7 @@
+ $(INSTALL) -d $(DESTDIR)$(libdir)
+ $(INSTALL) -m 0755 libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
+ ln -sf libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapipp.$(SHLIBEXT)
++ ln -sf libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapipp.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
+ ifeq ($(MANUALLY_CREATE_SYMLINKS), yes)
+ ln -sf libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION)
+ endif
diff --git a/net-libs/libmapi/files/openchange-1.0-BORG-python-location-fix.patch b/net-libs/libmapi/files/openchange-1.0-BORG-python-location-fix.patch
new file mode 100644
index 000000000000..8e8d243960c0
--- /dev/null
+++ b/net-libs/libmapi/files/openchange-1.0-BORG-python-location-fix.patch
@@ -0,0 +1,20 @@
+--- configure.ac~ 2012-03-15 13:50:43.000000000 +0000
++++ configure.ac 2012-10-10 12:00:15.225031516 +0000
+@@ -328,7 +328,7 @@
+ AC_SUBST(PYTHON_LIBS)
+
+ AC_MSG_CHECKING(python library directory)
+-pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, '\\${prefix}')"`
++pythondir=`$PYTHON -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`
+ AC_MSG_RESULT($pythondir)
+ AC_SUBST(pythondir)
+
+@@ -661,7 +661,7 @@
+ [build Python bindings for libmapi]),
+ enable_pymapi="$enableval",
+ enable_pymapi=no)
+-PYCDIR=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='\\$(prefix)')"`
++PYCDIR=`$PYTHON -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`
+ AC_SUBST(PYCDIR)
+
+ dnl Enable pyopenchange by default
diff --git a/net-libs/libmapi/libmapi-1.0.ebuild b/net-libs/libmapi/libmapi-1.0.ebuild
new file mode 100644
index 000000000000..9939d5600926
--- /dev/null
+++ b/net-libs/libmapi/libmapi-1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+PYTHON_DEPEND="python? *"
+
+inherit autotools eutils python
+
+MY_PN=openchange
+MY_P=${MY_PN}-${PV}-BORG
+
+DESCRIPTION="Portable open-source implementations of Exchange protocols"
+HOMEPAGE="http://www.openchange.org/"
+SRC_URI="http://tracker.openchange.org/attachments/download/180/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="python"
+
+RDEPEND=">=net-fs/samba-4.0.0_rc2
+ dev-libs/boost
+ python? ( dev-lang/python )"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/"${MY_P}"-python-location-fix.patch
+ epatch "${FILESDIR}"/"${MY_P}"-fix-soname-QA.patch
+ eaclocal
+ eautoconf
+}
+src_configure() {
+ ECONF="--disable-coverage
+ $(use_enable python pymapi)"
+
+ econf ${ECONF}
+}
+
+src_compile() {
+ emake libmapi libmapixx || die "libmapi compilation failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" libmapi-install libmapixx-install || die "libmapi install failed"
+
+ if use python ; then
+ emake DESTDIR="${D}" python-install || die "pymapi install failed"
+ fi
+}
diff --git a/net-libs/libmapi/metadata.xml b/net-libs/libmapi/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/net-libs/libmapi/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
new file mode 100644
index 000000000000..112f1d4c3b17
--- /dev/null
+++ b/net-libs/libmbim/Manifest
@@ -0,0 +1,3 @@
+DIST libmbim-1.10.0.tar.xz 384480 SHA256 4e5eade46a61d0cd1f8b6ad47bee938868766eca617a64e7acd2d0b72ff38b6e SHA512 648395a37621e51647878a6c86766a319e5f93080dde6fc41e0e280ffda95decb68352e6bfba946d0a1b441bc2a58e1cdef750274b1282b1f1183b1cbcd51d84 WHIRLPOOL 4febb3e92d8adf96067b4e0742ef7ac513f5791093f0f0551d0f99cceae5afdd986e74521ff9a4f672b91f3ec17938adb59a9770aff038a9651280b115498f60
+DIST libmbim-1.12.2.tar.xz 397268 SHA256 949351d3e3d69b81e40a49f1d187944c26149e0647a415f0227ccdc112047b29 SHA512 d9ae50fecd39f2581ca8db21ec66ac6bfe13e10fe9298a7ec60338f66421ca8411dee3042f58692d60d491d17324d25233623674d322e81f0205c0dea486361a WHIRLPOOL e4225f287580f5cd7b842b025fc887d48d649a8fff962f0a76312cbeeea7443cb3ed518bab3b49d9da2a96b7e942d50a2428bb1005f43764842f3130162841fc
+DIST libmbim-1.6.0.tar.xz 360800 SHA256 e0efbdaf2aeddec033b4c7c5d0f7934c91ce535c5c9f0cadf1e67527d10ab082 SHA512 60c20da65cb5e0e5e3d73434c8b7960ebb7138d6b004d4e6223ba63ea95fdc97b35697a329f12a81033c39c36efcbb3bcb5d8ae813a569dc6e6ca928a1cd79dd WHIRLPOOL 08408f332bfb41ac29e705c462b56899e988ce28ba581202ac6b54f7beee0769b106d4f3bbef7f6484ba68c6dbb27bed905b9611393775ef72f13138b7036aa3
diff --git a/net-libs/libmbim/libmbim-1.10.0.ebuild b/net-libs/libmbim/libmbim-1.10.0.ebuild
new file mode 100644
index 000000000000..5917b4c9d506
--- /dev/null
+++ b/net-libs/libmbim/libmbim-1.10.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
+else
+ KEYWORDS="~alpha amd64 arm ~mips x86"
+ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="MBIM modem protocol helper library"
+HOMEPAGE="http://cgit.freedesktop.org/libmbim/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/glib-2.32:2"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/libgudev
+ virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+ [[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-more-warnings \
+ --disable-gtk-doc \
+ $(use_enable static{-libs,})
+}
+
+src_install() {
+ default
+ use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libmbim/libmbim-1.12.2.ebuild b/net-libs/libmbim/libmbim-1.12.2.ebuild
new file mode 100644
index 000000000000..7f567e4ccf4e
--- /dev/null
+++ b/net-libs/libmbim/libmbim-1.12.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~mips ~x86"
+ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="MBIM modem protocol helper library"
+HOMEPAGE="http://cgit.freedesktop.org/libmbim/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/glib-2.32:2"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/libgudev
+ virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+ [[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-more-warnings \
+ --disable-gtk-doc \
+ $(use_enable static{-libs,})
+}
+
+src_install() {
+ default
+ use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libmbim/libmbim-1.6.0.ebuild b/net-libs/libmbim/libmbim-1.6.0.ebuild
new file mode 100644
index 000000000000..849b2f5073d6
--- /dev/null
+++ b/net-libs/libmbim/libmbim-1.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
+else
+ KEYWORDS="~alpha amd64 arm ~mips x86"
+ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="MBIM modem protocol helper library"
+HOMEPAGE="http://cgit.freedesktop.org/libmbim/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc static-libs test"
+
+RDEPEND=">=dev-libs/glib-2.32"
+DEPEND="${RDEPEND}
+ virtual/libgudev
+ doc? ( dev-util/gtk-doc )
+ virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+ [[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-more-warnings \
+ $(use_enable static{-libs,}) \
+ $(use_enable {,gtk-}doc) \
+ $(use_with test{,s})
+}
+
+src_install() {
+ default
+ use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libmbim/libmbim-9999.ebuild b/net-libs/libmbim/libmbim-9999.ebuild
new file mode 100644
index 000000000000..ab53d288b6c2
--- /dev/null
+++ b/net-libs/libmbim/libmbim-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
+else
+ KEYWORDS="~amd64 ~arm ~x86"
+ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="MBIM modem protocol helper library"
+HOMEPAGE="http://cgit.freedesktop.org/libmbim/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc static-libs test"
+
+RDEPEND=">=dev-libs/glib-2.32"
+DEPEND="${RDEPEND}
+ virtual/libgudev
+ doc? ( dev-util/gtk-doc )
+ virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+ [[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-more-warnings \
+ $(use_enable static{-libs,}) \
+ $(use_enable {,gtk-}doc) \
+ $(use_with test{,s})
+}
+
+src_install() {
+ default
+ use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libmbim/metadata.xml b/net-libs/libmbim/metadata.xml
new file mode 100644
index 000000000000..4d7d21afc425
--- /dev/null
+++ b/net-libs/libmbim/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>alexxy@gentoo.org</email>
+ <name>Alexey Shvetsov</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-libs/libmediawiki/Manifest b/net-libs/libmediawiki/Manifest
new file mode 100644
index 000000000000..d9b60e0ce7c5
--- /dev/null
+++ b/net-libs/libmediawiki/Manifest
@@ -0,0 +1,4 @@
+DIST digikam-4.10.0.tar.bz2 69413654 SHA256 4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725 SHA512 a2f1d5f44719409ee45158106cc44541e7226e3c948b722045e104bc398f96233481d60e11dd198e96bfe3028201dac335be403ec74af1ef07e3137c3e9221a4 WHIRLPOOL 5d7997787c549318e5d7d677edc68ee2ebaa95c789b7d5f05e3ea5dea48d56afc23aa7bf3afa33f44353f4189644df7573683580486c0d248352ffb534215f37
+DIST digikam-4.12.0.tar.bz2 69527960 SHA256 15043afb04733e059460165bc3cdf58dc42a67d7a349fbe12c2ebbe1946e3420 SHA512 a5ebe481ef9803475cd2d4d198b0d093753ecb71367662f0e83a151ab34a2ff071139b28c1d9600279463fed96745b025db86d24b059b0794bc4a2b50338df85 WHIRLPOOL cf29c3555ce41a298c9760287996d8edee76ff8a6ec42b503f55059e40b35f91cf56afb054f641e800f6e630d851491c2f77e0bd67020feefe8d6adf36a643f5
+DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
+DIST digikam-4.7.0-1.tar.bz2 70151058 SHA256 230a5841754107d273c953ad4aeef2b57265c4623decc74a454c437175468002 SHA512 a9e162c83d83b2183a4e8f254b971993b884677e24676b3dd58dcf8e90ca87f1046c099ea33083ee0f58eedd13aee69a242fbc3d1eab70e285956393637f3dd4 WHIRLPOOL e454bd9c95b3aa9a4c9007065c8ee3e1da595b389fc868a6a21cacba761d8101d4be507c299fd7651d8ab0c0ddff5fb4038bf49f73213a8ec2b69bcdce02808b
diff --git a/net-libs/libmediawiki/libmediawiki-4.10.0.ebuild b/net-libs/libmediawiki/libmediawiki-4.10.0.ebuild
new file mode 100644
index 000000000000..8102cc2483dc
--- /dev/null
+++ b/net-libs/libmediawiki/libmediawiki-4.10.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV="${PV/_/-}"
+MY_P="digikam-${MY_PV}"
+
+KDE_MINIMAL="4.10"
+inherit kde4-base
+
+DESCRIPTION="KDE C++ interface for MediaWiki based web service as wikipedia.org"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
diff --git a/net-libs/libmediawiki/libmediawiki-4.12.0.ebuild b/net-libs/libmediawiki/libmediawiki-4.12.0.ebuild
new file mode 100644
index 000000000000..9a42599b21f1
--- /dev/null
+++ b/net-libs/libmediawiki/libmediawiki-4.12.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV="${PV/_/-}"
+MY_P="digikam-${MY_PV}"
+
+inherit kde4-base
+
+DESCRIPTION="KDE C++ interface for MediaWiki based web service as wikipedia.org"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
diff --git a/net-libs/libmediawiki/libmediawiki-4.4.0.ebuild b/net-libs/libmediawiki/libmediawiki-4.4.0.ebuild
new file mode 100644
index 000000000000..3541ad963d64
--- /dev/null
+++ b/net-libs/libmediawiki/libmediawiki-4.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS=""
+KDE_MINIMAL="4.10"
+
+CMAKE_MIN_VERSION=2.8
+
+inherit kde4-base
+
+MY_PV=${PV/_/-}
+MY_P="digikam-${MY_PV}"
+SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2"
+
+DESCRIPTION="KDE C++ interface for MediaWiki based web service as wikipedia.org"
+HOMEPAGE="http://www.digikam.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+SLOT=4
+
+DEPEND=""
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
+
+src_configure() {
+ mycmakeargs=(
+ -DFORCED_UNBUNDLE=ON
+ )
+ kde4-base_src_configure
+}
diff --git a/net-libs/libmediawiki/libmediawiki-4.7.0.ebuild b/net-libs/libmediawiki/libmediawiki-4.7.0.ebuild
new file mode 100644
index 000000000000..736eb6c9d98c
--- /dev/null
+++ b/net-libs/libmediawiki/libmediawiki-4.7.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV="${PV/_/-}"
+MY_P="digikam-${MY_PV}"
+
+KDE_MINIMAL="4.10"
+inherit kde4-base
+
+DESCRIPTION="KDE C++ interface for MediaWiki based web service as wikipedia.org"
+HOMEPAGE="http://www.digikam.org/"
+SRC_URI="mirror://kde/stable/digikam/${MY_P}-1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+S=${WORKDIR}/${MY_P}/extra/${PN}
diff --git a/net-libs/libmediawiki/metadata.xml b/net-libs/libmediawiki/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/net-libs/libmediawiki/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
new file mode 100644
index 000000000000..b52117effb9d
--- /dev/null
+++ b/net-libs/libmicrohttpd/Manifest
@@ -0,0 +1,2 @@
+DIST libmicrohttpd-0.9.39.tar.gz 1205722 SHA256 4f937b6065c366d776be86b1d24b8fc400ebc7ea006a9d77c49a8f2f0cd7e373 SHA512 f7a526803fd5bbd28c817836340f91569542c3f8db6f04ffc8e60cf794cd5a7f1da3beda782fa80b2f6c07bb48cd09454c5bbcae1ad81b00f0df2985740a927a WHIRLPOOL a2dc5f2303bf7fd042d9f5ca58f946e0e506232870b00d7a7cb65127cc1769fdbc9a5b12145d47d7ab4d32d48ab6b311f320c350adbc071d18aae810156073c0
+DIST libmicrohttpd-0.9.42.tar.gz 1232516 SHA256 00352073367003da40607319e4090a6a8308748b59246ae80e9871f34dad7d5b SHA512 6516f545a5b81aa23bb0d22582f6d7e7f028069d94e0d33d9d6f929e111a3c0e0432eb43b26b4eec87860e8b9f50de38f1b5e6e20cd8faf30512e4891f29b9f3 WHIRLPOOL 9d42c08ee37042debf2e16ddd244c91375e4cecb9843e08d58581a9838677148d90d469bcd4890d4a0680a62e691c659394067da1c7060f7c4e49b309be4417c
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.39.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.39.ebuild
new file mode 100644
index 000000000000..577a8f76987a
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.39.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="${P/_/}"
+
+DESCRIPTION="A small C library that makes it easy to run an HTTP server as part of another application"
+HOMEPAGE="http://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+
+IUSE="epoll messages ssl static-libs test"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+RDEPEND="ssl? (
+ dev-libs/libgcrypt:0
+ net-libs/gnutls
+ )"
+
+DEPEND="${RDEPEND}
+ test? (
+ ssl? ( >=net-misc/curl-7.25.0-r1[ssl] )
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS NEWS README ChangeLog"
+
+src_configure() {
+ econf \
+ --enable-bauth \
+ --enable-dauth \
+ --disable-spdy \
+ $(use_enable epoll) \
+ $(use_enable test curl) \
+ $(use_enable messages) \
+ $(use_enable messages postprocessor) \
+ $(use_enable ssl https) \
+ $(use_with ssl gnutls) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.42.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.42.ebuild
new file mode 100644
index 000000000000..0ee9a02a574a
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.42.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="${P/_/}"
+
+DESCRIPTION="A small C library that makes it easy to run an HTTP server as part of another application"
+HOMEPAGE="http://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="epoll messages ssl static-libs test"
+
+RDEPEND="ssl? (
+ dev-libs/libgcrypt:0
+ net-libs/gnutls
+ )"
+
+DEPEND="${RDEPEND}
+ test? (
+ ssl? ( >=net-misc/curl-7.25.0-r1[ssl] )
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS NEWS README ChangeLog"
+
+src_configure() {
+ econf \
+ --enable-bauth \
+ --enable-dauth \
+ --disable-examples \
+ --disable-spdy \
+ --enable-postprocessor \
+ $(use_enable epoll) \
+ $(use_enable test curl) \
+ $(use_enable messages) \
+ $(use_enable ssl https) \
+ $(use_with ssl gnutls) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/libmicrohttpd/metadata.xml b/net-libs/libmicrohttpd/metadata.xml
new file mode 100644
index 000000000000..e486bb8aeb41
--- /dev/null
+++ b/net-libs/libmicrohttpd/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>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+ <use>
+ <flag name='messages'>enable error messages</flag>
+ <flag name='epoll'>use epoll() system call</flag>
+ </use>
+</pkgmetadata>
+
diff --git a/net-libs/libmirisdr/libmirisdr-9999.ebuild b/net-libs/libmirisdr/libmirisdr-9999.ebuild
new file mode 100644
index 000000000000..f7b07fd9c697
--- /dev/null
+++ b/net-libs/libmirisdr/libmirisdr-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils git-2 multilib
+
+DESCRIPTION="Software for the Mirics MSi2500 + MSi001 SDR platform"
+HOMEPAGE="http://cgit.osmocom.org/libmirisdr/"
+EGIT_REPO_URI="git://git.osmocom.org/libmirisdr"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="doc static-libs"
+
+RDEPEND="virtual/libusb:1"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_install() {
+ cmake-utils_src_install
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libmirisdr.a
+}
diff --git a/net-libs/libmirisdr/metadata.xml b/net-libs/libmirisdr/metadata.xml
new file mode 100644
index 000000000000..044f12194316
--- /dev/null
+++ b/net-libs/libmirisdr/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>
+<email>zerochaos@gentoo.org</email>
+<name>Rick Farina</name>
+</maintainer>
+<herd>radio</herd>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/net-libs/libmm-qt/Manifest b/net-libs/libmm-qt/Manifest
new file mode 100644
index 000000000000..5301e9200b18
--- /dev/null
+++ b/net-libs/libmm-qt/Manifest
@@ -0,0 +1 @@
+DIST libmm-qt-1.0.1.tar.xz 69448 SHA256 0ad57815a904ddb2660a7327c0bda5da47a2a60ce57b2b12f4aaff99b174f74a SHA512 608f413510935639d226f59c8e5b125931077020ee8d7fd85d653add118dd98f605c33962462ba41c4702c8a254559d60dfd0b16a76be4cd7bcbf4c57b704dbe WHIRLPOOL 3c556bf8430badc8c166513111d11d1340255ba59d4c6ee4f0926cee209ca119c800b78fb7d248a29ad9cc27efb7e979c99d0e51950ee41271975ab195cd541b
diff --git a/net-libs/libmm-qt/files/libmm-qt-1.0.1-cxxflags.patch b/net-libs/libmm-qt/files/libmm-qt-1.0.1-cxxflags.patch
new file mode 100644
index 000000000000..c09af04fd258
--- /dev/null
+++ b/net-libs/libmm-qt/files/libmm-qt-1.0.1-cxxflags.patch
@@ -0,0 +1,19 @@
+commit 70697ac8327955a488d79aea1bfd6100f400377a
+Author: Lamarque V. Souza <lamarque@kde.org>
+Date: Sat May 24 14:21:30 2014 -0300
+
+ Respect external CMAKE_CXX_FLAGS values.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5bcf7e2..40ee9c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@ add_definitions(${QT_DEFINITIONS})
+ include(CheckCXXCompilerFlag)
+ check_cxx_compiler_flag("-Werror=return-type" HAVE_GCC_ERROR_RETURN_TYPE)
+ if (HAVE_GCC_ERROR_RETURN_TYPE)
+- set(CMAKE_CXX_FLAGS "-Werror=return-type")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type")
+ endif()
+
+ include_directories(
diff --git a/net-libs/libmm-qt/libmm-qt-1.0.1-r1.ebuild b/net-libs/libmm-qt/libmm-qt-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..68425a9e3122
--- /dev/null
+++ b/net-libs/libmm-qt/libmm-qt-1.0.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="never"
+inherit kde4-base
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ KEYWORDS="amd64 x86"
+ SRC_URI="mirror://kde/unstable/modemmanager-qt/${PV}/src/${P}.tar.xz"
+else
+ KEYWORDS=""
+fi
+
+DESCRIPTION="Modemmanager bindings for Qt"
+HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libmm-qt"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ net-misc/mobile-broadband-provider-info
+ >=net-misc/networkmanager-0.9.8[modemmanager]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-cxxflags.patch" )
diff --git a/net-libs/libmm-qt/metadata.xml b/net-libs/libmm-qt/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/net-libs/libmm-qt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
new file mode 100644
index 000000000000..5e56654fdb8e
--- /dev/null
+++ b/net-libs/libmnl/Manifest
@@ -0,0 +1 @@
+DIST libmnl-1.0.3.tar.bz2 337375 SHA256 6f14336e9acdbc62c2dc71bbb59ce162e54e9af5c80153e92476c5443fe784de SHA512 c47b76a6125271ef9dce13bc8bebd415d2bbd79b6d50491d8ba23344e7e6fe0c1413fe055913ab9444203f0d73166b79f0d4b532b13b62feecde3e5a8cd442a7 WHIRLPOOL 80717c63015e8df36a11c2b7914d63747ff296fac72b4f3a66670038f94d28961ddc6dce2050c41d3ceaf195030b61535ee84a628fa1fa686d8fed013f4d6261
diff --git a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..4b0bbc27c6cf
--- /dev/null
+++ b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Minimalistic netlink library"
+HOMEPAGE="http://netfilter.org/projects/libmnl"
+SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux"
+IUSE="examples static-libs"
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ gen_usr_ldscript -a mnl
+ prune_libtool_files
+
+ if use examples; then
+ find examples/ -name 'Makefile*' -delete
+ dodoc -r examples/
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/net-libs/libmnl/metadata.xml b/net-libs/libmnl/metadata.xml
new file mode 100644
index 000000000000..b301c633562b
--- /dev/null
+++ b/net-libs/libmnl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription lang="en">
+ libmnl is a minimalistic user-space library oriented to Netlink developers.
+ There are a lot of common tasks in parsing, validating, constructing of both
+ the Netlink header and TLVs that are repetitive and easy to get wrong. This
+ library aims to provide simple helpers that allows you to re-use code and to
+ avoid re-inventing the wheel.
+</longdescription>
+</pkgmetadata>
+
diff --git a/net-libs/libmrss/Manifest b/net-libs/libmrss/Manifest
new file mode 100644
index 000000000000..a527f4609a42
--- /dev/null
+++ b/net-libs/libmrss/Manifest
@@ -0,0 +1 @@
+DIST libmrss-0.19.2.tar.gz 375238 RMD160 4ac352f158925463ea38af7c122b01222d4b4864 SHA1 3723b0f41151873de11eb56bb3743a4f72d446ce SHA256 071416adcae5c1a9317a4a313f2deb34667e3cc2be4487fb3076528ce45b210b
diff --git a/net-libs/libmrss/libmrss-0.19.2.ebuild b/net-libs/libmrss/libmrss-0.19.2.ebuild
new file mode 100644
index 000000000000..ff4756a4dbc5
--- /dev/null
+++ b/net-libs/libmrss/libmrss-0.19.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or streams"
+HOMEPAGE="http://www.autistici.org/bakunin/libmrss/doc/"
+SRC_URI="http://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc examples static-libs"
+
+RDEPEND=">=net-libs/libnxml-0.18.0
+ net-misc/curl"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+# TODO: php-bindings
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ emake
+
+ if use doc; then
+ ebegin "Creating documentation"
+ doxygen doxy.conf || die "generating docs failed"
+ eend 0
+ fi
+}
+
+src_install() {
+ default
+
+ if use doc; then
+ dohtml doc/html/*
+ fi
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/test
+ doins test/*.c
+ fi
+
+ find "${D}" -name '*.la' -exec rm -f {} +
+}
diff --git a/net-libs/libmrss/metadata.xml b/net-libs/libmrss/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/net-libs/libmrss/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
new file mode 100644
index 000000000000..943171fdd2f1
--- /dev/null
+++ b/net-libs/libnatpmp/Manifest
@@ -0,0 +1,4 @@
+DIST libnatpmp-20110808.tar.gz 17762 SHA256 2c306719c8f77027c51161e90fb7fa72e1eb22475288ea6867a133316e944a69 SHA512 1bb4304319a0570602f19e4bf5ea42505de259f4f9d659ffc3f54faf67717e2e28563a50b747556bf5ee279fed6fe92ee798cddec233b7d3b97f3aad697729e2 WHIRLPOOL 2751ba8322e6c5f0b518aed544995d5e138b6f2d05772234783afdd828c18d26c63e1aeac166a8dac8615201243c977b2601da2064c0b41c46256a7e10fac578
+DIST libnatpmp-20130911.tar.gz 18744 SHA256 a30d83b9175585cc0f5bff753ce7eb5d83aaecb6222ccac670ed759fea595d7d SHA512 e7dfb3955ccc2c30e7c74c1085bc71bd9318f6171b84fbad2d8ae8bd5a227f7ceed3f60ecb49bd10e6fb838d8be3325bbf467467bf0d04e46883e3a19fa14a2d WHIRLPOOL fafb32c930e21afd8c3e10528638be4b31d03a2bcfdc481b4f2ea682ae4b7fd0cf943f32b8a395f03ceeecf42a41370fcd49a6026bc3cd449b6e4fba39cf191f
+DIST libnatpmp-20140401.tar.gz 23302 SHA256 b2ce5e626a21c795cba2d118f26e54aaa89de29d4611c440fafc49a2a5bedabb SHA512 12616f07b0a096046a35079954b8a34d474e672d7836ddac9da993a47178902aa2d781786ac76c55c5f16cfdf6a7e7258f92fec3850714ad9cd50208d854c4c2 WHIRLPOOL c12bfbc83d1f30f20162c3fddd5452f53d6ef556452845c6303420718a92568c8e8174939a3ef2702045d7c2061f5aff57bfe81c3516452d84172ef6ecf08849
+DIST libnatpmp-20150609.tar.gz 24392 SHA256 e1aa9c4c4219bc06943d6b2130f664daee213fb262fcb94dd355815b8f4536b0 SHA512 e50b1f68ce9254bb2f068ddc37417a3c417b80f7b3fb3d84e3e9af4a144d89e204ab993b54c01657335e855d0124a8fcbbf96ce78db7b9ae0b03b6eb79de2e09 WHIRLPOOL 27243e13e445a8bbe592257e1029264c3535ef1c71ccaf476708e91c8ead39b778a2d07e6bc42500444b910a005d5be092c5a453df225a556975e97f4184b7c7
diff --git a/net-libs/libnatpmp/files/remove-static-lib-20130911.patch b/net-libs/libnatpmp/files/remove-static-lib-20130911.patch
new file mode 100644
index 000000000000..a2c1f516c363
--- /dev/null
+++ b/net-libs/libnatpmp/files/remove-static-lib-20130911.patch
@@ -0,0 +1,74 @@
+diff -Naur libnatpmp-20130911.orig/Makefile libnatpmp-20130911/Makefile
+--- libnatpmp-20130911.orig/Makefile 2013-09-13 07:00:55.874343916 -0400
++++ libnatpmp-20130911/Makefile 2013-09-13 07:03:33.733351101 -0400
+@@ -35,7 +35,6 @@
+
+ OBJS = $(LIBOBJS) testgetgateway.o natpmpc.o natpmp-jni.o
+
+-STATICLIB = libnatpmp.a
+ ifeq ($(OS), Darwin)
+ SHAREDLIB = libnatpmp.dylib
+ JNISHAREDLIB = libjninatpmp.dylib
+@@ -58,7 +57,7 @@
+
+ HEADERS = natpmp.h
+
+-EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
++EXECUTABLES = testgetgateway natpmpc-shared
+
+ INSTALLPREFIX ?= $(PREFIX)/usr
+ INSTALLDIRINC = $(INSTALLPREFIX)/include
+@@ -72,9 +71,9 @@
+
+ .PHONY: all clean depend install cleaninstall installpythonmodule
+
+-all: $(STATICLIB) $(SHAREDLIB) $(EXECUTABLES)
++all: $(SHAREDLIB) $(EXECUTABLES)
+
+-pythonmodule: $(STATICLIB) libnatpmpmodule.c setup.py
++pythonmodule: libnatpmpmodule.c setup.py
+ python setup.py build
+ touch $@
+
+@@ -82,18 +81,17 @@
+ python setup.py install
+
+ clean:
+- $(RM) $(OBJS) $(EXECUTABLES) $(STATICLIB) $(SHAREDLIB) $(JAVACLASSES) $(JNISHAREDLIB)
++ $(RM) $(OBJS) $(EXECUTABLES) $(SHAREDLIB) $(JAVACLASSES) $(JNISHAREDLIB)
+ $(RM) pythonmodule
+ $(RM) -r build/ dist/ libraries/
+
+ depend:
+ makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null
+
+-install: $(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared
++install: $(HEADERS) $(SHAREDLIB) natpmpc-shared
+ $(INSTALL) -d $(INSTALLDIRINC)
+ $(INSTALL) -m 644 $(HEADERS) $(INSTALLDIRINC)
+ $(INSTALL) -d $(INSTALLDIRLIB)
+- $(INSTALL) -m 644 $(STATICLIB) $(INSTALLDIRLIB)
+ $(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME)
+ $(INSTALL) -d $(INSTALLDIRBIN)
+ $(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc
+@@ -142,20 +140,13 @@
+ $(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))
+ $(RM) $(INSTALLDIRLIB)/$(SONAME)
+ $(RM) $(INSTALLDIRLIB)/$(SHAREDLIB)
+- $(RM) $(INSTALLDIRLIB)/$(STATICLIB)
+
+ testgetgateway: testgetgateway.o getgateway.o
+ $(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+
+-natpmpc-static: natpmpc.o $(STATICLIB)
+- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+-
+ natpmpc-shared: natpmpc.o $(SHAREDLIB)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+
+-$(STATICLIB): $(LIBOBJS)
+- $(AR) crs $@ $?
+-
+ $(SHAREDLIB): $(LIBOBJS)
+ ifeq ($(OS), Darwin)
+ $(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
diff --git a/net-libs/libnatpmp/files/remove-static-lib.patch b/net-libs/libnatpmp/files/remove-static-lib.patch
new file mode 100644
index 000000000000..dae64601b9cb
--- /dev/null
+++ b/net-libs/libnatpmp/files/remove-static-lib.patch
@@ -0,0 +1,44 @@
+--- libnatpmp-20110715/Makefile
++++ libnatpmp-20110715/Makefile
+@@ -33,7 +32,7 @@
+
+ HEADERS = natpmp.h
+
+-EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
++EXECUTABLES = testgetgateway natpmpc-shared
+
+ INSTALLPREFIX ?= $(PREFIX)/usr
+ INSTALLDIRINC = $(INSTALLPREFIX)/include
+@@ -45,9 +44,9 @@
+
+ .PHONY: all clean depend install cleaninstall installpythonmodule
+
+-all: $(STATICLIB) $(SHAREDLIB) $(EXECUTABLES)
++all: $(SHAREDLIB) $(EXECUTABLES)
+
+-pythonmodule: $(STATICLIB) libnatpmpmodule.c setup.py
++pythonmodule: libnatpmpmodule.c setup.py
+ python setup.py build
+ touch $@
+
+@@ -55,11 +54,10 @@
+ depend:
+ makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null
+
+-install: $(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared
++install: $(HEADERS) $(SHAREDLIB) natpmpc-shared
+ $(INSTALL) -d $(INSTALLDIRINC)
+ $(INSTALL) -m 644 $(HEADERS) $(INSTALLDIRINC)
+ $(INSTALL) -d $(INSTALLDIRLIB)
+- $(INSTALL) -m 644 $(STATICLIB) $(INSTALLDIRLIB)
+ $(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME)
+ $(INSTALL) -d $(INSTALLDIRBIN)
+ $(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc
+@@ -76,7 +74,6 @@
+ $(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))
+ $(RM) $(INSTALLDIRLIB)/$(SONAME)
+ $(RM) $(INSTALLDIRLIB)/$(SHAREDLIB)
+- $(RM) $(INSTALLDIRLIB)/$(STATICLIB)
+
+ testgetgateway: testgetgateway.o getgateway.o
+
diff --git a/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch b/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch
new file mode 100644
index 000000000000..df36e2d4a4a0
--- /dev/null
+++ b/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch
@@ -0,0 +1,53 @@
+diff -Naur libnatpmp-20130911.orig/Makefile libnatpmp-20130911/Makefile
+--- libnatpmp-20130911.orig/Makefile 2013-09-10 16:15:06.000000000 -0400
++++ libnatpmp-20130911/Makefile 2013-09-12 13:20:29.191447842 -0400
+@@ -5,7 +5,7 @@
+ # http://miniupnp.free.fr/libnatpmp.html
+
+ OS = $(shell uname -s)
+-CC = gcc
++CC ?= gcc
+ INSTALL = install
+ VERSION = $(shell cat VERSION)
+
+@@ -22,6 +22,7 @@
+ # APIVERSION is used in soname
+ APIVERSION = 1
+ #LDFLAGS = -Wl,--no-undefined
++GENTOO_CFLAGS := $(CFLAGS)
+ CFLAGS = -Os
+ #CFLAGS = -g -O0
+ CFLAGS += -fPIC
+@@ -52,6 +53,8 @@
+ endif
+ endif
+
++CFLAGS := $(CFLAGS) $(GENTOO_CFLAGS)
++
+ HEADERS = natpmp.h
+
+ EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
+@@ -144,19 +147,19 @@
+ $(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+
+ natpmpc-static: natpmpc.o $(STATICLIB)
+- $(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+
+ natpmpc-shared: natpmpc.o $(SHAREDLIB)
+- $(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+
+ $(STATICLIB): $(LIBOBJS)
+ $(AR) crs $@ $?
+
+ $(SHAREDLIB): $(LIBOBJS)
+ ifeq ($(OS), Darwin)
+- $(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
+ else
+- $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
+ endif
+
+
diff --git a/net-libs/libnatpmp/files/respect-FLAGS-20140401.patch b/net-libs/libnatpmp/files/respect-FLAGS-20140401.patch
new file mode 100644
index 000000000000..0a007b169a79
--- /dev/null
+++ b/net-libs/libnatpmp/files/respect-FLAGS-20140401.patch
@@ -0,0 +1,36 @@
+diff -Naur libnatpmp-20140401.orig/Makefile libnatpmp-20140401/Makefile
+--- libnatpmp-20140401.orig/Makefile 2013-12-09 15:52:28.000000000 -0500
++++ libnatpmp-20140401/Makefile 2014-04-02 10:03:42.128609226 -0400
+@@ -5,7 +5,7 @@
+ # http://miniupnp.free.fr/libnatpmp.html
+
+ OS = $(shell uname -s)
+-CC = gcc
++CC ?= gcc
+ INSTALL = install -p
+ ARCH = $(shell uname -m | sed -e s/i.86/i686/)
+ VERSION = $(shell cat VERSION)
+@@ -153,19 +153,19 @@
+ $(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+
+ natpmpc-static: natpmpc.o $(STATICLIB)
+- $(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+
+ natpmpc-shared: natpmpc.o $(SHAREDLIB)
+- $(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+
+ $(STATICLIB): $(LIBOBJS)
+ $(AR) crs $@ $?
+
+ $(SHAREDLIB): $(LIBOBJS)
+ ifeq ($(OS), Darwin)
+- $(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
+ else
+- $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
+ endif
+
+
diff --git a/net-libs/libnatpmp/files/respect-FLAGS.patch b/net-libs/libnatpmp/files/respect-FLAGS.patch
new file mode 100644
index 000000000000..0338d1810e67
--- /dev/null
+++ b/net-libs/libnatpmp/files/respect-FLAGS.patch
@@ -0,0 +1,40 @@
+--- libnatpmp-20110808/Makefile
++++ libnatpmp-20110808/Makefile
+@@ -4,13 +4,12 @@
+ # http://miniupnp.free.fr/libnatpmp.html
+
+ OS = $(shell uname -s)
+-CC = gcc
++CC ?= gcc
+ INSTALL = install
+
+ # APIVERSION is used in soname
+ APIVERSION = 1
+-#LDFLAGS = -Wl,--no-undefined
+-CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR
++CFLAGS := -Wall -DENABLE_STRNATPMPERR $(CFLAGS)
+
+ LIBOBJS = natpmp.o getgateway.o
+
+@@ -75,16 +75,18 @@
+ testgetgateway: testgetgateway.o getgateway.o
+
+ natpmpc-shared: natpmpc.o $(SHAREDLIB)
+- $(CC) $(LDFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
++
++getgateway.o natpmp.o: CFLAGS += -fPIC
+
+ $(STATICLIB): $(LIBOBJS)
+ $(AR) crs $@ $?
+
+ $(SHAREDLIB): $(LIBOBJS)
+ ifeq ($(OS), Darwin)
+- $(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
+ else
+- $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^
+ endif
+
+ # DO NOT DELETE
diff --git a/net-libs/libnatpmp/files/respect-libdir-20120821.patch b/net-libs/libnatpmp/files/respect-libdir-20120821.patch
new file mode 100644
index 000000000000..90b7167a1d4f
--- /dev/null
+++ b/net-libs/libnatpmp/files/respect-libdir-20120821.patch
@@ -0,0 +1,20 @@
+diff -Naur libnatpmp-20120821.orig/Makefile libnatpmp-20120821/Makefile
+--- libnatpmp-20120821.orig/Makefile 2012-08-26 20:26:27.000000000 -0400
++++ libnatpmp-20120821/Makefile 2012-08-26 20:27:07.000000000 -0400
+@@ -4,6 +4,7 @@
+ # (c) 2007-2011 Thomas Bernard
+ # http://miniupnp.free.fr/libnatpmp.html
+
++GENTOO_LIBDIR ?= lib
+ OS = $(shell uname -s)
+ CC ?= gcc
+ INSTALL = install
+@@ -41,7 +42,7 @@
+
+ INSTALLPREFIX ?= $(PREFIX)/usr
+ INSTALLDIRINC = $(INSTALLPREFIX)/include
+-INSTALLDIRLIB = $(INSTALLPREFIX)/lib
++INSTALLDIRLIB = $(INSTALLPREFIX)/$(GENTOO_LIBDIR)
+ INSTALLDIRBIN = $(INSTALLPREFIX)/bin
+
+ .PHONY: all clean depend install cleaninstall installpythonmodule
diff --git a/net-libs/libnatpmp/files/respect-libdir.patch b/net-libs/libnatpmp/files/respect-libdir.patch
new file mode 100644
index 000000000000..07f5d87ddf98
--- /dev/null
+++ b/net-libs/libnatpmp/files/respect-libdir.patch
@@ -0,0 +1,19 @@
+--- libnatpmp-20110808/Makefile
++++ libnatpmp-20110808/Makefile
+@@ -6,6 +6,7 @@
+ # (c) 2007-2011 Thomas Bernard
+ # http://miniupnp.free.fr/libnatpmp.html
+
++GENTOO_LIBDIR ?= lib
+ OS = $(shell uname -s)
+ CC ?= gcc
+ INSTALL = install
+@@ -36,7 +37,7 @@
+
+ INSTALLPREFIX ?= $(PREFIX)/usr
+ INSTALLDIRINC = $(INSTALLPREFIX)/include
+-INSTALLDIRLIB = $(INSTALLPREFIX)/lib
++INSTALLDIRLIB = $(INSTALLPREFIX)/$(GENTOO_LIBDIR)
+ INSTALLDIRBIN = $(INSTALLPREFIX)/bin
+
+ .PHONY: all clean depend install cleaninstall installpythonmodule
diff --git a/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
new file mode 100644
index 000000000000..65ed6c4d5a18
--- /dev/null
+++ b/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="An alternative protocol to UPnP IGD specification"
+HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
+SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="sparc"
+IUSE="static-libs"
+
+src_prepare() {
+ epatch "${FILESDIR}"/respect-FLAGS.patch
+ epatch "${FILESDIR}"/respect-libdir.patch
+ use static-libs || epatch "${FILESDIR}"/remove-static-lib.patch
+ tc-export CC
+}
+
+src_install() {
+ emake PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
+
+ dodoc Changelog.txt README
+ doman natpmpc.1
+}
diff --git a/net-libs/libnatpmp/libnatpmp-20130911.ebuild b/net-libs/libnatpmp/libnatpmp-20130911.ebuild
new file mode 100644
index 000000000000..44178ee6bd7b
--- /dev/null
+++ b/net-libs/libnatpmp/libnatpmp-20130911.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="An alternative protocol to UPnP IGD specification"
+HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
+SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="static-libs"
+
+src_prepare() {
+ epatch "${FILESDIR}"/respect-FLAGS-${PV}.patch
+ epatch "${FILESDIR}"/respect-libdir-20120821.patch
+ use static-libs || epatch "${FILESDIR}"/remove-static-lib-${PV}.patch
+ tc-export CC
+}
+
+src_install() {
+ emake PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
+
+ dodoc Changelog.txt README
+ doman natpmpc.1
+}
diff --git a/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
new file mode 100644
index 000000000000..541f829fd7af
--- /dev/null
+++ b/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="An alternative protocol to UPnP IGD specification"
+HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
+SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="static-libs"
+
+src_prepare() {
+ epatch "${FILESDIR}"/respect-FLAGS-20140401.patch
+ epatch "${FILESDIR}"/respect-libdir-20120821.patch
+ use static-libs || epatch "${FILESDIR}"/remove-static-lib-20130911.patch
+ tc-export CC
+}
+
+src_install() {
+ # Override HEADERS for missing declspec.h wrt #506832
+ emake HEADERS='declspec.h natpmp.h' PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
+
+ dodoc Changelog.txt README
+ doman natpmpc.1
+}
diff --git a/net-libs/libnatpmp/libnatpmp-20150609.ebuild b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
new file mode 100644
index 000000000000..207323a88776
--- /dev/null
+++ b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="An alternative protocol to UPnP IGD specification"
+HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
+SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="static-libs"
+
+src_prepare() {
+ epatch "${FILESDIR}"/respect-FLAGS-20140401.patch
+ epatch "${FILESDIR}"/respect-libdir-20120821.patch
+ use static-libs || epatch "${FILESDIR}"/remove-static-lib-20130911.patch
+ tc-export CC
+}
+
+src_install() {
+ # Override HEADERS for missing declspec.h wrt #506832
+ emake HEADERS='declspec.h natpmp.h' PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
+
+ dodoc Changelog.txt README
+ doman natpmpc.1
+}
diff --git a/net-libs/libnatpmp/metadata.xml b/net-libs/libnatpmp/metadata.xml
new file mode 100644
index 000000000000..1e7587374fdf
--- /dev/null
+++ b/net-libs/libnatpmp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/libndp/Manifest b/net-libs/libndp/Manifest
new file mode 100644
index 000000000000..ce3f0f50dc12
--- /dev/null
+++ b/net-libs/libndp/Manifest
@@ -0,0 +1,2 @@
+DIST libndp-1.4.tar.gz 337802 SHA256 3a0be247ec024bd72fe5b40ea9491519c4023c7faf078311196fab817b2fd55f SHA512 a84d4d6672bf83bcf865eef8986e7bbcc49587686c5085a5ce5f346791223ede0e60db3b990055afc4f0005182aa1b5546c459306d2955f95d00ffb68bd58766 WHIRLPOOL 7c5a25b7bcde139bc7d194b07a53ea1fa4bc57caa2e5d6ccb93a6b89d47141706b040030e7124058f1f58f9538e558f5b86547bcd93380ca8ab8747b177e48c9
+DIST libndp-1.5.tar.gz 337212 SHA256 faf116ab70ce9514ec4e8573556025debea08f606e7f38b616de1f26e120c795 SHA512 f9a70e23e235cac92e978bf08f36eeff8324e94da158ca60290f7d607ac9ecdefc0b8b3766b877af7ed532506a061aa708155f8f2e4af4570378a97ff7d59c65 WHIRLPOOL 5b1d3b2646a1b0e4e29172e59d1dc093c504fbecf41a41a02921f30312bf1fb660c8bb4494273e5ef340b9f2b70e0faf2ec96b5da7febb4874499bc7d0afc588
diff --git a/net-libs/libndp/libndp-1.4.ebuild b/net-libs/libndp/libndp-1.4.ebuild
new file mode 100644
index 000000000000..2209baa55925
--- /dev/null
+++ b/net-libs/libndp/libndp-1.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Library for Neighbor Discovery Protocol"
+HOMEPAGE="http://libndp.org"
+SRC_URI="http://libndp.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ --enable-logging
+}
diff --git a/net-libs/libndp/libndp-1.5.ebuild b/net-libs/libndp/libndp-1.5.ebuild
new file mode 100644
index 000000000000..5f2ce9af5839
--- /dev/null
+++ b/net-libs/libndp/libndp-1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="Library for Neighbor Discovery Protocol"
+HOMEPAGE="http://libndp.org"
+SRC_URI="http://libndp.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+
+DEPEND=""
+RDEPEND=""
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" \
+ gnome2_src_configure \
+ --disable-static \
+ --enable-logging
+}
diff --git a/net-libs/libndp/metadata.xml b/net-libs/libndp/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/net-libs/libndp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
new file mode 100644
index 000000000000..9cbc0ae64c3c
--- /dev/null
+++ b/net-libs/libnet/Manifest
@@ -0,0 +1,3 @@
+DIST libnet-1.0.2a.tar.gz 140191 SHA256 7c7f2e8ccb47bb47072c5cd583fea5e90ab892c75889b625346b60d10464459a SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95 WHIRLPOOL 9b3748fe93191643a01cab0ce76283aa11079960efca5daaf52d7a0aa830c3791a200711c9d4b4634739328282bbc4f73b24a15406b4bf5353838ef24c19afcc
+DIST libnet-1.1.6.tar.gz 1202970 SHA256 d392bb5825c4b6b672fc93a0268433c86dc964e1500c279dc6d0711ea6ec467a SHA512 a67e502b0e6957ca590e47cb50b0472dd83d622d84c62818d665d771616df91b5a8fa8fcf1040d13b7860aaabaf338152ef40f66ab97c3fc9502edb08cea0bb6 WHIRLPOOL eb0596d8d6d1b0434ce8d1ec7069826e326effa5ad215e607dc7afc495ae0bdee443f6661deb5b54c8564abd8fa0ccbf4f509726d3caa81767d80f4f5079b379
+DIST libnet-1.2-rc3.tar.gz 676205 SHA256 72c380785ad44183005e654b47cc12485ee0228d7fa6b0a87109ff7614be4a63 SHA512 4f1c5c1a72e2c35ca3add772cb1af63e8245bb5c127e4a74fb9f619f987a4ea047bf17caaa292e9b7fa7642635773b90975d013644be0383dca93d688ca8430d WHIRLPOOL 617b01b3e0ec150b89fd0a5160a84704e82a14c584735d87bca6bf7f0847e461d99e72fe2d632761af229c4379881b0ddf270171071052cd288a2ab54c3d3a02
diff --git a/net-libs/libnet/files/1.0.2a-endian.patch b/net-libs/libnet/files/1.0.2a-endian.patch
new file mode 100644
index 000000000000..aad0bacb2f2e
--- /dev/null
+++ b/net-libs/libnet/files/1.0.2a-endian.patch
@@ -0,0 +1,20 @@
+--- a/include/libnet.h
++++ b/include/libnet.h
+@@ -32,6 +32,17 @@
+ #ifndef __LIBNET_H
+ #define __LIBNET_H
+
++#include <endian.h>
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++# define LIBNET_LIL_ENDIAN 1
++#else
++# if __BYTE_ORDER == __BIG_ENDIAN
++# define LIBNET_BIG_ENDIAN 1
++# else
++# error unrecognized __BYTE_ORDER
++# endif
++#endif
++
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
diff --git a/net-libs/libnet/files/1.0.2a-slot.patch b/net-libs/libnet/files/1.0.2a-slot.patch
new file mode 100644
index 000000000000..bcc0d56113f5
--- /dev/null
+++ b/net-libs/libnet/files/1.0.2a-slot.patch
@@ -0,0 +1,189 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -18,17 +18,17 @@
+ LIB_PREFIX = @libdir@/
+ MAN_PREFIX = @MAN_PREFIX@
+
+-LIBNET = libnet
+-LIBPWRITE = libpwrite
++LIBNET = libnet-1.0
++LIBPWRITE = libpwrite-1.0
+ LIB = lib/$(LIBNET).a
+ MAN = doc/$(LIBNET).3
+ INCLUDE = include/$(LIBNET).h
+-INCLUDE-H = include/$(LIBNET)/$(LIBNET)-headers.h
+-INCLUDE-F = include/$(LIBNET)/$(LIBNET)-functions.h
+-INCLUDE-S = include/$(LIBNET)/$(LIBNET)-structures.h
+-INCLUDE-M = include/$(LIBNET)/$(LIBNET)-macros.h
+-INCLUDE-A = include/$(LIBNET)/$(LIBNET)-asn1.h
+-INCLUDE-O = include/$(LIBNET)/$(LIBNET)-ospf.h
++INCLUDE-H = include/libnet/$(LIBNET)-headers.h
++INCLUDE-F = include/libnet/$(LIBNET)-functions.h
++INCLUDE-S = include/libnet/$(LIBNET)-structures.h
++INCLUDE-M = include/libnet/$(LIBNET)-macros.h
++INCLUDE-A = include/libnet/$(LIBNET)-asn1.h
++INCLUDE-O = include/libnet/$(LIBNET)-ospf.h
+ CONFIG = $(LIBNET)-config
+ DEFINES += @DEFS@
+ RANLIB = @RANLIB@
+@@ -94,7 +94,7 @@
+ install: libnet
+ $(ENSUREDIR) $(DESTDIR)$(prefix) 755
+ $(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755
+- $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755
++ $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)/libnet/ 755
+ $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
+ $(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
+ $(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
+@@ -102,12 +102,12 @@
+ rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
+ cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a
+ $(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX)
+- $(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+- $(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+- $(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+- $(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+- $(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+- $(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
++ $(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)/libnet/
++ $(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)/libnet/
++ $(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)/libnet/
++ $(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)/libnet/
++ $(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)/libnet/
++ $(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)/libnet/
+ $(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
+ $(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
+
+@@ -142,6 +142,6 @@
+ cd support/bpf-lkm/etherspoof && rm -rf Makefile; \
+ fi
+ rm -f config.log config.cache config.status Makefile include/config.h \
+- version.h support/bpf-lkm/etherspoof conftest* libnet-config
++ version.h support/bpf-lkm/etherspoof conftest* libnet-1.0-config
+
+ # EOF
+--- a/configure.in
++++ b/configure.in
+@@ -261,6 +261,6 @@
+ AC_OUTPUT(Makefile test/Makefile test/TCP/Makefile test/Ethernet/Makefile \
+ test/UDP/Makefile test/ICMP/Makefile test/Random/Makefile \
+ test/OSPF/Makefile util/Makefile util/Get-mac/Makefile example/Makefile \
+- libnet-config, chmod +x libnet-config)
++ libnet-1.0-config, chmod +x libnet-1.0-config)
+
+ dnl EOF
+--- a/include/libnet.h
++++ b/include/libnet.h
+@@ -74,12 +74,12 @@
+ #include <errno.h>
+ #include <assert.h>
+
+-#include "./libnet/libnet-headers.h"
+-#include "./libnet/libnet-structures.h"
+-#include "./libnet/libnet-macros.h"
+-#include "./libnet/libnet-asn1.h"
+-#include "./libnet/libnet-functions.h"
+-#include "./libnet/libnet-ospf.h"
++#include "./libnet/libnet-1.0-headers.h"
++#include "./libnet/libnet-1.0-structures.h"
++#include "./libnet/libnet-1.0-macros.h"
++#include "./libnet/libnet-1.0-asn1.h"
++#include "./libnet/libnet-1.0-functions.h"
++#include "./libnet/libnet-1.0-ospf.h"
+
+ #define LIBNET_VERSION "1.0.2a"
+
+--- a/libnet-config.in
++++ b/libnet-config.in
+@@ -9,12 +9,12 @@
+
+ libnet_defines="@LIBNET_CONFIG_DEFINES@"
+ libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
+-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
++libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet-1.0"
+
+ usage()
+ {
+ cat <<EOF
+-Usage: libnet-config [OPTIONS]
++Usage: libnet-1.0-config [OPTIONS]
+ Options:
+ [--libs]
+ [--cflags]
+--- a/test/Ethernet/Makefile.in
++++ b/test/Ethernet/Makefile.in
+@@ -10,7 +10,7 @@
+ CFLAGS = @CFLAGS@
+ OBJECTS = arp.o tcp.o icmp_mask.o get_address.o poink.o
+ DEFINES += @DEFS@
+-LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+
+ .c.o:
+ $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- a/test/ICMP/Makefile.in
++++ b/test/ICMP/Makefile.in
+@@ -15,7 +15,7 @@
+ ping_of_death.o
+
+ DEFINES += @DEFS@
+-LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+
+ .c.o:
+ $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- a/test/IP/Makefile.in
++++ b/test/IP/Makefile.in
+@@ -10,7 +10,7 @@
+ OBJECTS =
+
+ DEFINES += @DEFS@
+-LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+
+ .c.o:
+ $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- a/test/OSPF/Makefile.in
++++ b/test/OSPF/Makefile.in
+@@ -12,7 +12,7 @@
+ ospf_request.o \
+
+ DEFINES += @DEFS@
+-LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+
+ .c.o:
+ $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- a/test/Random/Makefile.in
++++ b/test/Random/Makefile.in
+@@ -9,7 +9,7 @@
+ CFLAGS = @CFLAGS@
+ OBJECTS = prand_trials.o
+ DEFINES += @DEFS@
+-LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+
+ .c.o:
+ $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- a/test/TCP/Makefile.in
++++ b/test/TCP/Makefile.in
+@@ -13,7 +13,7 @@
+ tcp+data+ipopt.o
+
+ DEFINES += @DEFS@
+-LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+
+ .c.o:
+ $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- a/test/UDP/Makefile.in
++++ b/test/UDP/Makefile.in
+@@ -11,7 +11,7 @@
+ udp+data.o
+
+ DEFINES += @DEFS@
+-LIBS = -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS = -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+
+ .c.o:
+ $(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
diff --git a/net-libs/libnet/files/libnet-1.2-rc.patch b/net-libs/libnet/files/libnet-1.2-rc.patch
new file mode 100644
index 000000000000..b9e44a3491cb
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.2-rc.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,7 @@
+ dnl
+ dnl Process this file with autoconf to produce a configure script.
+
+-AC_INIT([libnet],[1.2-rc3])
++AC_INIT([libnet],[1.2])
+ AC_MSG_RESULT(beginning autoconfiguration process for libnet-${PACKAGE_VERSION} ...)
+ AC_CANONICAL_TARGET
+ AC_CONFIG_SRCDIR([src/libnet_build_ip.c])
diff --git a/net-libs/libnet/files/libnet-gcc33-fix b/net-libs/libnet/files/libnet-gcc33-fix
new file mode 100644
index 000000000000..6f711abc8ebf
--- /dev/null
+++ b/net-libs/libnet/files/libnet-gcc33-fix
@@ -0,0 +1,13 @@
+--- Libnet-1.0.2a-orig/include/libnet.h 2001-02-07 00:19:25.000000000 +0100
++++ Libnet-1.0.2a/include/libnet.h 2003-07-24 18:34:33.000000000 +0200
+@@ -84,8 +84,8 @@
+ #define LIBNET_VERSION "1.0.2a"
+
+ #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
+-#error "byte order has not been specified, you'll
+-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the
++#error "byte order has not been specified, you'll \
++need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the \
+ documentation regarding the libnet-config script."
+ #endif
+
diff --git a/net-libs/libnet/libnet-1.0.2a-r5.ebuild b/net-libs/libnet/libnet-1.0.2a-r5.ebuild
new file mode 100644
index 000000000000..53a912d044c4
--- /dev/null
+++ b/net-libs/libnet/libnet-1.0.2a-r5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
+HOMEPAGE="http://www.packetfactory.net/libnet/"
+SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 HPND"
+SLOT="1.0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}/Libnet-${PV}
+
+src_prepare() {
+ epatch "${FILESDIR}"/libnet-gcc33-fix \
+ "${FILESDIR}"/${PV}-slot.patch
+
+ use arm && epatch "${FILESDIR}"/${PV}-endian.patch
+
+ cd "${S}"
+ mv libnet-config.in libnet-${SLOT}-config.in || die "moving libnet-config"
+
+ cd "${S}"/include
+ ln -s libnet.h libnet-${SLOT}.h
+
+ cd libnet
+ for f in *.h ; do
+ ln -s ${f} ${f/-/-${SLOT}-} || die "linking ${f}"
+ done
+
+ cd "${S}"/doc
+ ln -s libnet.3 libnet-${SLOT}.3 || die "linking manpage"
+
+ cd "${S}"
+ sed -i configure.in -e '/CCOPTS=/d;/CFLAGS=/s|.*|:|' || die
+
+ eautoconf
+
+ tc-export AR RANLIB
+}
+
+src_install() {
+ default
+ doman "${D}"/usr/man/man3/libnet-1.0.3
+ rm -r "${D}"/usr/man
+
+ dodoc VERSION doc/{README,TODO*,CHANGELOG*}
+ newdoc README README.1st
+ docinto example ; dodoc example/libnet*
+ docinto Ancillary ; dodoc doc/Ancillary/*
+}
+
+pkg_postinst(){
+ elog "libnet ${SLOT} is deprecated !"
+ elog "config script: libnet-${SLOT}-config"
+ elog "manpage: libnet-${SLOT}"
+ elog "library: libnet-${SLOT}.a"
+ elog "include: libnet-${SLOT}.h"
+}
diff --git a/net-libs/libnet/libnet-1.1.6.ebuild b/net-libs/libnet/libnet-1.1.6.ebuild
new file mode 100644
index 000000000000..83eb1881f6ea
--- /dev/null
+++ b/net-libs/libnet/libnet-1.1.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
+HOMEPAGE="http://libnet-dev.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}-dev/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 HPND"
+SLOT="1.1"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc static-libs"
+
+DEPEND="sys-devel/autoconf"
+RDEPEND=""
+
+DOCS=(
+ README doc/{CHANGELOG,CONTRIB,DESIGN_NOTES,MIGRATION}
+ doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO}
+)
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ if use doc ; then
+ dohtml -r doc/html/*
+ docinto sample
+ dodoc sample/*.[ch]
+ fi
+
+ if ! use static-libs; then
+ rm "${ED}"/usr/lib*/libnet.la || die
+ fi
+}
diff --git a/net-libs/libnet/libnet-1.2_rc3.ebuild b/net-libs/libnet/libnet-1.2_rc3.ebuild
new file mode 100644
index 000000000000..7fa3661901d5
--- /dev/null
+++ b/net-libs/libnet/libnet-1.2_rc3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
+HOMEPAGE="http://libnet-dev.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}-dev/${P/_/-}.tar.gz"
+
+LICENSE="BSD BSD-2 HPND"
+SLOT="1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc static-libs"
+
+DEPEND="sys-devel/autoconf"
+RDEPEND=""
+
+DOCS=(
+ README doc/{CHANGELOG,CONTRIB,DESIGN_NOTES,MIGRATION}
+ doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO}
+)
+
+S=${WORKDIR}/${P/_/-}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.2-rc.patch
+ eautoreconf
+}
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ if use doc ; then
+ dohtml -r doc/html/*
+ docinto sample
+ dodoc sample/*.[ch]
+ fi
+
+ use static-libs || prune_libtool_files
+}
diff --git a/net-libs/libnet/metadata.xml b/net-libs/libnet/metadata.xml
new file mode 100644
index 000000000000..aaad48cdde39
--- /dev/null
+++ b/net-libs/libnet/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>netmon</herd>
+ <longdescription>
+Libnet is a high-level API (toolkit) allowing the application
+programmer to construct and inject network packets. It provides a
+portable and simplified interface for low-level network packet
+shaping, handling and injection. Libnet hides much of the tedium
+of packet creation from the application programmer such as
+multiplexing, buffer management, arcane packet header
+information, byte-ordering, OS-dependent issues, and much more.
+Libnet features portable packet creation interfaces at the IP
+layer and link layer, as well as a host of supplementary and
+complementary functionality. Using libnet, quick and simple
+packet assembly applications can be whipped up with little
+effort. With a bit more time, more complex programs can be
+written (Traceroute and ping were easily rewritten using libnet
+and libpcap).
+</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">libnet-dev</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libnetfilter_acct/Manifest b/net-libs/libnetfilter_acct/Manifest
new file mode 100644
index 000000000000..0d9a37709058
--- /dev/null
+++ b/net-libs/libnetfilter_acct/Manifest
@@ -0,0 +1 @@
+DIST libnetfilter_acct-1.0.2.tar.bz2 292718 SHA256 0128f19c3419fbd84f7e6d46b13a33ef7bda9b9f5e493bc5ae1882d087514b71 SHA512 6bd299d509736ce3335e051137851d7f1a3751eafa380b55e9c73a25afb5d45c904ce9acefd4f934f1d21f2ff85b06faed4b072dc74d74e3a8b93342d59f5cdf WHIRLPOOL 00f178afa4720d0ebfa0af2bce14d386d756940eedced27d4a58c68d6593627e70126f8f65bbe73fd8ace8e4200ebd774237c2fc7fda2029f5f7e4a3738e688a
diff --git a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild
new file mode 100644
index 000000000000..6e785995bc6f
--- /dev/null
+++ b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-info multilib
+
+DESCRIPTION="Userspace library providing interface to extended accounting infrastructure of NetFilter"
+HOMEPAGE="http://netfilter.org/projects/libnetfilter_acct"
+SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 x86 ~amd64-linux"
+IUSE="examples"
+
+RDEPEND="net-libs/libmnl"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( README )
+CONFIG_CHECK="~NETFILTER_NETLINK_ACCT"
+
+pkg_setup() {
+ kernel_is lt 3 3 && ewarn "This package will work with kernel version 3.3 or higher"
+ linux-info_pkg_setup
+}
+
+src_configure() {
+ econf \
+ --libdir="${EPREFIX}"/$(get_libdir)
+}
+
+src_install() {
+ default
+ dodir /usr/$(get_libdir)/pkgconfig/
+ mv "${ED}"/{,usr/}$(get_libdir)/pkgconfig/${PN}.pc || die
+
+ if use examples; then
+ find examples/ -name "Makefile*" -exec rm -f '{}' + || die 'find failed'
+ dodoc -r examples/
+ docompress -x /usr/share/doc/${P}/examples
+ fi
+
+ prune_libtool_files
+}
diff --git a/net-libs/libnetfilter_acct/metadata.xml b/net-libs/libnetfilter_acct/metadata.xml
new file mode 100644
index 000000000000..1870437aa8f1
--- /dev/null
+++ b/net-libs/libnetfilter_acct/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription lang="en">
+libnetfilter_acct is the userspace library that provides a programming
+interface (API) to the extended accounting infrastructure. This information can
+then be used by <pkg>net-firewall/nfacct</pkg>
+</longdescription>
+</pkgmetadata>
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
new file mode 100644
index 000000000000..132351b653cc
--- /dev/null
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -0,0 +1,2 @@
+DIST libnetfilter_conntrack-1.0.3.tar.bz2 390454 SHA256 fc1710854d26d527087dbbefb110193650d9aae1876f90cb64b8d5c0a8dd95a4 SHA512 9949d3b3352e2cad3310128089de024950a1178a2a42c7a0ecec026dfe3b51b9b1b658d291d95d1a7d2ea038608ada4f77b9b8b2c72f9e887fb6211a1e25f628 WHIRLPOOL 4daab5dddf617fc00c6f21796b56a14eebe77e67601bd2fb9a4bd8b178c700ff83746496f6f88fe549ad964e85d31f8c7294b99204adbc2fc19223bdfaa83bac
+DIST libnetfilter_conntrack-1.0.4.tar.bz2 428147 SHA256 d9ec4a3caf49417f2b0a2d8d44249133e8c3ec78c757b7eb8c273f1cb6929c7d SHA512 53b5e5b26ca58abd6b9d83979bbb61aac4b24a85aa425c6b4fc4472b8273e30393678d6acd1aec0e959916b919cd561582ddd4b2ee656b6cb774aa9d9819c046 WHIRLPOOL 5028ca559a734019c6796b6ed73b120a1cf84c27748ae640f084ee5f1fd0c9b0f34e485a526761e35eb29c0e65e9126853b489bdb5e7d45b7cbe960113584a82
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.3.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.3.ebuild
new file mode 100644
index 000000000000..553a02c68b72
--- /dev/null
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-utils linux-info
+
+DESCRIPTION="programming interface (API) to the in-kernel connection tracking state table"
+HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_conntrack/"
+SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="static-libs"
+
+RDEPEND="
+ >=net-libs/libmnl-1.0.3
+ >=net-libs/libnfnetlink-1.0.0
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+DOCS=( README )
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ if kernel_is lt 2 6 18 ; then
+ die "${PN} requires at least 2.6.18 kernel version"
+ fi
+
+ #netfilter core team has changed some option names with kernel 2.6.20
+ if kernel_is lt 2 6 20 ; then
+ CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
+ else
+ CONFIG_CHECK="~NF_CT_NETLINK"
+ fi
+
+ check_extra_config
+}
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild
new file mode 100644
index 000000000000..18d248cd920a
--- /dev/null
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-utils linux-info
+
+DESCRIPTION="programming interface (API) to the in-kernel connection tracking state table"
+HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_conntrack/"
+SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
+IUSE="static-libs"
+
+RDEPEND="
+ >=net-libs/libmnl-1.0.3
+ >=net-libs/libnfnetlink-1.0.0
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+DOCS=( README )
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ if kernel_is lt 2 6 18 ; then
+ die "${PN} requires at least 2.6.18 kernel version"
+ fi
+
+ #netfilter core team has changed some option names with kernel 2.6.20
+ if kernel_is lt 2 6 20 ; then
+ CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
+ else
+ CONFIG_CHECK="~NF_CT_NETLINK"
+ fi
+
+ check_extra_config
+}
diff --git a/net-libs/libnetfilter_conntrack/metadata.xml b/net-libs/libnetfilter_conntrack/metadata.xml
new file mode 100644
index 000000000000..03aa50bab7e3
--- /dev/null
+++ b/net-libs/libnetfilter_conntrack/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+</pkgmetadata>
diff --git a/net-libs/libnetfilter_cthelper/Manifest b/net-libs/libnetfilter_cthelper/Manifest
new file mode 100644
index 000000000000..8f16f0dd3844
--- /dev/null
+++ b/net-libs/libnetfilter_cthelper/Manifest
@@ -0,0 +1 @@
+DIST libnetfilter_cthelper-1.0.0.tar.bz2 275229 SHA256 07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d SHA512 f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45 WHIRLPOOL a94915f51b0dd4dbf165c195fff2291ad414147ad068ed3eec4d29bf4850d128c83f6f75b94853bd840334e77f68c7a74dbc7aa50d7745ff9a0074621385afc0
diff --git a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0.ebuild b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0.ebuild
new file mode 100644
index 000000000000..e376207fd23e
--- /dev/null
+++ b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit linux-info autotools-utils
+
+DESCRIPTION="userspace library that provides the programming interface to the user-space helper infrastructure"
+HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_cthelper"
+SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa x86"
+IUSE="static-libs"
+
+RDEPEND="net-libs/libmnl"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+CONFIG_CHECK="~NF_CT_NETLINK_HELPER"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ kernel_is lt 3 6 0 && ewarn "requires at least 3.6.0 kernel version"
+}
diff --git a/net-libs/libnetfilter_cthelper/metadata.xml b/net-libs/libnetfilter_cthelper/metadata.xml
new file mode 100644
index 000000000000..78692635ad22
--- /dev/null
+++ b/net-libs/libnetfilter_cthelper/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>netmon</herd>
+</pkgmetadata>
diff --git a/net-libs/libnetfilter_cttimeout/Manifest b/net-libs/libnetfilter_cttimeout/Manifest
new file mode 100644
index 000000000000..f92998f3fb22
--- /dev/null
+++ b/net-libs/libnetfilter_cttimeout/Manifest
@@ -0,0 +1 @@
+DIST libnetfilter_cttimeout-1.0.0.tar.bz2 275065 SHA256 aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba SHA512 d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85 WHIRLPOOL a40a7b41ba118ff7868b8cf04f2653319d6ca242703c0b944d896336de80029ea2dd579eb706406035f57976c4890b7f984d6c9bba6fb240e78c6afa9f128c51
diff --git a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild
new file mode 100644
index 000000000000..3282a62442dc
--- /dev/null
+++ b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit linux-info autotools-utils
+
+DESCRIPTION="netlink interface to the connection tracking timeout infrastructure in the kernel packet filter"
+HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_cttimeout"
+SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa x86"
+IUSE="static-libs"
+
+RDEPEND="net-libs/libmnl"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+CONFIG_CHECK="~NF_CT_NETLINK_TIMEOUT"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ kernel_is lt 3 4 0 && ewarn "requires at least 3.4.0 kernel version"
+}
diff --git a/net-libs/libnetfilter_cttimeout/metadata.xml b/net-libs/libnetfilter_cttimeout/metadata.xml
new file mode 100644
index 000000000000..9ca15ca788e8
--- /dev/null
+++ b/net-libs/libnetfilter_cttimeout/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+</pkgmetadata>
+
diff --git a/net-libs/libnetfilter_log/Manifest b/net-libs/libnetfilter_log/Manifest
new file mode 100644
index 000000000000..47d9e2056aa1
--- /dev/null
+++ b/net-libs/libnetfilter_log/Manifest
@@ -0,0 +1 @@
+DIST libnetfilter_log-1.0.1.tar.bz2 262545 SHA256 74e0fe75753dba3ac114531b5e73240452c789a3f3adccf5c51217da1d933b21 SHA512 4088b9bf055fb4cd5f2e201a46a00def7642116b5d1695a371936b7b45eb93877944456506b45761bf2f3f81b40c161c1ecdcfb90532009f073dac3cedc6f436 WHIRLPOOL 95f20aca05f8ce89e9b59e06de80075b792104835376dc05452afcaa012f95519351ff3e869d1e1b82c36d4d577313525585106c4c5bd2fd47f427d003e153b4
diff --git a/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild b/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
new file mode 100644
index 000000000000..5a2462e00964
--- /dev/null
+++ b/net-libs/libnetfilter_log/libnetfilter_log-1.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit linux-info autotools-utils
+
+DESCRIPTION="interface to packets that have been logged by the kernel packet filter"
+HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_log/"
+SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
+IUSE="static-libs"
+
+RDEPEND=">=net-libs/libnfnetlink-1.0.0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+CONFIG_CHECK="~NETFILTER_NETLINK_LOG"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
+}
diff --git a/net-libs/libnetfilter_log/metadata.xml b/net-libs/libnetfilter_log/metadata.xml
new file mode 100644
index 000000000000..03aa50bab7e3
--- /dev/null
+++ b/net-libs/libnetfilter_log/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+</pkgmetadata>
diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest
new file mode 100644
index 000000000000..6675bf035d3c
--- /dev/null
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -0,0 +1 @@
+DIST libnetfilter_queue-1.0.2.tar.bz2 354201 SHA256 838490eb5dbe358f9669823704982f5313a8d397111562373200203f93ac1a32 SHA512 89fec4d943b85f35e7cef3b1b9071b1280c6e1b282b7e5cb97eb17d05b9ddd175194639ead986767d27152540fe8e167383a1f7bbfe3cdf874a5a42a2c096f11 WHIRLPOOL b3a47c01c6250190a5519dc1e6edd9a88cd295c38189752c2e4516676673ec956aec2c2744faa0681700ad251e94cdab146daf4c13260666194bce5b6f207ef7
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild
new file mode 100644
index 000000000000..e859330ff5f7
--- /dev/null
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-utils linux-info
+
+DESCRIPTION="API to packets that have been queued by the kernel packet filter"
+HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_queue/"
+SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 hppa ~ppc ~ppc64 ~sparc x86"
+IUSE="static-libs"
+
+RDEPEND="
+ >=net-libs/libmnl-1.0.3
+ >=net-libs/libnfnetlink-0.0.41
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+CONFIG_CHECK="~NETFILTER_NETLINK_QUEUE"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ kernel_is lt 2 6 14 && ewarn "requires at least 2.6.14 kernel version"
+}
diff --git a/net-libs/libnetfilter_queue/metadata.xml b/net-libs/libnetfilter_queue/metadata.xml
new file mode 100644
index 000000000000..03aa50bab7e3
--- /dev/null
+++ b/net-libs/libnetfilter_queue/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+</pkgmetadata>
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
new file mode 100644
index 000000000000..ad35fba0b5ad
--- /dev/null
+++ b/net-libs/libnfnetlink/Manifest
@@ -0,0 +1 @@
+DIST libnfnetlink-1.0.1.tar.bz2 320641 SHA256 f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a SHA512 2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104 WHIRLPOOL a27bee0e096e695ed4661c50f1ab2fb16e7012f96cc94baae8d5d67224e8b5dcbd869e5001b73fde4c9788f0fd87f85ff6caa3c5b95bae25f3005caed377451c
diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
new file mode 100644
index 000000000000..6ecd4d8e29e3
--- /dev/null
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit linux-info eutils
+
+DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
+HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
+SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="static-libs"
+
+DOCS=( README )
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ if kernel_is lt 2 6 18 ; then
+ ewarn "${PN} requires at least 2.6.18 kernel version"
+ fi
+
+ #netfilter core team has changed some option names with kernel 2.6.20
+ error_common=' is not set when it should be. You can activate it in the Core Netfilter Configuration'
+ if kernel_is lt 2 6 20 ; then
+ CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
+ ERROR_IP_NF_CONNTRACK_NETLINK="CONFIG_IP_NF_CONNTRACK_NETLINK:\t${error_common}"
+ else
+ CONFIG_CHECK="~NF_CT_NETLINK"
+ ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t${error_common}"
+ fi
+
+ check_extra_config
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/net-libs/libnfnetlink/metadata.xml b/net-libs/libnfnetlink/metadata.xml
new file mode 100644
index 000000000000..03aa50bab7e3
--- /dev/null
+++ b/net-libs/libnfnetlink/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+</pkgmetadata>
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
new file mode 100644
index 000000000000..bdee430b60a5
--- /dev/null
+++ b/net-libs/libnfsidmap/Manifest
@@ -0,0 +1,2 @@
+DIST libnfsidmap-0.24.tar.gz 328720 SHA256 59501432e683336d7a290da13767e92afb5b86f42ea4254041225fe218e8dd47 SHA512 1283a4af1bcf3c6f941ab294acc0b2b4bd9ca947f2d3c2e866717478ba2e7a2190a5467b71d7e9136c5c83de564c4892f9e3304323ae17e3988af2e40c43982b WHIRLPOOL 7f9e81dec91429c09b24325bdf077d800b608bb87eeeb5d4334fa3dbbd50a4acf482162716c19c5f5175e48bf129dbf4611c1d6be933097753eeaab834192bae
+DIST libnfsidmap-0.25.tar.gz 346587 SHA256 656d245d84400e1030f8f40a5a27da76370690c4a932baf249110f047fe7efcf SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557 WHIRLPOOL de71282707013a28fb8ad4b32edc90821ebe2f50d832607135383197ae185b6d4040b06feb864fd3ba5ac36efcac1b9c6528c5a13b8c81b5cda551f842bddfd0
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch
new file mode 100644
index 000000000000..0d5d367b95b4
--- /dev/null
+++ b/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch
@@ -0,0 +1,115 @@
+http://bugs.gentoo.org/169909
+
+--- libnfsidmap-0.19/configure.in
++++ libnfsidmap-0.19/configure.in
+@@ -38,7 +38,7 @@
+
+ # Checks for library functions.
+ AC_FUNC_MALLOC
+-AC_CHECK_FUNCS([strchr strdup])
++AC_CHECK_FUNCS([strchr strdup getgrouplist])
+
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT(libnfsidmap.pc)
+--- libnfsidmap-0.19/nss.c
++++ libnfsidmap-0.19/nss.c
+@@ -49,6 +49,8 @@
+ #include "cfg.h"
+ #include <syslog.h>
+
++#include "getgrouplist.c"
++
+ /*
+ * NSS Translation Methods
+ *
+--- libnfsidmap-0.19/getgrouplist.c
++++ libnfsidmap-0.19/getgrouplist.c
+@@ -0,0 +1,88 @@
++/*
++ * getgrouplist.c
++ *
++ * if system does not provide the non-standard getgrouplist, we will emulate
++ * it via POSIX standard functions
++ *
++ * Copyright (c) 1991, 1993
++ * The Regents of the University of California. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ * 4. Neither the name of the University nor the names of its contributors
++ * may be used to endorse or promote products derived from this software
++ * without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++#include <sys/types.h>
++#include <grp.h>
++#include <string.h>
++#include <unistd.h>
++
++#ifndef HAVE_GETGROUPLIST
++static
++int
++getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
++{
++ const struct group *grp;
++ int i, maxgroups, ngroups, ret;
++
++ ret = 0;
++ ngroups = 0;
++ maxgroups = *grpcnt;
++ /*
++ * When installing primary group, duplicate it;
++ * the first element of groups is the effective gid
++ * and will be overwritten when a setgid file is executed.
++ */
++ groups[ngroups++] = agroup;
++ if (maxgroups > 1)
++ groups[ngroups++] = agroup;
++ /*
++ * Scan the group file to find additional groups.
++ */
++ setgrent();
++ while ((grp = getgrent()) != NULL) {
++ for (i = 0; i < ngroups; i++) {
++ if (grp->gr_gid == groups[i])
++ goto skip;
++ }
++ for (i = 0; grp->gr_mem[i]; i++) {
++ if (!strcmp(grp->gr_mem[i], uname)) {
++ if (ngroups >= maxgroups) {
++ ret = -1;
++ break;
++ }
++ groups[ngroups++] = grp->gr_gid;
++ break;
++ }
++ }
++skip:
++ ;
++ }
++ endgrent();
++ *grpcnt = ngroups;
++ return (ret);
++}
++#endif
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch
new file mode 100644
index 000000000000..6ef12d44e44f
--- /dev/null
+++ b/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch
@@ -0,0 +1,22 @@
+for toupper and such
+
+--- a/nss.c
++++ b/nss.c
+@@ -34,6 +34,7 @@
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
++#include <ctype.h>
+ #include <sys/types.h>
+ #include <errno.h>
+ #include <unistd.h>
+--- a/libnfsidmap.c
++++ b/libnfsidmap.c
+@@ -37,6 +37,7 @@
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
++#include <ctype.h>
+ #include <sys/types.h>
+ #include <errno.h>
+ #include <unistd.h>
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild
new file mode 100644
index 000000000000..6f42eddf5a49
--- /dev/null
+++ b/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="NFSv4 ID <-> name mapping library"
+HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
+SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="ldap static-libs"
+
+DEPEND="ldap? ( net-nds/openldap )"
+RDEPEND="${DEPEND}
+ !<net-fs/nfs-utils-1.2.2
+ !net-fs/idmapd"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.19-getgrouplist.patch #169909
+ epatch "${FILESDIR}"/${PN}-0.21-headers.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable static-libs static) \
+ $(use_enable ldap)
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ dodoc AUTHORS ChangeLog NEWS README
+
+ insinto /etc
+ doins idmapd.conf || die
+
+ # remove useless files
+ rm -f "${D}"/usr/lib*/libnfsidmap/*.{a,la}
+ use static-libs || rm -f "${D}"/usr/lib*/*.la
+}
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
new file mode 100644
index 000000000000..8338eb5b4568
--- /dev/null
+++ b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools eutils multilib
+
+DESCRIPTION="NFSv4 ID <-> name mapping library"
+HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
+SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ldap static-libs"
+
+DEPEND="ldap? ( net-nds/openldap )"
+RDEPEND="${DEPEND}
+ !<net-fs/nfs-utils-1.2.2
+ !net-fs/idmapd"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.19-getgrouplist.patch #169909
+ epatch "${FILESDIR}"/${PN}-0.21-headers.patch
+ # Ideally the build would use -DLIBDIR=$(libdir) at build time.
+ sed -i \
+ -e "/PATH_PLUGINS/s:/usr/lib/libnfsidmap:${EPREFIX}/usr/$(get_libdir)/libnfsidmap:" \
+ libnfsidmap.c || die #504666
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable static-libs static) \
+ $(use_enable ldap)
+}
+
+src_install() {
+ default
+
+ insinto /etc
+ doins idmapd.conf
+
+ # remove useless files
+ rm -f "${D}"/usr/$(get_libdir)/libnfsidmap/*.{a,la}
+ use static-libs || find "${D}"/usr -name '*.la' -delete
+}
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.25.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25.ebuild
new file mode 100644
index 000000000000..ea97224784fa
--- /dev/null
+++ b/net-libs/libnfsidmap/libnfsidmap-0.25.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools eutils multilib
+
+DESCRIPTION="NFSv4 ID <-> name mapping library"
+HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
+SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ldap static-libs"
+
+DEPEND="ldap? ( net-nds/openldap )"
+RDEPEND="${DEPEND}
+ !<net-fs/nfs-utils-1.2.2
+ !net-fs/idmapd"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.19-getgrouplist.patch #169909
+ epatch "${FILESDIR}"/${PN}-0.21-headers.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable static-libs static) \
+ $(use_enable ldap)
+}
+
+src_install() {
+ default
+
+ insinto /etc
+ doins idmapd.conf
+
+ # remove useless files
+ rm -f "${D}"/usr/$(get_libdir)/libnfsidmap/*.{a,la}
+ use static-libs || find "${D}"/usr -name '*.la' -delete
+}
diff --git a/net-libs/libnfsidmap/metadata.xml b/net-libs/libnfsidmap/metadata.xml
new file mode 100644
index 000000000000..ca66751dee2f
--- /dev/null
+++ b/net-libs/libnfsidmap/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-fs</herd>
+</pkgmetadata>
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
new file mode 100644
index 000000000000..6bece668805c
--- /dev/null
+++ b/net-libs/libnftnl/Manifest
@@ -0,0 +1 @@
+DIST libnftnl-1.0.3.tar.bz2 356264 SHA256 cf0ae7eab6a6866192a1fbd6b370a8a2cbe2066fe3975ab44939fd50747c27f7 SHA512 6fba3f3a0c3d98e0c3200edbd45910e326f0864383dc695fa77580d47d3fe541c50518f62d2dbfc50b2378b9b311aec28b3321ef18f59a321e0a3f0817952181 WHIRLPOOL 70219737c4d865bdfe9f58803377d3a10619198cb486623d03d30a43b0d159ded9d625505cb0209fe30585dbe3413d136d2fdd6552a6ce2339151bedb1c94c9a
diff --git a/net-libs/libnftnl/libnftnl-1.0.3.ebuild b/net-libs/libnftnl/libnftnl-1.0.3.ebuild
new file mode 100644
index 000000000000..d74a39499681
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.0.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base linux-info toolchain-funcs
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="http://netfilter.org/projects/nftables/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="examples json static-libs test xml"
+SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+RDEPEND=">=net-libs/libmnl-1.0.0
+ xml? ( >=dev-libs/mini-xml-2.6 )
+ json? ( >=dev-libs/jansson-2.3 )"
+DEPEND="virtual/pkgconfig
+ ${RDEPEND}"
+
+REQUIRED_USE="test? ( json xml )"
+
+pkg_setup() {
+ if kernel_is ge 3 13; then
+ CONFIG_CHECK="~NF_TABLES"
+ linux-info_pkg_setup
+ else
+ eerror "This package requires kernel version 3.13 or newer to work properly."
+ fi
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_with xml xml-parsing) \
+ $(use_with json json-parsing)
+}
+
+src_install() {
+ default
+ gen_usr_ldscript -a nftnl
+ prune_libtool_files
+
+ if use examples; then
+ find examples/ -name 'Makefile*' -delete
+ dodoc -r examples/
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
+
+src_test() {
+ default
+ cd tests || die
+ ./test-script.sh || die
+}
diff --git a/net-libs/libnftnl/metadata.xml b/net-libs/libnftnl/metadata.xml
new file mode 100644
index 000000000000..905b54ef6c40
--- /dev/null
+++ b/net-libs/libnftnl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+<maintainer>
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+</maintainer>
+<use>
+ <flag name="json">Supports parsing of JSON</flag>
+</use>
+</pkgmetadata>
+
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
new file mode 100644
index 000000000000..69a37fcf0629
--- /dev/null
+++ b/net-libs/libnice/Manifest
@@ -0,0 +1,3 @@
+DIST libnice-0.1.10.tar.gz 903083 SHA256 1dbfb663b730889ae8cab13a2913fe557d581f70b513c918bbbd0b7d3eefebc9 SHA512 2eb6cdd89380c29a23a844d17022b338522ae6a438e9ac018385acb51c2904eccdb0cbfe97a37775182962c003bf6077bee1dde48c7a29963a57564d8c206532 WHIRLPOOL 8450973c2b175a5c3edd99064ee1418f4de2148a02c1501c0fd33cfc6344fa0e187287912f2b447f9fd4be6f1e852ec77e425d7b8d25cee94acb1989933dfb35
+DIST libnice-0.1.13.tar.gz 912374 SHA256 61112d9f3be933a827c8365f20551563953af6718057928f51f487bfe88419e1 SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1 WHIRLPOOL 93bd35742cc3ef3cf768613d7757552d7fae98e906cad334b499e3a69577480a840e4e9bdb16c047099a62d47a60e8eee006107b1717937312ada087098f9dad
+DIST libnice-0.1.8.tar.gz 881186 SHA256 9da7f09909902d535389d929c3e4d69129528fb18438a6c8565ec812d9904ddf SHA512 d573810d34a7ca9a5deddc11efa16e66615375fff50f91b406d8e6aa05486253335c35dfd0061ee68ee1c3ccbf9ea6c27225ad452540777c2e0ca0f7fe79d496 WHIRLPOOL c07d1d9d303e95af8d4d7f4fccd53a5fb07cbfbcb72f4364b6d3fb9be451e97f9ad5cb38f71a8c1a16e69302a6427261c3a1b5628423314ddfe126313b49d799
diff --git a/net-libs/libnice/files/libnice-0.1.13-gstreamer.patch b/net-libs/libnice/files/libnice-0.1.13-gstreamer.patch
new file mode 100644
index 000000000000..136d85456c40
--- /dev/null
+++ b/net-libs/libnice/files/libnice-0.1.13-gstreamer.patch
@@ -0,0 +1,40 @@
+From 76ff4aee9fe963842dd17748d14c68552c5dcda3 Mon Sep 17 00:00:00 2001
+From: Timo Gurr <timo.gurr@gmail.com>
+Date: Mon, 1 Jun 2015 16:10:16 +0200
+Subject: [PATCH] configure: Fix configure failure when building without
+ gstreamer support
+
+Error introduced in 20ea22e0a11a9bdfe4d8125b68083249b694338a, resulting in a
+configure/build error when building without gstreamer:
+
+configure: error: conditional "HAVE_GST_CHECK" was never defined.
+Usually this means the macro was only invoked conditionally.
+---
+ configure.ac | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6031cec..64a571f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -231,9 +231,6 @@ AS_IF([test "$with_gstreamer" != no], [
+ [
+ have_gst_check=no
+ ])
+-
+- AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes)
+-
+ ])
+
+ AS_IF([test "$with_gstreamer010" != no], [
+@@ -260,6 +257,7 @@ AC_SUBST(gstplugindir)
+ AC_SUBST(gstplugin010dir)
+
+ AM_CONDITIONAL(WITH_GSTREAMER, test "$with_gstreamer" = yes)
++AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes)
+ AM_CONDITIONAL(WITH_GSTREAMER010, test "$with_gstreamer010" = yes)
+
+ GUPNP_IGD_REQUIRED=0.2.4
+--
+2.4.1
+
diff --git a/net-libs/libnice/libnice-0.1.10.ebuild b/net-libs/libnice/libnice-0.1.10.ebuild
new file mode 100644
index 000000000000..ff29c718c504
--- /dev/null
+++ b/net-libs/libnice/libnice-0.1.10.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
+HOMEPAGE="http://nice.freedesktop.org/wiki/"
+SRC_URI="http://nice.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+introspection +upnp"
+
+RDEPEND="
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
+ upnp? ( >=net-libs/gupnp-igd-0.2.4:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+# Many tests fail from time to time, for example:
+# https://bugs.freedesktop.org/show_bug.cgi?id=81691
+RESTRICT="test"
+
+multilib_src_configure() {
+ # gstreamer plugin split off into media-plugins/gst-plugins-libnice
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-static \
+ --disable-static-plugins \
+ --without-gstreamer \
+ --without-gstreamer-0.10 \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable upnp gupnp)
+
+ if multilib_is_native_abi; then
+ ln -s {"${S}"/,}docs/reference/libnice/html || die
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --modules
+}
diff --git a/net-libs/libnice/libnice-0.1.13.ebuild b/net-libs/libnice/libnice-0.1.13.ebuild
new file mode 100644
index 000000000000..2fc44f783a57
--- /dev/null
+++ b/net-libs/libnice/libnice-0.1.13.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
+HOMEPAGE="http://nice.freedesktop.org/wiki/"
+SRC_URI="http://nice.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+introspection +upnp"
+
+RDEPEND="
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+ upnp? ( >=net-libs/gupnp-igd-0.2.4:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+# Many tests fail from time to time, for example:
+# https://bugs.freedesktop.org/show_bug.cgi?id=81691
+RESTRICT="test"
+
+src_prepare() {
+ # https://bugs.freedesktop.org/show_bug.cgi?id=90801
+ epatch "${FILESDIR}"/${P}-gstreamer.patch
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # gstreamer plugin split off into media-plugins/gst-plugins-libnice
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-static \
+ --disable-static-plugins \
+ --without-gstreamer \
+ --without-gstreamer-0.10 \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable upnp gupnp)
+
+ if multilib_is_native_abi; then
+ ln -s {"${S}"/,}docs/reference/libnice/html || die
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --modules
+}
diff --git a/net-libs/libnice/libnice-0.1.8.ebuild b/net-libs/libnice/libnice-0.1.8.ebuild
new file mode 100644
index 000000000000..72735acf50df
--- /dev/null
+++ b/net-libs/libnice/libnice-0.1.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="An implementation of the Interactice Connectivity Establishment standard (ICE)"
+HOMEPAGE="http://nice.freedesktop.org/wiki/"
+SRC_URI="http://nice.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+introspection +upnp"
+
+RDEPEND="
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
+ upnp? ( >=net-libs/gupnp-igd-0.2.4:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+# Many tests fail from time to time, for example:
+# https://bugs.freedesktop.org/show_bug.cgi?id=81691
+RESTRICT="test"
+
+multilib_src_configure() {
+ # gstreamer plugin split off into media-plugins/gst-plugins-libnice
+ ECONF_SOURCE=${S} \
+ econf --disable-static \
+ --without-gstreamer \
+ --without-gstreamer-0.10 \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable upnp gupnp)
+
+ if multilib_is_native_abi; then
+ ln -s {"${S}"/,}docs/reference/libnice/html || die
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --modules
+}
diff --git a/net-libs/libnice/metadata.xml b/net-libs/libnice/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/net-libs/libnice/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
new file mode 100644
index 000000000000..ceb019443d68
--- /dev/null
+++ b/net-libs/libnids/Manifest
@@ -0,0 +1 @@
+DIST libnids-1.24.tar.gz 151021 SHA256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359 SHA512 2046900023e853d7dbd7061c9f47d8a8ba26320991ca34198249019c1b9a6f75010574f9f022d02976272a384cf769394c4cc3ae536fc6164716cadc4770bb53 WHIRLPOOL c012e724c0f724cd817db4726a4ee1c0a438d717fe8534f96c41829e5574a3edaf4fd287c3acd65da4ee6591bb55dcd0f0bb71da7302e7b8ba43992ba85a1455
diff --git a/net-libs/libnids/files/libnids-1.24-ldflags.patch b/net-libs/libnids/files/libnids-1.24-ldflags.patch
new file mode 100644
index 000000000000..0f3daca463b6
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.24-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -65,7 +65,7 @@
+ ar -cr $@ $(OBJS)
+ $(RANLIB) $@
+ $(LIBSHARED): $(OBJS_SHARED)
+- $(CC) -shared -Wl,-soname,$(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB)
++ $(CC) -shared -Wl,-soname,$(LIBSHARED) $(LDFLAGS) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB)
+
+ _install install: $(LIBSTATIC)
+ ../mkinstalldirs $(install_prefix)$(libdir)
diff --git a/net-libs/libnids/files/libnids-1.24-static-libs.patch b/net-libs/libnids/files/libnids-1.24-static-libs.patch
new file mode 100644
index 000000000000..7bf9a0f1b629
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.24-static-libs.patch
@@ -0,0 +1,29 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -62,19 +62,22 @@
+
+
+ $(LIBSTATIC): $(OBJS)
+- ar -cr $@ $(OBJS)
++ $(AR) -cr $@ $(OBJS)
+ $(RANLIB) $@
+ $(LIBSHARED): $(OBJS_SHARED)
+ $(CC) -shared -Wl,-soname,$(LIBSHARED) $(LDFLAGS) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB)
+
+-_install install: $(LIBSTATIC)
++installbase:
+ ../mkinstalldirs $(install_prefix)$(libdir)
+ ../mkinstalldirs $(install_prefix)$(includedir)
+ ../mkinstalldirs $(install_prefix)$(mandir)/man3
+- $(INSTALL) -c -m 644 libnids.a $(install_prefix)$(libdir)
+ $(INSTALL) -c -m 644 nids.h $(install_prefix)$(includedir)
+ $(INSTALL) -c -m 644 libnids.3 $(install_prefix)$(mandir)/man3
+-_installshared installshared: install $(LIBSHARED)
++
++_install install: $(LIBSTATIC) installbase
++ $(INSTALL) -c -m 644 libnids.a $(install_prefix)$(libdir)
++
++_installshared installshared: $(LIBSHARED) installbase
+ $(INSTALL) -c -m 755 $(LIBSHARED) $(install_prefix)$(libdir)
+ ln -s -f $(LIBSHARED) $(install_prefix)$(libdir)/libnids.so
+
diff --git a/net-libs/libnids/libnids-1.24-r6.ebuild b/net-libs/libnids/libnids-1.24-r6.ebuild
new file mode 100644
index 000000000000..581561bba51d
--- /dev/null
+++ b/net-libs/libnids/libnids-1.24-r6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
+HOMEPAGE="http://libnids.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1.2"
+KEYWORDS="amd64 ppc x86"
+IUSE="+glib +libnet static-libs"
+
+RDEPEND="
+ !net-libs/libnids:1.1
+ glib? ( dev-libs/glib:2 )
+ libnet? ( >=net-libs/libnet-1.1.0-r3 )
+ net-libs/libpcap
+"
+DEPEND="
+ ${RDEPEND}
+ glib? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-ldflags.patch"
+ epatch "${FILESDIR}/${P}-static-libs.patch"
+}
+
+src_configure() {
+ tc-export AR
+ append-flags -fno-strict-aliasing
+
+ econf \
+ --enable-shared \
+ $(usex glib '' --disable-libglib) \
+ $(use_enable libnet)
+}
+
+src_compile() {
+ emake shared $(usex static-libs static '')
+}
+
+src_install() {
+ local tgt
+ for tgt in _installshared $(usex static-libs _install ''); do
+ emake install_prefix="${D}" ${tgt}
+ done
+
+ dodoc CHANGES CREDITS MISC README doc/*
+}
diff --git a/net-libs/libnids/metadata.xml b/net-libs/libnids/metadata.xml
new file mode 100644
index 000000000000..d669db19d880
--- /dev/null
+++ b/net-libs/libnids/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>netmon</herd>
+ <longdescription>emulates the IP stack of Linux 2.0.x and offers IP defragmentation, TCP stream assembly and TCP port scan detection.</longdescription>
+ <use>
+ <flag name="glib">Use <pkg>dev-libs/glib</pkg> for multiprocessing support</flag>
+ <flag name="libnet">Include code requiring <pkg>net-libs/libnet</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">libnids</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libnipper/Manifest b/net-libs/libnipper/Manifest
new file mode 100644
index 000000000000..460c95ba2f04
--- /dev/null
+++ b/net-libs/libnipper/Manifest
@@ -0,0 +1 @@
+DIST libnipper-0.12.6.tgz 444578 SHA256 70cd0cb66d8c0718c7d1ec9bc510d70ed17efed0213833790e79d7ca43fccf8c SHA512 eb6eabce06a71463f8dad59a2aca13583e9ae8113b6997a7946b9bbafe54cd0668189c915f917ffcb7ffe3b5dc6dbbf7d37874ec226e5bd8cdd3c8999f9e10b0 WHIRLPOOL dae559647ec689087d103fb0a8da4ef5179afc6a426412ab211eff6009df87b264decfe19aca84f29e3eaa187b26dc558341670c4efd3b8e47a3c201668ba1f9
diff --git a/net-libs/libnipper/files/libnipper-0.12.6-gcc47.patch b/net-libs/libnipper/files/libnipper-0.12.6-gcc47.patch
new file mode 100644
index 000000000000..45b65b5e0383
--- /dev/null
+++ b/net-libs/libnipper/files/libnipper-0.12.6-gcc47.patch
@@ -0,0 +1,16 @@
+ https://bugs.gentoo.org/423813
+
+
+ device/device.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/device/device.cpp
++++ b/device/device.cpp
+@@ -31,6 +31,7 @@
+
+
+ // Includes...
++#include <unistd.h>
+ #include "../globaldefs.h"
+ #include "errortext.h"
+ #include "device.h"
diff --git a/net-libs/libnipper/files/libnipper-0.12.6-glibc-2.10.patch b/net-libs/libnipper/files/libnipper-0.12.6-glibc-2.10.patch
new file mode 100644
index 000000000000..332276e14329
--- /dev/null
+++ b/net-libs/libnipper/files/libnipper-0.12.6-glibc-2.10.patch
@@ -0,0 +1,13 @@
+diff --git a/device/common/misc.cpp b/device/common/misc.cpp
+index 7b3a7fb..612aacd 100644
+--- a/device/common/misc.cpp
++++ b/device/common/misc.cpp
+@@ -198,7 +198,7 @@ const char *Device::cidrToNetmask(const char *cidr)
+ unsigned int Device::ipAddressToNum(const char *address)
+ {
+ // Variables...
+- char *addressPointer = 0;
++ const char *addressPointer = 0;
+ unsigned int returnAddress = 0;
+ int tempInt = 0;
+
diff --git a/net-libs/libnipper/files/libnipper-0.12.6-multilib-strict.patch b/net-libs/libnipper/files/libnipper-0.12.6-multilib-strict.patch
new file mode 100644
index 000000000000..471236b84f92
--- /dev/null
+++ b/net-libs/libnipper/files/libnipper-0.12.6-multilib-strict.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4cc6260..d4518fb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -319,7 +319,7 @@ SET(libnipper_SRC
+ ADD_LIBRARY(nipper SHARED ${libnipper_SRC})
+
+ # Install...
+-INSTALL(TARGETS nipper LIBRARY DESTINATION /usr/lib)
++INSTALL(TARGETS nipper LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ INSTALL(FILES nipper.conf DESTINATION /etc)
+ INSTALL(FILES libnipper.h config.h DESTINATION /usr/include/libnipper/)
+ INSTALL(FILES man/nipper.conf.5 DESTINATION /usr/share/man/man5)
diff --git a/net-libs/libnipper/libnipper-0.12.6-r1.ebuild b/net-libs/libnipper/libnipper-0.12.6-r1.ebuild
new file mode 100644
index 000000000000..78b1ff34a064
--- /dev/null
+++ b/net-libs/libnipper/libnipper-0.12.6-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit base cmake-utils
+
+DESCRIPTION="A router configuration security analysis library"
+HOMEPAGE="http://nipper.titania.co.uk/"
+SRC_URI="mirror://sourceforge/nipper/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}/${P}-glibc-2.10.patch"
+ "${FILESDIR}/${P}-gcc47.patch"
+ "${FILESDIR}/${P}-multilib-strict.patch"
+)
diff --git a/net-libs/libnipper/metadata.xml b/net-libs/libnipper/metadata.xml
new file mode 100644
index 000000000000..34e2b197ce46
--- /dev/null
+++ b/net-libs/libnipper/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>
+ <email>ikelos@gentoo.org</email>
+ <name>Mike Auty</name>
+ </maintainer>
+ <longdescription>A library for conducting security audits of cisco and other firewall device configurations.</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">nipper</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libnm-qt/Manifest b/net-libs/libnm-qt/Manifest
new file mode 100644
index 000000000000..37cafed8cde5
--- /dev/null
+++ b/net-libs/libnm-qt/Manifest
@@ -0,0 +1,2 @@
+DIST libnm-qt-0.9.8.3.tar.xz 133452 SHA256 1f749a21dd8b58026842d87f19e4f5b482b18a7620517ced4a8bdf38dbe84560 SHA512 314f063d45cd384c092b02212d71d45ee2a18892735ddde2a1165dca28a84163db2c6b6c677e7828301e063d4eeb7266fd193a7eb4e454ff945aacd718e0eceb WHIRLPOOL a08dc570a22b34e1ad7e00183b1ef598a127a1d4f59042a1468c4efd94e4560b166385a24fb8a28fe8e1a41c817f5177a6648b46c3f6c7283a3d9642e28d99dd
+DIST libnm-qt-0.9.8.4.tar.xz 133608 SHA256 3c6758da6c12668198ff8fdeda2f04c7b620f2ef1a506a1bdaeda63c06fbaff4 SHA512 a434d0f4056589e7e2413354503f75bbd885bdc1cec4884022b7aaa74268155a81f45d7209bdc02801f4aafc0b9ca045f30304d9aee2ca79bb7217545d9a0746 WHIRLPOOL 9d796df0af9f137b67e774e7d127da1c0c5c72f0797e3b64153923318b8ff7e93257868d4b72c3c5115cfdc2e37f5079d31b8e091b96dd9e547f416f4259eaf6
diff --git a/net-libs/libnm-qt/libnm-qt-0.9.8.3.ebuild b/net-libs/libnm-qt/libnm-qt-0.9.8.3.ebuild
new file mode 100644
index 000000000000..35a39a3e4118
--- /dev/null
+++ b/net-libs/libnm-qt/libnm-qt-0.9.8.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="never"
+inherit kde4-base
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ KEYWORDS="amd64 x86"
+ SRC_URI="mirror://kde/unstable/networkmanager-qt/${PV}/src/${P}.tar.xz"
+else
+ KEYWORDS=""
+fi
+
+DESCRIPTION="NetworkManager bindings for Qt"
+HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libnm-qt"
+
+LICENSE="LGPL-2"
+SLOT="0/1"
+IUSE="debug doc modemmanager test"
+
+RDEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ net-misc/mobile-broadband-provider-info
+ || (
+ >=net-misc/networkmanager-0.9.8.4[consolekit]
+ >=net-misc/networkmanager-0.9.8.4[systemd]
+ )
+ modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=OFF
+ $(cmake-utils_use_find_package doc Doxygen)
+ $(cmake-utils_use !modemmanager DISABLE_MODEMMANAGERQT)
+ $(cmake-utils_use !test DISABLE_TESTING)
+ )
+
+ kde4-base_src_configure
+}
+
+src_install() {
+ if use doc; then
+ { cd "${BUILD_DIR}" && doxygen; } || die "Generating documentation failed"
+ HTML_DOCS=( "${BUILD_DIR}/doc/html/" )
+ fi
+
+ cmake-utils_src_install
+}
diff --git a/net-libs/libnm-qt/libnm-qt-0.9.8.4.ebuild b/net-libs/libnm-qt/libnm-qt-0.9.8.4.ebuild
new file mode 100644
index 000000000000..81a1a6acb155
--- /dev/null
+++ b/net-libs/libnm-qt/libnm-qt-0.9.8.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="never"
+inherit kde4-base
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="mirror://kde/unstable/networkmanager-qt/${PV}/src/networkmanager-qt-${PV}.tar.xz -> ${P}.tar.xz"
+else
+ KEYWORDS=""
+fi
+
+DESCRIPTION="NetworkManager bindings for Qt"
+HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libnm-qt"
+
+LICENSE="LGPL-2"
+SLOT="0/1"
+IUSE="debug doc modemmanager test"
+
+RDEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ net-misc/mobile-broadband-provider-info
+ || (
+ >=net-misc/networkmanager-0.9.8.4[consolekit]
+ >=net-misc/networkmanager-0.9.8.4[systemd]
+ )
+ modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+"
+
+S=${WORKDIR}/networkmanager-qt-${PV}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=OFF
+ $(cmake-utils_use_find_package doc Doxygen)
+ $(cmake-utils_use !modemmanager DISABLE_MODEMMANAGERQT)
+ $(cmake-utils_use !test DISABLE_TESTING)
+ )
+
+ kde4-base_src_configure
+}
+
+src_install() {
+ if use doc; then
+ { cd "${BUILD_DIR}" && doxygen; } || die "Generating documentation failed"
+ HTML_DOCS=( "${BUILD_DIR}/doc/html/" )
+ fi
+
+ cmake-utils_src_install
+}
diff --git a/net-libs/libnm-qt/metadata.xml b/net-libs/libnm-qt/metadata.xml
new file mode 100644
index 000000000000..c5ae96e2c633
--- /dev/null
+++ b/net-libs/libnm-qt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+ <use>
+ <flag name="modemmanager">Enable support for mobile broadband devices</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/libntlm/Manifest b/net-libs/libntlm/Manifest
new file mode 100644
index 000000000000..83234c62ad98
--- /dev/null
+++ b/net-libs/libntlm/Manifest
@@ -0,0 +1,2 @@
+DIST libntlm-1.3.tar.gz 518803 SHA256 ea1955e4acbb0d4303b2121a4808eb4abb88d5360f90149b90ac650542c83780 SHA512 d375d472167e9c0f142e2415428f48ef692c9fcfe4d882ca442e0fbff86554a5bee23747ad1eb27f81d32ec2f3f5ff654e5c095e4b62dc25dc4918e6664966c0 WHIRLPOOL b7caafd136404fd61891601e9e50c42662b007889e2609c9ed9291486dadda62c70f55d2bf79bdeef047b77ed76cddb27d85a059e6d1953c7b00f2581d29695c
+DIST libntlm-1.4.tar.gz 568414 SHA256 8415d75e31d3135dc7062787eaf4119b984d50f86f0d004b964cdc18a3182589 SHA512 888ed2e9ee3e01a53bec951534966378a21c8a0baf555b65d97fed4408568c6b67f4199396cf3e61bb5a73b8e47dbe1333449369a92499e16478b0b60ac78274 WHIRLPOOL fa0967ebcf6dd01f579a73763eef52c6f87d824620e80fa09e263171553190f355d0a8efb04b1567e5431d9df9f69b9041850d9fd28f5064f8d2ecc8916bd80b
diff --git a/net-libs/libntlm/libntlm-1.3.ebuild b/net-libs/libntlm/libntlm-1.3.ebuild
new file mode 100644
index 000000000000..1b19a4eeeb09
--- /dev/null
+++ b/net-libs/libntlm/libntlm-1.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Microsoft's NTLM authentication (libntlm) library"
+HOMEPAGE="http://www.nongnu.org/libntlm/"
+SRC_URI="http://www.nongnu.org/${PN}/releases/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="alpha amd64 ~amd64-linux arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+src_configure() {
+ econf --disable-valgrind-tests
+}
+
+src_install () {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/net-libs/libntlm/libntlm-1.4.ebuild b/net-libs/libntlm/libntlm-1.4.ebuild
new file mode 100644
index 000000000000..faa6568c1ea7
--- /dev/null
+++ b/net-libs/libntlm/libntlm-1.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-utils
+
+DESCRIPTION="Microsoft's NTLM authentication (libntlm) library"
+HOMEPAGE="http://www.nongnu.org/libntlm/"
+SRC_URI="http://www.nongnu.org/${PN}/releases/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux"
+IUSE="static-libs"
diff --git a/net-libs/libntlm/metadata.xml b/net-libs/libntlm/metadata.xml
new file mode 100644
index 000000000000..3f5765681d73
--- /dev/null
+++ b/net-libs/libntlm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+<longdescription>
+libntlm is a library that implement Microsoft's NTLM authentication. However,
+the packaging of libntlm lacked certain things, such as having build problems,
+lacking shared library support, lacking autoconf macro for use in other
+applications, lacking pkg-config support, and more. So this page distributes an
+improved version of the library; called Libntlm.
+</longdescription>
+</pkgmetadata>
diff --git a/net-libs/libnxml/Manifest b/net-libs/libnxml/Manifest
new file mode 100644
index 000000000000..d169f600c901
--- /dev/null
+++ b/net-libs/libnxml/Manifest
@@ -0,0 +1 @@
+DIST libnxml-0.18.3.tar.gz 361977 SHA256 0f9460e3ba16b347001caf6843f0050f5482e36ebcb307f709259fd6575aa547 SHA512 fc420a4b773eca68608ac1d509930a0528c3a41b53fc7cc340c09fd53f92a88afb4091e810d97d59e73a8beeaaeed52dd3c880273ef512a5305800b3ef46717a WHIRLPOOL 570c0a1538c3e81e8e3e7c43a28975346434d2c0aa4bab4caaa9ec4fe83fd8c5d896187101ebab5f1afef311f49ed65c47af91abcf52c233ee5d89598aa34a98
diff --git a/net-libs/libnxml/libnxml-0.18.3.ebuild b/net-libs/libnxml/libnxml-0.18.3.ebuild
new file mode 100644
index 000000000000..5ae47b77774f
--- /dev/null
+++ b/net-libs/libnxml/libnxml-0.18.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="A C-library for parsing and writing XML 1.0/1.1 files or streams"
+HOMEPAGE="http://www.autistici.org/bakunin/libnxml/doc/"
+SRC_URI="http://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="doc examples static-libs"
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ emake
+
+ if use doc; then
+ ebegin "Creating documentation"
+ doxygen doxy.conf || die "creating docs failed"
+ eend 0
+ fi
+}
+
+src_install() {
+ default
+
+ if use doc; then
+ dohtml doc/html/*
+ fi
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/test
+ doins test/*.c
+ fi
+
+ find "${D}" -name '*.la' -exec rm -f {} +
+}
diff --git a/net-libs/libnxml/metadata.xml b/net-libs/libnxml/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/net-libs/libnxml/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/liboauth/Manifest b/net-libs/liboauth/Manifest
new file mode 100644
index 000000000000..37cf335fb29d
--- /dev/null
+++ b/net-libs/liboauth/Manifest
@@ -0,0 +1 @@
+DIST liboauth-1.0.1.tar.gz 501706 SHA256 5087d32fe1db7b588246a7de64fc0c2464c95efdebb2c7fe6f482d9b00e68d8b SHA512 5d84699ece179a3b17eae8b7113eeadd7bd24df953f7070a6a0e303923b1661d82174894bf64ef6abc6dc344042013256fb2b1ab4fae12ab2778fa15446aa06c WHIRLPOOL 41b83bfc578b74c65018df7a73ba58695352a6e9e53a8a69434dc033c8bea1664417b2e3691dd2f1dd99ce2d55d48bde0fb4d29727294f59b5436720294236ed
diff --git a/net-libs/liboauth/files/liboauth-1.0.1-doxygen-out-of-tree.patch b/net-libs/liboauth/files/liboauth-1.0.1-doxygen-out-of-tree.patch
new file mode 100644
index 000000000000..3ed37ec266cc
--- /dev/null
+++ b/net-libs/liboauth/files/liboauth-1.0.1-doxygen-out-of-tree.patch
@@ -0,0 +1,50 @@
+diff -urp liboauth-1.0.1-orig/Doxyfile.in liboauth-1.0.1/Doxyfile.in
+--- liboauth-1.0.1-orig/Doxyfile.in 2012-11-01 04:34:49.000000000 +0000
++++ liboauth-1.0.1/Doxyfile.in 2013-03-14 14:25:11.000000000 +0000
+@@ -45,7 +45,7 @@ PROJECT_BRIEF =
+ # exceed 55 pixels and the maximum width should not exceed 200 pixels.
+ # Doxygen will copy the logo to the output directory.
+
+-PROJECT_LOGO = doc/libOAuth.png
++PROJECT_LOGO = @top_srcdir@/doc/libOAuth.png
+
+ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+ # base path where the generated documentation will be put.
+@@ -130,7 +130,7 @@ FULL_PATH_NAMES = YES
+ # relative paths, which will be relative from the directory where doxygen is
+ # started.
+
+-STRIP_FROM_PATH = src/
++STRIP_FROM_PATH = @top_srcdir@/src/
+
+ # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+ # the path mentioned in the documentation of a class, which tells
+@@ -661,8 +661,8 @@ WARN_LOGFILE =
+ # directories like "/usr/src/myproject". Separate the files or directories
+ # with spaces.
+
+-INPUT = src/oauth.h \
+- doc/mainpage.dox
++INPUT = @top_srcdir@/src/oauth.h \
++ @top_srcdir@/doc/mainpage.dox
+
+ # This tag can be used to specify the character encoding of the source files
+ # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+@@ -722,7 +722,7 @@ EXCLUDE_SYMBOLS =
+ # directories that contain example code fragments that are included (see
+ # the \include command).
+
+-EXAMPLE_PATH = tests/
++EXAMPLE_PATH = @top_srcdir@/tests/
+
+ # If the value of the EXAMPLE_PATH tag contains directories, you can use the
+ # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+@@ -742,7 +742,7 @@ EXAMPLE_RECURSIVE = NO
+ # directories that contain image that are included in the documentation (see
+ # the \image command).
+
+-IMAGE_PATH = doc/
++IMAGE_PATH = @top_srcdir@/doc/
+
+ # The INPUT_FILTER tag can be used to specify a program that doxygen should
+ # invoke to filter for each input file. Doxygen will invoke the filter program
diff --git a/net-libs/liboauth/liboauth-1.0.1.ebuild b/net-libs/liboauth/liboauth-1.0.1.ebuild
new file mode 100644
index 000000000000..9b6d310ad18c
--- /dev/null
+++ b/net-libs/liboauth/liboauth-1.0.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="C library implementing the OAuth secure authentication protocol"
+HOMEPAGE="http://liboauth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 MIT )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x64-macos"
+IUSE="curl doc bindist +nss"
+
+PATCHES=( "${FILESDIR}"/${P}-doxygen-out-of-tree.patch )
+REQUIRED_USE="bindist? ( nss )"
+
+CDEPEND="
+ nss? ( dev-libs/nss
+ curl? ( || ( net-misc/curl[ssl,curl_ssl_nss] net-misc/curl[-ssl] ) )
+ )
+
+ !nss? ( dev-libs/openssl
+ curl? ( || ( net-misc/curl[ssl,curl_ssl_openssl] net-misc/curl[-ssl] ) )
+ )
+
+ net-misc/curl
+"
+
+RDEPEND="${CDEPEND}"
+
+DEPEND="${CDEPEND}
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ media-fonts/freefont
+ )
+ virtual/pkgconfig"
+
+src_configure() {
+ local myeconfargs=(
+ --disable-static
+ $(use_enable !curl curl)
+ $(use_enable curl libcurl)
+ $(use_enable nss)
+ )
+
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+
+ if use doc ; then
+ # make sure fonts are found
+ export DOTFONTPATH="${EPREFIX}"/usr/share/fonts/freefont-ttf
+ autotools-utils_src_compile dox
+ fi
+}
+
+DOCS=( AUTHORS ChangeLog LICENSE.OpenSSL README )
+
+src_install() {
+ use doc && HTML_DOCS=("${BUILD_DIR}"/doc/html/)
+
+ autotools-utils_src_install
+}
diff --git a/net-libs/liboauth/metadata.xml b/net-libs/liboauth/metadata.xml
new file mode 100644
index 000000000000..6b3cdb607cdd
--- /dev/null
+++ b/net-libs/liboauth/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="nss">
+ Use Mozilla NSS (<pkg>dev-libs/nss</pkg>) as hash library; if
+ this is disabled, <pkg>dev-libs/openssl</pkg> is used instead.
+ </flag>
+ <flag name="bindist">
+ Alias for the nss USE flag, since there are license compliancy
+ trouble when using OpenSSL.
+ </flag>
+ <flag name="curl">
+ If enabled, <pkg>net-misc/curl</pkg> is used thorugh the libcurl
+ library; if it's not, the curl command is used instead. Some
+ features are only available when using the library, but using it
+ as library requires matching SSL implementations.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">liboauth</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/liboping/Manifest b/net-libs/liboping/Manifest
new file mode 100644
index 000000000000..5eef357cb4b1
--- /dev/null
+++ b/net-libs/liboping/Manifest
@@ -0,0 +1,2 @@
+DIST liboping-1.7.0.tar.bz2 306359 SHA256 60089a544522abced4aecbb554f494632968371e5ade7bea27015cd6aa598db3 SHA512 74ca6184fc192cabc0edb289aaab7b7d6f743a69cd0e1c0de82d768e7fd599229fbb974fbc0e1f3f5a3377c47cc8871c8cd1b16982f7b67167cd7cc5808eb38e WHIRLPOOL cf845b01582cf207c2409e1e5ee71ca9e7fb402ff8fb0131778246aa8931aa3b1c59e6318fea6923ed3f83721f8a0928991ecefb87f7ec13f2f8c4f3f8df4fdc
+DIST liboping-1.8.0.tar.bz2 316441 SHA256 1dcb9182c981b31d67522ae24e925563bed57cf950dc681580c4b0abb6a65bdb SHA512 94170de6e23c1c2380866e5195a3cdac795f30bda560ee3869bcdd9aa42b831fa3aac1a351033f72ed81d501b8e3e02db9bb5e5ada29e51ea4b1d2cca7af6217 WHIRLPOOL 724144216788a3837e2afb45b88a9ea757984e45841a365cfc7b17b43269069600dd9ed261f4b108527eb5f19b151500b24e4544c8e3f944cc1d7392e39b6c4a
diff --git a/net-libs/liboping/files/liboping-1.6.2-nouidmagic.patch b/net-libs/liboping/files/liboping-1.6.2-nouidmagic.patch
new file mode 100644
index 000000000000..2cb1b25e12e0
--- /dev/null
+++ b/net-libs/liboping/files/liboping-1.6.2-nouidmagic.patch
@@ -0,0 +1,19 @@
+diff -ruN liboping-1.6.2.orig/src/Makefile.am liboping-1.6.2/src/Makefile.am
+--- liboping-1.6.2.orig/src/Makefile.am 2012-01-31 17:20:44.000000000 +0100
++++ liboping-1.6.2/src/Makefile.am 2012-06-11 21:21:08.000000000 +0200
+@@ -52,15 +52,3 @@
+ endif
+ endif # BUILD_WITH_LIBNCURSES
+
+-install-exec-hook:
+- @if test "x0" = "x$$UID"; then \
+- if test "xLinux" = "x`uname -s`"; then \
+- echo "Setting CAP_NET_RAW capability on binaries."; \
+- setcap cap_net_raw=ep $(DESTDIR)$(bindir)/oping || true; \
+- setcap cap_net_raw=ep $(DESTDIR)$(bindir)/noping || true; \
+- else \
+- echo "Setting set-UID bit on binaries."; \
+- chmod u+s $(DESTDIR)$(bindir)/oping || true; \
+- chmod u+s $(DESTDIR)$(bindir)/noping || true; \
+- fi; \
+- fi
diff --git a/net-libs/liboping/liboping-1.7.0.ebuild b/net-libs/liboping/liboping-1.7.0.ebuild
new file mode 100644
index 000000000000..502686eec835
--- /dev/null
+++ b/net-libs/liboping/liboping-1.7.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base autotools
+
+DESCRIPTION="C library and ncurses based program to generate ICMP echo requests and ping multiple hosts at once"
+HOMEPAGE="http://verplant.org/liboping"
+SRC_URI="http://verplant.org/${PN}/files/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="perl"
+
+DEPEND="
+ sys-libs/ncurses
+ perl? ( dev-lang/perl )
+"
+RDEPEND=${DEPEND}
+
+PATCHES=( "${FILESDIR}/${PN}-1.6.2-nouidmagic.patch" )
+
+src_prepare() {
+ base_src_prepare
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with perl perl-bindings INSTALLDIRS=vendor) \
+ --disable-static
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+
+ fperms u+s,og-r /usr/bin/oping
+ fperms u+s,og-r /usr/bin/noping
+}
diff --git a/net-libs/liboping/liboping-1.8.0.ebuild b/net-libs/liboping/liboping-1.8.0.ebuild
new file mode 100644
index 000000000000..0756a417c535
--- /dev/null
+++ b/net-libs/liboping/liboping-1.8.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base autotools
+
+DESCRIPTION="C library and ncurses based program to generate ICMP echo requests and ping multiple hosts at once"
+HOMEPAGE="http://noping.cc/"
+SRC_URI="http://noping.cc/files/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="perl"
+
+DEPEND="
+ sys-libs/ncurses
+ perl? ( dev-lang/perl )
+"
+RDEPEND=${DEPEND}
+
+PATCHES=( "${FILESDIR}/${PN}-1.6.2-nouidmagic.patch" )
+
+src_prepare() {
+ base_src_prepare
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with perl perl-bindings INSTALLDIRS=vendor) \
+ --disable-static
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+
+ fperms u+s,og-r /usr/bin/oping
+ fperms u+s,og-r /usr/bin/noping
+}
diff --git a/net-libs/liboping/metadata.xml b/net-libs/liboping/metadata.xml
new file mode 100644
index 000000000000..62e5578cfa83
--- /dev/null
+++ b/net-libs/liboping/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>bugs@bergstroem.nu</email>
+ <name>Johan Bergström</name>
+ <description>Proxied Maintainer</description>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/libopkele/Manifest b/net-libs/libopkele/Manifest
new file mode 100644
index 000000000000..8ac75e6d3c45
--- /dev/null
+++ b/net-libs/libopkele/Manifest
@@ -0,0 +1 @@
+DIST libopkele-2.0.4.tar.bz2 321277 SHA256 102e22431e4ec6f1f0baacb6b1b036476f5e5a83400f2174807a090a14f4dc67 SHA512 98515f1e29bbdbb761d2ac2f3c316c006624b4472ba9ea7d1370c188acaa16cdb4d2bc73aa17c7dad99f30c364a0e7abd5e7f1872a578dca94d7a818d161dec9 WHIRLPOOL 575acd7bc4bfcea83f4f5e0235e083072527ae7ccae1e5173913c29ed101d328509e3a974b67f2e0966c4f4e50abb5440ac549ba84508e91fb090af584ffd17e
diff --git a/net-libs/libopkele/files/libopkele-2.0.4-gcc471.patch b/net-libs/libopkele/files/libopkele-2.0.4-gcc471.patch
new file mode 100644
index 000000000000..5da095348e15
--- /dev/null
+++ b/net-libs/libopkele/files/libopkele-2.0.4-gcc471.patch
@@ -0,0 +1,23 @@
+From 9ff6244998b0d41e71f7cc7351403ad590e990e4 Mon Sep 17 00:00:00 2001
+From: qdii <qdii@reblochon.be>
+Date: Fri, 02 Nov 2012 19:46:03 +0000
+Subject: Fix argument-lookup failure on GCC 4.7.1, causing compilation to crash.
+
+Modified-by: Michael Krelin <hacker@klever.net>
+Signed-off-by: Michael Krelin <hacker@klever.net>
+---
+diff --git a/include/opkele/discovery.h b/include/opkele/discovery.h
+index f2721a6..985eef6 100644
+--- a/include/opkele/discovery.h
++++ b/include/opkele/discovery.h
+@@ -21,7 +21,7 @@ namespace opkele {
+ public:
+
+ inline _DT& add(long priority,const _DT& d) {
+- return insert(typename map_type::value_type(priority,d))->second;
++ return this->insert(typename map_type::value_type(priority,d))->second;
+ }
+
+ bool has_value(const _DT& d) const {
+--
+cgit v0.9-30-gcd78
diff --git a/net-libs/libopkele/files/libopkele-2.0.4-missing_includes.patch b/net-libs/libopkele/files/libopkele-2.0.4-missing_includes.patch
new file mode 100644
index 000000000000..184852749478
--- /dev/null
+++ b/net-libs/libopkele/files/libopkele-2.0.4-missing_includes.patch
@@ -0,0 +1,31 @@
+From 648ae5dbd90e062f3432f809a846d50d994b86d4 Mon Sep 17 00:00:00 2001
+From: qdii <qdii@reblochon.be>
+Date: Fri, 02 Nov 2012 13:49:03 +0000
+Subject: Function _exit was referenced in the code, but <unistd.h> was not included, causing compilation to fail.
+
+---
+diff --git a/test/idiscover.cc b/test/idiscover.cc
+index 4b1e90c..8a5a3fb 100644
+--- a/test/idiscover.cc
++++ b/test/idiscover.cc
+@@ -2,6 +2,7 @@
+ #include <stdexcept>
+ #include <iterator>
+ #include <algorithm>
++#include <unistd.h>
+ using namespace std;
+ #include <opkele/exception.h>
+ #include <opkele/discovery.h>
+diff --git a/test/test.cc b/test/test.cc
+index 2143ac0..770e0c6 100644
+--- a/test/test.cc
++++ b/test/test.cc
+@@ -1,5 +1,6 @@
+ #include <iostream>
+ #include <stdexcept>
++#include <unistd.h>
+ using namespace std;
+ #include <opkele/exception.h>
+ #include <opkele/util.h>
+--
+cgit v0.9-30-gcd78
diff --git a/net-libs/libopkele/libopkele-2.0.4-r1.ebuild b/net-libs/libopkele/libopkele-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..52f4ec6aa68c
--- /dev/null
+++ b/net-libs/libopkele/libopkele-2.0.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A C++ implementation of an OpenID decentralized identity system"
+HOMEPAGE="http://kin.klever.net/libopkele/"
+SRC_URI="http://kin.klever.net/dist/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/htmltidy
+ dev-libs/libpcre
+ dev-libs/openssl
+ net-misc/curl"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc471.patch \
+ "${FILESDIR}"/${P}-missing_includes.patch
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS NEWS
+}
diff --git a/net-libs/libopkele/metadata.xml b/net-libs/libopkele/metadata.xml
new file mode 100644
index 000000000000..4538a68724a6
--- /dev/null
+++ b/net-libs/libopkele/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/net-libs/libosip/Manifest b/net-libs/libosip/Manifest
new file mode 100644
index 000000000000..b9c1c1b5d854
--- /dev/null
+++ b/net-libs/libosip/Manifest
@@ -0,0 +1,2 @@
+DIST libosip2-3.6.0.tar.gz 598496 SHA256 c9a18b0c760506d150017cdb1fa5c1cefe12b8dcbbf9a7e784eb75af376e96cd SHA512 58109fdc643673e811ce576374194d6d33b930ecec3221f31834471f52f5f2b2b30e5e331e245e33b2aafbff1aaa411d3a7657c25f3bb0b9d6cda0ae766fd538 WHIRLPOOL 7ba0050963aa2c997ee3dd3769bbcc7910586818c7fd76037044be9843cb47481fd024b9f77f3a99b6958e42ec3f68004063d7cf8b7713fd7c60a5eab6b17ef3
+DIST libosip2-4.0.0.tar.gz 644958 SHA256 bb2d228a41750fab397480002b0865f305f83a3840b1aa84851593593491b015 SHA512 995fc67c9a7536628ebaec9f4500bafa8a2f88081531bbae5194372b51102d556de28aea7d121e20cfda82b302a8a4ceb6488dbad61676930fdc13accb12b961 WHIRLPOOL 1c5df05f5317f6daaa7623f9868ed057ea3f07d84523088038bba366bdb955424b615a5bfb96754c89e046523e5db44075529a552439dc961a490d4e2eb57198
diff --git a/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch b/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch
new file mode 100644
index 000000000000..04a64ed39446
--- /dev/null
+++ b/net-libs/libosip/files/libosip-3.3.0-out-source-build.patch
@@ -0,0 +1,16 @@
+Fixed upstream:
+
+http://www.atosc.org/pipermail/osip/2010-February/009864.html
+
+--- src/test/Makefile.am 2010-02-11 17:51:43 +0000
++++ src/test/Makefile.am 2010-02-11 17:52:09 +0000
+@@ -49,7 +49,7 @@
+ @echo " *******************************"
+ @echo " ****** starting tests! ********"
+ @echo " *******************************"
+- @./$(top_srcdir)/src/test/tst ./$(top_srcdir)/src/test/res -c
++ @$(top_srcdir)/src/test/tst $(top_srcdir)/src/test/res -c
+
+ @echo ""
+ @echo "In case you have a doubt, send the generated"
+
diff --git a/net-libs/libosip/libosip-3.6.0.ebuild b/net-libs/libosip/libosip-3.6.0.ebuild
new file mode 100644
index 000000000000..e31eeba4fca3
--- /dev/null
+++ b/net-libs/libosip/libosip-3.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils autotools
+
+MY_PV=${PV%.?}-${PV##*.}
+MY_PV=${PV}
+MY_P=${PN}2-${MY_PV}
+DESCRIPTION="a simple way to support the Session Initiation Protocol"
+HOMEPAGE="http://www.gnu.org/software/osip/"
+SRC_URI="mirror://gnu/osip/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="amd64 ppc ~sparc x86 ~ppc-macos ~x86-macos"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.3.0-out-source-build.patch"
+ AT_M4DIR="scripts" eautoreconf
+}
+
+src_configure() {
+ econf --enable-mt \
+ $(use_enable test)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "Failed to install"
+ dodoc AUTHORS ChangeLog FEATURES HISTORY README NEWS TODO || die
+}
diff --git a/net-libs/libosip/libosip-4.0.0.ebuild b/net-libs/libosip/libosip-4.0.0.ebuild
new file mode 100644
index 000000000000..faa6bd670689
--- /dev/null
+++ b/net-libs/libosip/libosip-4.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils autotools versionator
+
+MY_PV=${PV%.?}-${PV##*.}
+MY_PV=${PV}
+MY_P=${PN}2-${MY_PV}
+DESCRIPTION="a simple way to support the Session Initiation Protocol"
+HOMEPAGE="http://www.gnu.org/software/osip/"
+SRC_URI="mirror://gnu/osip/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="2/$(get_version_component_range 1-2)"
+KEYWORDS="amd64 ppc ~sparc x86 ~ppc-macos ~x86-macos"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.3.0-out-source-build.patch"
+ AT_M4DIR="scripts" eautoreconf
+}
+
+src_configure() {
+ econf --enable-mt \
+ $(use_enable test)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog FEATURES HISTORY README NEWS TODO
+}
diff --git a/net-libs/libosip/metadata.xml b/net-libs/libosip/metadata.xml
new file mode 100644
index 000000000000..4538a68724a6
--- /dev/null
+++ b/net-libs/libosip/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/net-libs/libosmo-abis/libosmo-abis-9999.ebuild b/net-libs/libosmo-abis/libosmo-abis-9999.ebuild
new file mode 100644
index 000000000000..2edd20402c53
--- /dev/null
+++ b/net-libs/libosmo-abis/libosmo-abis-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools git-2
+
+DESCRIPTION="Osmocom library for A-bis interface"
+HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/libosmo-abis"
+EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+EGIT_BRANCH="jolly/multi-trx"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="net-libs/ortp"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ eautoreconf
+}
diff --git a/net-libs/libosmo-abis/metadata.xml b/net-libs/libosmo-abis/metadata.xml
new file mode 100644
index 000000000000..c1b4dee070d2
--- /dev/null
+++ b/net-libs/libosmo-abis/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>radio</herd>
+</pkgmetadata>
+
diff --git a/net-libs/libosmo-dsp/Manifest b/net-libs/libosmo-dsp/Manifest
new file mode 100644
index 000000000000..a156f30ff3f0
--- /dev/null
+++ b/net-libs/libosmo-dsp/Manifest
@@ -0,0 +1 @@
+DIST libosmo-dsp-0.3.tar.xz 106792 SHA256 7e1bdcb7860aa85a532fc91147b93e1ad174c569519b349716f8cf5fd43f3cc8 SHA512 079316bb882859787ee26143e3b105aa260c89022b81a38b29713cde39093dc430abea406468774649dd14232c969b2806c47634b64f940f78fa20cb90ffade5 WHIRLPOOL c58c5fe48289a230c93215ca7e92ec8c78a35abe78094b105d21875637f8cb7b63ccad5334b5b3d26fdcc45c22e2f3a384539019fe1c3ca64858f0892dbc8774
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild
new file mode 100644
index 000000000000..cf0bcd09dab4
--- /dev/null
+++ b/net-libs/libosmo-dsp/libosmo-dsp-0.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools multilib
+
+DESCRIPTION="A library with SDR DSP primitives"
+HOMEPAGE="http://git.osmocom.org/libosmo-dsp/"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.osmocom.org/${PN}"
+ KEYWORDS=""
+else
+ SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="doc static-libs"
+
+RDEPEND="sci-libs/fftw"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig"
+
+src_prepare() {
+ eautoreconf
+}
+
+src_configure() {
+ use doc || export ac_cv_path_DOXYGEN=false
+ default_src_configure
+}
+
+src_install() {
+ default_src_install
+ use static-libs || rm "${ED}"/usr/$(get_libdir)/libosmodsp.a
+}
diff --git a/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
new file mode 100644
index 000000000000..cf0bcd09dab4
--- /dev/null
+++ b/net-libs/libosmo-dsp/libosmo-dsp-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools multilib
+
+DESCRIPTION="A library with SDR DSP primitives"
+HOMEPAGE="http://git.osmocom.org/libosmo-dsp/"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.osmocom.org/${PN}"
+ KEYWORDS=""
+else
+ SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="doc static-libs"
+
+RDEPEND="sci-libs/fftw"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig"
+
+src_prepare() {
+ eautoreconf
+}
+
+src_configure() {
+ use doc || export ac_cv_path_DOXYGEN=false
+ default_src_configure
+}
+
+src_install() {
+ default_src_install
+ use static-libs || rm "${ED}"/usr/$(get_libdir)/libosmodsp.a
+}
diff --git a/net-libs/libosmo-dsp/metadata.xml b/net-libs/libosmo-dsp/metadata.xml
new file mode 100644
index 000000000000..044f12194316
--- /dev/null
+++ b/net-libs/libosmo-dsp/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>
+<email>zerochaos@gentoo.org</email>
+<name>Rick Farina</name>
+</maintainer>
+<herd>radio</herd>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/net-libs/libosmocore/Manifest b/net-libs/libosmocore/Manifest
new file mode 100644
index 000000000000..508d858c3f3a
--- /dev/null
+++ b/net-libs/libosmocore/Manifest
@@ -0,0 +1,2 @@
+DIST libosmocore-0.6.6.tar.bz2 396707 SHA256 c0ea2cdb1bdfe9cd815f7abf1abbf3f9ae4f7d5fc73d2820a02038da565ec83d SHA512 d0b2a4f0efb8c364a3c3da8cd888a30eb19f193ae13e9ecbb7126b33dd18c2c23a19672866efc365cdc49b0a971ce87d828ec3fbf7e0df4f4d6ff5f3e32a9c17 WHIRLPOOL 7d01aee748b8866bb2f0117ba00d152de56994d7e9cabe27d07ac760b7e07c9c09cd0b983cf5044757190e3cd84632ffc2000fa84b46506574618c9babd56b2e
+DIST libosmocore-0.8.0.tar.bz2 439320 SHA256 7a757b20855a030bc402d6b03411bc6a2d717b2f2cc97ee891cb13661825aefb SHA512 4ffd5943807440f80f70e381e477631a592fef41a3485819d94e7ce9523785e20057759aec6cac7abe57ba21b7d48e38164b7272c5bcd89882a3a8e213d89361 WHIRLPOOL e9e3c82d0d64a85d6915dedc9070f224e49b86a85239a1649751b85ddf2eda537ca9f90a578c42da6df13e77203aaa4dcf069d434f140313439a91686647aee6
diff --git a/net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch b/net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch
new file mode 100644
index 000000000000..c61ecac1f336
--- /dev/null
+++ b/net-libs/libosmocore/files/libosmocore-0.6.0-automake-1.13.patch
@@ -0,0 +1,11 @@
+--- libosmocore-0.6.0/configure.ac
++++ libosmocore-0.6.0/configure.ac
+@@ -77,7 +77,7 @@
+ CHECK_TM_INCLUDES_TM_GMTOFF
+
+ dnl Generate the output
+-AC_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AC_ARG_ENABLE(talloc,
+ [AS_HELP_STRING(
diff --git a/net-libs/libosmocore/libosmocore-0.6.6.ebuild b/net-libs/libosmocore/libosmocore-0.6.6.ebuild
new file mode 100644
index 000000000000..22d18e9990fe
--- /dev/null
+++ b/net-libs/libosmocore/libosmocore-0.6.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
+HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
+SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="embedded"
+
+RDEPEND="embedded? ( sys-libs/talloc )"
+DEPEND="${RDEPEND}
+ app-doc/doxygen"
+
+src_prepare() {
+ # set correct version in pkgconfig files
+ sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
+
+ epatch "${FILESDIR}"/${PN}-0.6.0-automake-1.13.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable embedded)
+}
+
+src_install() {
+ default
+ # install to correct documentation directory
+ mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+}
diff --git a/net-libs/libosmocore/libosmocore-0.8.0.ebuild b/net-libs/libosmocore/libosmocore-0.8.0.ebuild
new file mode 100644
index 000000000000..4f9f02bc6293
--- /dev/null
+++ b/net-libs/libosmocore/libosmocore-0.8.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
+HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+ KEYWORDS=""
+else
+ SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0"
+IUSE="embedded pcsc-lite"
+
+RDEPEND="embedded? ( sys-libs/talloc )
+ pcsc-lite? ( sys-apps/pcsc-lite )"
+DEPEND="${RDEPEND}
+ app-doc/doxygen"
+
+src_prepare() {
+ # set correct version in pkgconfig files
+ sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
+
+ epatch "${FILESDIR}"/${PN}-0.6.0-automake-1.13.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable embedded) \
+ $(use_enable pcsc-lite pcsc)
+}
+
+src_install() {
+ default
+ # install to correct documentation directory
+ mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+}
diff --git a/net-libs/libosmocore/libosmocore-9999.ebuild b/net-libs/libosmocore/libosmocore-9999.ebuild
new file mode 100644
index 000000000000..4f9f02bc6293
--- /dev/null
+++ b/net-libs/libosmocore/libosmocore-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
+HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+ KEYWORDS=""
+else
+ SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0"
+IUSE="embedded pcsc-lite"
+
+RDEPEND="embedded? ( sys-libs/talloc )
+ pcsc-lite? ( sys-apps/pcsc-lite )"
+DEPEND="${RDEPEND}
+ app-doc/doxygen"
+
+src_prepare() {
+ # set correct version in pkgconfig files
+ sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
+
+ epatch "${FILESDIR}"/${PN}-0.6.0-automake-1.13.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable embedded) \
+ $(use_enable pcsc-lite pcsc)
+}
+
+src_install() {
+ default
+ # install to correct documentation directory
+ mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+}
diff --git a/net-libs/libosmocore/metadata.xml b/net-libs/libosmocore/metadata.xml
new file mode 100644
index 000000000000..a3b7887f7df3
--- /dev/null
+++ b/net-libs/libosmocore/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>radio</herd>
+ <use>
+ <flag name='embedded'>Build for embedded use and disable unsupported features</flag>
+ <flag name='pcsc-lite'>Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg></flag>
+ </use>
+</pkgmetadata>
+
diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
new file mode 100644
index 000000000000..393fde54b534
--- /dev/null
+++ b/net-libs/libotr/Manifest
@@ -0,0 +1,2 @@
+DIST libotr-3.2.1.tar.gz 414684 SHA256 d428eaa584984baa09450cca07742e0ac8fc62401f3a1c556e3025023369cdf4 SHA512 7dfac85cb7dd1a95481330ecf3bfe54477a9de7e20370919386e8aa9553e374a2d3587d7b4bb654d1a30bd1c47e41c577f7b78f4007c5cb97f2f6a2c63078899 WHIRLPOOL 96593df2cc3f5e5e606e14170c3706b1dc17f2142821d827d2e5ae1473b923eacc95909f489f18a700539e07de2042e39df36157f724ba79916591c8ccca594b
+DIST libotr-4.1.0.tar.gz 576771 SHA256 4fdb891940ec89d300190a98f69a9138248dcb8c8d337633fb981b8d0a9cd930 SHA512 3c6a6bf8ee64467484519187d1bc86001d5ae6ceb169e9c828f7750a1db3dadfef677b828a5d292e5caa12f874711df4fd2db977d48dc968e9f0edc2eab58e3e WHIRLPOOL ffd9f0ae542a2013554547ca37059cba91f3c5b4966a870d5df6f82a794da4aee318c3e1d1dbd23405a67990f9aee750281d6083d1ded59048191981dc59af16
diff --git a/net-libs/libotr/libotr-3.2.1.ebuild b/net-libs/libotr/libotr-3.2.1.ebuild
new file mode 100644
index 000000000000..1ba05619e9a6
--- /dev/null
+++ b/net-libs/libotr/libotr-3.2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
+HOMEPAGE="https://otr.cypherpunks.ca"
+SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+RDEPEND=">=dev-libs/libgcrypt-1.2:0
+ dev-libs/libgpg-error"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README UPGRADING )
diff --git a/net-libs/libotr/libotr-4.1.0.ebuild b/net-libs/libotr/libotr-4.1.0.ebuild
new file mode 100644
index 000000000000..a6ed64832260
--- /dev/null
+++ b/net-libs/libotr/libotr-4.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
+HOMEPAGE="https://otr.cypherpunks.ca"
+SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-libs/libgcrypt-1.2:0
+ dev-libs/libgpg-error"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README UPGRADING )
diff --git a/net-libs/libotr/metadata.xml b/net-libs/libotr/metadata.xml
new file mode 100644
index 000000000000..3e2b4181f5be
--- /dev/null
+++ b/net-libs/libotr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-im</herd>
+</pkgmetadata>
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
new file mode 100644
index 000000000000..935a2beb3180
--- /dev/null
+++ b/net-libs/libpcap/Manifest
@@ -0,0 +1 @@
+DIST libpcap-1.7.4.tar.gz 663021 SHA256 7ad3112187e88328b85e46dce7a9b949632af18ee74d97ffc3f2b41fe7f448b0 SHA512 83c55aa4173a90e8080a63dc6f0faeb4339d5def998abb9a578f08210c1784a1787ac6975f8bd27b02f8854dd18f03a23c1cd5fa611f46247090b2cc13943cf9 WHIRLPOOL b74cb9f55fd58f4521b0c074ae71448af8bc9e3d66577b6631b5ee59e27cca40f38519b9f2ab097755bd5a86a298bb3edb6d37aad9d0530060eb7ec9dc6221a8
diff --git a/net-libs/libpcap/files/libpcap-1.2.0-cross-linux.patch b/net-libs/libpcap/files/libpcap-1.2.0-cross-linux.patch
new file mode 100644
index 000000000000..fa3b300d8f4d
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.2.0-cross-linux.patch
@@ -0,0 +1,16 @@
+--- a/configure.in
++++ b/configure.in
+@@ -291,7 +291,12 @@
+ dnl XXX This could be done for cross-compiling, but for now it's not.
+ dnl
+ if test -z "$with_pcap" && test "$cross_compiling" = yes; then
+- AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...)
++ if test -z "$with_pcap" ; then
++ case $host in
++ *-linux*) with_pcap="linux";;
++ *) AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...);;
++ esac
++ fi
+ fi
+ AC_ARG_WITH(pcap,
+ AC_HELP_STRING([--with-pcap=TYPE],[use packet capture TYPE]))
diff --git a/net-libs/libpcap/files/libpcap-1.6.1-configure.patch b/net-libs/libpcap/files/libpcap-1.6.1-configure.patch
new file mode 100644
index 000000000000..538e49d51d1f
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.6.1-configure.patch
@@ -0,0 +1,15 @@
+Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup
+Check for bluetooth/mgmt.h before use
+
+
+--- a/configure.in
++++ b/configure.in
+@@ -1117,7 +1117,7 @@
+ if test "$enable_universal" != "no"; then
+ case "$host_os" in
+
+- darwin[0-7].*)
++ darwin**)
+ #
+ # Pre-Tiger. Build only for 32-bit PowerPC; no
+ # need for any special compiler or linker flags.
diff --git a/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch b/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
new file mode 100644
index 000000000000..7b5efb618230
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
@@ -0,0 +1,36 @@
+Prefix' Solaris uses GNU ld
+
+
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -415,7 +415,7 @@
+ aix*)
+ ;;
+
+- freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
++ freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
+ #
+ # Platforms where the linker is the GNU linker
+ # or accepts command-line arguments like
+@@ -429,10 +429,10 @@
+ PIC_OPT=-fpic
+ case "$host_cpu" in
+
+- sparc64*)
++ sparc64*|sparcv9*)
+ case "$host_os" in
+
+- freebsd*|openbsd*)
++ freebsd*|solaris*|openbsd*)
+ PIC_OPT=-fPIC
+ ;;
+ esac
+@@ -497,7 +497,7 @@
+ V_SHLIB_OPT="-G -bnoentry -bexpall"
+ ;;
+
+- freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
++ freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
+ #
+ # "cc" is GCC.
+ #
diff --git a/net-libs/libpcap/files/libpcap-1.7.2-libnl.patch b/net-libs/libpcap/files/libpcap-1.7.2-libnl.patch
new file mode 100644
index 000000000000..685453958762
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.7.2-libnl.patch
@@ -0,0 +1,22 @@
+--- a/configure.in
++++ b/configure.in
+@@ -453,10 +453,6 @@
+
+ incdir=-I/usr/include/libnl3
+ libnldir=
+- if test x$withval != x ; then
+- libnldir=-L${withval}/lib/.libs
+- incdir=-I${withval}/include
+- fi
+
+ #
+ # Try libnl 3.x first.
+@@ -471,7 +467,7 @@
+ AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
+ AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
+ AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
+- V_INCLS="$V_INCLS ${incdir}"
++ V_INCLS="${incdir} $V_INCLS"
+ have_any_nl="yes"
+ ],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
+
diff --git a/net-libs/libpcap/files/mgmt.h b/net-libs/libpcap/files/mgmt.h
new file mode 100644
index 000000000000..d7fc9c8956aa
--- /dev/null
+++ b/net-libs/libpcap/files/mgmt.h
@@ -0,0 +1,33 @@
+/*
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2010 Nokia Corporation
+ * Copyright (C) 2010 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifndef __packed
+#define __packed __attribute__((packed))
+#endif
+
+struct mgmt_hdr {
+ uint16_t opcode;
+ uint16_t index;
+ uint16_t len;
+} __packed;
+#define MGMT_HDR_SIZE 6
diff --git a/net-libs/libpcap/libpcap-1.7.4.ebuild b/net-libs/libpcap/libpcap-1.7.4.ebuild
new file mode 100644
index 000000000000..5ee80444a1cc
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.7.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="http://www.tcpdump.org/"
+SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
+ http://www.jp.tcpdump.org/release/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth dbus ipv6 netlink static-libs canusb"
+
+RDEPEND="
+ bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+ canusb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ virtual/yacc
+ dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-1.2.0-cross-linux.patch \
+ "${FILESDIR}"/${PN}-1.6.1-configure.patch \
+ "${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch \
+ "${FILESDIR}"/${PN}-1.7.2-libnl.patch
+
+ mkdir bluetooth || die
+ cp "${FILESDIR}"/mgmt.h bluetooth/ || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" \
+ econf \
+ $(use_enable bluetooth) \
+ $(use_enable ipv6) \
+ $(use_enable canusb) \
+ $(use_enable dbus) \
+ $(use_with netlink libnl)
+}
+
+multilib_src_compile() {
+ emake all shared
+}
+
+multilib_src_install_all() {
+ dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
+
+ # remove static libraries (--disable-static does not work)
+ if ! use static-libs; then
+ find "${ED}" -name '*.a' -exec rm {} + || die
+ fi
+ prune_libtool_files
+
+ # We need this to build pppd on G/FBSD systems
+ if [[ "${USERLAND}" == "BSD" ]]; then
+ insinto /usr/include
+ doins pcap-int.h
+ fi
+}
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
new file mode 100644
index 000000000000..5a09a1502eb8
--- /dev/null
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils git-r3 multilib-minimal
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="http://www.tcpdump.org/"
+EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="bluetooth dbus ipv6 netlink static-libs canusb"
+
+RDEPEND="
+ bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+ canusb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ virtual/yacc
+ dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-1.2.0-cross-linux.patch \
+ "${FILESDIR}"/${PN}-1.6.1-configure.patch \
+ "${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch \
+ "${FILESDIR}"/${PN}-1.7.2-libnl.patch
+
+ mkdir bluetooth || die
+ cp "${FILESDIR}"/mgmt.h bluetooth/ || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" \
+ econf \
+ $(use_enable bluetooth) \
+ $(use_enable ipv6) \
+ $(use_enable canusb) \
+ $(use_enable dbus) \
+ $(use_with netlink libnl)
+}
+
+multilib_src_compile() {
+ emake all shared
+}
+
+multilib_src_install_all() {
+ dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
+
+ # remove static libraries (--disable-static does not work)
+ if ! use static-libs; then
+ find "${ED}" -name '*.a' -exec rm {} + || die
+ fi
+ prune_libtool_files
+
+ # We need this to build pppd on G/FBSD systems
+ if [[ "${USERLAND}" == "BSD" ]]; then
+ insinto /usr/include
+ doins pcap-int.h
+ fi
+}
diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
new file mode 100644
index 000000000000..5455c0b7c293
--- /dev/null
+++ b/net-libs/libpcap/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>netmon</herd>
+ <use>
+ <flag name='netlink'>
+ Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.
+ </flag>
+ <flag name='canusb'>
+ Use <pkg>virtual/libusb</pkg> to support Controller Area Network over USB (CAN USB)
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/libpcapnav/Manifest b/net-libs/libpcapnav/Manifest
new file mode 100644
index 000000000000..fddd5bcf02d7
--- /dev/null
+++ b/net-libs/libpcapnav/Manifest
@@ -0,0 +1 @@
+DIST libpcapnav-0.8.tar.gz 387476 SHA256 11d6a4257cbc5a89aa73ce2aaa5b0fc17430f7279d0abb39ccaf3a411ba7e852 SHA512 bc0357d17228c157de5b480532df37a62459882d5a4fb8d2285fe4e86c1dca301e7cc505f2917bb3421d926bed263d93b2c587311431d9c3a5b02f04c93fdf18 WHIRLPOOL 08552c55bc6d2c80780b333e1ba0c476baa5d783c74309fe6e435cefae551b9d2a27040c66e2f27ee21a8679f48a3fe8f258a9efc64873fbda806656e339a974
diff --git a/net-libs/libpcapnav/files/libpcapnav-0.8-includes.patch b/net-libs/libpcapnav/files/libpcapnav-0.8-includes.patch
new file mode 100644
index 000000000000..cb41bedf4a32
--- /dev/null
+++ b/net-libs/libpcapnav/files/libpcapnav-0.8-includes.patch
@@ -0,0 +1,20 @@
+--- a/test/pcapnav-test1.c
++++ b/test/pcapnav-test1.c
+@@ -1,6 +1,7 @@
+ #include <config.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <time.h> /* ctime() */
+
+ #include <pcapnav.h>
+
+--- a/test/pcapnav-jump.c
++++ b/test/pcapnav-jump.c
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <pcapnav.h>
++#include <string.h> /* strcmp() */
+
+ int
+ main(int argc, char** argv)
diff --git a/net-libs/libpcapnav/libpcapnav-0.8.ebuild b/net-libs/libpcapnav/libpcapnav-0.8.ebuild
new file mode 100644
index 000000000000..b87808f6f8fa
--- /dev/null
+++ b/net-libs/libpcapnav/libpcapnav-0.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Libpcap wrapper library to navigate to arbitrary packets in a tcpdump trace file"
+HOMEPAGE="http://netdude.sourceforge.net/"
+SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE="doc static-libs"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-includes.patch
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_compile() {
+ emake SUBDIRS="src docs"
+}
+
+src_install() {
+ default
+ rm -fr "${D}"/usr/share/gtk-doc
+ use doc && dohtml -r docs/*.css docs/html/*.html docs/images
+ prune_libtool_files
+}
diff --git a/net-libs/libpcapnav/metadata.xml b/net-libs/libpcapnav/metadata.xml
new file mode 100644
index 000000000000..89664012b677
--- /dev/null
+++ b/net-libs/libpcapnav/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>netmon</herd>
+ <upstream>
+ <remote-id type="sourceforge">netdude</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
new file mode 100644
index 000000000000..25963f4a3435
--- /dev/null
+++ b/net-libs/libpri/Manifest
@@ -0,0 +1,4 @@
+DIST libpri-1.4.12.tar.gz 339669 SHA256 c0e170a742ed5d19515c99472fe79a467522355b3c24e4f7359d667b7d756e75 SHA512 54933b9fc23a09c71a1c9ce40d648fc90e6900043ab04f097ee3d01918b46f65462337e98e1b2c1917e36becdccc871bd5029dedc522020ea731c29172ccb1fe WHIRLPOOL 708387b8571668edd193605004c62d37d41db8a6c18161c36f3db12b05f99683eae2b8dc43037a202eb46117085cc1505e56b8195d70369ec994acc8ff31c404
+DIST libpri-1.4.13.tar.gz 338432 SHA256 5c17611b7294c83f20fac5dc5cd9930de684a2f84627efb15ef6742b68df1ebf SHA512 5fbd408577bc92f2232c696f91691ec28e011b0918c7ff08212f352499f0af56e1b9a03ec738b13c28a4ff5e687eaf873472035ed1908cf43a844ffbf34dd636 WHIRLPOOL 37b7694dd012677e6ecea73a79bf75577fc6f368f9963e08a50e8d12a407a4b979ae56e1c92bb0df85efbec3cfaa2f033dac5eb1cd864bfe2e472bb22415abd8
+DIST libpri-1.4.14.tar.gz 338303 SHA256 25def0f3d492e7604c58d81f5c5a3c70f158bbf78b1250a3bda208e994799dd0 SHA512 c702249db62abb694747b56c588aa0e3883f54cba7cc125652df446604f349979e68a6d6b477bdcddd938179f1d1bab0a73044b0eb4c88a615770344ca419cdf WHIRLPOOL 62b5d4480556eea849a54ebd3a8d910ca02f078c5376031cfa388602350b3a514671102e0a6fe568c092b822a8d514fa2012d20db78b0b96a947a1b3a8c42ecd
+DIST libpri-1.4.15.tar.gz 338633 SHA256 9af4192137b0364ebc1fb86ecceaf6bb154772d7b8f094a1a7b2f3dcddc032d5 SHA512 2737ad404440a0c809bf0bb0e406565757fe850040911561c2e5e64f4c49b02af69db0d23dac322dda354583bca0ced88becc07017e686a848b69c8f152fb9d4 WHIRLPOOL 4b162d9de627c657bd7d97c7e7b19aa5c74b2497728986d08c46fbfa0582eb0e2c865d5536c78c8eb6e0ec489e5e785a414ca82aa126b4de03ed5095d38783aa
diff --git a/net-libs/libpri/files/libpri-1.4.12-multilib.patch b/net-libs/libpri/files/libpri-1.4.12-multilib.patch
new file mode 100644
index 000000000000..bb30900a0ca5
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.12-multilib.patch
@@ -0,0 +1,51 @@
+--- libpri-1.4.12-beta3/Makefile.orig 2010-10-07 06:00:04.000000000 +0200
++++ libpri-1.4.12-beta3/Makefile 2010-11-23 22:04:59.884448930 +0100
+@@ -96,7 +96,7 @@
+ CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+-libdir?=$(INSTALL_BASE)/lib
++LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+ ifneq ($(findstring Darwin,$(OSARCH)),)
+ SOFLAGS=-dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
+ ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
+@@ -168,27 +168,27 @@
+ fi
+
+ install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+- mkdir -p $(INSTALL_PREFIX)$(libdir)
++ mkdir -p $(LIBDIR)
+ mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+ ifneq (${OSARCH},SunOS)
+ install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+- install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
+- #if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi
+- ( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
+- install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
+- if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
++ install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR)
++ if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi
++ ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
++ install -m 644 $(STATIC_LIBRARY) $(LIBDIR)
++ if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi
+ else
+ install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
+- install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
+- ( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
+- install -f $(INSTALL_PREFIX)$(libdir) -m 644 $(STATIC_LIBRARY)
++ install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
++ ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
++ install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
+ endif
+
+ uninstall:
+ @echo "Removing Libpri"
+- rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so.$(SONAME)
+- rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so
+- rm -f $(INSTALL_PREFIX)$(libdir)/libpri.a
++ rm -f $(LIBDIR)/libpri.so.$(SONAME)
++ rm -f $(LIBDIR)/libpri.so
++ rm -f $(LIBDIR)/libpri.a
+ rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
+
+ pritest: pritest.o
diff --git a/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch
new file mode 100644
index 000000000000..dd5b28587db9
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch
@@ -0,0 +1,47 @@
+diff -uNr libpri-1.4.12.ORIG//Makefile libpri-1.4.12/Makefile
+--- libpri-1.4.12.ORIG//Makefile 2011-07-27 10:37:34.247793740 +0100
++++ libpri-1.4.12/Makefile 2011-07-27 10:38:54.183790788 +0100
+@@ -90,7 +90,7 @@
+ rose_qsig_mwi.lo \
+ rose_qsig_name.lo \
+ version.lo
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
++CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+ LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+@@ -124,20 +124,12 @@
+
+ PRIVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
+
+-#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+-#This works for even old (2.96) versions of gcc and provides a small boost either way.
+-#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
+-ifeq ($(PROC),sparc64)
+-PROC=ultrasparc
+-LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
++ifneq ($(CODE_COVERAGE),)
++ LIBPRI_OPT=
++ COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
++ COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
+ else
+- ifneq ($(CODE_COVERAGE),)
+- LIBPRI_OPT=
+- COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
+- COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
+- else
+- LIBPRI_OPT=-O2
+- endif
++ LIBPRI_OPT=
+ endif
+
+ ifeq ($(CPUARCH),i686)
+@@ -216,7 +208,7 @@
+ ranlib $(STATIC_LIBRARY)
+
+ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
+- $(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
++ $(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
+ $(LDCONFIG) $(LDCONFIG_FLAGS) .
+ ln -sf libpri.so.$(SONAME) libpri.so
+
diff --git a/net-libs/libpri/files/libpri-1.4.13-multilib.patch b/net-libs/libpri/files/libpri-1.4.13-multilib.patch
new file mode 100644
index 000000000000..22eec7e50059
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.13-multilib.patch
@@ -0,0 +1,51 @@
+--- libpri-1.4.13/Makefile.orig 2012-09-26 17:46:23.000000000 +0200
++++ libpri-1.4.13/Makefile 2012-10-10 08:04:44.000000000 +0200
+@@ -71,7 +71,7 @@
+ CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+-libdir?=$(INSTALL_BASE)/lib
++LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+ ifneq ($(findstring Darwin,$(OSARCH)),)
+ SOFLAGS=$(LDFLAGS) -dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
+ ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
+@@ -145,27 +145,27 @@
+ fi
+
+ install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+- mkdir -p $(INSTALL_PREFIX)$(libdir)
++ mkdir -p $(LIBDIR)
+ mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+ ifneq (${OSARCH},SunOS)
+ install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+- install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
+- #if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi
+- ( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf $(DYNAMIC_LIBRARY) libpri.so)
+- install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
+- if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
++ install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR)
++ if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi
++ ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
++ install -m 644 $(STATIC_LIBRARY) $(LIBDIR)
++ if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi
+ else
+ install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
+- install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
+- ( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf $(DYNAMIC_LIBRARY) libpri.so)
+- install -f $(INSTALL_PREFIX)$(libdir) -m 644 $(STATIC_LIBRARY)
++ install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
++ ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
++ install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
+ endif
+
+ uninstall:
+ @echo "Removing Libpri"
+- rm -f $(INSTALL_PREFIX)$(libdir)/$(STATIC_LIBRARY)
+- rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so
+- rm -f $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY)
++ rm -f $(LIBDIR)/libpri.so.$(SONAME)
++ rm -f $(LIBDIR)/libpri.so
++ rm -f $(LIBDIR)/libpri.a
+ rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
+
+ pritest: pritest.o $(STATIC_LIBRARY)
diff --git a/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch b/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch
new file mode 100644
index 000000000000..963e730c6fda
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.13-no-static-lib.patch
@@ -0,0 +1,35 @@
+diff -uNr libpri-1.4.13.ORIG/Makefile libpri-1.4.13/Makefile
+--- libpri-1.4.13.ORIG/Makefile 2012-10-27 13:22:57.902838938 +0100
++++ libpri-1.4.13/Makefile 2012-10-27 13:23:36.746837229 +0100
+@@ -120,7 +120,7 @@
+ SOFLAGS += -m32
+ endif
+
+-all: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) $(UTILITIES)
++all: $(DYNAMIC_LIBRARY)
+
+ update:
+ @if [ -d .svn ]; then \
+@@ -139,7 +139,7 @@
+ echo "Not under version control"; \
+ fi
+
+-install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
++install: $(DYNAMIC_LIBRARY)
+ mkdir -p $(LIBDIR)
+ mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+ ifneq (${OSARCH},SunOS)
+@@ -147,13 +147,11 @@
+ install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR)
+ if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi
+ ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
+- install -m 644 $(STATIC_LIBRARY) $(LIBDIR)
+ if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi
+ else
+ install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
+ install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
+ ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
+- install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
+ endif
+
+ uninstall:
diff --git a/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch
new file mode 100644
index 000000000000..f10303d80590
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch
@@ -0,0 +1,41 @@
+--- libpri-1.4.13/Makefile.orig 2012-09-26 17:46:23.000000000 +0200
++++ libpri-1.4.13/Makefile 2012-10-10 08:11:24.000000000 +0200
+@@ -67,7 +67,7 @@
+ DYNAMIC_OBJS= \
+ $(STATIC_OBJS)
+ CFLAGS ?= -g
+-CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
++CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
+ CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+@@ -107,17 +107,12 @@
+ #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+ #This works for even old (2.96) versions of gcc and provides a small boost either way.
+ #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
+-ifeq ($(PROC),sparc64)
+-PROC=ultrasparc
+-LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+-else
+- ifneq ($(CODE_COVERAGE),)
++ifneq ($(CODE_COVERAGE),)
+ LIBPRI_OPT=
+ COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
+ COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
+- else
+- LIBPRI_OPT=-O2
+- endif
++else
++ LIBPRI_OPT=
+ endif
+
+ ifeq ($(CPUARCH),i686)
+@@ -196,7 +191,7 @@
+ ranlib $(STATIC_LIBRARY)
+
+ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
+- $(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
++ $(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
+ $(LDCONFIG) $(LDCONFIG_FLAGS) .
+ ln -sf $(DYNAMIC_LIBRARY) libpri.so
+
diff --git a/net-libs/libpri/libpri-1.4.12-r2.ebuild b/net-libs/libpri/libpri-1.4.12-r2.ebuild
new file mode 100644
index 000000000000..534a69b0221d
--- /dev/null
+++ b/net-libs/libpri/libpri-1.4.12-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit base
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Primary Rate ISDN (PRI) library"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~sparc x86"
+IUSE="static-libs"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.12-multilib.patch"
+ "${FILESDIR}/${PN}-1.4.12-respect-user-flags.patch"
+)
+
+src_install() {
+ emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
+ use static-libs || find "${D}" -name '*.a' -delete
+ dodoc ChangeLog README TODO
+}
diff --git a/net-libs/libpri/libpri-1.4.13.ebuild b/net-libs/libpri/libpri-1.4.13.ebuild
new file mode 100644
index 000000000000..9434c9ea783e
--- /dev/null
+++ b/net-libs/libpri/libpri-1.4.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit base
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Primary Rate ISDN (PRI) library"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.13-multilib.patch"
+ "${FILESDIR}/${PN}-1.4.13-respect-user-flags.patch"
+ "${FILESDIR}/${PN}-1.4.13-no-static-lib.patch"
+)
+
+src_install() {
+ emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
+ dodoc ChangeLog README TODO
+}
diff --git a/net-libs/libpri/libpri-1.4.14.ebuild b/net-libs/libpri/libpri-1.4.14.ebuild
new file mode 100644
index 000000000000..f7c75d794b7f
--- /dev/null
+++ b/net-libs/libpri/libpri-1.4.14.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit base
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Primary Rate ISDN (PRI) library"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.13-multilib.patch"
+ "${FILESDIR}/${PN}-1.4.13-respect-user-flags.patch"
+ "${FILESDIR}/${PN}-1.4.13-no-static-lib.patch"
+)
+
+src_install() {
+ emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
+ dodoc ChangeLog README TODO
+}
diff --git a/net-libs/libpri/libpri-1.4.15.ebuild b/net-libs/libpri/libpri-1.4.15.ebuild
new file mode 100644
index 000000000000..ad72274fa6e8
--- /dev/null
+++ b/net-libs/libpri/libpri-1.4.15.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Primary Rate ISDN (PRI) library"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.13-multilib.patch"
+ "${FILESDIR}/${PN}-1.4.13-respect-user-flags.patch"
+ "${FILESDIR}/${PN}-1.4.13-no-static-lib.patch"
+)
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+}
+
+src_install() {
+ emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
+ dodoc ChangeLog README TODO
+}
diff --git a/net-libs/libpri/metadata.xml b/net-libs/libpri/metadata.xml
new file mode 100644
index 000000000000..3ed4669f55a4
--- /dev/null
+++ b/net-libs/libpri/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>chainsaw@gentoo.org</email>
+ <name>Tony Vroon</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/libprotoident/Manifest b/net-libs/libprotoident/Manifest
new file mode 100644
index 000000000000..d7764bcb65f9
--- /dev/null
+++ b/net-libs/libprotoident/Manifest
@@ -0,0 +1 @@
+DIST libprotoident-2.0.7.tar.gz 483119 SHA256 5063497274e546b01b0606c8906a292cbe1e2ba8d6f3b6cd25de16a91fef635e SHA512 0491a2c67f1cd43dc82d68f8d6d3d6c423a7ba6ce07141107b9f50c08b858974c504dcf563501b3f33c29e799baa88871444f12ebf5f6c70adc73c08824dced8 WHIRLPOOL 37c9eecd5f3ba81d02d849aebeab05b21e26c0e0e58718a55841c500c9c33faf3cecac5d564a619a2aaf7d5c4e703297997f8e45d575d846ca9c1c6a34e8f6d6
diff --git a/net-libs/libprotoident/libprotoident-2.0.7.ebuild b/net-libs/libprotoident/libprotoident-2.0.7.ebuild
new file mode 100644
index 000000000000..dbb4c22a87c3
--- /dev/null
+++ b/net-libs/libprotoident/libprotoident-2.0.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-utils
+
+DESCRIPTION="A library that performs application layer protocol identification for flows"
+HOMEPAGE="http://research.wand.net.nz/software/libprotoident.php"
+SRC_URI="http://research.wand.net.nz/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs +tools"
+
+DEPEND=">=net-libs/libtrace-3.0.7
+ tools? ( net-libs/libflowmanager )"
+RDEPEND="${DEPEND}"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with tools)
+ )
+ autotools-utils_src_configure
+}
diff --git a/net-libs/libprotoident/metadata.xml b/net-libs/libprotoident/metadata.xml
new file mode 100644
index 000000000000..2281ff091ad3
--- /dev/null
+++ b/net-libs/libprotoident/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>netmon</herd>
+ <use>
+ <flag name="tools">Build and install command-line tools</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
new file mode 100644
index 000000000000..81c8202d93ad
--- /dev/null
+++ b/net-libs/libproxy/Manifest
@@ -0,0 +1 @@
+DIST libproxy-0.4.11.tar.gz 93757 SHA256 dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b SHA512 563a837946a73c41e0773cec93332c6308245c0b807a40a0fb052c2445deae4a117ba2780a350c799717fd11c4dbe410183a38ea050a4f04db0b1adcb6f9ad98 WHIRLPOOL 2165fcb9a43592e1112539ff7fdd79963fc6c00821edb5d5f04d92d7d1bd884362019a2a2cd12cb412dfaee25ad8e1554a568e9818910861000666bfe81ca479
diff --git a/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch b/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch
new file mode 100644
index 000000000000..91658574134e
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.10-disable-pac-test.patch
@@ -0,0 +1,29 @@
+From 5a1a8d2b920006e54d9de971999b443073f50843 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 16 Oct 2012 03:30:50 -0400
+Subject: [PATCH] Disable PAC test
+
+get-pac-test freezes when run from the ebuild, but succeeds when
+building manually. Using Xemake/virtualx.eclass doesn't seem to help.
+---
+ libproxy/test/CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/libproxy/test/CMakeLists.txt b/libproxy/test/CMakeLists.txt
+index 8894425..69543a4 100644
+--- a/libproxy/test/CMakeLists.txt
++++ b/libproxy/test/CMakeLists.txt
+@@ -17,10 +17,3 @@ if(WIN32)
+ target_link_libraries(url-encode ws2_32)
+ endif()
+ add_test(NAME url-encode COMMAND ${CMAKE_CURRENT_BINARY_DIR}/url-encode)
+-
+-# Get PAC
+-if (NOT WIN32)
+-add_executable(get-pac-test ${CMAKE_CURRENT_SOURCE_DIR}/get-pac-test.cpp ${PROJECT_SOURCE_DIR}/url.cpp)
+-target_link_libraries(get-pac-test pthread)
+-add_test(NAME get-pac-test COMMAND ${CMAKE_CURRENT_BINARY_DIR}/get-pac-test)
+-endif()
+--
+1.7.12.3
+
diff --git a/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch b/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch
new file mode 100644
index 000000000000..59e368b696eb
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.11-avoid-nm-build-dep.patch
@@ -0,0 +1,60 @@
+From 518214ee85e10c5bc99d3b115ae7ac9cc3fc14fc Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 29 Apr 2013 23:02:25 -0400
+Subject: [PATCH] Avoid build-time dependency on NetworkManager
+
+Needed to prevent a dependency loop:
+nm -> libsoup -> glib-networking -> libproxy -> nm
+
+https://bugs.gentoo.org/467696
+---
+ libproxy/cmake/modules/network_networkmanager.cmk | 4 ++--
+ libproxy/modules/network_networkmanager.cpp | 21 ++++++++++++++++++++-
+ 2 files changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/libproxy/cmake/modules/network_networkmanager.cmk b/libproxy/cmake/modules/network_networkmanager.cmk
+index d9f9588..2586bbd 100644
+--- a/libproxy/cmake/modules/network_networkmanager.cmk
++++ b/libproxy/cmake/modules/network_networkmanager.cmk
+@@ -1,3 +1,3 @@
+ if (NOT WIN32 AND NOT APPLE)
+- px_check_modules(NM NetworkManager dbus-1)
+-endif()
+\ No newline at end of file
++ px_check_modules(NM dbus-1)
++endif()
+diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp
+index 564c275..a03425b 100644
+--- a/libproxy/modules/network_networkmanager.cpp
++++ b/libproxy/modules/network_networkmanager.cpp
+@@ -23,7 +23,26 @@
+ using namespace libproxy;
+
+ #include <dbus/dbus.h>
+-#include <NetworkManager/NetworkManager.h>
++
++
++/*
++ * copy-pasted from NetworkManager-0.9.6.4's NetworkManager.h to prevent
++ * a circular dependency; https://bugs.gentoo.org/467696
++ */
++#define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
++#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
++typedef enum {
++ NM_STATE_UNKNOWN = 0,
++ NM_STATE_ASLEEP = 10,
++ NM_STATE_DISCONNECTED = 20,
++ NM_STATE_DISCONNECTING = 30,
++ NM_STATE_CONNECTING = 40,
++ NM_STATE_CONNECTED_LOCAL = 50,
++ NM_STATE_CONNECTED_SITE = 60,
++ NM_STATE_CONNECTED_GLOBAL = 70
++} NMState;
++#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
++
+
+ class networkmanager_network_extension : public network_extension {
+ public:
+--
+1.8.2.1
+
diff --git a/net-libs/libproxy/files/libproxy-0.4.11-macosx.patch b/net-libs/libproxy/files/libproxy-0.4.11-macosx.patch
new file mode 100644
index 000000000000..09558e3c4d76
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.11-macosx.patch
@@ -0,0 +1,86 @@
+https://trac.macports.org/browser/trunk/dports/net/libproxy/files/patch-libproxy-cmake.diff
+
+diff -ur libproxy/cmake.orig/libproxy.cmk libproxy/cmake/libproxy.cmk
+--- libproxy/cmake.orig/libproxy.cmk 2012-10-02 07:20:40.000000000 -0700
++++ libproxy/cmake/libproxy.cmk 2012-10-19 13:47:50.000000000 -0700
+@@ -18,7 +18,7 @@
+ set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp
+ PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES})
+ # When changing the SOVERSION here remember to also bump the 'favorite proxy .so' in python bindings.
+-set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1)
++set_target_properties(libproxy PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" PREFIX "" VERSION 1.0.0 SOVERSION 1)
+ set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
+ install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
+ install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR})
+diff -ur libproxy/cmake.orig/modules/config_envvar.cmk libproxy/cmake/modules/config_envvar.cmk
+--- libproxy/cmake.orig/modules/config_envvar.cmk 2010-06-14 10:40:47.000000000 -0700
++++ libproxy/cmake/modules/config_envvar.cmk 2012-10-19 13:45:42.000000000 -0700
+@@ -1,3 +1,3 @@
+-if (NOT WIN32 AND NOT APPLE)
++if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
+ set(ENVVAR_FOUND 1)
+-endif()
+\ No newline at end of file
++endif()
+diff -ur libproxy/cmake.orig/modules/config_gnome.cmk libproxy/cmake/modules/config_gnome.cmk
+--- libproxy/cmake.orig/modules/config_gnome.cmk 2012-10-02 07:20:40.000000000 -0700
++++ libproxy/cmake/modules/config_gnome.cmk 2012-10-19 13:45:42.000000000 -0700
+@@ -1,4 +1,4 @@
+-if (NOT WIN32 AND NOT APPLE)
++if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
+ option(WITH_GNOME2 "Target a GNOME 2 system (gconf)" OFF)
+ option(WITH_GNOME3 "Target a GNOME 3 system (gsettings)" ON)
+ if(WITH_GNOME3)
+diff -ur libproxy/cmake.orig/modules/config_kde4.cmk libproxy/cmake/modules/config_kde4.cmk
+--- libproxy/cmake.orig/modules/config_kde4.cmk 2010-06-14 10:40:47.000000000 -0700
++++ libproxy/cmake/modules/config_kde4.cmk 2012-10-19 13:45:42.000000000 -0700
+@@ -1,4 +1,4 @@
+-if (NOT WIN32 AND NOT APPLE)
++if (NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
+ option(WITH_KDE4 "Search for KDE4 package" ON)
+ if (WITH_KDE4)
+ find_package(KDE4)
+@@ -16,4 +16,4 @@
+ else()
+ set(KDE4_FOUND 0)
+ endif()
+-endif()
+\ No newline at end of file
++endif()
+diff -ur libproxy/cmake.orig/modules/config_macosx.cmk libproxy/cmake/modules/config_macosx.cmk
+--- libproxy/cmake.orig/modules/config_macosx.cmk 2010-06-14 10:40:47.000000000 -0700
++++ libproxy/cmake/modules/config_macosx.cmk 2012-10-19 13:45:42.000000000 -0700
+@@ -1,4 +1,4 @@
+-if(APPLE)
++if(APPLE AND MP_MACOSX)
+ find_library(SC_LIBRARIES SystemConfiguration)
+ find_library(CF_LIBRARIES CoreFoundation)
+ if(SC_LIBRARIES)
+@@ -7,4 +7,4 @@
+ if(CF_LIBRARIES)
+ set(CF_FOUND 1)
+ endif()
+-endif()
+\ No newline at end of file
++endif()
+diff -ur libproxy/cmake.orig/modules/pacrunner_webkit.cmk libproxy/cmake/modules/pacrunner_webkit.cmk
+--- libproxy/cmake.orig/modules/pacrunner_webkit.cmk 2012-10-02 07:20:40.000000000 -0700
++++ libproxy/cmake/modules/pacrunner_webkit.cmk 2012-10-19 13:45:42.000000000 -0700
+@@ -6,7 +6,7 @@
+ link_directories(WEBKIT_LIBRARIES)
+ include_directories("${WEBKIT_INCLUDE_DIR}")
+ endif()
+-elseif(APPLE)
++elseif(APPLE AND MP_MACOSX)
+ find_library(WEBKIT_LIBRARIES JavaScriptCore)
+ if(WEBKIT_LIBRARIES)
+ set(WEBKIT_FOUND 1)
+diff -ur libproxy/cmake.orig/pkgconfig.cmk libproxy/cmake/pkgconfig.cmk
+--- libproxy/cmake.orig/pkgconfig.cmk 2012-10-02 07:20:40.000000000 -0700
++++ libproxy/cmake/pkgconfig.cmk 2012-10-19 13:45:42.000000000 -0700
+@@ -1,4 +1,4 @@
+-if(NOT WIN32 AND NOT APPLE)
++if(NOT WIN32 AND NOT (APPLE AND MP_MACOSX))
+ find_package(PkgConfig)
+
+ # Define our magical px_check_modules function
diff --git a/net-libs/libproxy/files/libproxy-0.4.11-mozjs.pc.patch b/net-libs/libproxy/files/libproxy-0.4.11-mozjs.pc.patch
new file mode 100644
index 000000000000..8d8d21e65136
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.11-mozjs.pc.patch
@@ -0,0 +1,23 @@
+--- libproxy-0.4.11/libproxy/cmake/modules/pacrunner_mozjs.cmk.orig 2011-06-20 04:31:41.000000000 -0600
++++ libproxy-0.4.11/libproxy/cmake/modules/pacrunner_mozjs.cmk 2013-03-24 19:20:17.910765954 -0600
+@@ -9,12 +9,18 @@
+ elseif(NOT APPLE)
+ option(WITH_MOZJS "Search for MOZJS package" ON)
+ if (WITH_MOZJS)
+- pkg_search_module(MOZJS mozjs185>=1.8.5)
++ pkg_search_module(MOZJS mozjs187)
+ if(MOZJS_FOUND)
+ include_directories(${MOZJS_INCLUDE_DIRS})
+ link_directories(${MOZJS_LIBRARY_DIRS})
+ else()
+- set(MOZJS_FOUND 0)
++ pkg_search_module(MOZJS mozjs185)
++ if(MOZJS_FOUND)
++ include_directories(${MOZJS_INCLUDE_DIRS})
++ link_directories(${MOZJS_LIBRARY_DIRS})
++ else()
++ set(MOZJS_FOUND 0)
++ endif()
+ endif()
+ else()
+ set(MOZJS_FOUND 0)
diff --git a/net-libs/libproxy/libproxy-0.4.11-r2.ebuild b/net-libs/libproxy/libproxy-0.4.11-r2.ebuild
new file mode 100644
index 000000000000..14dddcba5ab2
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.4.11-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib eutils flag-o-matic mono python-r1
+
+DESCRIPTION="Library for automatic proxy configuration management"
+HOMEPAGE="http://code.google.com/p/libproxy/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# NOTE: mozjs/spidermonkey might still cause problems like #373397 ?
+# NOTE: webkit-gtk:3, not :2, needed for libjavascriptcoregtk support
+RDEPEND="gnome? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ kde? ( >=kde-base/kdelibs-4.4.5 )
+ mono? ( dev-lang/mono )
+ networkmanager? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ spidermonkey? ( >=dev-lang/spidermonkey-1.8.5:0= )
+ webkit? ( >=net-libs/webkit-gtk-1.6:3= )"
+DEPEND="${RDEPEND}
+ kde? ( dev-util/automoc )
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+# avoid dependency loop, bug #467696
+PDEPEND="networkmanager? ( net-misc/networkmanager )"
+
+src_prepare() {
+ # Gentoo's spidermonkey doesn't set Version: in mozjs18[57].pc
+ epatch "${FILESDIR}/${P}-mozjs.pc.patch"
+
+ # get-pac-test freezes when run by the ebuild, succeeds when building
+ # manually; virtualx.eclass doesn't help :(
+ epatch "${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch"
+
+ epatch "${FILESDIR}"/${P}-macosx.patch
+
+ # prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696
+ epatch "${FILESDIR}/${PN}-0.4.11-avoid-nm-build-dep.patch"
+}
+
+src_configure() {
+ [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
+ use python && python_setup
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ # WITH_VALA just copies the .vapi file over and needs no deps,
+ # hence always enable it unconditionally
+ local mycmakeargs=(
+ -DPERL_VENDORINSTALL=ON
+ -DCMAKE_C_FLAGS="${CFLAGS}"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+ $(cmake-utils_use_with gnome GNOME3)
+ $(multilib_is_native_abi && cmake-utils_use_with kde KDE4 \
+ || echo -DWITH_KDE4=OFF)
+ $(multilib_is_native_abi && cmake-utils_use_with mono DOTNET \
+ || echo -DWITH_DOTNET=OFF)
+ $(cmake-utils_use_with networkmanager NM)
+ $(multilib_is_native_abi && cmake-utils_use_with perl PERL \
+ || echo -DWITH_PERL=OFF)
+ $(multilib_is_native_abi && cmake-utils_use_with python PYTHON \
+ || echo -DWITH_PYTHON=OFF)
+ $(multilib_is_native_abi && cmake-utils_use_with spidermonkey MOZJS \
+ || echo -DWITH_MOZJS=OFF)
+ $(multilib_is_native_abi && cmake-utils_use_with webkit WEBKIT \
+ || echo -DWITH_WEBKIT=OFF)
+ $(multilib_is_native_abi && cmake-utils_use_with webkit WEBKIT3 \
+ || echo -DWITH_WEBKIT3=OFF)
+ -DWITH_VALA=ON
+ $(cmake-utils_use test BUILD_TESTING)
+ )
+ cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS ChangeLog NEWS README"
+ einstalldocs
+
+ if use python; then
+ python_foreach_impl python_domodule bindings/python/libproxy.py || die
+ fi
+}
diff --git a/net-libs/libproxy/metadata.xml b/net-libs/libproxy/metadata.xml
new file mode 100644
index 000000000000..a4957587f728
--- /dev/null
+++ b/net-libs/libproxy/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>freedesktop</herd>
+ <maintainer>
+ <email>freedesktop-bugs@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="gnome">Enable support for reading proxy settings from
+ GNOME</flag>
+ <flag name="kde">Enable support for reading proxy settings from KDE</flag>
+ <flag name="spidermonkey">Use libmozjs from
+ <pkg>dev-lang/spidermonkey</pkg> for PAC parsing</flag>
+ <flag name="webkit">Use libjavascriptcoregtk from
+ <pkg>net-libs/webkit-gtk</pkg> for PAC parsing</flag>
+ </use>
+ <upstream>
+ <remote-id type="google-code">libproxy</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libqinfinity/Manifest b/net-libs/libqinfinity/Manifest
new file mode 100644
index 000000000000..96ad2e0b0139
--- /dev/null
+++ b/net-libs/libqinfinity/Manifest
@@ -0,0 +1 @@
+DIST libqinfinity-v0.5.2.tar.xz 62140 SHA256 739f99afb7fd464e4b541e2980e07911c8f30924f9871f14294dc3148137825a SHA512 add5aebb48607f0cab9634ae9b459f3037f401a278f6941520993b736978b3ed7e794acfcf25a9f2c82013eda82d5f6eb8d823814ba23977d070ee9ed8134050 WHIRLPOOL 874918ec56a41e017f1304f88d2f096b24d5d598585d9f549565133522e1c3538bf35875e8a90ccb4d111e4de3bc6d2b2b01cae1c6da0f12e34364851c3c4c9f
diff --git a/net-libs/libqinfinity/libqinfinity-0.5.2.ebuild b/net-libs/libqinfinity/libqinfinity-0.5.2.ebuild
new file mode 100644
index 000000000000..4b8e14d01364
--- /dev/null
+++ b/net-libs/libqinfinity/libqinfinity-0.5.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-v${PV}"
+inherit cmake-utils
+
+DESCRIPTION="Qt-style interface for libinfinity"
+HOMEPAGE="https://projects.kde.org/projects/playground/libs/libqinfinity"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ net-libs/libinfinity
+"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+"
+
+S=${WORKDIR}/${MY_P}
diff --git a/net-libs/libqinfinity/metadata.xml b/net-libs/libqinfinity/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/net-libs/libqinfinity/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
new file mode 100644
index 000000000000..0d71545498d4
--- /dev/null
+++ b/net-libs/libqmi/Manifest
@@ -0,0 +1,5 @@
+DIST libqmi-1.0.0.tar.gz 2398450 SHA256 aea6b4c027bc24bdf5a624b50be8413c796c266c1e134425a8e783fb7b5ff419 SHA512 7d1a057fadd65e16e623670cc1a6292c9dc2e22630d329e820320c70acbabba519280bd76a954a5308d395cae23893ba5700b213e397457a8b7410ec6b8fc157 WHIRLPOOL 95a3341068d852f3754ba8c8bfa139a03de38e9a0ad861c84124e3cf55740576a66f8c9a1b33dac8d7c8b3f4924ac3be5a26ccf95d876c79c431949dcb19e2c3
+DIST libqmi-1.10.2.tar.xz 643256 SHA256 0d70b10810e45aebb4af902db59972d756441ca1e301240c5c529ef0f08bf80f SHA512 01f82d674ee1554473660b046fa3cc75f0d4f628d866fc1c111080c06cdb941d6d69950f2efce0f5839c461b459d51f14bf840e4f410a4beb0fad6e4c7dea2e9 WHIRLPOOL a7615cbbb195c94eb493edad0282f4bdf0ca695c3964331e00aa403e2dd83062eda1fd04cfdc77b84f9d9aebf213bc64726c0cc715d4f9ad6368f36cbffb6542
+DIST libqmi-1.12.6.tar.xz 710564 SHA256 0857bffece4e8ddfa7f721dd9ca63b4c78de345ac9ae2faebf04062cacba3780 SHA512 7001f61dbe2be431867a504dbfc634ed5e7c3f3b1740aef7833fb8163d1a6bdffb57793f09062f49c0b8eeff5a011a2a057a938d618f3547ff5942021b3e8a9d WHIRLPOOL 23e4b2d6349f7b6d6c88716787cc06fba5f5eaa426fb6af5d09662fe7e59251a63dd5bace691dcb1e5f76a1457caa382ab7a5e7bf7f123d276965aee79878200
+DIST libqmi-1.4.0.tar.xz 592684 SHA256 812515c36fd77c5f7eb9d52804e9666c4341e8c7dd3d932ca1e607b467831af3 SHA512 ca20352ba0eb4e03946b366ddcfec2892fda1e5dc8351816ee2314bc3d4235637eb143066f0f96bd9a9b5b5b3198265432beb8a984617e6618ddbd5c937e2b93 WHIRLPOOL 99418e9c91f89058279f9353b8b2b277f12fdda85f3114b005be59db9432fed91148bd6bcb3519bc4267cd2d1479c818cd8816d9c6d38a7721ad18f6b2fdd80e
+DIST libqmi-1.8.0.tar.xz 659720 SHA256 fadd8070dd6f95eb00d04058c616ade57966d8e54d894da8ddbf31e98310ee0d SHA512 016fdcdb8e66452be5c82107f00189292822afe97ec3e3a458b5a6bce2174a428035d76efd5f57497a07bfd62991e4330ebe150e91dd178c4f698be8e537d372 WHIRLPOOL 67f9addbb70203dfdb3bf379a1599ce9df197a1cc8e619795c08e28f3247c730f3f106fd02368834815cf1b55b64d22dc23a5108a42e8c509cd9ac4cc1593a93
diff --git a/net-libs/libqmi/files/libqmi-1.0.0-python3.patch b/net-libs/libqmi/files/libqmi-1.0.0-python3.patch
new file mode 100644
index 000000000000..152804dc3656
--- /dev/null
+++ b/net-libs/libqmi/files/libqmi-1.0.0-python3.patch
@@ -0,0 +1,176 @@
+http://bugs.gentoo.org/464314
+
+upstream seems to have this fixed already
+
+--- a/build-aux/qmi-codegen/Client.py
++++ b/build-aux/qmi-codegen/Client.py
+@@ -61,10 +61,10 @@ class Client:
+ break
+
+ translations = { 'underscore' : utils.build_underscore_name(self.name),
+- 'no_prefix_underscore_upper' : string.upper(utils.build_underscore_name(self.name[4:])),
++ 'no_prefix_underscore_upper' : utils.build_underscore_name(self.name[4:]).upper(),
+ 'camelcase' : utils.build_camelcase_name(self.name),
+ 'hyphened' : utils.build_dashed_name(self.name),
+- 'service' : string.upper(self.service) }
++ 'service' : self.service.upper() }
+
+ # Emit class header
+ template = (
+@@ -207,8 +207,8 @@ class Client:
+ # At least one field in the indication
+ translations['output_camelcase'] = utils.build_camelcase_name(message.output.fullname)
+ translations['bundle_type'] = 'QMI_TYPE_' + utils.remove_prefix(utils.build_underscore_uppercase_name(message.output.fullname), 'QMI_')
+- translations['service'] = string.upper(self.service)
+- translations['message_name_dashed'] = string.replace(message.name, ' ', '-')
++ translations['service'] = self.service.upper()
++ translations['message_name_dashed'] = message.name.replace(' ', '-')
+ inner_template += (
+ '\n'
+ ' /**\n'
+@@ -263,8 +263,8 @@ class Client:
+ def __emit_methods(self, hfile, cfile, message_list):
+ translations = { 'underscore' : utils.build_underscore_name(self.name),
+ 'camelcase' : utils.build_camelcase_name (self.name),
+- 'service_lowercase' : string.lower(self.service),
+- 'service_uppercase' : string.upper(self.service),
++ 'service_lowercase' : self.service.lower(),
++ 'service_uppercase' : self.service.upper(),
+ 'service_camelcase' : string.capwords(self.service) }
+
+ for message in message_list.list:
+@@ -518,7 +518,7 @@ class Client:
+ """
+ def emit_sections(self, sfile):
+ translations = { 'underscore' : utils.build_underscore_name(self.name),
+- 'no_prefix_underscore_upper' : string.upper(utils.build_underscore_name(self.name[4:])),
++ 'no_prefix_underscore_upper' : utils.build_underscore_name(self.name[4:]).upper(),
+ 'camelcase' : utils.build_camelcase_name (self.name),
+ 'hyphened' : utils.build_dashed_name (self.name) }
+
+--- a/build-aux/qmi-codegen/Field.py
++++ b/build-aux/qmi-codegen/Field.py
+@@ -57,10 +57,10 @@ class Field:
+ self.variable = VariableFactory.create_variable(dictionary, self.fullname, self.container_type)
+
+ # Create the variable name within the Container
+- self.variable_name = 'arg_' + string.lower(utils.build_underscore_name(self.name))
++ self.variable_name = 'arg_' + utils.build_underscore_name(self.name).lower()
+
+ # Create the ID enumeration name
+- self.id_enum_name = string.upper(utils.build_underscore_name(self.prefix + ' TLV ' + self.name))
++ self.id_enum_name = utils.build_underscore_name(self.prefix + ' TLV ' + self.name).upper()
+
+ # Output Fields may have prerequisites
+ self.prerequisites = []
+--- a/build-aux/qmi-codegen/Message.py
++++ b/build-aux/qmi-codegen/Message.py
+@@ -53,7 +53,7 @@ class Message:
+ self.fullname = self.prefix + ' ' + self.service + ' ' + self.name
+
+ # Create the ID enumeration name
+- self.id_enum_name = string.upper(utils.build_underscore_name(self.fullname))
++ self.id_enum_name = utils.build_underscore_name(self.fullname).upper()
+
+ # Build output container.
+ # Every defined message will have its own output container, which
+--- a/build-aux/qmi-codegen/MessageList.py
++++ b/build-aux/qmi-codegen/MessageList.py
+@@ -109,7 +109,7 @@ class MessageList:
+ messages of a given service.
+ """
+ def __emit_get_printable(self, hfile, cfile):
+- translations = { 'service' : string.lower(self.service) }
++ translations = { 'service' : self.service.lower() }
+
+ template = (
+ '\n'
+@@ -175,7 +175,7 @@ class MessageList:
+ introduced.
+ """
+ def __emit_get_version_introduced(self, hfile, cfile):
+- translations = { 'service' : string.lower(self.service) }
++ translations = { 'service' : self.service.lower() }
+
+ template = (
+ '\n'
+--- a/build-aux/qmi-codegen/Variable.py
++++ b/build-aux/qmi-codegen/Variable.py
+@@ -45,7 +45,7 @@ class Variable:
+ self.needs_dispose = False
+
+ self.endian = "QMI_ENDIAN_LITTLE"
+- if dictionary.has_key('endian'):
++ if 'endian' in dictionary:
+ endian = dictionary['endian']
+ if endian == 'network' or endian == 'big':
+ self.endian = "QMI_ENDIAN_BIG"
+--- a/build-aux/qmi-codegen/VariableArray.py
++++ b/build-aux/qmi-codegen/VariableArray.py
+@@ -86,7 +86,7 @@ class VariableArray(Variable):
+ def clear_func_name(self):
+ # element public format might be a base type like 'gchar *' rather
+ # than a structure name like QmiFooBar
+- elt_name = string.replace(self.array_element.public_format, '*', 'pointer')
++ elt_name = self.array_element.public_format.replace('*', 'pointer')
+ return utils.build_underscore_name(self.name) + \
+ '_' + \
+ utils.build_underscore_name_from_camelcase(utils.build_camelcase_name(elt_name))
+--- a/build-aux/qmi-codegen/VariableInteger.py
++++ b/build-aux/qmi-codegen/VariableInteger.py
+@@ -247,7 +247,7 @@ class VariableInteger(Variable):
+ '${lp} g_string_append_printf (${printable}, "%s", tmp ? "yes" : "no");\n')
+ elif self.public_format != self.private_format:
+ translations['public_type_underscore'] = utils.build_underscore_name_from_camelcase(self.public_format)
+- translations['public_type_underscore_upper'] = string.upper(utils.build_underscore_name_from_camelcase(self.public_format))
++ translations['public_type_underscore_upper'] = utils.build_underscore_name_from_camelcase(self.public_format).upper()
+ template += (
+ '#if defined __${public_type_underscore_upper}_IS_ENUM__\n'
+ '${lp} g_string_append_printf (${printable}, "%s", ${public_type_underscore}_get_string ((${public_format})tmp));\n'
+--- a/build-aux/qmi-codegen/utils.py
++++ b/build-aux/qmi-codegen/utils.py
+@@ -54,7 +54,7 @@ def add_copyright(f):
+ Build a header guard string based on the given filename
+ """
+ def build_header_guard(output_name):
+- return "__LIBQMI_GLIB_" + string.upper(string.replace (output_name, '-', '_')) + "__"
++ return "__LIBQMI_GLIB_" + output_name.replace('-', '_').upper() + "__"
+
+
+ """
+@@ -145,7 +145,7 @@ Build an underscore name from the given full name
+ e.g.: "This is a message" --> "this_is_a_message"
+ """
+ def build_underscore_name(name):
+- return string.lower(string.replace (name, ' ', '_'))
++ return name.replace(' ', '_').lower()
+
+
+ """
+@@ -153,7 +153,7 @@ Build an underscore uppercase name from the given full name
+ e.g.: "This is a message" --> "THIS_IS_A_MESSAGE"
+ """
+ def build_underscore_uppercase_name(name):
+- return string.upper(string.replace (name, ' ', '_'))
++ return name.replace(' ', '_').upper()
+
+
+ """
+@@ -170,7 +170,7 @@ Build a camelcase name from the given full name
+ e.g.: "This is a message" --> "ThisIsAMessage"
+ """
+ def build_camelcase_name(name):
+- return string.replace(string.capwords(name), ' ', '')
++ return string.capwords(name).replace(' ', '')
+
+
+ """
+@@ -178,7 +178,7 @@ Build a dashed lowercase name from the given full name
+ e.g.: "This is a message" --> "this-is-a-message"
+ """
+ def build_dashed_name(name):
+- return string.replace(string.lower(name), ' ', '-')
++ return name.replace(' ', '-').lower()
+
+
+ """
diff --git a/net-libs/libqmi/libqmi-1.0.0.ebuild b/net-libs/libqmi/libqmi-1.0.0.ebuild
new file mode 100644
index 000000000000..f9075c5e1a77
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit multilib autotools eutils
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-2
+ EGIT_REPO_URI="git://anongit.freedesktop.org/libqmi"
+else
+ KEYWORDS="~amd64 ~arm ~mips ~x86"
+ SRC_URI="http://cgit.freedesktop.org/libqmi/snapshot/${P}.tar.gz"
+fi
+
+DESCRIPTION="QMI modem protocol helper library"
+HOMEPAGE="http://cgit.freedesktop.org/libqmi/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc static-libs test"
+
+RDEPEND=">=dev-libs/glib-2.32"
+DEPEND="${RDEPEND}
+ doc? ( dev-util/gtk-doc )
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.0.0-python3.patch #464314
+ if [[ ! -e configure ]] ; then
+ find -name Makefile.am -exec sed -i 's:^INCLUDES:AM_CPPFLAGS:' {} + || die
+ sed -i \
+ -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+ {cli/test,libqmi-glib/test}/Makefile.am || die
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ econf \
+ --disable-more-warnings \
+ $(use_enable static{-libs,}) \
+ $(use_with doc{,s}) \
+ $(use_with test{,s})
+}
+
+src_install() {
+ default
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libqmi-glib.la
+}
diff --git a/net-libs/libqmi/libqmi-1.10.2.ebuild b/net-libs/libqmi/libqmi-1.10.2.ebuild
new file mode 100644
index 000000000000..bc45387898aa
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.10.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="QMI modem protocol helper library"
+HOMEPAGE="http://cgit.freedesktop.org/libqmi/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/glib-2.32"
+DEPEND="${RDEPEND}
+ doc? ( dev-util/gtk-doc )
+ virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+ [[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-more-warnings \
+ $(use_enable static{-libs,}) \
+ $(use_enable {,gtk-}doc)
+}
+
+src_install() {
+ default
+ use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libqmi/libqmi-1.12.6.ebuild b/net-libs/libqmi/libqmi-1.12.6.ebuild
new file mode 100644
index 000000000000..8ca64b459d06
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.12.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
+else
+ KEYWORDS="amd64 arm ~mips x86"
+ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="QMI modem protocol helper library"
+HOMEPAGE="http://cgit.freedesktop.org/libqmi/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/glib-2.32"
+DEPEND="${RDEPEND}
+ doc? ( dev-util/gtk-doc )
+ virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+ [[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-more-warnings \
+ $(use_enable static{-libs,}) \
+ $(use_enable {,gtk-}doc)
+}
+
+src_install() {
+ default
+ use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libqmi/libqmi-1.4.0.ebuild b/net-libs/libqmi/libqmi-1.4.0.ebuild
new file mode 100644
index 000000000000..2981108d5325
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-2 autotools
+ EGIT_REPO_URI="git://anongit.freedesktop.org/libqmi"
+else
+ KEYWORDS="amd64 arm ~mips x86"
+ SRC_URI="http://www.freedesktop.org/software/libqmi/${P}.tar.xz"
+fi
+
+DESCRIPTION="QMI modem protocol helper library"
+HOMEPAGE="http://cgit.freedesktop.org/libqmi/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc static-libs test"
+
+RDEPEND=">=dev-libs/glib-2.32"
+DEPEND="${RDEPEND}
+ doc? ( dev-util/gtk-doc )
+ virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+ [[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-more-warnings \
+ $(use_enable static{-libs,}) \
+ $(use_enable {,gtk-}doc) \
+ $(use_with test{,s})
+}
+
+src_install() {
+ default
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/libqmi-glib.la
+}
diff --git a/net-libs/libqmi/libqmi-1.8.0.ebuild b/net-libs/libqmi/libqmi-1.8.0.ebuild
new file mode 100644
index 000000000000..9f92c8c1f732
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.8.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
+else
+ KEYWORDS="amd64 arm ~mips x86"
+ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="QMI modem protocol helper library"
+HOMEPAGE="http://cgit.freedesktop.org/libqmi/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/glib-2.32"
+DEPEND="${RDEPEND}
+ doc? ( dev-util/gtk-doc )
+ virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+ [[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-more-warnings \
+ $(use_enable static{-libs,}) \
+ $(use_enable {,gtk-}doc)
+}
+
+src_install() {
+ default
+ use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild
new file mode 100644
index 000000000000..f008ae69a6c2
--- /dev/null
+++ b/net-libs/libqmi/libqmi-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
+else
+ KEYWORDS="~amd64 ~arm ~x86"
+ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="QMI modem protocol helper library"
+HOMEPAGE="http://cgit.freedesktop.org/libqmi/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/glib-2.32"
+DEPEND="${RDEPEND}
+ doc? ( dev-util/gtk-doc )
+ virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+ [[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-more-warnings \
+ $(use_enable static{-libs,}) \
+ $(use_enable {,gtk-}doc)
+}
+
+src_install() {
+ default
+ use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+}
diff --git a/net-libs/libqmi/metadata.xml b/net-libs/libqmi/metadata.xml
new file mode 100644
index 000000000000..b1647b8ca159
--- /dev/null
+++ b/net-libs/libqmi/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>
+ <email>vapier@gentoo.org</email>
+ <description>feel free to update</description>
+</maintainer>
+<maintainer>
+ <email>alexxy@gentoo.org</email>
+ <name>Alexey Shvetsov</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-libs/librouteros/Manifest b/net-libs/librouteros/Manifest
new file mode 100644
index 000000000000..eec8394178bb
--- /dev/null
+++ b/net-libs/librouteros/Manifest
@@ -0,0 +1 @@
+DIST librouteros-1.1.2.tar.bz2 234942 SHA256 1c58ada1ab70e15bb1490b5a24e54e3baf909554173445f71921558e2c111376
diff --git a/net-libs/librouteros/files/disable_werror.patch b/net-libs/librouteros/files/disable_werror.patch
new file mode 100644
index 000000000000..599e85b74d00
--- /dev/null
+++ b/net-libs/librouteros/files/disable_werror.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig 2011-12-30 21:17:04.233158203 +0200
++++ src/Makefile.am 2011-12-30 21:18:42.186354842 +0200
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = foreign no-dependencies
+
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ if BUILD_WITH_DEBUG
+ AM_CFLAGS += -Wextra -g -O0
+ endif
diff --git a/net-libs/librouteros/librouteros-1.1.2.ebuild b/net-libs/librouteros/librouteros-1.1.2.ebuild
new file mode 100644
index 000000000000..1145469caff3
--- /dev/null
+++ b/net-libs/librouteros/librouteros-1.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit base autotools-utils autotools
+
+DESCRIPTION="Library for accessing MikroTik's RouterOS via its API"
+HOMEPAGE="http://verplant.org/librouteros/"
+SRC_URI="http://verplant.org/librouteros/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug static-libs"
+
+DEPEND="dev-libs/libgcrypt:0"
+RDEPEND="${DEPEND}"
+
+DOCS=(README AUTHORS)
+PATCHES=("${FILESDIR}"/disable_werror.patch)
+
+src_prepare(){
+ base_src_prepare
+ eautoreconf
+}
diff --git a/net-libs/librouteros/metadata.xml b/net-libs/librouteros/metadata.xml
new file mode 100644
index 000000000000..60c7f53239ef
--- /dev/null
+++ b/net-libs/librouteros/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>andreis.vinogradovs@gmail.com</email>
+ <name>Andreis Vinogradovs</name>
+</maintainer>
+<maintainer>
+ <email>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-libs/librpcsecgss/Manifest b/net-libs/librpcsecgss/Manifest
new file mode 100644
index 000000000000..8934ba9e9d75
--- /dev/null
+++ b/net-libs/librpcsecgss/Manifest
@@ -0,0 +1,2 @@
+DIST librpcsecgss-0.16.tar.gz 362568 RMD160 29e950a86d4cbe2ce1e81ddc52df7b735689c169 SHA1 eb3336acf215301330facbd0172d275bc8e9179a SHA256 164305720920b4d24573aad97ebb04d8fadc648aae963ac22ed64fa41d438e9a
+DIST librpcsecgss-0.19.tar.gz 374487 RMD160 acaf3808fc5dcb0c16dff58aab5b953bdc18c632 SHA1 28522737949977d9733e876c91ccea5ce6b1f58b SHA256 0cafb86b67e5eb4c89e8abaaad9165298946bc164d258e8925fc6dc1fa913abd
diff --git a/net-libs/librpcsecgss/librpcsecgss-0.16.ebuild b/net-libs/librpcsecgss/librpcsecgss-0.16.ebuild
new file mode 100644
index 000000000000..46d7879b844a
--- /dev/null
+++ b/net-libs/librpcsecgss/librpcsecgss-0.16.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="implementation of rpcsec_gss (RFC 2203) for secure rpc communication"
+HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
+SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="net-libs/libgssglue"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/net-libs/librpcsecgss/librpcsecgss-0.19-r1.ebuild b/net-libs/librpcsecgss/librpcsecgss-0.19-r1.ebuild
new file mode 100644
index 000000000000..051481a48874
--- /dev/null
+++ b/net-libs/librpcsecgss/librpcsecgss-0.19-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+DESCRIPTION="implementation of rpcsec_gss (RFC 2203) for secure rpc communication"
+HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
+SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="net-libs/libgssglue"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ # No need to install static libraries, as it uses non-static dependencies
+ econf --disable-static
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ find "${D}" -name '*.la' -delete || die
+
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/net-libs/librpcsecgss/librpcsecgss-0.19.ebuild b/net-libs/librpcsecgss/librpcsecgss-0.19.ebuild
new file mode 100644
index 000000000000..f6501022a40f
--- /dev/null
+++ b/net-libs/librpcsecgss/librpcsecgss-0.19.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="implementation of rpcsec_gss (RFC 2203) for secure rpc communication"
+HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
+SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="net-libs/libgssglue"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/net-libs/librpcsecgss/metadata.xml b/net-libs/librpcsecgss/metadata.xml
new file mode 100644
index 000000000000..ca66751dee2f
--- /dev/null
+++ b/net-libs/librpcsecgss/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-fs</herd>
+</pkgmetadata>
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
new file mode 100644
index 000000000000..f189840c93fb
--- /dev/null
+++ b/net-libs/librsync/Manifest
@@ -0,0 +1 @@
+DIST librsync-0.9.7.tar.gz 453802 SHA256 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6 SHA512 339362fd01c94411849d3e4a6e95db1bef6cffa0475b1af49d73f11be0421a12d4c73ecbf1a272af01b2a21cec81b4a801c1f7d735e107d0242707fb4c45f9ef WHIRLPOOL 7cf5cc675c4bf4e041d9132f0a8311f83e827bfa7dd75180f3153cabeab41a94011e1a9b56e63a61dbe119444e2c24a39054986d97b686db99293ad9177b2bf7
diff --git a/net-libs/librsync/files/librsync-0.9.7-format-security.patch b/net-libs/librsync/files/librsync-0.9.7-format-security.patch
new file mode 100644
index 000000000000..e35980a4d7a0
--- /dev/null
+++ b/net-libs/librsync/files/librsync-0.9.7-format-security.patch
@@ -0,0 +1,20 @@
+Description: Always use a format string in printf
+ Fix the warning: buf.c:216:9: error: format not a string literal and no
+ format arguments [-Werror=format-security]
+Author: Andrey Rahmatullin <wrar@wrar.name>
+Forwarded: no
+Last-Update: 2012-02-05
+
+diff --git a/buf.c b/buf.c
+index 7f4e7a0..3a83f2b 100644
+--- a/buf.c
++++ b/buf.c
+@@ -213,7 +213,7 @@ rs_result rs_file_copy_cb(void *arg, rs_long_t pos, size_t *len, void **buf)
+
+ got = fread(*buf, 1, *len, f);
+ if (got == -1) {
+- rs_error(strerror(errno));
++ rs_error("%s", strerror(errno));
+ return RS_IO_ERROR;
+ } else if (got == 0) {
+ rs_error("unexpected eof on fd%d", fileno(f));
diff --git a/net-libs/librsync/files/librsync-0.9.7-getopt.patch b/net-libs/librsync/files/librsync-0.9.7-getopt.patch
new file mode 100644
index 000000000000..0859089b970a
--- /dev/null
+++ b/net-libs/librsync/files/librsync-0.9.7-getopt.patch
@@ -0,0 +1,17 @@
+Patch by Daniel Baumann <daniel@debian.org> for librsync >= 0.9.7, which makes
+rdiff aware of -i and -z getopt options mentioned in --help output. For further
+information, please have a look to Debian bug ID #435894.
+
+--- librsync-0.9.7/rdiff.c 2004-09-17 23:35:50.000000000 +0200
++++ librsync-0.9.7/rdiff.c.getopt 2008-12-20 13:45:58.000000000 +0100
+@@ -97,8 +97,8 @@
+ { "sum-size", 'S', POPT_ARG_INT, &strong_len },
+ { "statistics", 's', POPT_ARG_NONE, &show_stats },
+ { "stats", 0, POPT_ARG_NONE, &show_stats },
+- { "gzip", 0, POPT_ARG_NONE, 0, OPT_GZIP },
+- { "bzip2", 0, POPT_ARG_NONE, 0, OPT_BZIP2 },
++ { "gzip", 'z', POPT_ARG_NONE, 0, OPT_GZIP },
++ { "bzip2", 'i', POPT_ARG_NONE, 0, OPT_BZIP2 },
+ { "paranoia", 0, POPT_ARG_NONE, &rs_roll_paranoia },
+ { 0 }
+ };
diff --git a/net-libs/librsync/files/librsync-0.9.7-huge-files.patch b/net-libs/librsync/files/librsync-0.9.7-huge-files.patch
new file mode 100644
index 000000000000..fef08941a44f
--- /dev/null
+++ b/net-libs/librsync/files/librsync-0.9.7-huge-files.patch
@@ -0,0 +1,31 @@
+diff -urN librsync-0.9.7/mdfour.h librsync-0.9.7dev/mdfour.h
+--- librsync-0.9.7/mdfour.h 2004-02-07 18:17:57.000000000 -0500
++++ librsync-0.9.7dev/mdfour.h 2006-03-06 03:21:46.000000000 -0500
+@@ -24,7 +24,7 @@
+ #include "types.h"
+
+ struct rs_mdfour {
+- int A, B, C, D;
++ unsigned int A, B, C, D;
+ #if HAVE_UINT64
+ uint64_t totalN;
+ #else
+diff -urN librsync-0.9.7/patch.c librsync-0.9.7dev/patch.c
+--- librsync-0.9.7/patch.c 2004-09-17 17:35:50.000000000 -0400
++++ librsync-0.9.7dev/patch.c 2006-03-06 03:21:06.000000000 -0500
+@@ -214,12 +214,12 @@
+ void *buf, *ptr;
+ rs_buffers_t *buffs = job->stream;
+
+- len = job->basis_len;
+-
+ /* copy only as much as will fit in the output buffer, so that we
+ * don't have to block or store the input. */
+- if (len > buffs->avail_out)
++ if (job->basis_len > buffs->avail_out)
+ len = buffs->avail_out;
++ else
++ len = job->basis_len;
+
+ if (!len)
+ return RS_BLOCKED;
diff --git a/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch b/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch
new file mode 100644
index 000000000000..782597c8fe2b
--- /dev/null
+++ b/net-libs/librsync/files/librsync-0.9.7-implicit-declaration.patch
@@ -0,0 +1,19 @@
+Description: Fix -Wimplicit-function-declaration warning in the test suite
+ Fix the warning: isprefix.driver.c:43:5: warning: implicit declaration of
+ function ‘strcmp’ [-Wimplicit-function-declaration]
+Author: Andrey Rahmatullin <wrar@wrar.name>
+Forwarded: no
+Last-Update: 2012-02-05
+
+diff --git a/testsuite/isprefix.driver.c b/testsuite/isprefix.driver.c
+index a9fd77b..df558c2 100644
+--- a/testsuite/isprefix.driver.c
++++ b/testsuite/isprefix.driver.c
+@@ -21,6 +21,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ #include "isprefix.h"
+
diff --git a/net-libs/librsync/librsync-0.9.7-r3.ebuild b/net-libs/librsync/librsync-0.9.7-r3.ebuild
new file mode 100644
index 000000000000..82ae42a7cd6d
--- /dev/null
+++ b/net-libs/librsync/librsync-0.9.7-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Flexible remote checksum-based differencing"
+HOMEPAGE="http://librsync.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-huge-files.patch
+ "${FILESDIR}"/${P}-format-security.patch
+ "${FILESDIR}"/${P}-getopt.patch
+ "${FILESDIR}"/${P}-implicit-declaration.patch
+ )
+
+src_prepare() {
+ sed \
+ -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
+ -i configure.ac || die
+
+ autotools-utils_src_prepare
+}
diff --git a/net-libs/librsync/metadata.xml b/net-libs/librsync/metadata.xml
new file mode 100644
index 000000000000..0453ebdcc2bf
--- /dev/null
+++ b/net-libs/librsync/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">librsync</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libs3/Manifest b/net-libs/libs3/Manifest
new file mode 100644
index 000000000000..d0d5bdff22e0
--- /dev/null
+++ b/net-libs/libs3/Manifest
@@ -0,0 +1 @@
+DIST libs3-2.0.tar.gz 105783 SHA256 c99857bfbcc9ff47742119bc32f391f38a24acf40cf49902ef3b18b1f0e8c16d SHA512 eabbc24f4beaf270e976bb0071fb372c213dfc00051fc3b33e5f64f9b2690765bd7b764162ecb0da09b173635b37b6e3e0a111523850c8aeea8d9b9be9b9c7c9 WHIRLPOOL 78d968f5503f10d8255e7691d438cc36d8c27f3ff3152c776f5c85cf35f70a6afe894324223055da420e6af19a5a9a92c689876c49d131aaf26d636fef065164
diff --git a/net-libs/libs3/files/libs3-2.0-build.patch b/net-libs/libs3/files/libs3-2.0-build.patch
new file mode 100644
index 000000000000..804a0d28332a
--- /dev/null
+++ b/net-libs/libs3/files/libs3-2.0-build.patch
@@ -0,0 +1,83 @@
+ GNUmakefile | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 36398c1..dc24843 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -60,7 +60,7 @@ LIBS3_VER := $(LIBS3_VER_MAJOR).$(LIBS3_VER_MINOR)
+ # any value, then verbosity is turned on". So don't define VERBOSE if you
+ # don't want verbosity in the build process.
+ # -----------------------------------------------------------------------------
+-
++VERBOSE = true
+ ifdef VERBOSE
+ VERBOSE = true
+ VERBOSE_ECHO = @ echo
+@@ -125,7 +125,7 @@ ifndef CFLAGS
+ endif
+ endif
+
+-CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \
++CFLAGS += -Wall -Wshadow -Wextra -Iinc \
+ $(CURL_CFLAGS) $(LIBXML2_CFLAGS) \
+ -DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \
+ -DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" \
+@@ -134,7 +134,8 @@ CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \
+ -D_ISOC99_SOURCE \
+ -D_POSIX_C_SOURCE=200112L
+
+-LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread
++LDFLAGS += -lpthread
++LIBS = $(CURL_LIBS) $(LIBXML2_LIBS)
+
+
+ # --------------------------------------------------------------------------
+@@ -157,11 +158,11 @@ exported: libs3 s3 headers
+ .PHONY: install
+ install: exported
+ $(QUIET_ECHO) $(DESTDIR)/bin/s3: Installing executable
+- $(VERBOSE_SHOW) install -Dps -m u+rwx,go+rx $(BUILD)/bin/s3 \
++ $(VERBOSE_SHOW) install -Dp -m u+rwx,go+rx $(BUILD)/bin/s3 \
+ $(DESTDIR)/bin/s3
+ $(QUIET_ECHO) \
+ $(DESTDIR)/lib/libs3.so.$(LIBS3_VER): Installing shared library
+- $(VERBOSE_SHOW) install -Dps -m u+rw,go+r \
++ $(VERBOSE_SHOW) install -Dp -m u+rw,go+r \
+ $(BUILD)/lib/libs3.so.$(LIBS3_VER_MAJOR) \
+ $(DESTDIR)/lib/libs3.so.$(LIBS3_VER)
+ $(QUIET_ECHO) \
+@@ -199,18 +200,18 @@ uninstall:
+ $(BUILD)/obj/%.o: src/%.c
+ $(QUIET_ECHO) $@: Compiling object
+ @ mkdir -p $(dir $(BUILD)/dep/$<)
+- @ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
++ $(CC) $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
+ -o $(BUILD)/dep/$(<:%.c=%.d) -c $<
+ @ mkdir -p $(dir $@)
+- $(VERBOSE_SHOW) gcc $(CFLAGS) -o $@ -c $<
++ $(VERBOSE_SHOW) $(CC) $(CFLAGS) -o $@ -c $<
+
+ $(BUILD)/obj/%.do: src/%.c
+ $(QUIET_ECHO) $@: Compiling dynamic object
+ @ mkdir -p $(dir $(BUILD)/dep/$<)
+- @ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
++ $(CC) $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
+ -o $(BUILD)/dep/$(<:%.c=%.dd) -c $<
+ @ mkdir -p $(dir $@)
+- $(VERBOSE_SHOW) gcc $(CFLAGS) -fpic -fPIC -o $@ -c $<
++ $(VERBOSE_SHOW) $(CC) $(CFLAGS) -fpic -fPIC -o $@ -c $<
+
+
+ # --------------------------------------------------------------------------
+@@ -230,8 +231,8 @@ LIBS3_SOURCES := acl.c bucket.c error_parser.c general.c \
+ $(LIBS3_SHARED): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.do)
+ $(QUIET_ECHO) $@: Building shared library
+ @ mkdir -p $(dir $@)
+- $(VERBOSE_SHOW) gcc -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) \
+- -o $@ $^ $(LDFLAGS)
++ $(VERBOSE_SHOW) $(CC) $(LDFLAGS) -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) \
++ -o $@ $^ $(LIBS)
+
+ $(LIBS3_STATIC): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.o)
+ $(QUIET_ECHO) $@: Building static library
diff --git a/net-libs/libs3/libs3-2.0-r1.ebuild b/net-libs/libs3/libs3-2.0-r1.ebuild
new file mode 100644
index 000000000000..5c4023f3aa42
--- /dev/null
+++ b/net-libs/libs3/libs3-2.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A C Library API for Amazon S3"
+HOMEPAGE="http://libs3.ischo.com.s3.amazonaws.com/index.html"
+SRC_URI="http://libs3.ischo.com.s3.amazonaws.com/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+ net-misc/curl
+ dev-libs/libxml2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-build.patch
+ sed \
+ -e "s:/lib/:/$(get_libdir)/:g" \
+ -i *makefile* || die
+ tc-export CC
+}
+
+src_install() {
+ emake DESTDIR="${ED}/usr" install
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*a
+}
diff --git a/net-libs/libs3/metadata.xml b/net-libs/libs3/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/net-libs/libs3/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/libsmi/Manifest b/net-libs/libsmi/Manifest
new file mode 100644
index 000000000000..8d3ef932ad04
--- /dev/null
+++ b/net-libs/libsmi/Manifest
@@ -0,0 +1 @@
+DIST libsmi-0.4.8.tar.gz 4104111 SHA256 f048a5270f41bc88b0c3b0a8fe70ca4d716a46b531a0ecaaa87c462f49d74849 SHA512 c4f5f30c9fbf26c2e0d87e29783794014a518a7494c17112b1970b5434c698d06ffd529ea58eb7856a0f86a30f1059aaf49d4fbdf39db971d9114d427d8a1863 WHIRLPOOL 33523c5aca6792c3ec08be748ce976046693188e61770db99c01a030b66442a387729c99196729efcd5a03c778f0263452a833a40add7173d65c4a9f51a6d842
diff --git a/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch b/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch
new file mode 100644
index 000000000000..8c5e2f97dbf4
--- /dev/null
+++ b/net-libs/libsmi/files/libsmi-0.4.8-CVE-2010-2891.patch
@@ -0,0 +1,19 @@
+--- a/lib/smi.c
++++ b/lib/smi.c
+@@ -1793,10 +1793,15 @@
+ }
+
+ if (isdigit((int)node2[0])) {
+- for (oidlen = 0, p = strtok(node2, ". "); p;
++ for (oidlen = 0, p = strtok(node2, ". ");
++ p && oidlen < sizeof(oid)/sizeof(oid[0]);
+ oidlen++, p = strtok(NULL, ". ")) {
+ oid[oidlen] = strtoul(p, NULL, 0);
+ }
++ if (p) {
++ /* the numeric OID is too long */
++ return NULL;
++ }
+ nodePtr = getNode(oidlen, oid);
+ if (nodePtr) {
+ if (modulePtr) {
diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
new file mode 100644
index 000000000000..b0e04311455b
--- /dev/null
+++ b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="A Library to Access SMI MIB Information"
+SRC_URI="ftp://ftp.ibr.cs.tu-bs.de/pub/local/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.ibr.cs.tu-bs.de/projects/libsmi"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="static-libs"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-CVE-2010-2891.patch
+}
+
+src_configure() {
+ replace-flags -O? -O2
+ econf $(use_enable static-libs static)
+}
+
+src_test() {
+ # sming test is known to fail and some other fail if LC_ALL!=C:
+ # http://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/001014.html
+ sed -i '/^[[:space:]]*smidump-sming.test \\$/d' test/Makefile
+ LC_ALL=C emake -j1 check || die
+}
+
+src_install () {
+ default
+ dodoc smi.conf-example ANNOUNCE ChangeLog README THANKS TODO \
+ doc/{*.txt,smi.dia,smi.dtd,smi.xsd}
+ prune_libtool_files
+}
diff --git a/net-libs/libsmi/metadata.xml b/net-libs/libsmi/metadata.xml
new file mode 100644
index 000000000000..03aa50bab7e3
--- /dev/null
+++ b/net-libs/libsmi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+</pkgmetadata>
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
new file mode 100644
index 000000000000..cdf7311ff1aa
--- /dev/null
+++ b/net-libs/libsoup-gnome/Manifest
@@ -0,0 +1,3 @@
+DIST libsoup-2.46.0.tar.xz 1693772 SHA256 fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3 SHA512 a538fbb7c21b2e5d0f53ae917a7ebff21f74490c1ae55222b6dd31932ede5f872da06d544b7ab2e91dbf03682dd53c0fdaf3ba9aed24b3b1f1405f7e65785c0d WHIRLPOOL 3a82f4c4d5fa2543c055b801c6b15cc6faa6db8632de00113a087a0ea8f13e174b3434b58bc97449047be2a7dcc110c0d3604b4f04c874877effda7492c2e4d6
+DIST libsoup-2.48.1.tar.xz 1707612 SHA256 9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a SHA512 c0f652189c9a72bc2110ae1bb54dc7b26a437b3c7055795ec203081efaa97244731459cc115aadaba2c832689f3a4e839200be59453ec26f09202214ff50c19a WHIRLPOOL 10b3f3ff7fc1ded3e66a8b9b14359a50661bd61ecfe16e8bcb93baef5f22f905b20bd67fa1bbeca875f7bf698a7ee16857b1280b5f92916b2d94a1f075ff806c
+DIST libsoup-2.50.0.tar.xz 1755052 SHA256 1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b SHA512 5004baac41feb2c4a7c4f8e68e0a2aac91ae115518e5bb7b58bc7f85dc7675611de82ad21d6a2f779daf2fc7496ab802e7d6dcd5eca91186b221664db37819e2 WHIRLPOOL 09f2cdc9804a4785e1f6a8d9e8adefab549fcb6de1506e2c0fa7af9ee3af531a26a55909ab917c7f08076e99bff3f992516125d12baeb5fce22c918e81a4636e
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.44.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.44.2-system-lib.patch
new file mode 100644
index 000000000000..9c7a94a4ef46
--- /dev/null
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.44.2-system-lib.patch
@@ -0,0 +1,254 @@
+From f8711d536d9605d3d9c773ccbba039a7828e026a Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Tue, 20 Dec 2011 15:42:44 +0200
+Subject: [PATCH] Split support for libsoup-gnome
+
+https://bugzilla.gnome.org/show_bug.cgi?id=595065
+
+Original patch by Romain Perier.
+---
+ Makefile.am | 12 +++++++++--
+ configure.ac | 34 +++++++++++++++++++-----------
+ libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
+ 3 files changed, 76 insertions(+), 30 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 66992d9..046f945 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,11 @@
+ ## Process this file with automake to produce Makefile.in
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+-SUBDIRS = libsoup po tests examples docs
++SUBDIRS = libsoup
++
++if BUILD_LIBSOUP
++SUBDIRS += po tests docs
++endif
+
+ EXTRA_DIST = \
+ data/effective_tld_names.dat \
+@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+
+ pkgconfigdir = $(libdir)/pkgconfig
+
+-pkgconfig_DATA = libsoup-2.4.pc
++pkgconfig_DATA =
++
++if BUILD_LIBSOUP
++pkgconfig_DATA += libsoup-2.4.pc
++endif
+
+ if BUILD_LIBSOUP_GNOME
+ pkgconfig_DATA += libsoup-gnome-2.4.pc
+diff --git a/configure.ac b/configure.ac
+index 4db8cd2..c1b17f4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,20 +77,26 @@ LT_INIT([win32-dll])
+ dnl ***********************
+ dnl *** Checks for glib ***
+ dnl ***********************
++PKG_PROG_PKG_CONFIG
++enable_ssl=no
++AC_ARG_WITH(libsoup-system,
++ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
++ [with_libsoup_system=$withval], [with_libsoup_system=no])
++if test "$with_libsoup_system" = "no"; then
++ GLIB_REQUIRED=2.36.0
++ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
++ if test "$GLIB_LIBS" = ""; then
++ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
++ fi
++ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
++ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
++ AC_SUBST(GLIB_MAKEFILE)
+
+-GLIB_REQUIRED=2.36.0
+-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
+-if test "$GLIB_LIBS" = ""; then
+- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
++ PKG_CHECK_MODULES(XML, libxml-2.0)
++ AC_SUBST(XML_CFLAGS)
++ AC_SUBST(XML_LIBS)
+ fi
+-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
+-
+-GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
+-AC_SUBST(GLIB_MAKEFILE)
+-
+-PKG_CHECK_MODULES(XML, libxml-2.0)
+-AC_SUBST(XML_CFLAGS)
+-AC_SUBST(XML_LIBS)
++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
+
+ PKG_CHECK_MODULES(SQLITE, sqlite3)
+ AC_SUBST(SQLITE_CFLAGS)
+@@ -139,6 +145,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+
+ if test $with_gnome != no; then
+ AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
++
++ if test $with_libsoup_system != no; then
++ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
++ fi
+ fi
+ AC_SUBST(HAVE_GNOME)
+
+diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
+index 60920bd..26c5616 100644
+--- a/libsoup/Makefile.am
++++ b/libsoup/Makefile.am
+@@ -1,14 +1,19 @@
+ ## Process this file with automake to produce Makefile.in
+
+ EXTRA_DIST =
+-
++BUILT_SOURCES =
+ include $(GLIB_MAKEFILE)
+
+ if OS_WIN32
+ LIBWS2_32 = -lws2_32
+ endif
+
+-AM_CPPFLAGS = \
++AM_CPPFLAGS =
++lib_LTLIBRARIES =
++CLEANFILES =
++
++if BUILD_LIBSOUP
++AM_CPPFLAGS += \
+ -DG_LOG_DOMAIN=\"libsoup\" \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -I$(top_srcdir) \
+@@ -76,7 +81,7 @@ libsoupinclude_HEADERS = \
+ nodist_libsoupinclude_HEADERS = \
+ soup-version.h
+
+-lib_LTLIBRARIES = libsoup-2.4.la
++lib_LTLIBRARIES += libsoup-2.4.la
+
+ libsoup_2_4_la_LDFLAGS = \
+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
+@@ -184,18 +189,23 @@ libsoup_2_4_la_SOURCES = \
+ soup-version.c \
+ soup-xmlrpc.c
+
+-# TLD rules
+-EXTRA_DIST += tld-parser.py
+-
++BUILT_SOURCES += tld_data.inc
+ TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
+
+ tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
+- $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
++ $(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
++
++# TLD rules
++EXTRA_DIST += tld-parser.py
++
++endif
+
+ if BUILD_LIBSOUP_GNOME
+
+ libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
+
++AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
++
+ libsoupgnomeinclude_HEADERS = \
+ soup-cookie-jar-sqlite.h\
+ soup-gnome.h \
+@@ -203,17 +213,26 @@ libsoupgnomeinclude_HEADERS = \
+
+ lib_LTLIBRARIES += libsoup-gnome-2.4.la
+
++if BUILD_LIBSOUP
++libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
++else
+ libsoup_gnome_2_4_la_LDFLAGS = \
+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
+ -no-undefined \
+ -export-symbols $(srcdir)/libsoup-gnome-2.4.sym
++endif
+
+ EXTRA_DIST += libsoup-gnome-2.4.sym
+
+ libsoup_gnome_2_4_la_LIBADD = \
+- libsoup-2.4.la \
+ $(GLIB_LIBS)
+
++if BUILD_LIBSOUP
++libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
++else
++libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
++endif
++
+ libsoup_gnome_2_4_la_SOURCES = \
+ soup-cookie-jar-sqlite.c \
+ soup-gnome-features.c \
+@@ -225,9 +244,8 @@ libsoup_gnome_2_4_la_SOURCES = \
+ endif
+
+ GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
+-BUILT_SOURCES = \
+- $(GLIB_GENERATED) \
+- tld_data.inc
++BUILT_SOURCES += \
++ $(GLIB_GENERATED)
+
+ soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
+ soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
+@@ -242,6 +260,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+
+ if HAVE_INTROSPECTION
+
++if BUILD_LIBSOUP
++
+ # Core library
+ gi_soup_files = \
+ $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
+@@ -263,20 +283,28 @@ Soup_2_4_gir_FILES = \
+
+ INTROSPECTION_GIRS += Soup-2.4.gir
+
++endif
++
+ if BUILD_LIBSOUP_GNOME
+
++if BUILD_LIBSOUP
++SOUP_GIR = Soup-2.4.gir
++else
++SOUP_GIR =
++endif
++
+ # GNOME extensions
+ gi_soup_gnome_files = $(filter-out soup-gnome.h,\
+ $(libsoupgnomeinclude_HEADERS) \
+ $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
+-SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
++SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
++SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
+ SoupGNOME_2_4_gir_SCANNERFLAGS = \
+ --identifier-prefix=Soup \
+ --symbol-prefix=soup \
+- --c-include "libsoup/soup-gnome.h" \
+- --include-uninstalled=$(builddir)/Soup-2.4.gir
++ --c-include "libsoup/soup-gnome.h"
+ SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
+-SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
++SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
+ SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
+ SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
+
+@@ -290,6 +318,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
+ typelibdir = $(libdir)/girepository-1.0
+ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+-CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
++CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
+
+ endif
+--
+1.8.3.2
+
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
new file mode 100644
index 000000000000..15f7724dd5cd
--- /dev/null
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
@@ -0,0 +1,258 @@
+From 63db817bac0382f3f43947b8233bf4585ede0e0b Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Tue, 20 Dec 2011 15:42:44 +0200
+Subject: [PATCH] Split support for libsoup-gnome
+
+https://bugzilla.gnome.org/show_bug.cgi?id=595065
+
+Original patch by Romain Perier.
+---
+ Makefile.am | 12 +++++++++--
+ configure.ac | 35 ++++++++++++++++++++-----------
+ libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
+ 3 files changed, 77 insertions(+), 30 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c8fa95c..fc09778 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,11 @@
+ ## Process this file with automake to produce Makefile.in
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+-SUBDIRS = libsoup po tests examples docs
++SUBDIRS = libsoup
++
++if BUILD_LIBSOUP
++SUBDIRS += po tests docs
++endif
+
+ EXTRA_DIST = \
+ data/effective_tld_names.dat \
+@@ -18,7 +22,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+
+ pkgconfigdir = $(libdir)/pkgconfig
+
+-pkgconfig_DATA = libsoup-2.4.pc
++pkgconfig_DATA =
++
++if BUILD_LIBSOUP
++pkgconfig_DATA += libsoup-2.4.pc
++endif
+
+ if BUILD_LIBSOUP_GNOME
+ pkgconfig_DATA += libsoup-gnome-2.4.pc
+diff --git a/configure.ac b/configure.ac
+index 96bb378..0153f10 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,23 +77,30 @@ LT_INIT([win32-dll])
+ dnl ***********************
+ dnl *** Checks for glib ***
+ dnl ***********************
++PKG_PROG_PKG_CONFIG
++enable_ssl=no
++AC_ARG_WITH(libsoup-system,
++ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
++ [with_libsoup_system=$withval], [with_libsoup_system=no])
++if test "$with_libsoup_system" = "no"; then
++ GLIB_REQUIRED=2.38.0
++ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
++ if test "$GLIB_LIBS" = ""; then
++ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
++ fi
++ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
+
+-GLIB_REQUIRED=2.38.0
+-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
+-if test "$GLIB_LIBS" = ""; then
+- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
+-fi
+-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
++ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
++ AC_SUBST(GLIB_MAKEFILE)
+
+-GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
+-AC_SUBST(GLIB_MAKEFILE)
++ PKG_CHECK_MODULES(XML, libxml-2.0)
++ AC_SUBST(XML_CFLAGS)
++ AC_SUBST(XML_LIBS)
++fi
++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
+
+ GLIB_TESTS
+
+-PKG_CHECK_MODULES(XML, libxml-2.0)
+-AC_SUBST(XML_CFLAGS)
+-AC_SUBST(XML_LIBS)
+-
+ PKG_CHECK_MODULES(SQLITE, sqlite3)
+ AC_SUBST(SQLITE_CFLAGS)
+ AC_SUBST(SQLITE_LIBS)
+@@ -141,6 +148,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+
+ if test $with_gnome != no; then
+ AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
++
++ if test $with_libsoup_system != no; then
++ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
++ fi
+ fi
+ AC_SUBST(HAVE_GNOME)
+
+diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
+index 60920bd..26c5616 100644
+--- a/libsoup/Makefile.am
++++ b/libsoup/Makefile.am
+@@ -1,14 +1,19 @@
+ ## Process this file with automake to produce Makefile.in
+
+ EXTRA_DIST =
+-
++BUILT_SOURCES =
+ include $(GLIB_MAKEFILE)
+
+ if OS_WIN32
+ LIBWS2_32 = -lws2_32
+ endif
+
+-AM_CPPFLAGS = \
++AM_CPPFLAGS =
++lib_LTLIBRARIES =
++CLEANFILES =
++
++if BUILD_LIBSOUP
++AM_CPPFLAGS += \
+ -DG_LOG_DOMAIN=\"libsoup\" \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -I$(top_srcdir) \
+@@ -76,7 +81,7 @@ libsoupinclude_HEADERS = \
+ nodist_libsoupinclude_HEADERS = \
+ soup-version.h
+
+-lib_LTLIBRARIES = libsoup-2.4.la
++lib_LTLIBRARIES += libsoup-2.4.la
+
+ libsoup_2_4_la_LDFLAGS = \
+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
+@@ -184,18 +189,23 @@ libsoup_2_4_la_SOURCES = \
+ soup-version.c \
+ soup-xmlrpc.c
+
+-# TLD rules
+-EXTRA_DIST += tld-parser.py
+-
++BUILT_SOURCES += tld_data.inc
+ TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
+
+ tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
+- $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
++ $(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
++
++# TLD rules
++EXTRA_DIST += tld-parser.py
++
++endif
+
+ if BUILD_LIBSOUP_GNOME
+
+ libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
+
++AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
++
+ libsoupgnomeinclude_HEADERS = \
+ soup-cookie-jar-sqlite.h\
+ soup-gnome.h \
+@@ -203,17 +213,26 @@ libsoupgnomeinclude_HEADERS = \
+
+ lib_LTLIBRARIES += libsoup-gnome-2.4.la
+
++if BUILD_LIBSOUP
++libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
++else
+ libsoup_gnome_2_4_la_LDFLAGS = \
+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
+ -no-undefined \
+ -export-symbols $(srcdir)/libsoup-gnome-2.4.sym
++endif
+
+ EXTRA_DIST += libsoup-gnome-2.4.sym
+
+ libsoup_gnome_2_4_la_LIBADD = \
+- libsoup-2.4.la \
+ $(GLIB_LIBS)
+
++if BUILD_LIBSOUP
++libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
++else
++libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
++endif
++
+ libsoup_gnome_2_4_la_SOURCES = \
+ soup-cookie-jar-sqlite.c \
+ soup-gnome-features.c \
+@@ -225,9 +244,8 @@ libsoup_gnome_2_4_la_SOURCES = \
+ endif
+
+ GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
+-BUILT_SOURCES = \
+- $(GLIB_GENERATED) \
+- tld_data.inc
++BUILT_SOURCES += \
++ $(GLIB_GENERATED)
+
+ soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
+ soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
+@@ -242,6 +260,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+
+ if HAVE_INTROSPECTION
+
++if BUILD_LIBSOUP
++
+ # Core library
+ gi_soup_files = \
+ $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
+@@ -263,20 +283,28 @@ Soup_2_4_gir_FILES = \
+
+ INTROSPECTION_GIRS += Soup-2.4.gir
+
++endif
++
+ if BUILD_LIBSOUP_GNOME
+
++if BUILD_LIBSOUP
++SOUP_GIR = Soup-2.4.gir
++else
++SOUP_GIR =
++endif
++
+ # GNOME extensions
+ gi_soup_gnome_files = $(filter-out soup-gnome.h,\
+ $(libsoupgnomeinclude_HEADERS) \
+ $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
+-SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
++SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
++SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
+ SoupGNOME_2_4_gir_SCANNERFLAGS = \
+ --identifier-prefix=Soup \
+ --symbol-prefix=soup \
+- --c-include "libsoup/soup-gnome.h" \
+- --include-uninstalled=$(builddir)/Soup-2.4.gir
++ --c-include "libsoup/soup-gnome.h"
+ SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
+-SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
++SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
+ SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
+ SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
+
+@@ -290,6 +318,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
+ typelibdir = $(libdir)/girepository-1.0
+ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+-CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
++CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
+
+ endif
+--
+1.9.0
+
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.48.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.48.0-system-lib.patch
new file mode 100644
index 000000000000..d731fc0c733a
--- /dev/null
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.48.0-system-lib.patch
@@ -0,0 +1,283 @@
+From 63db817bac0382f3f43947b8233bf4585ede0e0b Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Tue, 20 Dec 2011 15:42:44 +0200
+Subject: [PATCH] Split support for libsoup-gnome
+
+https://bugzilla.gnome.org/show_bug.cgi?id=595065
+
+Original patch by Romain Perier.
+---
+ Makefile.am | 12 +++++++++--
+ configure.ac | 35 ++++++++++++++++++++-----------
+ libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
+ 3 files changed, 77 insertions(+), 30 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c8fa95c..fc09778 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,11 @@
+ ## Process this file with automake to produce Makefile.in
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+-SUBDIRS = libsoup po tests examples docs
++SUBDIRS = libsoup
++
++if BUILD_LIBSOUP
++SUBDIRS += po tests docs
++endif
+
+ EXTRA_DIST = \
+ data/effective_tld_names.dat \
+@@ -18,7 +22,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+
+ pkgconfigdir = $(libdir)/pkgconfig
+
+-pkgconfig_DATA = libsoup-2.4.pc
++pkgconfig_DATA =
++
++if BUILD_LIBSOUP
++pkgconfig_DATA += libsoup-2.4.pc
++endif
+
+ if BUILD_LIBSOUP_GNOME
+ pkgconfig_DATA += libsoup-gnome-2.4.pc
+diff --git a/configure.ac b/configure.ac
+index 96bb378..0153f10 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,23 +77,30 @@ LT_INIT([win32-dll])
+ dnl ***********************
+ dnl *** Checks for glib ***
+ dnl ***********************
++PKG_PROG_PKG_CONFIG
++enable_ssl=no
++AC_ARG_WITH(libsoup-system,
++ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
++ [with_libsoup_system=$withval], [with_libsoup_system=no])
++if test "$with_libsoup_system" = "no"; then
++ GLIB_REQUIRED=2.38.0
++ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
++ if test "$GLIB_LIBS" = ""; then
++ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
++ fi
++ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
+
+-GLIB_REQUIRED=2.38.0
+-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
+-if test "$GLIB_LIBS" = ""; then
+- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
+-fi
+-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
++ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
++ AC_SUBST(GLIB_MAKEFILE)
+
+-GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
+-AC_SUBST(GLIB_MAKEFILE)
++ PKG_CHECK_MODULES(XML, libxml-2.0)
++ AC_SUBST(XML_CFLAGS)
++ AC_SUBST(XML_LIBS)
++fi
++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
+
+ GLIB_TESTS
+
+-PKG_CHECK_MODULES(XML, libxml-2.0)
+-AC_SUBST(XML_CFLAGS)
+-AC_SUBST(XML_LIBS)
+-
+ PKG_CHECK_MODULES(SQLITE, sqlite3)
+ AC_SUBST(SQLITE_CFLAGS)
+ AC_SUBST(SQLITE_LIBS)
+@@ -141,6 +148,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+
+ if test $with_gnome != no; then
+ AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
++
++ if test $with_libsoup_system != no; then
++ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
++ fi
+ fi
+ AC_SUBST(HAVE_GNOME)
+
+diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
+index 60920bd..26c5616 100644
+--- a/libsoup/Makefile.am
++++ b/libsoup/Makefile.am
+@@ -1,14 +1,19 @@
+ ## Process this file with automake to produce Makefile.in
+
+ EXTRA_DIST =
+-
++BUILT_SOURCES =
+ include $(GLIB_MAKEFILE)
+
+ if OS_WIN32
+ LIBWS2_32 = -lws2_32
+ endif
+
+-AM_CPPFLAGS = \
++AM_CPPFLAGS =
++lib_LTLIBRARIES =
++CLEANFILES =
++
++if BUILD_LIBSOUP
++AM_CPPFLAGS += \
+ -DG_LOG_DOMAIN=\"libsoup\" \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -I$(top_srcdir) \
+@@ -76,7 +81,7 @@ libsoupinclude_HEADERS = \
+ nodist_libsoupinclude_HEADERS = \
+ soup-version.h
+
+-lib_LTLIBRARIES = libsoup-2.4.la
++lib_LTLIBRARIES += libsoup-2.4.la
+
+ libsoup_2_4_la_LDFLAGS = \
+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
+@@ -184,18 +189,23 @@ libsoup_2_4_la_SOURCES = \
+ soup-version.c \
+ soup-xmlrpc.c
+
+-# TLD rules
+-EXTRA_DIST += tld-parser.py
+-
++BUILT_SOURCES += tld_data.inc
+ TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
+
+ tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
+- $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
++ $(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
++
++# TLD rules
++EXTRA_DIST += tld-parser.py
++
++endif
+
+ if BUILD_LIBSOUP_GNOME
+
+ libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
+
++AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
++
+ libsoupgnomeinclude_HEADERS = \
+ soup-cookie-jar-sqlite.h\
+ soup-gnome.h \
+@@ -203,17 +213,26 @@ libsoupgnomeinclude_HEADERS = \
+
+ lib_LTLIBRARIES += libsoup-gnome-2.4.la
+
++if BUILD_LIBSOUP
++libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
++else
+ libsoup_gnome_2_4_la_LDFLAGS = \
+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
+ -no-undefined \
+ -export-symbols $(srcdir)/libsoup-gnome-2.4.sym
++endif
+
+ EXTRA_DIST += libsoup-gnome-2.4.sym
+
+ libsoup_gnome_2_4_la_LIBADD = \
+- libsoup-2.4.la \
+ $(GLIB_LIBS)
+
++if BUILD_LIBSOUP
++libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
++else
++libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
++endif
++
+ libsoup_gnome_2_4_la_SOURCES = \
+ soup-cookie-jar-sqlite.c \
+ soup-gnome-features.c \
+@@ -225,9 +244,8 @@ libsoup_gnome_2_4_la_SOURCES = \
+ endif
+
+ GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
+-BUILT_SOURCES = \
+- $(GLIB_GENERATED) \
+- tld_data.inc
++BUILT_SOURCES += \
++ $(GLIB_GENERATED)
+
+ soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
+ soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
+@@ -242,6 +260,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+
+ if HAVE_INTROSPECTION
+
++if BUILD_LIBSOUP
++
+ # Core library
+ gi_soup_files = \
+ $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
+@@ -263,20 +283,28 @@ Soup_2_4_gir_FILES = \
+
+ INTROSPECTION_GIRS += Soup-2.4.gir
+
++endif
++
+ if BUILD_LIBSOUP_GNOME
+
++if BUILD_LIBSOUP
++SOUP_GIR = Soup-2.4.gir
++else
++SOUP_GIR =
++endif
++
+ # GNOME extensions
+ gi_soup_gnome_files = $(filter-out soup-gnome.h,\
+ $(libsoupgnomeinclude_HEADERS) \
+ $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
+-SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
++SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
++SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
+ SoupGNOME_2_4_gir_SCANNERFLAGS = \
+ --identifier-prefix=Soup \
+ --symbol-prefix=soup \
+- --c-include "libsoup/soup-gnome.h" \
+- --include-uninstalled=$(builddir)/Soup-2.4.gir
++ --c-include "libsoup/soup-gnome.h"
+ SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
+-SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
++SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
+ SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
+ SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
+
+@@ -290,6 +318,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
+ typelibdir = $(libdir)/girepository-1.0
+ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+-CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
++CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
+
+ endif
+@@ -326,6 +326,7 @@
+
+ # We only do this check on Linux, so we don't have to worry about
+ # different "nm" output on other platforms
++if BUILD_LIBSOUP
+ if OS_LINUX
+ check-local:
+ @echo Checking libsoup-2.4.so symbols
+@@ -335,3 +336,16 @@
+ env LANG=C sort -u | \
+ diff -U0 $(srcdir)/libsoup-2.4.sym - >&2
+ endif
++endif
++
++if BUILD_LIBSOUP_GNOME
++if OS_LINUX
++check-local:
++ @echo Checking libsoup-gnome-2.4.so symbols
++ @nm $(builddir)/.libs/libsoup-gnome-2.4.so | \
++ grep "^[[:xdigit:]]\+ [BTR] " | \
++ sed "s/^[[:xdigit:]]\+ [BTR] //" | \
++ env LANG=C sort -u | \
++ diff -U0 $(srcdir)/libsoup-gnome-2.4.sym - >&2
++endif
++endif
+--
+1.9.0
+
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild
new file mode 100644
index 000000000000..9b3d2b132796
--- /dev/null
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild
@@ -0,0 +1,62 @@
+# 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"
+
+MY_PN=${PN/-gnome}
+MY_P=${MY_PN}-${PV}
+
+inherit autotools eutils gnome2 multilib-minimal
+
+DESCRIPTION="GNOME plugin for libsoup"
+HOMEPAGE="https://wiki.gnome.org/LibSoup"
+SRC_URI="${SRC_URI//-gnome}"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="debug +introspection"
+KEYWORDS="~alpha ~amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+ ~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
+ dev-db/sqlite:3=[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ >=net-libs/libsoup-2.42.2-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # Use lib present on the system
+ epatch "${FILESDIR}"/${PN}-2.46.0-system-lib.patch
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ # FIXME: we need addpredict to workaround bug #324779 until
+ # root cause (bug #249496) is solved
+ addpredict /usr/share/snmp/mibs/.index
+
+ # Disable apache tests until they are usable on Gentoo, bug #326957
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static \
+ --disable-tls-check \
+ $(multilib_native_use_enable introspection) \
+ --with-libsoup-system \
+ --with-gnome \
+ --without-apache-httpd
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild
new file mode 100644
index 000000000000..b76a15879c0f
--- /dev/null
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+MY_PN=${PN/-gnome}
+MY_P=${MY_PN}-${PV}
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GNOME plugin for libsoup"
+HOMEPAGE="https://wiki.gnome.org/LibSoup"
+SRC_URI="${SRC_URI//-gnome}"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="debug +introspection"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+ ~net-libs/libsoup-${PV}[introspection?]
+ dev-db/sqlite:3=
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ >=net-libs/libsoup-2.42.2-r1
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # Use lib present on the system
+ epatch "${FILESDIR}"/${PN}-2.46.0-system-lib.patch
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # FIXME: we need addpredict to workaround bug #324779 until
+ # root cause (bug #249496) is solved
+ addpredict /usr/share/snmp/mibs/.index
+
+ # Disable apache tests until they are usable on Gentoo, bug #326957
+ gnome2_src_configure \
+ --disable-static \
+ --disable-tls-check \
+ $(use_enable introspection) \
+ --with-libsoup-system \
+ --with-gnome \
+ --without-apache-httpd
+}
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild
new file mode 100644
index 000000000000..a84399060df5
--- /dev/null
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild
@@ -0,0 +1,62 @@
+# 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"
+
+MY_PN=${PN/-gnome}
+MY_P=${MY_PN}-${PV}
+
+inherit autotools eutils gnome2 multilib-minimal
+
+DESCRIPTION="GNOME plugin for libsoup"
+HOMEPAGE="https://wiki.gnome.org/LibSoup"
+SRC_URI="${SRC_URI//-gnome}"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="debug +introspection"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+ ~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
+ dev-db/sqlite:3=[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ >=net-libs/libsoup-2.42.2-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # Use lib present on the system
+ epatch "${FILESDIR}"/${PN}-2.48.0-system-lib.patch
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ # FIXME: we need addpredict to workaround bug #324779 until
+ # root cause (bug #249496) is solved
+ addpredict /usr/share/snmp/mibs/.index
+
+ # Disable apache tests until they are usable on Gentoo, bug #326957
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static \
+ --disable-tls-check \
+ $(multilib_native_use_enable introspection) \
+ --with-libsoup-system \
+ --with-gnome \
+ --without-apache-httpd
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild
new file mode 100644
index 000000000000..0a993a75c1a7
--- /dev/null
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+MY_PN=${PN/-gnome}
+MY_P=${MY_PN}-${PV}
+
+inherit autotools eutils gnome2 multilib-minimal
+
+DESCRIPTION="GNOME plugin for libsoup"
+HOMEPAGE="https://wiki.gnome.org/LibSoup"
+SRC_URI="${SRC_URI//-gnome}"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="debug +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+ ~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
+ dev-db/sqlite:3=[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ >=net-libs/libsoup-2.42.2-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # Use lib present on the system
+ epatch "${FILESDIR}"/${PN}-2.48.0-system-lib.patch
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ # FIXME: we need addpredict to workaround bug #324779 until
+ # root cause (bug #249496) is solved
+ addpredict /usr/share/snmp/mibs/.index
+
+ # Disable apache tests until they are usable on Gentoo, bug #326957
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static \
+ --disable-tls-check \
+ $(multilib_native_use_enable introspection) \
+ --with-libsoup-system \
+ --with-gnome \
+ --without-apache-httpd
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/net-libs/libsoup-gnome/metadata.xml b/net-libs/libsoup-gnome/metadata.xml
new file mode 100644
index 000000000000..dad9001338dc
--- /dev/null
+++ b/net-libs/libsoup-gnome/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
new file mode 100644
index 000000000000..cdf7311ff1aa
--- /dev/null
+++ b/net-libs/libsoup/Manifest
@@ -0,0 +1,3 @@
+DIST libsoup-2.46.0.tar.xz 1693772 SHA256 fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3 SHA512 a538fbb7c21b2e5d0f53ae917a7ebff21f74490c1ae55222b6dd31932ede5f872da06d544b7ab2e91dbf03682dd53c0fdaf3ba9aed24b3b1f1405f7e65785c0d WHIRLPOOL 3a82f4c4d5fa2543c055b801c6b15cc6faa6db8632de00113a087a0ea8f13e174b3434b58bc97449047be2a7dcc110c0d3604b4f04c874877effda7492c2e4d6
+DIST libsoup-2.48.1.tar.xz 1707612 SHA256 9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a SHA512 c0f652189c9a72bc2110ae1bb54dc7b26a437b3c7055795ec203081efaa97244731459cc115aadaba2c832689f3a4e839200be59453ec26f09202214ff50c19a WHIRLPOOL 10b3f3ff7fc1ded3e66a8b9b14359a50661bd61ecfe16e8bcb93baef5f22f905b20bd67fa1bbeca875f7bf698a7ee16857b1280b5f92916b2d94a1f075ff806c
+DIST libsoup-2.50.0.tar.xz 1755052 SHA256 1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b SHA512 5004baac41feb2c4a7c4f8e68e0a2aac91ae115518e5bb7b58bc7f85dc7675611de82ad21d6a2f779daf2fc7496ab802e7d6dcd5eca91186b221664db37819e2 WHIRLPOOL 09f2cdc9804a4785e1f6a8d9e8adefab549fcb6de1506e2c0fa7af9ee3af531a26a55909ab917c7f08076e99bff3f992516125d12baeb5fce22c918e81a4636e
diff --git a/net-libs/libsoup/libsoup-2.46.0-r1.ebuild b/net-libs/libsoup/libsoup-2.46.0-r1.ebuild
new file mode 100644
index 000000000000..eda28ef29129
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.46.0-r1.ebuild
@@ -0,0 +1,90 @@
+# 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-minimal python-any-r1
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="https://wiki.gnome.org/LibSoup"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="debug +introspection samba ssl test"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+ >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+ >=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ samba? ( net-fs/samba )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=dev-util/intltool-0.35
+ >=dev-util/gtk-doc-am-1.10
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
+"
+# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+# dev-lang/php[apache2,xmlrpc]
+# net-misc/curl
+# net-libs/glib-networking[ssl])"
+RDEPEND="${RDEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r8
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
+
+src_prepare() {
+ if ! use test; then
+ # don't waste time building tests (bug #226271)
+ sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+ || die "sed failed"
+ fi
+
+ # FIXME: does not behave as expected
+ sed -e 's|\(g_test_add.*\)|/*\1*/|' \
+ -i tests/socket-test.c || die
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # FIXME: we need addpredict to workaround bug #324779 until
+ # root cause (bug #249496) is solved
+ addpredict /usr/share/snmp/mibs/.index
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ # Disable apache tests until they are usable on Gentoo, bug #326957
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static \
+ --disable-tls-check \
+ --without-gnome \
+ --without-apache-httpd \
+ $(multilib_native_use_enable introspection) \
+ $(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
+
+ if multilib_is_native_abi; then
+ # fix gtk-doc
+ ln -s "${S}"/docs/reference/html docs/reference/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
diff --git a/net-libs/libsoup/libsoup-2.48.1.ebuild b/net-libs/libsoup/libsoup-2.48.1.ebuild
new file mode 100644
index 000000000000..5398621e8a04
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.48.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit gnome2 multilib-minimal python-any-r1
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="https://wiki.gnome.org/LibSoup"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="debug +introspection samba ssl test"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+ >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+ >=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ samba? ( net-fs/samba )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=dev-util/intltool-0.35
+ >=dev-util/gtk-doc-am-1.10
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
+"
+# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+# dev-lang/php[apache2,xmlrpc]
+# net-misc/curl
+# net-libs/glib-networking[ssl])"
+
+# They hang for some unknown reason, bug #537836, also bug #326957 is pending
+RESTRICT="test"
+
+RDEPEND="${RDEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r8
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
+
+src_prepare() {
+ if ! use test; then
+ # don't waste time building tests (bug #226271)
+ sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+ || die "sed failed"
+ fi
+
+ # FIXME: does not behave as expected
+ sed -e 's|\(g_test_add.*\)|/*\1*/|' \
+ -i tests/socket-test.c || die
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # FIXME: we need addpredict to workaround bug #324779 until
+ # root cause (bug #249496) is solved
+ addpredict /usr/share/snmp/mibs/.index
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ # Disable apache tests until they are usable on Gentoo, bug #326957
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static \
+ --disable-tls-check \
+ --without-gnome \
+ --without-apache-httpd \
+ $(multilib_native_use_enable introspection) \
+ $(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
+
+ if multilib_is_native_abi; then
+ # fix gtk-doc
+ ln -s "${S}"/docs/reference/html docs/reference/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
diff --git a/net-libs/libsoup/libsoup-2.50.0.ebuild b/net-libs/libsoup/libsoup-2.50.0.ebuild
new file mode 100644
index 000000000000..d9354bbac525
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.50.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit gnome2 multilib-minimal python-any-r1
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="https://wiki.gnome.org/LibSoup"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="debug +introspection samba ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+ >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+ >=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ samba? ( net-fs/samba )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=dev-util/intltool-0.35
+ >=dev-util/gtk-doc-am-1.10
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
+"
+# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+# dev-lang/php[apache2,xmlrpc]
+# net-misc/curl
+# net-libs/glib-networking[ssl])"
+
+RDEPEND="${RDEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r8
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
+
+src_prepare() {
+ if ! use test; then
+ # don't waste time building tests (bug #226271)
+ sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+ || die "sed failed"
+ fi
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # FIXME: we need addpredict to workaround bug #324779 until
+ # root cause (bug #249496) is solved
+ addpredict /usr/share/snmp/mibs/.index
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ # Disable apache tests until they are usable on Gentoo, bug #326957
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static \
+ --disable-tls-check \
+ --without-gnome \
+ --without-apache-httpd \
+ $(multilib_native_use_enable introspection) \
+ $(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
+
+ if multilib_is_native_abi; then
+ # fix gtk-doc
+ ln -s "${S}"/docs/reference/html docs/reference/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
diff --git a/net-libs/libsoup/metadata.xml b/net-libs/libsoup/metadata.xml
new file mode 100644
index 000000000000..f96b3e310f95
--- /dev/null
+++ b/net-libs/libsoup/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="samba">Use <pkg>net-fs/samba</pkg> for NTLM Single
+ Sign-On</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
new file mode 100644
index 000000000000..317420782dca
--- /dev/null
+++ b/net-libs/libsrtp/Manifest
@@ -0,0 +1,3 @@
+DIST libsrtp-1.5.2.tar.gz 1690272 SHA256 86e1efe353397c0751f6bdd709794143bd1b76494412860f16ff2b6d9c304eda SHA512 fb09252edaca6da5b579fae34d3b6382ee0cf61a706e38283158ef10c879b9a0f80cfd0c354852e771b4649288dd5cc41158a4e046e8073cf26a586dfd41b024 WHIRLPOOL 973f27db06b725ca641a5c13184083926dbe0fd99ab18604b1d2d40fa0ab5118e9b978d729502a32bc25d05d6264ee501ff94f72e6dafd46588092f678f0a4c5
+DIST srtp-1.4.4.tgz 502890 SHA256 d9c2cbb1c95172ed2dc963eff0d6ce1072326dc81cb1dd38414e9f0e430af314 SHA512 951bfec212f579daae4a5a7fc9eded163dd6790da2e3840629dbeac36d7d960f95a1f1b844505629c7815816515f0784bf9b6e1c47f2986416ec04ec9d4b7564 WHIRLPOOL 82b01ce07de0c7b82d5f99b2fda6c72653e2927c3838a15dd1bb7e36725846599f2a96675dcf5ddfd7dcab9210f554b30fcf9bcb3806a60aa732d56926a4c07f
+DIST srtp-1.4.4_p20121108.tar.gz 485875 SHA256 ebc0b7b27f5ab669a058c82f62b1c96298a961d54633d7041e776bca19a4f295 SHA512 a6bf2674babed512bd90fd11d63adecf4ddf357d26652f321651fcc42d932d3d9f8713ecab4bdcddb026106a2d5bfbac0a626938f70822f5b1ee05881bb823d9 WHIRLPOOL 27296c776d60688dfa3c655999b6a87828036f9a71cff7a9ea9d1f0c6c5afa787eb625fb4ec9254b0eda459769fc0ca41cf4c1eaa38053cd365243c101f444bd
diff --git a/net-libs/libsrtp/files/libsrtp-1.4.4-invalid-index.patch b/net-libs/libsrtp/files/libsrtp-1.4.4-invalid-index.patch
new file mode 100644
index 000000000000..90a8f019fd43
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-1.4.4-invalid-index.patch
@@ -0,0 +1,11 @@
+--- srtp/crypto/replay/rdb.c.orig 2012-03-20 14:52:32.890017830 +0100
++++ srtp/crypto/replay/rdb.c 2012-03-20 14:56:31.670017835 +0100
+@@ -115,7 +115,7 @@
+
+ /* shift the window forward by delta bits*/
+ v128_left_shift(&rdb->bitmask, delta);
+- v128_set_bit(&rdb->bitmask, rdb_bits_in_bitmask-delta);
++ v128_set_bit(&rdb->bitmask, rdb_bits_in_bitmask-1);
+ rdb->window_start += delta;
+
+ }
diff --git a/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch b/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
new file mode 100644
index 000000000000..43b8843603c1
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
@@ -0,0 +1,52 @@
+--- srtp/Makefile.in
++++ srtp/Makefile.in
+@@ -65,11 +65,11 @@
+
+
+ # implicit rules for object files and test apps
+
+ %.o: %.c
+- $(COMPILE) -c $< -o $@
++ $(COMPILE) -fPIC -c $< -o $@
+
+ %$(EXE): %.c
+ $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
+
+
+@@ -103,10 +103,16 @@
+
+ libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi)
+ ar cr libsrtp.a $^
+ $(RANLIB) libsrtp.a
+
++libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi)
++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.1 -o libsrtp.so.1.0 $^
++
++libsrtp.dylib: $(srtpobj) $(cryptobj) $(gdoi)
++ $(CC) $(LDFLAGS) -dynamiclib -install_name $(libdir)/libsrtp.1.dylib -o libsrtp.1.0.dylib $^
++
+ # libcryptomath.a contains general-purpose routines that are used to
+ # generate tables and verify cryptoalgorithm implementations - this
+ # library is not meant to be included in production code
+
+ cryptomath = crypto/math/math.o crypto/math/gf2_8.o
+@@ -195,10 +198,20 @@
+ $(INSTALL) -d $(DESTDIR)$(includedir)/srtp
+ $(INSTALL) -d $(DESTDIR)$(libdir)
+ cp include/*.h $(DESTDIR)$(includedir)/srtp
+ cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp
+ if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
++ if [ -f libsrtp.so.1.0 ]; then \
++ cp libsrtp.so.1.0 $(DESTDIR)$(libdir)/; \
++ ln -s libsrtp.so.1.0 $(DESTDIR)$(libdir)/libsrtp.so.1; \
++ ln -s libsrtp.so.1.0 $(DESTDIR)$(libdir)/libsrtp.so; \
++ fi
++ if [ -f libsrtp.1.0.dylib ]; then \
++ cp libsrtp.1.0.dylib $(DESTDIR)$(libdir)/; \
++ ln -s libsrtp.1.0.dylib $(DESTDIR)$(libdir)/libsrtp.1.dylib; \
++ ln -s libsrtp.1.0.dylib $(DESTDIR)$(libdir)/libsrtp.dylib; \
++ fi
+
+ uninstall:
+ rm -rf $(DESTDIR)$(includedir)/srtp
+ rm -rf $(DESTDIR)$(libdir)/libsrtp.a
diff --git a/net-libs/libsrtp/files/libsrtp-1.4.4_p20121108-shared.patch b/net-libs/libsrtp/files/libsrtp-1.4.4_p20121108-shared.patch
new file mode 100644
index 000000000000..4e70a0ddd34e
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-1.4.4_p20121108-shared.patch
@@ -0,0 +1,55 @@
+Description: Hack build routines to compile shared library
+Author: loki_val and solar
+Origin: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch
+Last-Update: 2010-03-19
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -15,7 +15,7 @@
+
+ .PHONY: all test build_table_apps
+
+-all: test
++all: libsrtp.so test
+
+ runtest: build_table_apps test
+ @echo "running libsrtp test applications..."
+@@ -67,7 +67,7 @@
+ # implicit rules for object files and test apps
+
+ %.o: %.c
+- $(COMPILE) -c $< -o $@
++ $(COMPILE) -fPIC -c $< -o $@
+
+ %$(EXE): %.c
+ $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
+@@ -105,6 +105,9 @@
+ ar cr libsrtp.a $^
+ $(RANLIB) libsrtp.a
+
++libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi)
++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.0 -o libsrtp.so.0.0 $^
++
+ # libcryptomath.a contains general-purpose routines that are used to
+ # generate tables and verify cryptoalgorithm implementations - this
+ # library is not meant to be included in production code
+@@ -198,6 +201,11 @@
+ cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp
+ if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi
+ if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
++ if [ -f libsrtp.so.0.0 ]; then \
++ cp libsrtp.so.0.0 $(DESTDIR)$(libdir)/; \
++ ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so.0; \
++ ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so; \
++ fi
+
+ uninstall:
+ rm -f $(DESTDIR)$(includedir)/srtp/*.h
+@@ -206,7 +214,7 @@
+
+ clean:
+ rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \
+- libcryptomath.a libsrtp.a core *.core test/core
++ libcryptomath.a libsrtp.a libsrtp.so.0.0 core *.core test/core
+ for a in * */* */*/*; do \
+ if [ -f "$$a~" ] ; then rm -f $$a~; fi; \
+ done;
diff --git a/net-libs/libsrtp/files/libsrtp-1.5.2-bindir.patch b/net-libs/libsrtp/files/libsrtp-1.5.2-bindir.patch
new file mode 100644
index 000000000000..2c71faf48ba9
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-1.5.2-bindir.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile.in b/Makefile.in
+index 1a40de2..02f090c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -252,13 +252,13 @@ libsrtpdoc:
+ install:
+ $(INSTALL) -d $(DESTDIR)$(includedir)/srtp
+ $(INSTALL) -d $(DESTDIR)$(libdir)
+- $(INSTALL) -d $(DESTDIR)$(bindir)
+ cp $(srcdir)/include/*.h $(DESTDIR)$(includedir)/srtp
+ cp $(srcdir)/crypto/include/*.h $(DESTDIR)$(includedir)/srtp
+ if [ "$(srcdir)" != "." ]; then cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp; fi
+ if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
+ if [ -f libsrtp.dll.a ]; then cp libsrtp.dll.a $(DESTDIR)$(libdir)/; fi
+ if [ -f libsrtp.$(SHAREDLIBSUFFIX) ]; then \
++ $(INSTALL) -d $(DESTDIR)$(SHAREDLIB_DIR); \
+ cp libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/; \
+ ln -sfn libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp.$(SHAREDLIBSUFFIXNOVER); \
+ fi
diff --git a/net-libs/libsrtp/files/libsrtp-1.5.2-fix-make-install.patch b/net-libs/libsrtp/files/libsrtp-1.5.2-fix-make-install.patch
new file mode 100644
index 000000000000..f3f1f0e5c1ae
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-1.5.2-fix-make-install.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 002d25d..1a40de2 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -260,7 +260,7 @@ install:
+ if [ -f libsrtp.dll.a ]; then cp libsrtp.dll.a $(DESTDIR)$(libdir)/; fi
+ if [ -f libsrtp.$(SHAREDLIBSUFFIX) ]; then \
+ cp libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/; \
+- cp libsrtp.$(SHAREDLIBSUFFIXNOVER) $(DESTDIR)$(SHAREDLIB_DIR)/; \
++ ln -sfn libsrtp.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp.$(SHAREDLIBSUFFIXNOVER); \
+ fi
+ if [ "$(pkgconfig_DATA)" != "" ]; then \
+ $(INSTALL) -d $(DESTDIR)$(pkgconfigdir); \
diff --git a/net-libs/libsrtp/files/libsrtp-CVE-2013-2139.diff b/net-libs/libsrtp/files/libsrtp-CVE-2013-2139.diff
new file mode 100644
index 000000000000..dcafe177638b
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-CVE-2013-2139.diff
@@ -0,0 +1,46 @@
+diff --git a/srtp/srtp.c b/srtp/srtp.c
+index 839c1ee..7fd19e6 100644
+--- a/srtp/srtp.c
++++ b/srtp/srtp.c
+@@ -2063,23 +2063,18 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
+ switch(profile) {
+ case srtp_profile_aes128_cm_sha1_80:
+ crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
+- crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
+ break;
+ case srtp_profile_aes128_cm_sha1_32:
+ crypto_policy_set_aes_cm_128_hmac_sha1_32(policy);
+- crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
+ break;
+ case srtp_profile_null_sha1_80:
+ crypto_policy_set_null_cipher_hmac_sha1_80(policy);
+- crypto_policy_set_null_cipher_hmac_sha1_80(policy);
+ break;
+ case srtp_profile_aes256_cm_sha1_80:
+ crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
+- crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
+ break;
+ case srtp_profile_aes256_cm_sha1_32:
+ crypto_policy_set_aes_cm_256_hmac_sha1_32(policy);
+- crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
+ break;
+ /* the following profiles are not (yet) supported */
+ case srtp_profile_null_sha1_32:
+@@ -2100,6 +2095,8 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
+ crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
+ break;
+ case srtp_profile_aes128_cm_sha1_32:
++ /* We do not honor the 32-bit auth tag request since
++ * this is not compliant with RFC 3711 */
+ crypto_policy_set_aes_cm_128_hmac_sha1_80(policy);
+ break;
+ case srtp_profile_null_sha1_80:
+@@ -2109,6 +2106,8 @@ static inline int base_key_length(const cipher_type_t *cipher, int key_length)
+ crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
+ break;
+ case srtp_profile_aes256_cm_sha1_32:
++ /* We do not honor the 32-bit auth tag request since
++ * this is not compliant with RFC 3711 */
+ crypto_policy_set_aes_cm_256_hmac_sha1_80(policy);
+ break;
+ /* the following profiles are not (yet) supported */
diff --git a/net-libs/libsrtp/files/libsrtp-pcap-automagic-r0.patch b/net-libs/libsrtp/files/libsrtp-pcap-automagic-r0.patch
new file mode 100644
index 000000000000..2457e4d9616d
--- /dev/null
+++ b/net-libs/libsrtp/files/libsrtp-pcap-automagic-r0.patch
@@ -0,0 +1,19 @@
+--- configure.in.orig 2015-03-25 15:37:31.953386365 +0000
++++ configure.in 2015-03-25 15:39:49.192183689 +0000
+@@ -182,6 +182,8 @@
+ AC_SUBST(HMAC_OBJS)
+
+ dnl Checking for PCAP
++AC_ARG_ENABLE([pcap], AS_HELP_STRING([--disable-pcap], [Build without `pcap' library (-lpcap)]))
++AS_IF([test "x$enable_pcap" != "xno"], [
+ AC_CHECK_LIB([pcap],[pcap_create],
+ [PCAP=1
+ LIBS="-lpcap $LIBS"
+@@ -189,6 +191,7 @@
+ AC_DEFINE(HAVE_PCAP, 1, [Define to 1 if you have the `pcap' library (-lpcap)])
+ AC_SUBST(HAVE_PCAP)
+ ])
++])
+
+ AC_MSG_CHECKING(whether to use syslog for error reporting)
+ AC_ARG_ENABLE(syslog,
diff --git a/net-libs/libsrtp/libsrtp-1.4.4-r1.ebuild b/net-libs/libsrtp/libsrtp-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..a1a0db620c51
--- /dev/null
+++ b/net-libs/libsrtp/libsrtp-1.4.4-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils multilib
+
+MY_PN="srtp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="http://srtp.sourceforge.net/srtp.html"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="aesicm console debug doc syslog"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+ # generate a shared lib
+ epatch "${FILESDIR}"/${P}-shared.patch
+}
+
+src_configure() {
+ # stdout: default error output for messages in debug
+ # kernel-linux: breaks the build
+ # gdoi: disabled by upstream and breaks the build
+ econf \
+ --enable-stdout \
+ --disable-kernel-linux \
+ --disable-gdoi \
+ $(use_enable aesicm generic-aesicm) \
+ $(use_enable console) \
+ $(use_enable debug) \
+ $(use_enable syslog)
+}
+
+src_compile() {
+ # target all is building test
+ emake ${PN}.a ${PN}$(get_libname) || die "emake failed"
+}
+
+src_test() {
+ # getopt returns an int, not a char
+ sed -i -e "s/char q/int q/" \
+ test/rdbx_driver.c test/srtp_driver.c test/dtls_srtp_driver.c \
+ || die "fixing getopt errors failed"
+
+ # test/rtpw_test.sh is assuming . is in $PATH
+ sed -i -e "s:\$RTPW :./\$RTPW :" test/rtpw_test.sh \
+ || die "patching test/rtpw_test.sh failed"
+
+ # test/rtpw.c is using /usr/share/dict/words assuming it exists
+ # using test/rtpw.c guaratees the file exists in any case
+ sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c \
+ || die "patching test/rtpw.c failed"
+
+ emake test || die "building test failed"
+ emake -j1 runtest || die "tests failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc CHANGES README TODO || die "dodoc failed"
+
+ if use doc; then
+ # libsrtp.pdf can also be generated with doxygen
+ # but it would be a waste of time as an up-to-date version is built
+ dodoc doc/*.txt doc/${PN}.pdf || die "dodoc failed"
+ fi
+}
diff --git a/net-libs/libsrtp/libsrtp-1.4.4-r2.ebuild b/net-libs/libsrtp/libsrtp-1.4.4-r2.ebuild
new file mode 100644
index 000000000000..2d0d4b7c17b9
--- /dev/null
+++ b/net-libs/libsrtp/libsrtp-1.4.4-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit base multilib
+
+MY_PN="srtp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="http://srtp.sourceforge.net/srtp.html"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="aesicm console debug doc static-libs syslog"
+PATCHES=( "${FILESDIR}/${P}-shared.patch"
+ "${FILESDIR}/${P}-invalid-index.patch" )
+
+S=${WORKDIR}/${MY_PN}
+
+src_configure() {
+ # stdout: default error output for messages in debug
+ # kernel-linux: breaks the build
+ # gdoi: disabled by upstream and breaks the build
+ econf \
+ --enable-stdout \
+ --disable-kernel-linux \
+ --disable-gdoi \
+ $(use_enable aesicm generic-aesicm) \
+ $(use_enable console) \
+ $(use_enable debug) \
+ $(use_enable syslog)
+}
+
+src_compile() {
+ if use static-libs; then
+ emake ${PN}.a || die "Failed to build static library"
+ fi
+ emake ${PN}$(get_libname) || die "Failed to build dynamic library"
+}
+
+src_test() {
+ # getopt returns an int, not a char
+ sed -i -e "s/char q/int q/" \
+ test/rdbx_driver.c test/srtp_driver.c test/dtls_srtp_driver.c \
+ || die "fixing getopt errors failed"
+
+ # test/rtpw_test.sh is assuming . is in $PATH
+ sed -i -e "s:\$RTPW :./\$RTPW :" test/rtpw_test.sh \
+ || die "patching test/rtpw_test.sh failed"
+
+ # test/rtpw.c is using /usr/share/dict/words assuming it exists
+ # using test/rtpw.c guaratees the file exists in any case
+ sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c \
+ || die "patching test/rtpw.c failed"
+
+ emake test || die "building test failed"
+ emake -j1 runtest || die "tests failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc CHANGES README TODO || die "dodoc failed"
+
+ if use doc; then
+ # libsrtp.pdf can also be generated with doxygen
+ # but it would be a waste of time as an up-to-date version is built
+ dodoc doc/*.txt doc/${PN}.pdf || die "dodoc failed"
+ fi
+}
diff --git a/net-libs/libsrtp/libsrtp-1.4.4_p20121108-r1.ebuild b/net-libs/libsrtp/libsrtp-1.4.4_p20121108-r1.ebuild
new file mode 100644
index 000000000000..992fe0cff79e
--- /dev/null
+++ b/net-libs/libsrtp/libsrtp-1.4.4_p20121108-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit base multilib
+
+MY_PN="srtp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="http://srtp.sourceforge.net/srtp.html"
+SRC_URI="http://dev.gentoo.org/~phajdan.jr/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="aesicm console debug doc static-libs syslog"
+PATCHES=(
+ "${FILESDIR}/${P}-shared.patch"
+ "${FILESDIR}/${PN}-CVE-2013-2139.diff"
+ )
+
+S=${WORKDIR}/${MY_PN}
+
+src_configure() {
+ # stdout: default error output for messages in debug
+ # kernel-linux: breaks the build
+ # gdoi: disabled by upstream and breaks the build
+ econf \
+ --enable-stdout \
+ --disable-kernel-linux \
+ --disable-gdoi \
+ $(use_enable aesicm generic-aesicm) \
+ $(use_enable console) \
+ $(use_enable debug) \
+ $(use_enable syslog)
+}
+
+src_compile() {
+ if use static-libs; then
+ emake ${PN}.a || die "Failed to build static library"
+ fi
+ emake ${PN}$(get_libname) || die "Failed to build dynamic library"
+}
+
+src_test() {
+ # getopt returns an int, not a char
+ sed -i -e "s/char q/int q/" \
+ test/rdbx_driver.c test/srtp_driver.c test/dtls_srtp_driver.c \
+ || die "fixing getopt errors failed"
+
+ # test/rtpw_test.sh is assuming . is in $PATH
+ sed -i -e "s:\$RTPW :./\$RTPW :" test/rtpw_test.sh \
+ || die "patching test/rtpw_test.sh failed"
+
+ # test/rtpw.c is using /usr/share/dict/words assuming it exists
+ # using test/rtpw.c guaratees the file exists in any case
+ sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c \
+ || die "patching test/rtpw.c failed"
+
+ emake test || die "building test failed"
+ emake -j1 runtest || die "tests failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc CHANGES README TODO || die "dodoc failed"
+
+ if use doc; then
+ # libsrtp.pdf can also be generated with doxygen
+ # but it would be a waste of time as an up-to-date version is built
+ dodoc doc/*.txt doc/${PN}.pdf || die "dodoc failed"
+ fi
+}
diff --git a/net-libs/libsrtp/libsrtp-1.4.4_p20121108.ebuild b/net-libs/libsrtp/libsrtp-1.4.4_p20121108.ebuild
new file mode 100644
index 000000000000..a8d1fd56b638
--- /dev/null
+++ b/net-libs/libsrtp/libsrtp-1.4.4_p20121108.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit base multilib
+
+MY_PN="srtp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="http://srtp.sourceforge.net/srtp.html"
+SRC_URI="http://dev.gentoo.org/~phajdan.jr/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="aesicm console debug doc static-libs syslog"
+PATCHES=( "${FILESDIR}/${P}-shared.patch" )
+
+S=${WORKDIR}/${MY_PN}
+
+src_configure() {
+ # stdout: default error output for messages in debug
+ # kernel-linux: breaks the build
+ # gdoi: disabled by upstream and breaks the build
+ econf \
+ --enable-stdout \
+ --disable-kernel-linux \
+ --disable-gdoi \
+ $(use_enable aesicm generic-aesicm) \
+ $(use_enable console) \
+ $(use_enable debug) \
+ $(use_enable syslog)
+}
+
+src_compile() {
+ if use static-libs; then
+ emake ${PN}.a || die "Failed to build static library"
+ fi
+ emake ${PN}$(get_libname) || die "Failed to build dynamic library"
+}
+
+src_test() {
+ # getopt returns an int, not a char
+ sed -i -e "s/char q/int q/" \
+ test/rdbx_driver.c test/srtp_driver.c test/dtls_srtp_driver.c \
+ || die "fixing getopt errors failed"
+
+ # test/rtpw_test.sh is assuming . is in $PATH
+ sed -i -e "s:\$RTPW :./\$RTPW :" test/rtpw_test.sh \
+ || die "patching test/rtpw_test.sh failed"
+
+ # test/rtpw.c is using /usr/share/dict/words assuming it exists
+ # using test/rtpw.c guaratees the file exists in any case
+ sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c \
+ || die "patching test/rtpw.c failed"
+
+ emake test || die "building test failed"
+ emake -j1 runtest || die "tests failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc CHANGES README TODO || die "dodoc failed"
+
+ if use doc; then
+ # libsrtp.pdf can also be generated with doxygen
+ # but it would be a waste of time as an up-to-date version is built
+ dodoc doc/*.txt doc/${PN}.pdf || die "dodoc failed"
+ fi
+}
diff --git a/net-libs/libsrtp/libsrtp-1.5.2-r1.ebuild b/net-libs/libsrtp/libsrtp-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..ff18b97953d4
--- /dev/null
+++ b/net-libs/libsrtp/libsrtp-1.5.2-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="https://github.com/cisco/libsrtp"
+SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="aesicm console debug doc openssl static-libs syslog test"
+
+DEPEND="openssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES README TODO )
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-pcap-automagic-r0.patch"
+ epatch "${FILESDIR}/${P}-fix-make-install.patch"
+ epatch "${FILESDIR}/${P}-bindir.patch"
+
+ # getopt returns an int, not a char
+ sed -i -e "s/char q/int q/" \
+ test/rdbx_driver.c test/srtp_driver.c test/dtls_srtp_driver.c || die
+
+ # test/rtpw_test.sh is assuming . is in $PATH
+ sed -i -e "s:\$RTPW :./\$RTPW :" test/rtpw_test.sh || die
+
+ # test/rtpw.c is using /usr/share/dict/words assuming it exists
+ # using test/rtpw.c guaratees the file exists in any case
+ sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # stdout: default error output for messages in debug
+ # kernel-linux: breaks the build
+ # gdoi: disabled by upstream and breaks the build
+ # pcap: seems to be test-only
+ econf \
+ --enable-stdout \
+ --disable-kernel-linux \
+ --disable-gdoi \
+ --disable-pcap \
+ $(use_enable aesicm generic-aesicm) \
+ $(use_enable console) \
+ $(use_enable debug) \
+ $(use_enable openssl) \
+ $(use_enable syslog)
+}
+
+src_compile() {
+ use static-libs && emake ${PN}.a
+ emake shared_library
+ use test && emake test
+}
+
+src_test() {
+ LD_LIBRARY_PATH="${S}" emake -j1 runtest
+
+ # Makefile.in has '$(testapp): libsrtp.a'
+ if use !static-libs; then
+ rm libsrtp.a || die
+ fi
+}
+
+src_install() {
+ default
+
+ # libsrtp.pdf can also be generated with doxygen
+ # but it would be a waste of time as an up-to-date version is built
+ use doc && dodoc doc/*.txt doc/${PN}.pdf
+}
diff --git a/net-libs/libsrtp/libsrtp-1.5.2.ebuild b/net-libs/libsrtp/libsrtp-1.5.2.ebuild
new file mode 100644
index 000000000000..9b896e397b30
--- /dev/null
+++ b/net-libs/libsrtp/libsrtp-1.5.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools base multilib
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="https://github.com/cisco/libsrtp"
+SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="aesicm console debug doc openssl static-libs syslog"
+
+DEPEND="openssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-pcap-automagic-r0.patch"
+ eautoreconf || die
+}
+
+src_configure() {
+ # stdout: default error output for messages in debug
+ # kernel-linux: breaks the build
+ # gdoi: disabled by upstream and breaks the build
+ # pcap: seems to be test-only
+ econf \
+ --enable-stdout \
+ --disable-kernel-linux \
+ --disable-gdoi \
+ --disable-pcap \
+ $(use_enable aesicm generic-aesicm) \
+ $(use_enable console) \
+ $(use_enable debug) \
+ $(use_enable openssl) \
+ $(use_enable syslog)
+}
+
+src_compile() {
+ if use static-libs; then
+ emake ${PN}.a || die
+ fi
+ emake shared_library || die
+}
+
+src_test() {
+ # getopt returns an int, not a char
+ sed -i -e "s/char q/int q/" \
+ test/rdbx_driver.c test/srtp_driver.c test/dtls_srtp_driver.c || die
+
+ # test/rtpw_test.sh is assuming . is in $PATH
+ sed -i -e "s:\$RTPW :./\$RTPW :" test/rtpw_test.sh || die
+
+ # test/rtpw.c is using /usr/share/dict/words assuming it exists
+ # using test/rtpw.c guaratees the file exists in any case
+ sed -i -e "s:/usr/share/dict/words:rtpw.c:" test/rtpw.c || die
+
+ emake test || die
+ emake -j1 runtest || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ dodoc CHANGES README TODO || die
+
+ if use doc; then
+ # libsrtp.pdf can also be generated with doxygen
+ # but it would be a waste of time as an up-to-date version is built
+ dodoc doc/*.txt doc/${PN}.pdf || die
+ fi
+}
diff --git a/net-libs/libsrtp/metadata.xml b/net-libs/libsrtp/metadata.xml
new file mode 100644
index 000000000000..f4ee7e9f96f0
--- /dev/null
+++ b/net-libs/libsrtp/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>chromium</herd>
+ <maintainer>
+ <email>chainsaw@gentoo.org</email>
+ <name>Tony Vroon</name>
+ </maintainer>
+ <use>
+ <flag name="aesicm">Use AES ICM cryptographic algorithm</flag>
+ <flag name="console">
+ Use /dev/console instead of stdout for error messages
+ </flag>
+ <flag name="openssl">Use OpenSSL crypto primitives</flag>
+ <flag name="syslog">Use syslog for error messages</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">cisco/libsrtp</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
new file mode 100644
index 000000000000..41991e50be97
--- /dev/null
+++ b/net-libs/libssh/Manifest
@@ -0,0 +1,5 @@
+DIST libssh-0.6.5-compilefix.patch 737 SHA256 952c6a617791c35fe8d44a47d1252aebd2d844f40480170b14391c80f2092fff SHA512 fa9d8322778ca93b6ae62e0012722a2df94179891f5bafefc67a7502f4bc96ec86768e07f374f37486641614298472227eb48aa5747dabf840636e9f1ce9cbde WHIRLPOOL 575bca37a3dbe892e44b362c02f370cc13f94ef2706c435a9d3e2604941cece285637dd6831c27337ab5fc76c4e8588092f106e2ea963dc15d46129cecd1f2cb
+DIST libssh-0.6.5.tar.xz 281564 SHA256 0fd52763e033d5e9b1cd55f60a74e619731c5ba630938eec95682dbe4cf7dc2c SHA512 55d614ff311a29a20b93094ac1dd16a2ad1345368b874a0e385f0c235e8defde8816948ab04eab68ade477a0a6901b317c7884df1ba3078cf12db89dfc4169cc WHIRLPOOL 9801eee45a178306b0645d75c268df381d206a8c566695d8b6c228ea7f5638a313bdbdf990ad7bd299c24d280595007b44fd16449ee3a0643b6e2084bb148d09
+DIST libssh-0.7.0-ssh_forward_listen.patch 813 SHA256 3d5d4d4a5c7eb34b9790ebb557de2df359c98f955ff37e812945f256b8bdd482 SHA512 727face00743cf964b9fbbff001f2d2240c6d1ac64d2e65298bca97e973d06d2e1591755446fb7c8fd8d83bf1247c42591c47dcc7f008ca89b84d817b5b2f457 WHIRLPOOL f7fdb169a1f6db68dae4d591a2802901d12f030342da1c32e5bc85f95a6f3ea62cade29081d760e0dd67b77b91ec0aa6314a319280c1dd8abd777493237b1d9e
+DIST libssh-0.7.0.tar.xz 349548 SHA256 0551bc341f33641ddc349b31730b3010870ad26a4dbfad3d090a1738fe3e402b SHA512 2ef897f7295d2b4ba63f0d797c51ba2c8cb7d8569152d34ec982d2b88adccc97c8f2aabea3bbc88b72421256d3d0be661f82bbcf5c4b151018b5a695be445568 WHIRLPOOL 1337ca1fc69c5de60f2d33ce1d66f04b0d2807b01794af6787a5d4b7ca84715afe00ff72d8b1bb21590186b7af9058fa90c69af865a0534402735076dec51397
+DIST libssh-0.7.1.tar.xz 349888 SHA256 2fc7ccf96d3263cbd8ab520118cb94d9a2e11714c61e22b3f761fc5352fd046d SHA512 c7cea829e97c9f37c23b5d331e02ea5b8c8bea1a0b28fad62a273b252040a30ea9631b502ea165a1e041b6e23c3bf6746d49800875fa492d8f42c7d1e232ebb9 WHIRLPOOL 7569b16a9524efac40d7a7b8c91201a8ce2c37c56008c7262e4d7628f5ac0993a0164bccc845a121438a62451a10d94b71ba69788b145d0592b83fa88ee251e1
diff --git a/net-libs/libssh/files/libssh-0.5.0-tests.patch b/net-libs/libssh/files/libssh-0.5.0-tests.patch
new file mode 100644
index 000000000000..dde770ce5b2a
--- /dev/null
+++ b/net-libs/libssh/files/libssh-0.5.0-tests.patch
@@ -0,0 +1,11 @@
+--- a/tests/unittests/torture_misc.c
++++ b/tests/unittests/torture_misc.c
+@@ -195,7 +195,7 @@
+ #ifdef _WIN32
+ unit_test(torture_path_expand_tilde_win),
+ #else
+- unit_test(torture_path_expand_tilde_unix),
++ //unit_test(torture_path_expand_tilde_unix),
+ #endif
+ unit_test_setup_teardown(torture_path_expand_escape, setup, teardown),
+ unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown),
diff --git a/net-libs/libssh/libssh-0.6.5.ebuild b/net-libs/libssh/libssh-0.6.5.ebuild
new file mode 100644
index 000000000000..46cce2ba0676
--- /dev/null
+++ b/net-libs/libssh/libssh-0.6.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${PN}-${PV/_rc/rc}
+inherit eutils cmake-multilib multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="http://www.libssh.org/"
+SRC_URI="https://red.libssh.org/attachments/download/121/${MY_P}.tar.xz -> ${P}.tar.xz
+ https://git.libssh.org/projects/libssh.git/patch/?id=6e0dee7845cea22f59bd353ef42b31cb67170030 -> ${PN}-0.6.5-compilefix.patch"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+RDEPEND="
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5.0-tests.patch
+ "${DISTDIR}"/${P}-compilefix.patch
+)
+
+src_prepare() {
+ # just install the examples do not compile them
+ sed -i \
+ -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+ CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with debug DEBUG_CALLTRACE)
+ $(cmake-utils_use_with debug DEBUG_CRYPTO)
+ $(cmake-utils_use_with gcrypt)
+ $(cmake-utils_use_with gssapi)
+ $(cmake-utils_use_with pcap)
+ $(cmake-utils_use_with server)
+ $(cmake-utils_use_with sftp)
+ $(cmake-utils_use_with ssh1)
+ $(cmake-utils_use_with static-libs STATIC_LIB)
+ $(cmake-utils_use_with test STATIC_LIB)
+ $(cmake-utils_use_with test TESTING)
+ $(cmake-utils_use_with zlib)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+
+ multilib_is_native_abi && use doc && dohtml -r doc/html/.
+
+ use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use examples; then
+ docinto examples
+ dodoc examples/*.{c,h,cpp}
+ fi
+}
diff --git a/net-libs/libssh/libssh-0.7.0-r1.ebuild b/net-libs/libssh/libssh-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..f6cc31c3b7ef
--- /dev/null
+++ b/net-libs/libssh/libssh-0.7.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${PN}-${PV/_rc/rc}
+inherit eutils cmake-multilib multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="http://www.libssh.org/"
+SRC_URI="https://red.libssh.org/attachments/download/140/${MY_P}.tar.xz -> ${P}.tar.xz
+ https://projects.archlinux.org/svntogit/packages.git/plain/trunk/ssh_forward_listen.patch?h=packages/libssh&id=e7628675b7b5dec45371b67745ce786ee5b78d8c -> ${PN}-0.7.0-ssh_forward_listen.patch"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+RDEPEND="
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5.0-tests.patch
+ "${DISTDIR}"/${P}-ssh_forward_listen.patch
+)
+
+src_prepare() {
+ # just install the examples do not compile them
+ sed -i \
+ -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+ CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with debug DEBUG_CALLTRACE)
+ $(cmake-utils_use_with debug DEBUG_CRYPTO)
+ $(cmake-utils_use_with gcrypt)
+ $(cmake-utils_use_with gssapi)
+ $(cmake-utils_use_with pcap)
+ $(cmake-utils_use_with server)
+ $(cmake-utils_use_with sftp)
+ $(cmake-utils_use_with ssh1)
+ $(cmake-utils_use_with static-libs STATIC_LIB)
+ $(cmake-utils_use_with test STATIC_LIB)
+ $(cmake-utils_use_with test TESTING)
+ $(cmake-utils_use_with zlib)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+
+ multilib_is_native_abi && use doc && dohtml -r doc/html/.
+
+ use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use examples; then
+ docinto examples
+ dodoc examples/*.{c,h,cpp}
+ fi
+}
diff --git a/net-libs/libssh/libssh-0.7.1.ebuild b/net-libs/libssh/libssh-0.7.1.ebuild
new file mode 100644
index 000000000000..a35bde428cac
--- /dev/null
+++ b/net-libs/libssh/libssh-0.7.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P=${PN}-${PV/_rc/rc}
+inherit eutils cmake-multilib multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="http://www.libssh.org/"
+SRC_URI="https://red.libssh.org/attachments/download/154/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+RDEPEND="
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5.0-tests.patch
+)
+
+src_prepare() {
+ # just install the examples do not compile them
+ sed -i \
+ -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+ CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with debug DEBUG_CALLTRACE)
+ $(cmake-utils_use_with debug DEBUG_CRYPTO)
+ $(cmake-utils_use_with gcrypt)
+ $(cmake-utils_use_with gssapi)
+ $(cmake-utils_use_with pcap)
+ $(cmake-utils_use_with server)
+ $(cmake-utils_use_with sftp)
+ $(cmake-utils_use_with ssh1)
+ $(cmake-utils_use_with static-libs STATIC_LIB)
+ $(cmake-utils_use_with test STATIC_LIB)
+ $(cmake-utils_use_with test TESTING)
+ $(cmake-utils_use_with zlib)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+
+ multilib_is_native_abi && use doc && dohtml -r doc/html/.
+
+ use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use examples; then
+ docinto examples
+ dodoc examples/*.{c,h,cpp}
+ fi
+}
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
new file mode 100644
index 000000000000..7fcefa909307
--- /dev/null
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-multilib multilib git-r3
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="http://www.libssh.org/"
+EGIT_REPO_URI="git://git.libssh.org/projects/libssh.git"
+
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+SLOT="0"
+IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+RDEPEND="
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+EGIT_MIN_CLONE_TYPE=single
+
+src_prepare() {
+ # just install the examples do not compile them
+ sed -i \
+ -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+ CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with debug DEBUG_CALLTRACE)
+ $(cmake-utils_use_with debug DEBUG_CRYPTO)
+ $(cmake-utils_use_with gcrypt)
+ $(cmake-utils_use_with gssapi)
+ $(cmake-utils_use_with pcap)
+ $(cmake-utils_use_with server)
+ $(cmake-utils_use_with sftp)
+ $(cmake-utils_use_with ssh1)
+ $(cmake-utils_use_with static-libs STATIC_LIB)
+ $(cmake-utils_use_with test STATIC_LIB)
+ $(cmake-utils_use_with test TESTING)
+ $(cmake-utils_use_with zlib)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+
+ multilib_is_native_abi && use doc && dohtml -r doc/html/.
+
+ use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use examples; then
+ docinto examples
+ dodoc examples/*.{c,h,cpp}
+ fi
+}
diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
new file mode 100644
index 000000000000..61a522ff1ed8
--- /dev/null
+++ b/net-libs/libssh/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<herd>kde</herd>
+<use>
+ <flag name='gcrypt'>Prefer <pkg>dev-libs/libgcrypt</pkg> over
+ <pkg>dev-libs/openssl</pkg> for encryption</flag>
+ <flag name='gssapi'>Enable gssapi support</flag>
+ <flag name='pcap'>Build with PCAP output support</flag>
+ <flag name='sftp'>Build with SFTP support</flag>
+ <flag name='ssh1'>Build with SSH1 support</flag>
+ <flag name='server'>Build with SSH server support</flag>
+</use>
+</pkgmetadata>
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
new file mode 100644
index 000000000000..774146db19fe
--- /dev/null
+++ b/net-libs/libssh2/Manifest
@@ -0,0 +1,2 @@
+DIST libssh2-1.5.0.tar.gz 728222 SHA256 83196badd6868f5b926bdac8017a6f90fb8a90b16652d3bf02df0330d573d0fc SHA512 9dada6d86e962ce35d6d30625d3a8743b5f269b325d4f1e072206e73c4ef87f216fe54c0c5bfc06eb969a07e221c21ce6f7b9e5524afdb3f957a25f714c62f73 WHIRLPOOL 94e897f59a02ca7ab4b3006cc9c84228a202f16a8e898f202e89015275e95324cb7a71c722324134f1b7f5a85a45718a2c7d25de1d806e0534c1d61683da5487
+DIST libssh2-1.6.0.tar.gz 734110 SHA256 5a202943a34a1d82a1c31f74094f2453c207bf9936093867f41414968c8e8215 SHA512 aa28bf782b5de1f09d1b85aa8b480069bf08494ed3505e59ed522799dd710905b8d3464b3447e35393764632d5e43d21990ceab9584a8df17abda4f85dfc2ec7 WHIRLPOOL 0702eb089483b5047e517e89eca0c23719528b3672e24bf3f3a3ff3c0ca5335e1d00ff328f0c6458ae1cdd25d73d222cb3dfb5d95445df80a6bd9d8c4f17b9ff
diff --git a/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch b/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch
new file mode 100644
index 000000000000..f741a256f7cd
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- a/libssh2.pc.in
++++ b/libssh2.pc.in
+@@ -12,6 +12,6 @@
+ Description: Library for SSH-based communication
+ Version: @LIBSSH2VER@
+ Requires.private: @LIBSREQUIRED@
+-Libs: -L${libdir} -lssh2 @LDFLAGS@ @LIBS@
++Libs: -L${libdir} -lssh2 @LIBS@
+ Libs.private: @LIBS@
+ Cflags: -I${includedir}
diff --git a/net-libs/libssh2/libssh2-1.5.0.ebuild b/net-libs/libssh2/libssh2-1.5.0.ebuild
new file mode 100644
index 000000000000..4af6d5e9d3ca
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+inherit autotools-multilib
+
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="http://www.libssh2.org/"
+SRC_URI="http://www.${PN}.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="gcrypt static-libs test zlib"
+
+DEPEND="!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+DOCS=( README )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4.2-pkgconfig.patch )
+
+src_prepare() {
+ sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ # Disable tests that require extra permissions (bug #333319)
+ use test && local -x ac_cv_path_SSHD=
+
+ local myeconfargs=(
+ $(use_with zlib libz)
+ $(usex gcrypt --with-libgcrypt --with-openssl)
+ )
+ autotools-utils_src_configure
+}
diff --git a/net-libs/libssh2/libssh2-1.6.0.ebuild b/net-libs/libssh2/libssh2-1.6.0.ebuild
new file mode 100644
index 000000000000..6c9ad56b8418
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+inherit autotools-multilib
+
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="http://www.libssh2.org/"
+SRC_URI="http://www.${PN}.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="gcrypt static-libs test zlib"
+
+DEPEND="!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+DOCS=( README )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4.2-pkgconfig.patch )
+
+src_prepare() {
+ sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ # Disable tests that require extra permissions (bug #333319)
+ use test && local -x ac_cv_path_SSHD=
+
+ local myeconfargs=(
+ $(use_with zlib libz)
+ $(usex gcrypt --with-libgcrypt --with-openssl)
+ )
+ autotools-utils_src_configure
+}
diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
new file mode 100644
index 000000000000..a41ca40951fa
--- /dev/null
+++ b/net-libs/libssh2/libssh2-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+EGIT_REPO_URI="https://github.com/libssh2/libssh2"
+inherit autotools-multilib git-r3
+
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="http://www.libssh2.org/"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="gcrypt static-libs test zlib"
+
+DEPEND="!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+DOCS=( README )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4.2-pkgconfig.patch )
+
+src_prepare() {
+ sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die
+ ln -s ../src/libssh2_config.h.in example/libssh2_config.h.in || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ # Disable tests that require extra permissions (bug #333319)
+ use test && local -x ac_cv_path_SSHD=
+
+ local myeconfargs=(
+ $(use_with zlib libz)
+ $(usex gcrypt --with-libgcrypt --with-openssl)
+ )
+ autotools-utils_src_configure
+}
diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml
new file mode 100644
index 000000000000..1644999aaaaa
--- /dev/null
+++ b/net-libs/libssh2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<use>
+<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> instead of <pkg>dev-libs/openssl</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/net-libs/libtelnet/Manifest b/net-libs/libtelnet/Manifest
new file mode 100644
index 000000000000..177b6de4f3d7
--- /dev/null
+++ b/net-libs/libtelnet/Manifest
@@ -0,0 +1 @@
+DIST libtelnet-0.21.tar.gz 240486 SHA256 fb4b02106b77c00ff5e1c15159d681a1a70962a1b087151061726075ec2ce445 SHA512 69dc0ac4741c81d932136cd736b48a11a05cd2738da6255d6050844f50a2f16c575c747e5c758bbdbc6b1e3309ce02e4979f0002b40fed32a3711aa8f22e04f1 WHIRLPOOL 889d53bed552939c4540747a21b3301de4cc721af3c86bfd4eee6fc9c3a6aa6f2f8e07172c2af84566e3f31723864d57fc6dbd98ecc59e6a13ef8dc599ca1413
diff --git a/net-libs/libtelnet/libtelnet-0.21.ebuild b/net-libs/libtelnet/libtelnet-0.21.ebuild
new file mode 100644
index 000000000000..922047875bec
--- /dev/null
+++ b/net-libs/libtelnet/libtelnet-0.21.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools
+DESCRIPTION="Simple RFC-complient TELNET implementation as a C library"
+HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
+
+if [ ${PV} = 9999 ]; then
+ KEYWORDS=""
+ EGIT_REPO_URI="https://github.com/seanmiddleditch/${PN}.git"
+ inherit git-2
+ DEPEND="dev-vcs/git"
+ S="${WORKDIR}/${PN}-master"
+else
+ KEYWORDS="~x86 ~amd64"
+ SRC_URI="https://github.com/seanmiddleditch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+WANT_AUTOMAKE=1.11
+DEPEND="${DEPEND} sys-devel/automake:${WANT_AUTOMAKE}"
+LICENSE="public-domain"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+
+src_prepare() {
+ _elibtoolize
+ eaclocal
+ eautoconf
+ eautoheader
+ eautomake
+}
diff --git a/net-libs/libtelnet/libtelnet-9999.ebuild b/net-libs/libtelnet/libtelnet-9999.ebuild
new file mode 100644
index 000000000000..922047875bec
--- /dev/null
+++ b/net-libs/libtelnet/libtelnet-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools
+DESCRIPTION="Simple RFC-complient TELNET implementation as a C library"
+HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
+
+if [ ${PV} = 9999 ]; then
+ KEYWORDS=""
+ EGIT_REPO_URI="https://github.com/seanmiddleditch/${PN}.git"
+ inherit git-2
+ DEPEND="dev-vcs/git"
+ S="${WORKDIR}/${PN}-master"
+else
+ KEYWORDS="~x86 ~amd64"
+ SRC_URI="https://github.com/seanmiddleditch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+WANT_AUTOMAKE=1.11
+DEPEND="${DEPEND} sys-devel/automake:${WANT_AUTOMAKE}"
+LICENSE="public-domain"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+
+src_prepare() {
+ _elibtoolize
+ eaclocal
+ eautoconf
+ eautoheader
+ eautomake
+}
diff --git a/net-libs/libtelnet/metadata.xml b/net-libs/libtelnet/metadata.xml
new file mode 100644
index 000000000000..e9303fc9e524
--- /dev/null
+++ b/net-libs/libtelnet/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>nativemad@gentoo.org</email>
+ <name>Andreas Schuerch</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">seanmiddleditch/libtelnet</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
new file mode 100644
index 000000000000..13d140eead03
--- /dev/null
+++ b/net-libs/libtirpc/Manifest
@@ -0,0 +1,5 @@
+DIST libtirpc-0.1.10.tar.bz2 416468 SHA256 8441ee7b583b964c961e4e2b502063b668bb0b59c405526176e71d071caf0b0a SHA512 93b833672b9d2ef9708f25edf4d8007079e6367b2f3da1c778d315d099dc2abbbb47ea66be0244fd1afa631daa9c2315d09d4fd7572e3713ec1cab12626cc172 WHIRLPOOL 024d2e258327c81be7728f7c9a07990441066432f5565d73088e5effd921031aec9b66b4c757edc75908d92c4e122c035e29e1118ba74fa19cc3f611cbfa5c2e
+DIST libtirpc-0.2.4.tar.bz2 458544 SHA256 45c3e21dfc23a5ba501f9dfc6671678316fdfdb8355a1ec404ae2aa2f81943a1 SHA512 8b7fec13d34ad0ddfa3832f4a4955607d94f6a691fedcc81a98554345f6c6e64d5f289490a10a80600cebf5b53cfad99c0d78007b88f8f2fbc60cbb8680fc87f WHIRLPOOL c12cb4503fc621437ea0c1543abd0ce739bca40e1f77eba1af533456e93c62fb137a0d1e99d815c6026fae4321d90d9a032d7d1e6daeab1531bcb59bc66b746f
+DIST libtirpc-0.2.5.tar.bz2 459094 SHA256 62f9de7c2c8686c568757730e1fef66502a0e00d6cacf33546d0267984e002db SHA512 9f8afa1acb04a2c2c558018f2528f8caaa79994a2af2abeed947f914145872ef72988b241e11925c799db0de9ec51fd9baecd2b08150240b22f91e2e55a45194 WHIRLPOOL a2b4f1c4825f2b774c2290cccd9d552bb7566ec9eb5988d3ab619d7870a907600f67e7af39fbc3e245606db8534f114c990145789c383206d3a9cf96cf043d8c
+DIST libtirpc-0.3.1.tar.bz2 479721 SHA256 a8838fe180deb8a6f6e491ee665325a28dee4100ec6b1f0b86d611dbfe3a2bb8 SHA512 31b0a00a5390e418ab909e02fb67cbe31bef3326ee0105b2d9dc3ed93270a86e30d4cd618335af01be6b4da4bea215c111b9bead0d8d3e225c2e1d1b2f1e76a3 WHIRLPOOL 183f8ef45c381287e33f50c183c5fdb02ccf6e58dc69a80bbf31c46fcf990c422f3971ce40c9f6607a6be0daf015e412633b9e49ff77be41e6b804a21d6fc72c
+DIST libtirpc-glibc-nfs.tar.xz 8948 SHA256 2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba WHIRLPOOL 06bcf3fd4e424a86071e5c4ddeb89aa571c862e765aae9382d9f9a55ab72cd1c623490555c1a9bd3380a2d04ecb10fb47a75a7dddf449d4368a1a01617226858
diff --git a/net-libs/libtirpc/files/libtirpc-0.2.1-fortify.patch b/net-libs/libtirpc/files/libtirpc-0.2.1-fortify.patch
new file mode 100644
index 000000000000..7375bf83e41d
--- /dev/null
+++ b/net-libs/libtirpc/files/libtirpc-0.2.1-fortify.patch
@@ -0,0 +1,18 @@
+Index: libtirpc-0.2.1/src/getrpcport.c
+===================================================================
+--- libtirpc-0.2.1.orig/src/getrpcport.c
++++ libtirpc-0.2.1/src/getrpcport.c
+@@ -54,11 +54,11 @@ getrpcport(host, prognum, versnum, proto
+
+ if ((hp = gethostbyname(host)) == NULL)
+ return (0);
++ if (hp->h_length != sizeof(addr.sin_addr.s_addr))
++ return (0);
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+ addr.sin_port = 0;
+- if (hp->h_length > sizeof(addr))
+- hp->h_length = sizeof(addr);
+ memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length);
+ /* Inconsistent interfaces need casts! :-( */
+ return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum,
diff --git a/net-libs/libtirpc/files/libtirpc-0.2.2-rpc-des-prot.patch b/net-libs/libtirpc/files/libtirpc-0.2.2-rpc-des-prot.patch
new file mode 100644
index 000000000000..c5de6da40640
--- /dev/null
+++ b/net-libs/libtirpc/files/libtirpc-0.2.2-rpc-des-prot.patch
@@ -0,0 +1,36 @@
+From f2f43212b33dea42635061c82645287454a70107 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 11 Jun 2011 15:21:55 -0400
+Subject: [PATCH] add multiple inclusion protection to rpc/des.h
+
+If you try to include this file multiple times, you get a build failure
+due to redefinitions of enums and such.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ tirpc/rpc/des.h | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h
+index e3d6897..d2881ad 100644
+--- a/tirpc/rpc/des.h
++++ b/tirpc/rpc/des.h
+@@ -33,6 +33,9 @@
+ * Copyright (c) 1986 by Sun Microsystems, Inc.
+ */
+
++#ifndef _RPC_DES_H_
++#define _RPC_DES_H_
++
+ #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */
+ #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */
+
+@@ -80,3 +83,5 @@ struct desparams {
+ * Software DES.
+ */
+ extern int _des_crypt( char *, int, struct desparams * );
++
++#endif
+--
+1.7.5.3
+
diff --git a/net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch b/net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch
new file mode 100644
index 000000000000..8006de39e4dc
--- /dev/null
+++ b/net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch
@@ -0,0 +1,29 @@
+From d26607bade0893fe8652e1a0983f9fae59c64649 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 12 Aug 2014 03:11:41 -0400
+Subject: [PATCH libtirpc] include stdarg.h when used
+
+The debug.h header uses va_list but doesn't include stdarg.h which
+can lead to random build failures.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/debug.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/debug.h b/src/debug.h
+index afc8d57..c971ac3 100644
+--- a/src/debug.h
++++ b/src/debug.h
+@@ -21,6 +21,8 @@
+
+ #ifndef _DEBUG_H
+ #define _DEBUG_H
++
++#include <stdarg.h>
+ #include <syslog.h>
+
+ extern int libtirpc_debug_level;
+--
+2.0.0
+
diff --git a/net-libs/libtirpc/libtirpc-0.1.10.ebuild b/net-libs/libtirpc/libtirpc-0.1.10.ebuild
new file mode 100644
index 000000000000..23fc663df1e5
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-0.1.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="http://libtirpc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="kerberos"
+
+DEPEND="kerberos? ( net-libs/libgssglue )"
+
+src_compile() {
+ econf $(use_enable kerberos gss) || die
+ emake || die
+}
+
+src_install() {
+ dodir /etc
+ emake install DESTDIR="${D}" || die
+ dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
diff --git a/net-libs/libtirpc/libtirpc-0.2.4-r1.ebuild b/net-libs/libtirpc/libtirpc-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..c07a64e65cc9
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-0.2.4-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="http://libtirpc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+ mirror://gentoo/${PN}-glibc-nfs.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="ipv6 kerberos static-libs"
+
+RDEPEND="kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig"
+
+src_unpack() {
+ unpack ${A}
+ cp -r tirpc "${S}"/ || die
+}
+
+src_configure() {
+ econf \
+ $(use_enable ipv6) \
+ $(use_enable kerberos gssapi) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ insinto /etc
+ doins doc/netconfig
+
+ insinto /usr/include/tirpc
+ doins -r "${WORKDIR}"/tirpc/*
+
+ # libtirpc replaces rpc support in glibc, so we need it in /
+ gen_usr_ldscript -a tirpc
+
+ # makes sure that the linking order for nfs-utils is proper, as
+ # libtool would inject a libgssglue dependency in the list.
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild b/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild
new file mode 100644
index 000000000000..4b3aa4c8fc95
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="http://libtirpc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+ mirror://gentoo/${PN}-glibc-nfs.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6 kerberos static-libs"
+
+RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+RDEPEND="${RDEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r7
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+
+src_unpack() {
+ unpack ${A}
+ cp -r tirpc "${S}"/ || die
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable ipv6) \
+ $(use_enable kerberos gssapi) \
+ $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+ default
+
+ # libtirpc replaces rpc support in glibc, so we need it in /
+ multilib_is_native_abi && gen_usr_ldscript -a tirpc
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ insinto /etc
+ doins doc/netconfig
+
+ insinto /usr/include/tirpc
+ doins -r "${WORKDIR}"/tirpc/*
+
+ # makes sure that the linking order for nfs-utils is proper, as
+ # libtool would inject a libgssglue dependency in the list.
+ use static-libs || prune_libtool_files
+}
diff --git a/net-libs/libtirpc/libtirpc-0.2.5.ebuild b/net-libs/libtirpc/libtirpc-0.2.5.ebuild
new file mode 100644
index 000000000000..304b8d8f38d1
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-0.2.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="http://libtirpc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+ mirror://gentoo/${PN}-glibc-nfs.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="ipv6 kerberos static-libs"
+
+RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+RDEPEND="${RDEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r7
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+
+src_unpack() {
+ unpack ${A}
+ cp -r tirpc "${S}"/ || die
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-stdarg.patch
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable ipv6) \
+ $(use_enable kerberos gssapi) \
+ $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+ default
+
+ # libtirpc replaces rpc support in glibc, so we need it in /
+ multilib_is_native_abi && gen_usr_ldscript -a tirpc
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ insinto /etc
+ doins doc/netconfig
+
+ insinto /usr/include/tirpc
+ doins -r "${WORKDIR}"/tirpc/*
+
+ # makes sure that the linking order for nfs-utils is proper, as
+ # libtool would inject a libgssglue dependency in the list.
+ use static-libs || prune_libtool_files
+}
diff --git a/net-libs/libtirpc/libtirpc-0.3.1.ebuild b/net-libs/libtirpc/libtirpc-0.3.1.ebuild
new file mode 100644
index 000000000000..dc5f6523132d
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-0.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="http://libtirpc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+ mirror://gentoo/${PN}-glibc-nfs.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6 kerberos static-libs"
+
+RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+RDEPEND="${RDEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r7
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+
+src_unpack() {
+ unpack ${A}
+ cp -r tirpc "${S}"/ || die
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable ipv6) \
+ $(use_enable kerberos gssapi) \
+ $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+ default
+
+ # libtirpc replaces rpc support in glibc, so we need it in /
+ multilib_is_native_abi && gen_usr_ldscript -a tirpc
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ insinto /etc
+ doins doc/netconfig
+
+ insinto /usr/include/tirpc
+ doins -r "${WORKDIR}"/tirpc/*
+
+ # makes sure that the linking order for nfs-utils is proper, as
+ # libtool would inject a libgssglue dependency in the list.
+ use static-libs || prune_libtool_files
+}
diff --git a/net-libs/libtirpc/metadata.xml b/net-libs/libtirpc/metadata.xml
new file mode 100644
index 000000000000..5f43a51c7b3e
--- /dev/null
+++ b/net-libs/libtirpc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-fs</herd>
+ <upstream>
+ <remote-id type="sourceforge">libtirpc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
new file mode 100644
index 000000000000..588fdf9c1dab
--- /dev/null
+++ b/net-libs/libtorrent/Manifest
@@ -0,0 +1,2 @@
+DIST libtorrent-0.13.3.tar.gz 732847 SHA256 34317d6783b7f8d0805274c9467475b5432a246c0de8e28fc16e3b0b43f35677 SHA512 40f504db26d52b0c65fc1008c7b1465bde0e316c776028c5448bf15c6fd38389fad780b0c200933e51f63974a43942603e0103d45a98a3dd57f23f01a306ef25 WHIRLPOOL 7ed5c4903413c9a1587a561a9ec4bedf86f1ed78c8f81c0d0ebe7bf7de9f45187cb41520d3187d62d3718c2fb379857fac255311618b42bfcf77794ee8636ff2
+DIST libtorrent-0.13.4.tar.gz 768382 SHA256 704e097119dc89e2ee4630396b25de1cd64b0549841347ea75b9ef9217084955 SHA512 6a5ea944c1193d1160563828c5901f0cf557f38c4de61153d505344f3c3c8509c765e01b6cc5e3a53ec2bb184a9e8db32ed4ec154e93a93822804210f0fa45d0 WHIRLPOOL dc3361a1fed59d64e8b6c2fed46d8e20134cd7f0c3b1cad2a1776375a4a3ff796a63fdfb027fa3f81fbb0b409db76592985444702ddf5e034e7c6384b602c4d4
diff --git a/net-libs/libtorrent/files/download_constructor.diff b/net-libs/libtorrent/files/download_constructor.diff
new file mode 100644
index 000000000000..e806cabb64b2
--- /dev/null
+++ b/net-libs/libtorrent/files/download_constructor.diff
@@ -0,0 +1,21 @@
+--- src/download/download_constructor.cc 2011-03-08 17:48:43.000000000 +0300
++++ src/download/download_constructor.cc.new 2011-03-08 17:36:42.000000000 +0300
+@@ -97,7 +97,17 @@
+
+ parse_name(b.get_key("info"));
+ parse_info(b.get_key("info"));
+-
++
++ // hack, quick fix for #2505
++ if (b.has_key_list("announce-list"))
++ if (b.get_key_list("announce-list").empty()) {
++ b.erase_key("announce-list");
++ } else {
++ Object::list_type & l = b.get_key_list("announce-list");
++ if (l.size() == 1 && !l.begin()->is_list()) {
++ b.erase_key("announce-list");
++ }
++ }
+ parse_tracker(b);
+ }
+
diff --git a/net-libs/libtorrent/libtorrent-0.13.3.ebuild b/net-libs/libtorrent/libtorrent-0.13.3.ebuild
new file mode 100644
index 000000000000..66b18a83155d
--- /dev/null
+++ b/net-libs/libtorrent/libtorrent-0.13.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils libtool toolchain-funcs
+
+DESCRIPTION="BitTorrent library written in C++ for *nix"
+HOMEPAGE="http://libtorrent.rakshasa.no/"
+SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="debug ipv6 ssl"
+
+RDEPEND="
+ >=dev-libs/libsigc++-2.2.2:2
+ ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+# epatch "${FILESDIR}"/download_constructor.diff
+ elibtoolize
+}
+
+src_configure() {
+ # the configure check for posix_fallocate is wrong.
+ # reported upstream as Ticket 2416.
+ local myconf
+ echo "int main(){return posix_fallocate();}" > "${T}"/posix_fallocate.c
+ if $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${T}"/posix_fallocate.c -o /dev/null 2>/dev/null ; then
+ myconf="--with-posix-fallocate"
+ else
+ myconf="--without-posix-fallocate"
+ fi
+
+ # configure needs bash or script bombs out on some null shift, bug #291229
+ CONFIG_SHELL=${BASH} econf \
+ --disable-dependency-tracking \
+ --enable-aligned \
+ $(use_enable debug) \
+ $(use_enable ipv6) \
+ $(use_enable ssl openssl) \
+ ${myconf}
+}
diff --git a/net-libs/libtorrent/libtorrent-0.13.4.ebuild b/net-libs/libtorrent/libtorrent-0.13.4.ebuild
new file mode 100644
index 000000000000..fe1cdc92dbd2
--- /dev/null
+++ b/net-libs/libtorrent/libtorrent-0.13.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils libtool toolchain-funcs
+
+DESCRIPTION="BitTorrent library written in C++ for *nix"
+HOMEPAGE="http://libtorrent.rakshasa.no/"
+SRC_URI="http://libtorrent.rakshasa.no/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="debug ipv6 ssl"
+
+RDEPEND="
+ >=dev-libs/libsigc++-2.2.2:2
+ ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+# epatch "${FILESDIR}"/download_constructor.diff
+ elibtoolize
+}
+
+src_configure() {
+ # the configure check for posix_fallocate is wrong.
+ # reported upstream as Ticket 2416.
+ local myconf
+ echo "int main(){return posix_fallocate();}" > "${T}"/posix_fallocate.c
+ if $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${T}"/posix_fallocate.c -o /dev/null 2>/dev/null ; then
+ myconf="--with-posix-fallocate"
+ else
+ myconf="--without-posix-fallocate"
+ fi
+
+ # configure needs bash or script bombs out on some null shift, bug #291229
+ CONFIG_SHELL=${BASH} econf \
+ --disable-dependency-tracking \
+ --enable-aligned \
+ $(use_enable debug) \
+ $(use_enable ipv6) \
+ $(use_enable ssl openssl) \
+ ${myconf}
+}
diff --git a/net-libs/libtorrent/metadata.xml b/net-libs/libtorrent/metadata.xml
new file mode 100644
index 000000000000..aa0f3664825f
--- /dev/null
+++ b/net-libs/libtorrent/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-p2p</herd>
+</pkgmetadata>
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
new file mode 100644
index 000000000000..4351fed6c4f0
--- /dev/null
+++ b/net-libs/libtrace/Manifest
@@ -0,0 +1,2 @@
+DIST libtrace-3.0.21.tar.bz2 618097 SHA256 965d6224213530565926f22f7c2e5bdd41e89f99ece973444e567e94f895c658 SHA512 f463349372a0b11e138a6c131a0d47e9cae32221df9ab19e59da95c94ad3cecfdd671e455351b8ab5435b343332bf7a56e505d0157d5cd10ec922189f91eedf9 WHIRLPOOL 6a25706c40557c2d701f34fa581da75c00a2eb8634afbf3545cb8dac3c0cec08962d3c0e0ae0ac831e61dbb6ef61481c249c11989be5ea18fe43886547ab823d
+DIST libtrace-3.0.22.tar.bz2 642284 SHA256 b8bbaa2054c69cc8f93066143e2601c09c8ed56e75c6e5e4e2c115d07952f8f8 SHA512 6a9055c6c7f7f65f08eacf111abf72418eb4546ff252362977e4f81a4e6d3a36bf7e2ed6ea988cd6baf6b315d6a5fc1691de364fc7d56e561ae230da77810113 WHIRLPOOL 4c1c6c3faef2049466bd8ad07ea9b1c0462ff78c91278b7ed1e9f0938c16d871c6215b24dbed2a85a942e9a63856a15d082c82174dc40d8eec081d92e33dc8d8
diff --git a/net-libs/libtrace/files/libtrace-3.0.20-autoconf-1.13.patch b/net-libs/libtrace/files/libtrace-3.0.20-autoconf-1.13.patch
new file mode 100644
index 000000000000..ed51ecb82868
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-3.0.20-autoconf-1.13.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -61,7 +61,7 @@
+ ])
+
+ # Put all our automake definitions in config.h
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+
+ # Checks for C and C++ compilers
+ AC_PROG_CC
diff --git a/net-libs/libtrace/files/libtrace-3.0.20-libwandio-linking.patch b/net-libs/libtrace/files/libtrace-3.0.20-libwandio-linking.patch
new file mode 100644
index 000000000000..bed8ad945487
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-3.0.20-libwandio-linking.patch
@@ -0,0 +1,8 @@
+--- a/libwandio/Makefile.am
++++ b/libwandio/Makefile.am
+@@ -43,3 +43,5 @@
+ wandiocat_CFLAGS = -I"$(top_srcdir)/libwandio"
+ wandiocat_CXXFLAGS = -I"$(top_srcdir)/libwandio"
+ wandiocat_LDFLAGS = -L"$(top_srcdir)/libwandio" -lwandio
++
++wandiocat: libwandio.la
diff --git a/net-libs/libtrace/files/libtrace-3.0.20-no-examples.patch b/net-libs/libtrace/files/libtrace-3.0.20-no-examples.patch
new file mode 100644
index 000000000000..57983d036114
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-3.0.20-no-examples.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ LIBPACKETDUMP_DIR = libpacketdump
+ TOOLS_DIR = tools
+ WANDIO_DIR=libwandio
+-SUBDIRS = $(WANDIO_DIR) lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs examples
++SUBDIRS = $(WANDIO_DIR) lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs
+
+ ACLOCAL_AMFLAGS = -I m4
+ AUTOMAKE_OPTIONS = 1.9 foreign
diff --git a/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch b/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch
new file mode 100644
index 000000000000..9bda8a43b6b2
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-3.0.20-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/tools/tracetop/Makefile.am
++++ b/tools/tracetop/Makefile.am
+@@ -6,6 +6,6 @@
+ include ../Makefile.tools
+
+ tracetop_SOURCES = tracetop.cc
+-tracetop_LDADD = -lncurses
++tracetop_LDADD = @ncurses_LIBS@
+ tracetop_CPPFLAGS = -fno-strict-aliasing $(AM_CFLAGS)
+ endif
+--- a/configure.in
++++ b/configure.in
+@@ -492,6 +492,8 @@
+ fi
+ fi
+
++PKG_CHECK_MODULES(ncurses,ncurses)
++
+ AC_ARG_WITH([ncurses],
+ AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)]))
+
diff --git a/net-libs/libtrace/libtrace-3.0.21.ebuild b/net-libs/libtrace/libtrace-3.0.21.ebuild
new file mode 100644
index 000000000000..4915f522669c
--- /dev/null
+++ b/net-libs/libtrace/libtrace-3.0.21.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="A library and tools for trace processing"
+HOMEPAGE="http://research.wand.net.nz/software/libtrace.php"
+SRC_URI="http://research.wand.net.nz/software/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 doc lzo ncurses static-libs zlib"
+
+RDEPEND=">=net-libs/libpcap-0.8
+ ncurses? ( sys-libs/ncurses )
+ bzip2? ( app-arch/bzip2 )
+ zlib? ( sys-libs/zlib )
+ lzo? ( dev-libs/lzo )"
+DEPEND="${RDEPEND}
+ app-doc/doxygen
+ sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch \
+ "${FILESDIR}"/${PN}-3.0.20-no-examples.patch \
+ "${FILESDIR}"/${PN}-3.0.20-tinfo.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-man \
+ $(use_enable static-libs static) \
+ $(use_with ncurses) \
+ $(use_with bzip2) \
+ $(use_with zlib) \
+ $(use_with lzo)
+}
+
+src_install() {
+ default
+ use doc && dohtml docs/doxygen/html/*
+ prune_libtool_files --modules
+}
diff --git a/net-libs/libtrace/libtrace-3.0.22.ebuild b/net-libs/libtrace/libtrace-3.0.22.ebuild
new file mode 100644
index 000000000000..ce8cac11cf30
--- /dev/null
+++ b/net-libs/libtrace/libtrace-3.0.22.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="A library and tools for trace processing"
+HOMEPAGE="http://research.wand.net.nz/software/libtrace.php"
+SRC_URI="http://research.wand.net.nz/software/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 doc lzo ncurses static-libs zlib"
+
+RDEPEND=">=net-libs/libpcap-0.8
+ ncurses? ( sys-libs/ncurses )
+ bzip2? ( app-arch/bzip2 )
+ zlib? ( sys-libs/zlib )
+ lzo? ( dev-libs/lzo )"
+DEPEND="${RDEPEND}
+ app-doc/doxygen
+ sys-devel/flex
+ virtual/yacc
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch \
+ "${FILESDIR}"/${PN}-3.0.20-no-examples.patch \
+ "${FILESDIR}"/${PN}-3.0.20-tinfo.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-man \
+ $(use_enable static-libs static) \
+ $(use_with ncurses) \
+ $(use_with bzip2) \
+ $(use_with zlib) \
+ $(use_with lzo)
+}
+
+src_install() {
+ default
+ use doc && dohtml docs/doxygen/html/*
+ prune_libtool_files --modules
+}
diff --git a/net-libs/libtrace/metadata.xml b/net-libs/libtrace/metadata.xml
new file mode 100644
index 000000000000..03aa50bab7e3
--- /dev/null
+++ b/net-libs/libtrace/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+</pkgmetadata>
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
new file mode 100644
index 000000000000..a63cd0ce67c3
--- /dev/null
+++ b/net-libs/libupnp/Manifest
@@ -0,0 +1,2 @@
+DIST libupnp-1.6.18.tar.bz2 1201056 SHA256 b21bc676365622d3ace1b25292dab8d4d23f6e6a80ddc8f029b765d39797e934 SHA512 2ce9b637a7edf544ae272aea137f735b03761a7925da0578e0073cf6429389f7f2af6cb05f666a02faa839caba3e1798ad31657afd287626b88905a5c45f3cb4 WHIRLPOOL b575b517fb668c5e3af78dc1bc95c1a202404beb42966400b3b1313a1fe0e6cb8437ce392af6ad6de4ccc90715c8df7cc34bf3d0b3b828af4e14f1cc8a5e0eda
+DIST libupnp-1.6.19.tar.bz2 1213439 SHA256 b3142b39601243b50532eec90f4a27dba85eb86f58d4b849ac94edeb29d9b22a SHA512 97af62a7483cc19cfe80157cbc3383c1b4b7c9c39b848f4ed063784b74df0b9b0527f7b467e01451e0a44dbf9e8a9eab510619146a6ee1e3dce46f3e4af6e661 WHIRLPOOL fe3ed0115c76872b45eb3f16909e23c61b004f028b745be17346b94dffd7c90108420cf71f50f73aa4ef241403b65b9d1c72926af3044ffacdae11f9649dad68
diff --git a/net-libs/libupnp/files/libupnp-1.6.18-suse.patch b/net-libs/libupnp/files/libupnp-1.6.18-suse.patch
new file mode 100644
index 000000000000..2e91990c0243
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.6.18-suse.patch
@@ -0,0 +1,132 @@
+--- configure.ac 2013-01-29 16:39:56.000000000 +0100
++++ configure.ac 2013-02-17 10:40:53.680021913 +0100
+@@ -7,9 +7,9 @@
+ # (C) Copyright 2005-2007 Rémi Turboult <r3mi@users.sourceforge.net>
+ #
+
+-AC_PREREQ(2.60)
++AC_PREREQ([2.60])
+
+-AC_INIT([libupnp], [1.6.18], [mroberto@users.sourceforge.net])
++AC_INIT([libupnp],[1.6.18],[mroberto@users.sourceforge.net])
+ dnl ############################################################################
+ dnl # *Independently* of the above libupnp package version, the libtool version
+ dnl # of the 3 libraries need to be updated whenever there is a change released:
+@@ -366,7 +366,6 @@
+ # installed libraries.
+ #
+ AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h])
+-#AC_SYS_LARGEFILE_SENSITIVE
+
+ AC_REVISION([$Revision: 1.1 $])
+
+@@ -506,9 +505,12 @@
+ #
+ # Checks for programs
+ #
+-AC_PROG_CC
++AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
++AC_SYS_LARGEFILE
+ AM_PROG_CC_C_O
+-AC_PROG_LIBTOOL
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
++LT_INIT
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_EGREP
+@@ -532,9 +534,7 @@
+ #:
+ # Use -O0 in debug so that variables do not get optimized out
+ AX_CFLAGS_GCC_OPTION([-O0, -g])
+- else
+- # add optimise for size
+- AX_CFLAGS_GCC_OPTION([-Os])
++
+ fi
+ ;;
+ esac
+@@ -548,8 +548,7 @@
+ #
+ AC_TYPE_SIZE_T
+ AC_TYPE_OFF_T
+-AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support])
+-AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
++
+
+
+ #
+--- ixml/Makefile.am.orig
++++ ixml/Makefile.am
+@@ -7,7 +7,7 @@
+
+ SUBDIRS = doc
+
+-AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc
++AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc
+ AM_CFLAGS =
+
+ LDADD = libixml.la
+--- threadutil/Makefile.am.orig
++++ threadutil/Makefile.am
+@@ -4,7 +4,7 @@
+ # (C) Copyright 2005 Remi Turboult <r3mi@users.sourceforge.net>
+ #
+
+-AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc
++AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc
+
+ if ENABLE_DEBUG
+ AM_CPPFLAGS += -DDEBUG -DSTATS
+--- upnp/src/api/UpnpString.c.orig
++++ upnp/src/api/UpnpString.c
+@@ -28,38 +28,6 @@
+ /* Other systems have strncasecmp */
+ #endif
+
+-#ifndef UPNP_USE_MSVCPP
+- /* VC has strnlen which is already included but with (potentially) different linkage */
+- /* strnlen() is a GNU extension. */
+- #if HAVE_STRNLEN
+- extern size_t strnlen(const char *s, size_t maxlen);
+- #else /* HAVE_STRNLEN */
+- static size_t strnlen(const char *s, size_t n)
+- {
+- const char *p = (const char *)memchr(s, 0, n);
+- return p ? p - s : n;
+- }
+- #endif /* HAVE_STRNLEN */
+-#endif /* WIN32 */
+-
+-/* strndup() is a GNU extension. */
+-#if HAVE_STRNDUP && !defined(WIN32)
+- extern char *strndup(__const char *__string, size_t __n);
+-#else /* HAVE_STRNDUP && !defined(WIN32) */
+- static char *strndup(const char *__string, size_t __n)
+- {
+- size_t strsize = strnlen(__string, __n);
+- char *newstr = (char *)malloc(strsize + 1);
+- if (newstr == NULL)
+- return NULL;
+-
+- strncpy(newstr, __string, strsize);
+- newstr[strsize] = 0;
+-
+- return newstr;
+- }
+-#endif /* HAVE_STRNDUP && !defined(WIN32) */
+-
+ /*!
+ * \brief Internal implementation of the class UpnpString.
+ *
+--- upnp/Makefile.am.orig
++++ upnp/Makefile.am
+@@ -6,7 +6,7 @@
+
+ SUBDIRS = doc . sample
+
+-AM_CPPFLAGS = \
++AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h \
+ -I$(srcdir)/inc \
+ -I$(top_srcdir)/threadutil/inc \
+ -I$(top_srcdir)/ixml/inc
diff --git a/net-libs/libupnp/files/libupnp-1.6.19-suse.patch b/net-libs/libupnp/files/libupnp-1.6.19-suse.patch
new file mode 100644
index 000000000000..75a7f0dac75c
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.6.19-suse.patch
@@ -0,0 +1,132 @@
+--- configure.ac 2013-01-29 16:39:56.000000000 +0100
++++ configure.ac 2013-02-17 10:40:53.680021913 +0100
+@@ -7,9 +7,9 @@
+ # (C) Copyright 2005-2007 Rémi Turboult <r3mi@users.sourceforge.net>
+ #
+
+-AC_PREREQ(2.60)
++AC_PREREQ([2.60])
+
+-AC_INIT([libupnp], [1.6.19], [mroberto@users.sourceforge.net])
++AC_INIT([libupnp],[1.6.19],[mroberto@users.sourceforge.net])
+ dnl ############################################################################
+ dnl # *Independently* of the above libupnp package version, the libtool version
+ dnl # of the 3 libraries need to be updated whenever there is a change released:
+@@ -366,7 +366,6 @@
+ # installed libraries.
+ #
+ AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h])
+-#AC_SYS_LARGEFILE_SENSITIVE
+
+ AC_REVISION([$Revision: 1.1 $])
+
+@@ -519,10 +519,12 @@
+ #
+ # Checks for programs
+ #
+-AC_PROG_CC
++AC_PROG_CC_STDC
++AC_USE_SYSTEM_EXTENSIONS
++AC_SYS_LARGEFILE
+ AM_PROG_CC_C_O
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+-AC_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_EGREP
+@@ -532,9 +534,7 @@
+ #:
+ # Use -O0 in debug so that variables do not get optimized out
+ AX_CFLAGS_GCC_OPTION([-O0, -g])
+- else
+- # add optimise for size
+- AX_CFLAGS_GCC_OPTION([-Os])
++
+ fi
+ ;;
+ esac
+@@ -548,8 +548,7 @@
+ #
+ AC_TYPE_SIZE_T
+ AC_TYPE_OFF_T
+-AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support])
+-AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
++
+
+
+ #
+--- ixml/Makefile.am.orig
++++ ixml/Makefile.am
+@@ -7,7 +7,7 @@
+
+ SUBDIRS = doc
+
+-AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc
++AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc
+ AM_CFLAGS =
+
+ LDADD = libixml.la
+--- threadutil/Makefile.am.orig
++++ threadutil/Makefile.am
+@@ -4,7 +4,7 @@
+ # (C) Copyright 2005 Remi Turboult <r3mi@users.sourceforge.net>
+ #
+
+-AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc
++AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc
+
+ if ENABLE_DEBUG
+ AM_CPPFLAGS += -DDEBUG -DSTATS
+--- upnp/src/api/UpnpString.c.orig
++++ upnp/src/api/UpnpString.c
+@@ -28,38 +28,6 @@
+ /* Other systems have strncasecmp */
+ #endif
+
+-#ifndef UPNP_USE_MSVCPP
+- /* VC has strnlen which is already included but with (potentially) different linkage */
+- /* strnlen() is a GNU extension. */
+- #if HAVE_STRNLEN
+- extern size_t strnlen(const char *s, size_t maxlen);
+- #else /* HAVE_STRNLEN */
+- static size_t strnlen(const char *s, size_t n)
+- {
+- const char *p = (const char *)memchr(s, 0, n);
+- return p ? p - s : n;
+- }
+- #endif /* HAVE_STRNLEN */
+-#endif /* WIN32 */
+-
+-/* strndup() is a GNU extension. */
+-#if HAVE_STRNDUP && !defined(WIN32)
+- extern char *strndup(__const char *__string, size_t __n);
+-#else /* HAVE_STRNDUP && !defined(WIN32) */
+- static char *strndup(const char *__string, size_t __n)
+- {
+- size_t strsize = strnlen(__string, __n);
+- char *newstr = (char *)malloc(strsize + 1);
+- if (newstr == NULL)
+- return NULL;
+-
+- strncpy(newstr, __string, strsize);
+- newstr[strsize] = 0;
+-
+- return newstr;
+- }
+-#endif /* HAVE_STRNDUP && !defined(WIN32) */
+-
+ /*!
+ * \brief Internal implementation of the class UpnpString.
+ *
+--- upnp/Makefile.am.orig
++++ upnp/Makefile.am
+@@ -6,7 +6,7 @@
+
+ SUBDIRS = doc . sample
+
+-AM_CPPFLAGS = \
++AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h \
+ -I$(srcdir)/inc \
+ -I$(top_srcdir)/threadutil/inc \
+ -I$(top_srcdir)/ixml/inc
diff --git a/net-libs/libupnp/libupnp-1.6.18-r1.ebuild b/net-libs/libupnp/libupnp-1.6.18-r1.ebuild
new file mode 100644
index 000000000000..60084e379f84
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.6.18-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+IUSE="debug doc ipv6 static-libs"
+
+DOCS="NEWS README ChangeLog"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-suse.patch
+
+ # fix tests
+ chmod +x ixml/test/test_document.sh || die
+
+ eautoreconf
+}
+
+src_configure() {
+ use x86-fbsd && append-flags -O1
+ # w/o docdir to avoid sandbox violations
+ econf \
+ $(use_enable debug) \
+ $(use_enable ipv6) \
+ $(use_enable static-libs static) \
+ $(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
+}
+
+src_install () {
+ default
+ dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
+ use static-libs || prune_libtool_files
+}
+
+pkg_postinst() {
+ ewarn "Please remember to run revdep-rebuild when upgrading"
+ ewarn "from libupnp 1.4.x to libupnp 1.6.x , so packages"
+ ewarn "gets linked with the new library."
+ echo ""
+ ewarn "The revdep-rebuild script is part of the"
+ ewarn "app-portage/gentoolkit package."
+}
diff --git a/net-libs/libupnp/libupnp-1.6.18.ebuild b/net-libs/libupnp/libupnp-1.6.18.ebuild
new file mode 100644
index 000000000000..4b84eed43038
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.6.18.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+IUSE="debug doc ipv6 static-libs"
+
+DOCS="NEWS README ChangeLog"
+
+src_prepare() {
+ sed -e '/AX_CFLAGS_GCC_OPTION/s:-Os::g' \
+ -i "${S}/configure.ac" || die
+
+ # fix tests
+ chmod +x ixml/test/test_document.sh || die
+
+ eautoreconf
+}
+
+src_configure() {
+ use x86-fbsd && append-flags -O1
+ # w/o docdir to avoid sandbox violations
+ econf \
+ $(use_enable debug) \
+ $(use_enable ipv6) \
+ $(use_enable static-libs static) \
+ $(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
+}
+
+src_install () {
+ default
+ dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
+ use static-libs || find "${ED}" -type f -name '*.la' -delete
+}
+
+pkg_postinst() {
+ ewarn "Please remember to run revdep-rebuild when upgrading"
+ ewarn "from libupnp 1.4.x to libupnp 1.6.x , so packages"
+ ewarn "gets linked with the new library."
+ ewarn ""
+ ewarn "The revdep-rebuild script is part of the"
+ ewarn "app-portage/gentoolkit package."
+}
diff --git a/net-libs/libupnp/libupnp-1.6.19.ebuild b/net-libs/libupnp/libupnp-1.6.19.ebuild
new file mode 100644
index 000000000000..161fa7ef80c3
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.6.19.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+IUSE="debug doc ipv6 static-libs"
+
+DOCS="NEWS README ChangeLog"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-suse.patch
+
+ # fix tests
+ chmod +x ixml/test/test_document.sh || die
+
+ eautoreconf
+}
+
+src_configure() {
+ use x86-fbsd && append-flags -O1
+ # w/o docdir to avoid sandbox violations
+ econf \
+ $(use_enable debug) \
+ $(use_enable ipv6) \
+ $(use_enable static-libs static) \
+ $(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
+}
+
+src_install () {
+ default
+ dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
+ use static-libs || prune_libtool_files
+}
+
+pkg_postinst() {
+ ewarn "Please remember to run revdep-rebuild when upgrading"
+ ewarn "from libupnp 1.4.x to libupnp 1.6.x , so packages"
+ ewarn "gets linked with the new library."
+ echo ""
+ ewarn "The revdep-rebuild script is part of the"
+ ewarn "app-portage/gentoolkit package."
+}
diff --git a/net-libs/libupnp/metadata.xml b/net-libs/libupnp/metadata.xml
new file mode 100644
index 000000000000..89b139d370cc
--- /dev/null
+++ b/net-libs/libupnp/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>maq@maqibooy.com</email>
+ <name>Marcus Stjärnås</name>
+ </maintainer>
+ <maintainer>
+ <email>gurligebis@gentoo.org</email>
+ <name>Bjarke Istrup Pedersen</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">pupnp</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
new file mode 100644
index 000000000000..89c19a7b60a7
--- /dev/null
+++ b/net-libs/libvncserver/Manifest
@@ -0,0 +1 @@
+DIST LibVNCServer-0.9.10.tar.gz 1415191 SHA256 ed10819a5bfbf269969f97f075939cc38273cc1b6d28bccfb0999fba489411f7 SHA512 eb637dfb72dc50fb713a715c9d0cc8824a6871527c2edb497e70c92e2e708021fbd5d8134f2dee6a9e90d1c8fd3fee53c5f5ece790c2804e938011a980ffceae WHIRLPOOL 821234e772d15668b88bd99e72345a7b5d1a9072fd868ddd47fb47a1e4c6b3c1c2de2380622231a968bd98ac05f20a004a80dfbe43db77f8170056121207b9f4
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.10-libva-1.0.patch b/net-libs/libvncserver/files/libvncserver-0.9.10-libva-1.0.patch
new file mode 100644
index 000000000000..2e6939e8860f
--- /dev/null
+++ b/net-libs/libvncserver/files/libvncserver-0.9.10-libva-1.0.patch
@@ -0,0 +1,52 @@
+commit 7b6243157f042a7bde353abc6fb22aadad6d9e2d
+Author: Floris Bos <bos@je-eigen-domein.nl>
+Date: 2014-12-29 00:02:33 +0100
+
+ Fix libva related compile errors
+
+ - Make h264.c compile with recent libva version by including va_compat.h
+ - Only enable libva if libva-x11 is installed
+ - Modified configure help text
+ Previous help text suggested libva was only build when --with-libva
+ was specified, while actual behavior is to build it by default.
+
+ Warning: THIS CODE IS UNTESTED. Lacking a h.264 capable VNC server
+ Also no attempt is made to support platforms not using X11
+
+ Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
+
+diff --git a/configure.ac b/configure.ac
+index ca9f3b3..fe8b1de 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -150,12 +150,11 @@ AM_CONDITIONAL(HAVE_LIBSSL, test ! -z "$SSL_LIBS")
+
+
+ # See if we want libva support
+-# TODO: check if library actually exists
+ AH_TEMPLATE(CONFIG_LIBVA, [Build libva support])
+ AC_ARG_WITH(libva,
+-[ --with-libva build libva support],,)
++[ --without-libva disable support for libva],,)
+ if test "x$with_libva" != "xno"; then
+- AC_CHECK_LIB(va, vaInitialize,
++ AC_CHECK_LIB(va-x11, vaGetDisplay,
+ VA_LIBS="-lva -lva-x11"
+ [AC_DEFINE(CONFIG_LIBVA) CONFIG_LIBVA="true"], ,)
+ fi
+diff --git a/libvncclient/h264.c b/libvncclient/h264.c
+index 1d94454..c63a713 100644
+--- a/libvncclient/h264.c
++++ b/libvncclient/h264.c
+@@ -20,6 +20,10 @@
+ #ifdef LIBVNCSERVER_CONFIG_LIBVA
+
+ #include <X11/Xlib.h>
++#include <va/va_version.h>
++#if VA_CHECK_VERSION(0,34,0)
++#include <va/va_compat.h>
++#endif
+ #include <va/va_x11.h>
+
+ enum _slice_types {
+
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch b/net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch
new file mode 100644
index 000000000000..6da3b018af22
--- /dev/null
+++ b/net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch
@@ -0,0 +1,76 @@
+From 66282f58000c8863e104666c30cb67b1d5cbdee3 Mon Sep 17 00:00:00 2001
+From: "Kyle J. McKay" <mackyle@gmail.com>
+Date: Fri, 18 May 2012 00:30:11 -0700
+Subject: [PATCH] libvncserver/sockets.c: do not segfault when
+ listenSock/listen6Sock == -1
+
+---
+ libvncserver/sockets.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libvncserver/sockets.c b/libvncserver/sockets.c
+index 84c9c98..3ff2aac 100644
+--- a/libvncserver/sockets.c
++++ b/libvncserver/sockets.c
+@@ -402,9 +402,9 @@ rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen)
+ rfbLogPerror("rfbProcessNewConnection: error in select");
+ return FALSE;
+ }
+- if (FD_ISSET(rfbScreen->listenSock, &listen_fds))
++ if (rfbScreen->listenSock >= 0 && FD_ISSET(rfbScreen->listenSock, &listen_fds))
+ chosen_listen_sock = rfbScreen->listenSock;
+- if (FD_ISSET(rfbScreen->listen6Sock, &listen_fds))
++ if (rfbScreen->listen6Sock >= 0 && FD_ISSET(rfbScreen->listen6Sock, &listen_fds))
+ chosen_listen_sock = rfbScreen->listen6Sock;
+
+ if ((sock = accept(chosen_listen_sock,
+--
+1.8.5.5
+
+From 584542ba97d35706a9e5c001b5cdf64296b5dd7f Mon Sep 17 00:00:00 2001
+From: Oliver Loch <o.loch@gmx.net>
+Date: Wed, 8 Aug 2012 22:09:13 +0200
+Subject: [PATCH] Patched sockets.c to allow the use of IPv6 without IPv4.
+
+As requested only those lines are indented that have been changed.
+---
+ libvncserver/sockets.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libvncserver/sockets.c b/libvncserver/sockets.c
+index 3ff2aac..15b40ac 100644
+--- a/libvncserver/sockets.c
++++ b/libvncserver/sockets.c
+@@ -176,7 +176,9 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen)
+ rfbScreen->maxFd = max((int)rfbScreen->listen6Sock,rfbScreen->maxFd);
+ #endif
+ }
+- else if(rfbScreen->port>0) {
++ else
++ {
++ if(rfbScreen->port>0) {
+ FD_ZERO(&(rfbScreen->allFds));
+
+ if ((rfbScreen->listenSock = rfbListenOnTCPPort(rfbScreen->port, iface)) < 0) {
+@@ -187,8 +189,10 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen)
+
+ FD_SET(rfbScreen->listenSock, &(rfbScreen->allFds));
+ rfbScreen->maxFd = rfbScreen->listenSock;
++ }
+
+ #ifdef LIBVNCSERVER_IPv6
++ if (rfbScreen->ipv6port>0) {
+ if ((rfbScreen->listen6Sock = rfbListenOnTCP6Port(rfbScreen->ipv6port, rfbScreen->listen6Interface)) < 0) {
+ /* ListenOnTCP6Port has its own detailed error printout */
+ return;
+@@ -197,6 +201,7 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen)
+
+ FD_SET(rfbScreen->listen6Sock, &(rfbScreen->allFds));
+ rfbScreen->maxFd = max((int)rfbScreen->listen6Sock,rfbScreen->maxFd);
++ }
+ #endif
+
+ }
+--
+1.8.5.5
+
diff --git a/net-libs/libvncserver/files/libvncserver-memcpy.patch b/net-libs/libvncserver/files/libvncserver-memcpy.patch
new file mode 100644
index 000000000000..9d30e7e3122a
--- /dev/null
+++ b/net-libs/libvncserver/files/libvncserver-memcpy.patch
@@ -0,0 +1,24 @@
+Fix a buffer overflow on platforms where sizeof(long) > sizeof(int).
+https://bugs.gentoo.org/show_bug.cgi?id=329031
+
+--- libvncserver/tightvnc-filetransfer/filetransfermsg.c
++++ libvncserver/tightvnc-filetransfer/filetransfermsg.c
+@@ -393,7 +393,8 @@
+ CreateFileDownloadZeroSizeDataMsg(unsigned long mTime)
+ {
+ FileTransferMsg fileDownloadZeroSizeDataMsg;
+- int length = sz_rfbFileDownloadDataMsg + sizeof(int);
++ uint32_t mTime32 = (uint32_t)mTime;
++ int length = sz_rfbFileDownloadDataMsg + sizeof(mTime32);
+ rfbFileDownloadDataMsg *pFDD = NULL;
+ char *pFollow = NULL;
+
+@@ -413,7 +414,7 @@
+ pFDD->compressedSize = Swap16IfLE(0);
+ pFDD->realSize = Swap16IfLE(0);
+
+- memcpy(pFollow, &mTime, sizeof(unsigned long));
++ memcpy(pFollow, &mTime, sizeof(mTime32));
+
+ fileDownloadZeroSizeDataMsg.data = pData;
+ fileDownloadZeroSizeDataMsg.length = length;
diff --git a/net-libs/libvncserver/libvncserver-0.9.10-r1.ebuild b/net-libs/libvncserver/libvncserver-0.9.10-r1.ebuild
new file mode 100644
index 000000000000..12f679367ec6
--- /dev/null
+++ b/net-libs/libvncserver/libvncserver-0.9.10-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="library for creating vnc servers"
+HOMEPAGE="http://libvncserver.sourceforge.net/"
+SRC_URI="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+24bpp gcrypt gnutls ipv6 +jpeg +png ssl static-libs test threads vaapi +zlib"
+
+DEPEND="
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ gnutls? (
+ >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
+ >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+ )
+ !gnutls? (
+ ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ )
+ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+ png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
+ vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}-LibVNCServer-${PV}
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+ # https://github.com/LibVNC/libvncserver/issues/11
+ epatch "${FILESDIR}/${P}-libva-1.0.patch"
+
+ sed -i -r \
+ -e "/^SUBDIRS/s:\<$(usex test 'test|' '')client_examples|examples\>::g" \
+ Makefile.am || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-silent-rules \
+ $(use_enable static-libs static) \
+ $(use_with 24bpp) \
+ $(use_with gnutls) \
+ $(usex gnutls --with-gcrypt $(use_with gcrypt)) \
+ $(usex gnutls --without-ssl $(use_with ssl)) \
+ $(use_with ipv6) \
+ $(use_with jpeg) \
+ $(use_with png) \
+ $(use_with threads pthread) \
+ $(use_with vaapi libva) \
+ $(use_with zlib)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/net-libs/libvncserver/libvncserver-0.9.10-r3.ebuild b/net-libs/libvncserver/libvncserver-0.9.10-r3.ebuild
new file mode 100644
index 000000000000..2513920a9deb
--- /dev/null
+++ b/net-libs/libvncserver/libvncserver-0.9.10-r3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="library for creating vnc servers"
+HOMEPAGE="http://libvncserver.sourceforge.net/"
+SRC_URI="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+24bpp gcrypt gnutls ipv6 +jpeg +png ssl static-libs test threads +zlib"
+
+DEPEND="
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ gnutls? (
+ >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
+ >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+ )
+ !gnutls? (
+ ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ )
+ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+ png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}-LibVNCServer-${PV}
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+ # https://github.com/LibVNC/libvncserver/issues/11
+ epatch "${FILESDIR}/${P}-libva-1.0.patch"
+
+ sed -i -r \
+ -e "/^SUBDIRS/s:\<$(usex test '' 'test|')client_examples|examples\>::g" \
+ Makefile.am || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # bug 548012: disable vaapi per upstream
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-silent-rules \
+ --without-libva \
+ $(use_enable static-libs static) \
+ $(use_with 24bpp) \
+ $(use_with gnutls) \
+ $(usex gnutls --with-gcrypt $(use_with gcrypt)) \
+ $(usex gnutls --without-ssl $(use_with ssl)) \
+ $(use_with ipv6) \
+ $(use_with jpeg) \
+ $(use_with png) \
+ $(use_with threads pthread) \
+ $(use_with zlib)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/net-libs/libvncserver/libvncserver-0.9.10.ebuild b/net-libs/libvncserver/libvncserver-0.9.10.ebuild
new file mode 100644
index 000000000000..109f2e0741f1
--- /dev/null
+++ b/net-libs/libvncserver/libvncserver-0.9.10.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="library for creating vnc servers"
+HOMEPAGE="http://libvncserver.sourceforge.net/"
+SRC_URI="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+24bpp gcrypt gnutls ipv6 +jpeg +png ssl static-libs test threads vaapi +zlib"
+
+DEPEND="
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ gnutls? (
+ >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
+ >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+ )
+ !gnutls? (
+ ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ )
+ jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+ png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
+ vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}-LibVNCServer-${PV}
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+ # https://github.com/LibVNC/libvncserver/issues/11
+ epatch "${FILESDIR}/${P}-libva-1.0.patch"
+
+ sed -i -r \
+ -e "/^SUBDIRS/s:\<$(usex test 'test|' '')client_examples|examples\>::g" \
+ Makefile.am || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-silent-rules \
+ $(use_enable static-libs static) \
+ $(use_with 24bpp) \
+ $(use_with gnutls) \
+ $(usex gnutls --with-gcrypt $(use_with gcrypt)) \
+ $(usex gnutls --without-ssl $(use_with ssl)) \
+ $(use_with ipv6) \
+ $(use_with jpeg) \
+ $(use_with png) \
+ $(use_with threads pthread) \
+ $(use_with zlib)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml
new file mode 100644
index 000000000000..5ed648558f0d
--- /dev/null
+++ b/net-libs/libvncserver/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>alex_y_xu@yahoo.ca</email>
+ <name>Alex Xu</name>
+ <description>Proxy maintainer</description>
+ </maintainer>
+ <longdescription>
+If you don't know VNC, have a look at the original VNC or at Tridia
+VNC, who also have commercial support for it.
+
+Now that you know what it is, maybe you want to make your own server. If
+this is not the case, you can ignore the rest of this page an go on
+surfing the internet.
+
+Now that you want to make a VNC server, that is, a server which speaks
+the RFB protocol, you can download this library from sourceforge.
+</longdescription>
+ <use>
+ <flag name="24bpp">enable 24bpp support</flag>
+ <flag name="gcrypt">enable support for gcrypt</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">LibVNC/libvncserver</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libwhisker/Manifest b/net-libs/libwhisker/Manifest
new file mode 100644
index 000000000000..9e0455e44313
--- /dev/null
+++ b/net-libs/libwhisker/Manifest
@@ -0,0 +1 @@
+DIST libwhisker2-2.5.tar.gz 207569 SHA256 f45a1cf2ad2637b29dd1b13d7221ea12e3923ea09d107ced446400f19070a42f SHA512 ea3cfa7658048b23d4fd773db9ee7fde32758096cf7491d309390247648b7635952d734a0918f53109de37cdd87b675843320539db727fd107e81647b13bce10 WHIRLPOOL 7eefdaf357be03599d9d8743b6fbe8ed18f06a6d0ea5106ea32f9014a919fdf468d682cef4b8c8f3b37925fa6bd4dcfdf6d87d8fb87adc015642a15b7a8c2f1b
diff --git a/net-libs/libwhisker/libwhisker-2.5-r1.ebuild b/net-libs/libwhisker/libwhisker-2.5-r1.ebuild
new file mode 100644
index 000000000000..e34fd95eaed3
--- /dev/null
+++ b/net-libs/libwhisker/libwhisker-2.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit perl-module
+MY_P=${PN}2-${PV}
+
+DESCRIPTION="Perl module geared to HTTP testing"
+HOMEPAGE="http://www.wiretrip.net/rfp/lw.asp"
+SRC_URI="http://www.wiretrip.net/rfp/libwhisker/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ssl"
+
+DEPEND=""
+RDEPEND="virtual/perl-MIME-Base64
+ ssl? ( dev-perl/Net-SSLeay )"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+ perl Makefile.pl lib || die
+}
+
+src_install() {
+ perl_set_version
+ insinto "${VENDOR_LIB}"
+ doins LW2.pm
+ dodoc CHANGES KNOWNBUGS README
+}
diff --git a/net-libs/libwhisker/metadata.xml b/net-libs/libwhisker/metadata.xml
new file mode 100644
index 000000000000..74dec4574fe6
--- /dev/null
+++ b/net-libs/libwhisker/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>perl</herd>
+ <longdescription>
+ Libwhisker is a Perl library useful for HTTP testing scripts. It
+ contains a pure-Perl implementation of functionality found in the LWP,
+ URI, Digest::MD5, Digest::MD4, Data::Dumper, Authen::NTLM, HTML::Parser,
+ HTML::FormParser, CGI::Upload, MIME::Base64, and GetOpt::Std modules.
+ Libwhisker is designed to be portable (a single perl file), fast
+ (general benchmarks show libwhisker is faster than LWP), and flexible
+ (great care was taken to ensure the library does exactly what you want
+ to do, even if it means breaking the protocol).
+ </longdescription>
+</pkgmetadata>
diff --git a/net-libs/libyahoo2/Manifest b/net-libs/libyahoo2/Manifest
new file mode 100644
index 000000000000..06aaeb8e3705
--- /dev/null
+++ b/net-libs/libyahoo2/Manifest
@@ -0,0 +1 @@
+DIST libyahoo2-1.0.1.tar.gz 507023 SHA256 6cd2d02369358190e90e5286e7626ea4ff8d4341cdeb98e13f0bfa06852b2aa7
diff --git a/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch b/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch
new file mode 100644
index 000000000000..b05190a02a71
--- /dev/null
+++ b/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch
@@ -0,0 +1,16 @@
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -21,11 +21,9 @@
+ noinst_PROGRAMS = yahoo autoresponder
+
+ yahoo_SOURCES = sample_client.c
+-yahoo_LDADD = libyahoo2.la
+-yahoo_LDFLAGS = -lssl
++yahoo_LDADD = libyahoo2.la -lssl
+
+ autoresponder_SOURCES = autoresponder.c
+-autoresponder_LDADD = libyahoo2.la
+-autoresponder_LDFLAGS = -lssl
++autoresponder_LDADD = libyahoo2.la -lssl
+
+ endif
diff --git a/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild b/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild
new file mode 100644
index 000000000000..8be4c29091dc
--- /dev/null
+++ b/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="interface to the new Yahoo! Messenger protocol"
+HOMEPAGE="http://libyahoo2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libyahoo2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static-libs ssl"
+
+RDEPEND="dev-libs/glib:2
+ ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-asneeded.patch
+ sed -i -e 's:-ansi -pedantic::' configure.ac || die #240912
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable static-libs static) \
+ $(use_enable ssl sample-client)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ if use ssl; then
+ dobin src/.libs/{autoresponder,yahoo} || die
+ fi
+
+ dodoc AUTHORS ChangeLog doc/*.txt NEWS README TODO
+
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+}
diff --git a/net-libs/libyahoo2/metadata.xml b/net-libs/libyahoo2/metadata.xml
new file mode 100644
index 000000000000..a4dd39fe7e4e
--- /dev/null
+++ b/net-libs/libyahoo2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-im</herd>
+ <upstream>
+ <remote-id type="sourceforge">libyahoo2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/libzapojit/Manifest b/net-libs/libzapojit/Manifest
new file mode 100644
index 000000000000..e4b25331380c
--- /dev/null
+++ b/net-libs/libzapojit/Manifest
@@ -0,0 +1 @@
+DIST libzapojit-0.0.3.tar.xz 272108 SHA256 3d25f99329105abb99d1e9651b0aa1842065456ea54c22970a7330e9f3d1c37e SHA512 8dc1006db515a4b2971ebccdcf167930566a11bfe74f545e3a9647ff061be4ac2781faf1adbf6e6107b4ff2e08f16b9ad1f96f9b8e4f0eba87601fdc1c35eaa3 WHIRLPOOL ba5198e4f520475569b495299336755122bdb065ee5065cb3d5912486b6af1b84928de9795309db43011cd5993842ee0e8a274d44eb497be0c3b8993faf5874c
diff --git a/net-libs/libzapojit/libzapojit-0.0.3.ebuild b/net-libs/libzapojit/libzapojit-0.0.3.ebuild
new file mode 100644
index 000000000000..9a6ec16835be
--- /dev/null
+++ b/net-libs/libzapojit/libzapojit-0.0.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
+HOMEPAGE="http://git.gnome.org/browse/libzapojit"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+introspection"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.28:2
+ >=net-libs/libsoup-2.38:2.4
+ dev-libs/json-glib
+ net-libs/rest
+ net-libs/gnome-online-accounts
+
+ introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.11
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+# eautoreconf needs:
+# gnome-base/gnome-common:3
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection)
+}
diff --git a/net-libs/libzapojit/metadata.xml b/net-libs/libzapojit/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/net-libs/libzapojit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/libzrtpcpp/Manifest b/net-libs/libzrtpcpp/Manifest
new file mode 100644
index 000000000000..350f445054fb
--- /dev/null
+++ b/net-libs/libzrtpcpp/Manifest
@@ -0,0 +1,2 @@
+DIST ZRTPCPP-4.2.4.tar.gz 1924579 SHA256 976e24d9e0520fcce77c58c2e1a247988296c517fa980c5abf548f7cd6f06c8d SHA512 cf8ee70891b29b86f252e28f70d546ed150c7c0adcd69f8b3b7b4a6d773f1a6aa7d800fded6dfecb224e1682ea21d3edc8a57a64563b4ac2b300e2dddd594b4a WHIRLPOOL e6f14617a51d3d231a0c60ca12501fbff8256d7d9548a4eca23769efa75ceb86e1da0f7b1b97eaea9584ec175c0d5f596a0c6e001b8cf6ad4372708bd30110e0
+DIST libzrtpcpp-2.3.4.tar.gz 257234 SHA256 03e5d4de487fd154177cf2b7a45600b1c8df783136e4f01a9ebc6104b3771008 SHA512 fbadb826ae26b2729e10d64197c58d545e0e6e7bd9524775cbf4838d2ce3e6ae559932b5c20bb579a3e0cab33abd50251adf129e761cfdcf3fb25347e71ffc36 WHIRLPOOL 9bf31917100605f46242bdc6ab4fc4e7db79f445ceeb23c24b313eb1e010f42b848f1ccbeeedb21a3856cbf9ba1a56091b5e9b272d1c23559bca73ab659babcf
diff --git a/net-libs/libzrtpcpp/libzrtpcpp-2.3.4.ebuild b/net-libs/libzrtpcpp/libzrtpcpp-2.3.4.ebuild
new file mode 100644
index 000000000000..044db2a68f3f
--- /dev/null
+++ b/net-libs/libzrtpcpp/libzrtpcpp-2.3.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"
+HOMEPAGE="http://www.gnutelephony.org/index.php/GNU_ZRTP"
+SRC_URI="mirror://gnu/ccrtp/${P}.tar.gz"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+LICENSE="GPL-3"
+IUSE=""
+SLOT="0"
+
+RDEPEND=">=net-libs/ccrtp-2
+ >=dev-cpp/commoncpp2-1.5.1
+ || (
+ >=dev-libs/openssl-0.9.8[-bindist]
+ dev-libs/libgcrypt:0=
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS README.md )
diff --git a/net-libs/libzrtpcpp/libzrtpcpp-4.2.4.ebuild b/net-libs/libzrtpcpp/libzrtpcpp-4.2.4.ebuild
new file mode 100644
index 000000000000..ccb6256c78b4
--- /dev/null
+++ b/net-libs/libzrtpcpp/libzrtpcpp-4.2.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+MY_P=ZRTPCPP-${PV}
+
+DESCRIPTION="GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"
+HOMEPAGE="http://www.gnutelephony.org/index.php/GNU_ZRTP"
+# https://github.com/wernerd/ZRTPCPP/releases
+SRC_URI="http://dev.gentoo.org/~mgorny/dist/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+LICENSE="GPL-3"
+IUSE="sqlite"
+SLOT="0/4"
+
+RDEPEND="
+ dev-libs/openssl:0=
+ sqlite? ( dev-db/sqlite:3= )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS README.md )
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ # note: building only core since that's what ortp wants
+
+ local mycmakeargs=(
+ -DCORE_LIB=yes
+ -DCRYPTO_STANDALONE=no
+ -DSQLITE=$(usex sqlite)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/net-libs/libzrtpcpp/metadata.xml b/net-libs/libzrtpcpp/metadata.xml
new file mode 100644
index 000000000000..4538a68724a6
--- /dev/null
+++ b/net-libs/libzrtpcpp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
new file mode 100644
index 000000000000..10f26611de42
--- /dev/null
+++ b/net-libs/loudmouth/Manifest
@@ -0,0 +1 @@
+DIST loudmouth-1.4.3.tar.bz2 366818 SHA256 95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3 SHA512 02d1de14a4d626a4c9100bd24c06d4b4203eabb0f95bab40ee18ea5e68ed81d47aa977625140157b2d9f7974ac748af857c2ee3a916f0db700e2a2d0934940ec WHIRLPOOL 4f9e3e8e4f2fd0a36996e84deebeb26c789d5334af11a3d6cc6c742b59508945a6279715f6fbb02bbbc04a0d9709e7aae4cc39803b2a60acfd47d76f0482f969
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-async-fix.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-async-fix.patch
new file mode 100644
index 000000000000..3213d72865aa
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-async-fix.patch
@@ -0,0 +1,30 @@
+--- a/loudmouth/lm-socket.c
++++ b/loudmouth/lm-socket.c
+@@ -1022,7 +1022,7 @@ _lm_socket_create_phase2 (LmSocket *socket, struct addrinfo *ans)
+ if (socket->connect_func) {
+ (socket->connect_func) (socket, FALSE, socket->user_data;
+ }
+- g_free (socket->connect_data);
++ g_free (socket->connect_data);
+ socket->connect_data = NULL;
+ return;
+ }
+@@ -1107,6 +1107,10 @@ lm_socket_create (GMainContext *context,
+ _lm_socket_create_phase1 (socket, NULL, 0);
+ }
+
++#ifndef HAVE_ASYNCNS
++ /* Only do this check if we are not using asyncns or it will crash.
++ * Report and patch by Senko.
++ */
+ if (socket->connect_data == NULL) {
+ /* Open failed synchronously, probably a DNS lookup problem */
+ lm_socket_unref(socket);
+@@ -1118,6 +1122,7 @@ lm_socket_create (GMainContext *context,
+
+ return NULL;
+ }
++#endif /* HAVE_ASYNCNS */
+
+
+ /* If the connection fails synchronously, we don't want to call the
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-asyncns-system.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-asyncns-system.patch
new file mode 100644
index 000000000000..9cf5345e558d
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-asyncns-system.patch
@@ -0,0 +1,83 @@
+diff --git a/configure.ac b/configure.ac
+index 9369e55..17a9e1d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -199,19 +199,31 @@ AM_CONDITIONAL(USE_GNUTLS, test x$enable_ssl = xGnuTLS)
+ dnl +-------------------------------------------------------------------+
+ dnl | Checking for libasyncns |
+ dnl +-------------------------------------------------------------------+
+-AC_ARG_WITH(asyncns, [ --with-asyncns=yes/no define whether to use libasyncns, default=no],
+- ac_asyncns=$withval,
+- ac_asyncns=no
+- )
++AC_ARG_WITH(asyncns,
++ AS_HELP_STRING([--with-asyncns],
++ [define whether to use libasyncns, @<:@default=no@:>@ (internal/system/no)]),
++ ac_asyncns=$withval,
++ ac_asyncns=no)
+
+ enable_asyncns=no
++have_asyncns_system=no
+ if test x$ac_asyncns != xno; then
+ enable_asyncns=yes
+ AC_DEFINE(HAVE_ASYNCNS, 1, [Whether to use libasyncns])
++
++ if test x$ac_asyncns = xsystem; then
++ PKG_CHECK_MODULES(ASYNCNS, [libasyncns >= 0.3],
++ [have_asyncns_system=yes],
++ [have_asyncns_system=no])
++ fi
+ else
+ echo "Not using asynchronous dns lookups"
+ fi
+
++AC_SUBST(ASYNCNS_CFLAGS)
++AC_SUBST(ASYNCNS_LIBS)
++AM_CONDITIONAL(USE_SYSTEM_ASYNCNS, test x$have_asyncns_system = xyes)
++
+ dnl +-------------------------------------------------------------------+
+ dnl | Checking for Linux TCP/IP stack |
+ dnl +-------------------------------------------------------------------+
+diff --git a/loudmouth/Makefile.am b/loudmouth/Makefile.am
+index f73aa0c..e308e1c 100644
+--- a/loudmouth/Makefile.am
++++ b/loudmouth/Makefile.am
+@@ -6,6 +6,7 @@ AM_CPPFLAGS = \
+ -I. \
+ -I$(top_srcdir) \
+ $(LOUDMOUTH_CFLAGS) \
++ $(ASYNCNS_CFLAGS) \
+ $(LIBIDN_CFLAGS) \
+ -DLM_COMPILATION \
+ -DRUNTIME_ENDIAN \
+@@ -51,8 +52,6 @@ libloudmouth_1_la_SOURCES = \
+ lm-sock.c \
+ lm-socket.c \
+ lm-socket.h \
+- asyncns.c \
+- asyncns.h \
+ lm-sasl.c \
+ lm-sasl.h \
+ md5.c \
+@@ -61,6 +60,13 @@ libloudmouth_1_la_SOURCES = \
+ base64.h \
+ $(NULL)
+
++if ! USE_SYSTEM_ASYNCNS
++libloudmouth_1_la_SOURCES += \
++ asyncns.c \
++ asyncns.h \
++ $(NULL)
++endif
++
+ libloudmouthinclude_HEADERS = \
+ lm-connection.h \
+ lm-error.h \
+@@ -75,6 +81,7 @@ libloudmouthinclude_HEADERS = \
+
+ libloudmouth_1_la_LIBADD = \
+ $(LOUDMOUTH_LIBS) \
++ $(ASYNCNS_LIBS) \
+ $(LIBIDN_LIBS) \
+ -lresolv
+
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-drop-stanzas-on-fail.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-drop-stanzas-on-fail.patch
new file mode 100644
index 000000000000..05c76c590b58
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-drop-stanzas-on-fail.patch
@@ -0,0 +1,47 @@
+
+From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+Date: Tue, 13 Jan 2009 11:28:44 +0000
+Subject: [PATCH] Drop stanzas when failing to convert them to LmMessages
+
+when a stanza comes in that for some reason can't be parsed into an LmMessage,
+just drop them on the floor instead of blocking the parser. I've seen this
+issue happen in practise because some (buggy?) client sending an iq with a
+prefix e.g. <client:iq xmlns:client="jabber:client" ... />
+---
+ loudmouth/lm-parser.c | 15 ++++++---------
+ 1 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/loudmouth/lm-parser.c b/loudmouth/lm-parser.c
+index 1938d56..89f6675 100644
+--- a/loudmouth/lm-parser.c
++++ b/loudmouth/lm-parser.c
+@@ -151,19 +151,16 @@ parser_end_node_cb (GMarkupParseContext *context,
+ if (!m) {
+ g_warning ("Couldn't create message: %s\n",
+ parser->cur_root->name);
+- return;
+- }
+-
+- g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
++ } else {
++ g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
+ "Have a new message\n");
+- if (parser->function) {
+- (* parser->function) (parser, m, parser->user_data);
++ if (parser->function) {
++ (* parser->function) (parser, m, parser->user_data);
++ }
++ lm_message_unref (m);
+ }
+
+- lm_message_unref (m);
+ lm_message_node_unref (parser->cur_root);
+-
+-
+ parser->cur_node = parser->cur_root = NULL;
+ } else {
+ LmMessageNode *tmp_node;
+--
+1.5.6.5
+
+
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-fix-sasl-md5-digest-uri.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-fix-sasl-md5-digest-uri.patch
new file mode 100644
index 000000000000..5bca69c0c15e
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-fix-sasl-md5-digest-uri.patch
@@ -0,0 +1,24 @@
+diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c
+index 21c1bc2..ae8de94 100644
+--- a/loudmouth/lm-connection.c
++++ b/loudmouth/lm-connection.c
+@@ -1441,11 +1441,18 @@ lm_connection_authenticate (LmConnection *connection,
+ connection->effective_jid = g_strdup_printf ("%s/%s",
+ connection->jid, connection->resource);
+
+ if (connection->use_sasl) {
++ gchar *domain = NULL;
++
++ if (!connection_get_server_from_jid (connection->jid, &domain)) {
++ domain = g_strdup (connection->server);
++ }
++
+ lm_sasl_authenticate (connection->sasl,
+ username, password,
+- connection->server,
++ domain,
+ connection_sasl_auth_finished);
++ g_free (domain);
+
+ connection->features_cb =
+ lm_message_handler_new (connection_features_cb,
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-free-before-closed.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-free-before-closed.patch
new file mode 100644
index 000000000000..d6c43ae9d66f
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-free-before-closed.patch
@@ -0,0 +1,137 @@
+From ff113220df9073c3e6078487e87b6a7b86e2d952 Mon Sep 17 00:00:00 2001
+From: Mikael Hallendal <micke@imendio.com>
+Date: Sun, 30 Nov 2008 09:27:21 +0100
+Subject: [PATCH] Don't free connection internals before it's closed. [#34]
+
+When the connection freed up internal states (in this case the handler
+lists) before closing itself it segfaulted when trying to unregister the
+SASL handlers.
+
+Reported by Julien Puydt.
+---
+ loudmouth/lm-connection.c | 30 +++++++++++++++++-------------
+ loudmouth/lm-sasl.c | 18 +++++++++---------
+ 2 files changed, 26 insertions(+), 22 deletions(-)
+
+diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c
+index 915c0ad..dda2978 100644
+--- a/loudmouth/lm-connection.c
++++ b/loudmouth/lm-connection.c
+@@ -191,13 +191,21 @@ connection_free (LmConnection *connection)
+ {
+ int i;
+
++ /* This needs to be run before starting to free internal states.
++ * It used to be run after the handlers where freed which lead to a crash
++ * when the connection was freed prior to running lm_connection_close.
++ */
++ if (connection->state >= LM_CONNECTION_STATE_OPENING) {
++ connection_do_close (connection);
++ }
++
+ g_free (connection->server);
+ g_free (connection->jid);
+ g_free (connection->effective_jid);
+ g_free (connection->stream_id);
+ g_free (connection->resource);
+
+- if (connection->sasl) {
++ if (connection->sasl) {
+ lm_sasl_free (connection->sasl);
+ }
+
+@@ -218,13 +226,9 @@ connection_free (LmConnection *connection)
+
+ g_slist_free (connection->handlers[i]);
+ }
+-
+ g_hash_table_destroy (connection->id_handlers);
+- if (connection->state >= LM_CONNECTION_STATE_OPENING) {
+- connection_do_close (connection);
+- }
+
+- if (connection->open_cb) {
++ if (connection->open_cb) {
+ _lm_utils_free_callback (connection->open_cb);
+ }
+
+@@ -2030,11 +2034,11 @@ lm_connection_unregister_message_handler (LmConnection *connection,
+ g_return_if_fail (handler != NULL);
+ g_return_if_fail (type != LM_MESSAGE_TYPE_UNKNOWN);
+
+- for (l = connection->handlers[type]; l; l = l->next) {
+- HandlerData *hd = (HandlerData *) l->data;
+-
++ for (l = connection->handlers[type]; l; l = l->next) {
++ HandlerData *hd = (HandlerData *) l->data;
++
+ if (handler == hd->handler) {
+- connection->handlers[type] = g_slist_remove_link (connection->handlers[type], l);
++ connection->handlers[type] = g_slist_remove_link (connection->handlers[type], l);
+ g_slist_free (l);
+ lm_message_handler_unref (hd->handler);
+ g_free (hd);
+@@ -2140,7 +2144,7 @@ lm_connection_ref (LmConnection *connection)
+ g_return_val_if_fail (connection != NULL, NULL);
+
+ connection->ref_count++;
+-
++
+ return connection;
+ }
+
+@@ -2157,8 +2161,8 @@ lm_connection_unref (LmConnection *connection)
+ g_return_if_fail (connection != NULL);
+
+ connection->ref_count--;
+-
++
+ if (connection->ref_count == 0) {
+- connection_free (connection);
++ connection_free (connection);
+ }
+ }
+diff --git a/loudmouth/lm-sasl.c b/loudmouth/lm-sasl.c
+index 42ee0e1..e6a72f5 100644
+--- a/loudmouth/lm-sasl.c
++++ b/loudmouth/lm-sasl.c
+@@ -807,27 +807,27 @@ lm_sasl_free (LmSASL *sasl)
+ g_free (sasl->server);
+
+ if (sasl->features_cb) {
+- lm_connection_unregister_message_handler (sasl->connection,
+- sasl->features_cb,
+- LM_MESSAGE_TYPE_STREAM_FEATURES);
++ lm_connection_unregister_message_handler (sasl->connection,
++ sasl->features_cb,
++ LM_MESSAGE_TYPE_STREAM_FEATURES);
+ }
+
+ if (sasl->challenge_cb) {
+ lm_connection_unregister_message_handler (sasl->connection,
+- sasl->challenge_cb,
+- LM_MESSAGE_TYPE_CHALLENGE);
++ sasl->challenge_cb,
++ LM_MESSAGE_TYPE_CHALLENGE);
+ }
+
+ if (sasl->success_cb) {
+ lm_connection_unregister_message_handler (sasl->connection,
+- sasl->success_cb,
+- LM_MESSAGE_TYPE_SUCCESS);
++ sasl->success_cb,
++ LM_MESSAGE_TYPE_SUCCESS);
+ }
+
+ if (sasl->failure_cb) {
+ lm_connection_unregister_message_handler (sasl->connection,
+- sasl->failure_cb,
+- LM_MESSAGE_TYPE_FAILURE);
++ sasl->failure_cb,
++ LM_MESSAGE_TYPE_FAILURE);
+ }
+
+ g_free (sasl);
+--
+1.7.7.1
+
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-glib-2.32.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-glib-2.32.patch
new file mode 100644
index 000000000000..87fc170c80da
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-glib-2.32.patch
@@ -0,0 +1,13 @@
+Index: loudmouth-1.4.3/loudmouth/lm-error.c
+===================================================================
+--- loudmouth-1.4.3.orig/loudmouth/lm-error.c
++++ loudmouth-1.4.3/loudmouth/lm-error.c
+@@ -19,7 +19,7 @@
+ */
+
+ #include <config.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include "lm-error.h"
+
+ /**
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-gnutls28.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-gnutls28.patch
new file mode 100644
index 000000000000..a538533db03b
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-gnutls28.patch
@@ -0,0 +1,15 @@
+# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=272027
+# Patch from mandriva
+--- a/configure.ac 2009-05-30 17:59:03.000000000 +0200
++++ b/configure.ac 2009-05-30 18:02:24.000000000 +0200
+@@ -146,8 +146,9 @@
+ enable_ssl=no
+ if test "x$ac_ssl" = "xgnutls"; then
+ dnl Look for GnuTLS
+- AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no)
++ PKG_CHECK_EXISTS([gnutls >= $GNUTLS_REQUIRED], have_libgnutls=yes, have_libgnutls=no)
+ if test "x$have_libgnutls" = "xyes"; then
++ PKG_CHECK_MODULES(LIBGNUTLS, [gnutls >= $GNUTLS_REQUIRED])
+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+ LIBS="$LIBS $LIBGNUTLS_LIBS"
+ AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-id-tag-in-opening-headers.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-id-tag-in-opening-headers.patch
new file mode 100644
index 000000000000..43b923a5e73f
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-id-tag-in-opening-headers.patch
@@ -0,0 +1,35 @@
+From 6f3a168d985d37af42e747412b5d6d427b4d1ab8 Mon Sep 17 00:00:00 2001
+From: Will Thompson <will.thompson@collabora.co.uk>
+Date: Wed, 5 Nov 2008 23:19:42 +0100
+Subject: [PATCH] Don't append the 'id'-tag in opening stream headers. [#30]
+
+According to RFC 3920 (section 4.4) the id attribute SHOULD NOT be added
+by the initiating party.
+
+[#30 responsible:Hallski state:resolved milestone:Loudmouth 1.4.4 tagged:committed]
+---
+ loudmouth/lm-message.c | 8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/loudmouth/lm-message.c b/loudmouth/lm-message.c
+index a7d1b46..e2fdcc2 100644
+--- a/loudmouth/lm-message.c
++++ b/loudmouth/lm-message.c
+@@ -223,9 +223,11 @@ lm_message_new (const gchar *to, LmMessageType type)
+
+ m->node = _lm_message_node_new (_lm_message_type_to_string (type));
+
+- id = _lm_utils_generate_id ();
+- lm_message_node_set_attribute (m->node, "id", id);
+- g_free (id);
++ if (type != LM_MESSAGE_TYPE_STREAM) {
++ id = _lm_utils_generate_id ();
++ lm_message_node_set_attribute (m->node, "id", id);
++ g_free (id);
++ }
+
+ if (to) {
+ lm_message_node_set_attribute (m->node, "to", to);
+--
+1.7.7.1
+
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-invalid-unicode.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-invalid-unicode.patch
new file mode 100644
index 000000000000..2a97653c93cd
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-invalid-unicode.patch
@@ -0,0 +1,144 @@
+From e08dbcca6cf50c834e2fe4e7290cce642903251d Mon Sep 17 00:00:00 2001
+From: Hermitifier <quantifier666@gmail.com>
+Date: Mon, 3 Oct 2011 17:06:18 +0200
+Subject: [PATCH] Protect GMarkup parser against invalid unicode characters
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 1.4.3]
+
+http://loudmouth.lighthouseapp.com/projects/17276/tickets/61
+---
+ loudmouth/lm-parser.c | 94 ++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 85 insertions(+), 9 deletions(-)
+
+diff --git a/loudmouth/lm-parser.c b/loudmouth/lm-parser.c
+index 89f6675..0a61a56 100644
+--- a/loudmouth/lm-parser.c
++++ b/loudmouth/lm-parser.c
+@@ -43,6 +43,8 @@ struct LmParser {
+
+ GMarkupParser *m_parser;
+ GMarkupParseContext *context;
++ gchar *incomplete; /* incomplete utf-8 character
++ found at the end of buffer */
+ };
+
+
+@@ -233,25 +235,98 @@ lm_parser_new (LmParserMessageFunction function,
+ parser->cur_root = NULL;
+ parser->cur_node = NULL;
+
++ parser->incomplete = NULL;
++
+ return parser;
+ }
+
++static gchar *
++_lm_parser_make_valid (const gchar *buffer, gchar **incomplete)
++{
++ GString *string;
++ const gchar *remainder, *invalid;
++ gint remaining_bytes, valid_bytes;
++ gunichar code; /*error code for invalid character*/
++
++ g_return_val_if_fail (buffer != NULL, NULL);
++
++ string = NULL;
++ remainder = buffer;
++ remaining_bytes = strlen (buffer);
++
++ while (remaining_bytes != 0)
++ {
++ if (g_utf8_validate (remainder, remaining_bytes, &invalid))
++ break;
++ valid_bytes = invalid - remainder;
++
++ if (string == NULL)
++ string = g_string_sized_new (remaining_bytes);
++
++ g_string_append_len (string, remainder, valid_bytes);
++
++ remainder = g_utf8_find_next_char(invalid, NULL);
++ remaining_bytes -= valid_bytes + (remainder - invalid);
++
++ code = g_utf8_get_char_validated (invalid, -1);
++
++ if (code == -1) {
++ /* A complete but invalid codepoint */
++ /* append U+FFFD REPLACEMENT CHARACTER */
++ g_string_append (string, "\357\277\275");
++#ifndef LM_NO_DEBUG
++ g_debug ("invalid character!\n");
++#endif
++ } else if (code == -2) {
++ /* Beginning of what could be a character */
++ *incomplete = g_strdup (invalid);
++#ifndef LM_NO_DEBUG
++ g_debug ("incomplete character: %s\n", *incomplete);
++#endif
++
++ g_assert (remaining_bytes == 0);
++ g_assert (*(g_utf8_find_next_char(invalid, NULL)) == '\0');
++ }
++ }
++
++ if (string == NULL)
++ return g_strdup (buffer);
++
++ g_string_append (string, remainder);
++
++ g_assert (g_utf8_validate (string->str, -1, NULL));
++
++ return g_string_free (string, FALSE);
++}
++
++
+ void
+ lm_parser_parse (LmParser *parser, const gchar *string)
+ {
++ gchar *valid, *completed;
+ g_return_if_fail (parser != NULL);
+
+- if (!parser->context) {
+- parser->context = g_markup_parse_context_new (parser->m_parser, 0,
+- parser, NULL);
+- }
+-
+- if (g_markup_parse_context_parse (parser->context, string,
+- (gssize)strlen (string), NULL)) {
+- } else {
++ if (!parser->context) {
++ parser->context = g_markup_parse_context_new (parser->m_parser, 0,
++ parser, NULL);
++ }
++
++ if (parser->incomplete) {
++ completed = g_strdup_printf("%s%s", parser->incomplete, string);
++ g_free(parser->incomplete);
++ parser->incomplete = NULL;
++ } else {
++ completed = g_strdup(string);
++ }
++ valid = _lm_parser_make_valid (completed, &parser->incomplete);
++ g_free(completed);
++ if (g_markup_parse_context_parse (parser->context, valid,
++ (gssize)strlen (valid), NULL)) {
++ } else {
+ g_markup_parse_context_free (parser->context);
+ parser->context = NULL;
+- }
++ }
++ g_free(valid);
+ }
+
+ void
+@@ -264,6 +339,7 @@ lm_parser_free (LmParser *parser)
+ if (parser->context) {
+ g_markup_parse_context_free (parser->context);
+ }
++ g_free (parser->incomplete);
+ g_free (parser->m_parser);
+ g_free (parser);
+ }
+--
+1.7.7.1
+
diff --git a/net-libs/loudmouth/files/loudmouth-1.4.3-silence-chdir.patch b/net-libs/loudmouth/files/loudmouth-1.4.3-silence-chdir.patch
new file mode 100644
index 000000000000..0ee8c940fade
--- /dev/null
+++ b/net-libs/loudmouth/files/loudmouth-1.4.3-silence-chdir.patch
@@ -0,0 +1,33 @@
+From 4d8a5ea64abb65ed086efc3e32125c529068acbe Mon Sep 17 00:00:00 2001
+From: Mikael Hallendal <micke@imendio.com>
+Date: Wed, 19 Nov 2008 10:16:40 +0100
+Subject: [PATCH] Silence chdir by catching return value
+
+---
+ loudmouth/asyncns.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/loudmouth/asyncns.c b/loudmouth/asyncns.c
+index 9b238fa..55cb471 100644
+--- a/loudmouth/asyncns.c
++++ b/loudmouth/asyncns.c
+@@ -382,6 +382,7 @@ static int process_worker(int in_fd, int out_fd) {
+ int have_death_sig = 0;
+ assert(in_fd > 2);
+ assert(out_fd > 2);
++ int no_warn;
+
+ close(0);
+ close(1);
+@@ -391,7 +392,7 @@ static int process_worker(int in_fd, int out_fd) {
+ open("/dev/null", O_WRONLY);
+ open("/dev/null", O_WRONLY);
+
+- chdir("/");
++ no_warn = chdir("/");
+
+ if (geteuid() == 0) {
+ struct passwd *pw;
+--
+1.7.7.1
+
diff --git a/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild b/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild
new file mode 100644
index 000000000000..0a1453575be9
--- /dev/null
+++ b/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
+# Not using gnome macro, but behavior is similar, #434736
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Lightweight C Jabber library"
+HOMEPAGE="https://github.com/engineyard/loudmouth"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~ppc-macos"
+
+IUSE="asyncns ssl static-libs test"
+
+# Automagic libidn dependency
+RDEPEND="
+ >=dev-libs/glib-2.4:2
+ net-dns/libidn
+ ssl? ( >=net-libs/gnutls-1.4.0 )
+ asyncns? ( net-libs/libasyncns )
+"
+# FIXME:
+# openssl dropped because of bug #216705
+
+DEPEND="${RDEPEND}
+ test? ( dev-libs/check )
+ virtual/pkgconfig
+ >=dev-util/gtk-doc-am-1
+"
+
+src_prepare() {
+ # Use system libasyncns, bug #236844
+ epatch "${FILESDIR}/${P}-asyncns-system.patch"
+
+ # Fix detection of gnutls-2.8, bug #272027
+ epatch "${FILESDIR}/${P}-gnutls28.patch"
+
+ # Fix digest auth with SRV (or similar)
+ # Upstream: http://loudmouth.lighthouseapp.com/projects/17276-libloudmouth/tickets/44-md5-digest-uri-not-set-correctly-when-using-srv
+ epatch "${FILESDIR}/${P}-fix-sasl-md5-digest-uri.patch"
+
+ # Drop stanzas when failing to convert them to LmMessages
+ # From debian..
+ epatch "${FILESDIR}/${P}-drop-stanzas-on-fail.patch"
+
+ # Don't check for sync dns problems when using asyncns [#33]
+ # From debian..
+ epatch "${FILESDIR}/${P}-async-fix.patch"
+
+ # Don't append id tag in opening headers [#30]
+ epatch "${FILESDIR}/${P}-id-tag-in-opening-headers.patch"
+
+ # Silence chdir, from engineyard git
+ epatch "${FILESDIR}/${P}-silence-chdir.patch"
+
+ # Don't free connection internals before connection is closed [#34]
+ epatch "${FILESDIR}/${P}-free-before-closed.patch"
+
+ # Check for invalid utf8, bug #389127
+ # Upstream: http://loudmouth.lighthouseapp.com/projects/17276/tickets/61
+ epatch "${FILESDIR}/${P}-invalid-unicode.patch"
+
+ # http://loudmouth.lighthouseapp.com/projects/17276/tickets/63
+ epatch "${FILESDIR}/${P}-glib-2.32.patch"
+
+ sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467694
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf
+
+ if use ssl; then
+ myconf="${myconf} --with-ssl=gnutls"
+ else
+ myconf="${myconf} --with-ssl=no"
+ fi
+
+ if use asyncns; then
+ myconf="${myconf} --with-asyncns=system"
+ else
+ myconf="${myconf} --without-asyncns"
+ fi
+ gnome2_src_configure \
+ $(use_enable static-libs static) \
+ ${myconf}
+}
diff --git a/net-libs/loudmouth/metadata.xml b/net-libs/loudmouth/metadata.xml
new file mode 100644
index 000000000000..fcbfe25fc1fc
--- /dev/null
+++ b/net-libs/loudmouth/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">engineyard/loudmouth</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/meanwhile/Manifest b/net-libs/meanwhile/Manifest
new file mode 100644
index 000000000000..429a98222080
--- /dev/null
+++ b/net-libs/meanwhile/Manifest
@@ -0,0 +1 @@
+DIST meanwhile-1.0.2.tar.gz 479325 SHA256 38a8059eaa549cbcb45ca0a5b453e9608ceadab360db2ae14581fb22ddabdf23 SHA512 ba356124352ed522bc4c62282e4267960e0d3751c990cc422957ae263c70932264dee2d5e3dfe436325ad53f1833ff541eda4b36a6b78441374256ef54c786e6 WHIRLPOOL 2edce25025baa4c2aecb534a8f0417687b97de808b2fac09bd8370e081a18d42e69f67279e7a6e20b7f06952ab654fb2b7caf63ac3a902b00088127863cd48c1
diff --git a/net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch b/net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch
new file mode 100644
index 000000000000..4ffcc3672fc7
--- /dev/null
+++ b/net-libs/meanwhile/files/meanwhile-1.0.2-glib2.31.patch
@@ -0,0 +1,213 @@
+diff -uNr meanwhile-1.0.2/src/channel.c meanwhile-1.0.2-r1/src/channel.c
+--- meanwhile-1.0.2/src/channel.c 2005-12-08 23:04:46.000000000 +0100
++++ meanwhile-1.0.2-r1/src/channel.c 2012-03-20 21:15:03.000000000 +0100
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+diff -uNr meanwhile-1.0.2/src/mw_debug.c meanwhile-1.0.2-r1/src/mw_debug.c
+--- meanwhile-1.0.2/src/mw_debug.c 2005-12-03 04:46:10.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_debug.c 2012-03-20 21:12:09.000000000 +0100
+@@ -19,7 +19,7 @@
+ */
+
+
+-#include <glib/gstring.h>
++#include <glib.h>
+
+ #include "mw_debug.h"
+
+diff -uNr meanwhile-1.0.2/src/mw_message.h meanwhile-1.0.2-r1/src/mw_message.h
+--- meanwhile-1.0.2/src/mw_message.h 2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_message.h 2012-03-20 21:06:28.000000000 +0100
+@@ -22,7 +22,7 @@
+ #define _MW_MESSAGE_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+diff -uNr meanwhile-1.0.2/src/mw_srvc_conf.h meanwhile-1.0.2-r1/src/mw_srvc_conf.h
+--- meanwhile-1.0.2/src/mw_srvc_conf.h 2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_srvc_conf.h 2012-03-20 21:08:01.000000000 +0100
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_CONF_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+diff -uNr meanwhile-1.0.2/src/mw_srvc_dir.h meanwhile-1.0.2-r1/src/mw_srvc_dir.h
+--- meanwhile-1.0.2/src/mw_srvc_dir.h 2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_srvc_dir.h 2012-03-20 21:08:23.000000000 +0100
+@@ -22,7 +22,6 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+
+ #ifdef __cplusplus
+diff -uNr meanwhile-1.0.2/src/mw_srvc_place.h meanwhile-1.0.2-r1/src/mw_srvc_place.h
+--- meanwhile-1.0.2/src/mw_srvc_place.h 2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_srvc_place.h 2012-03-20 21:09:51.000000000 +0100
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_PLACE_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+diff -uNr meanwhile-1.0.2/src/mw_srvc_resolve.h meanwhile-1.0.2-r1/src/mw_srvc_resolve.h
+--- meanwhile-1.0.2/src/mw_srvc_resolve.h 2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_srvc_resolve.h 2012-03-20 21:10:54.000000000 +0100
+@@ -23,7 +23,6 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+
+ #ifdef __cplusplus
+diff -uNr meanwhile-1.0.2/src/mw_st_list.h meanwhile-1.0.2-r1/src/mw_st_list.h
+--- meanwhile-1.0.2/src/mw_st_list.h 2005-12-15 01:30:28.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_st_list.h 2012-03-20 21:11:27.000000000 +0100
+@@ -30,7 +30,6 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include "mw_common.h"
+
+
+diff -uNr meanwhile-1.0.2/src/mw_util.h meanwhile-1.0.2-r1/src/mw_util.h
+--- meanwhile-1.0.2/src/mw_util.h 2004-12-28 21:41:26.000000000 +0100
++++ meanwhile-1.0.2-r1/src/mw_util.h 2012-03-20 21:06:54.000000000 +0100
+@@ -23,8 +23,6 @@
+
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+
+
+ #define map_guint_new() \
+diff -uNr meanwhile-1.0.2/src/srvc_aware.c meanwhile-1.0.2-r1/src/srvc_aware.c
+--- meanwhile-1.0.2/src/srvc_aware.c 2005-12-08 23:02:11.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_aware.c 2012-03-20 21:07:22.000000000 +0100
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+diff -uNr meanwhile-1.0.2/src/srvc_conf.c meanwhile-1.0.2-r1/src/srvc_conf.c
+--- meanwhile-1.0.2/src/srvc_conf.c 2005-12-28 03:46:54.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_conf.c 2012-03-20 21:07:42.000000000 +0100
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -uNr meanwhile-1.0.2/src/srvc_dir.c meanwhile-1.0.2-r1/src/srvc_dir.c
+--- meanwhile-1.0.2/src/srvc_dir.c 2005-09-15 22:30:20.000000000 +0200
++++ meanwhile-1.0.2-r1/src/srvc_dir.c 2012-03-20 21:08:44.000000000 +0100
+@@ -18,7 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <glib/ghash.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_common.h"
+diff -uNr meanwhile-1.0.2/src/srvc_ft.c meanwhile-1.0.2-r1/src/srvc_ft.c
+--- meanwhile-1.0.2/src/srvc_ft.c 2005-09-15 22:30:37.000000000 +0200
++++ meanwhile-1.0.2-r1/src/srvc_ft.c 2012-03-20 21:09:05.000000000 +0100
+@@ -19,7 +19,7 @@
+ */
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_common.h"
+diff -uNr meanwhile-1.0.2/src/srvc_im.c meanwhile-1.0.2-r1/src/srvc_im.c
+--- meanwhile-1.0.2/src/srvc_im.c 2005-12-28 03:46:54.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_im.c 2012-03-20 21:09:31.000000000 +0100
+@@ -19,7 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+diff -uNr meanwhile-1.0.2/src/srvc_place.c meanwhile-1.0.2-r1/src/srvc_place.c
+--- meanwhile-1.0.2/src/srvc_place.c 2005-12-03 03:00:29.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_place.c 2012-03-20 21:10:05.000000000 +0100
+@@ -19,8 +19,7 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
++
+
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -uNr meanwhile-1.0.2/src/srvc_resolve.c meanwhile-1.0.2-r1/src/srvc_resolve.c
+--- meanwhile-1.0.2/src/srvc_resolve.c 2005-10-27 02:10:06.000000000 +0200
++++ meanwhile-1.0.2-r1/src/srvc_resolve.c 2012-03-20 21:10:21.000000000 +0100
+@@ -18,7 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <glib/ghash.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_common.h"
+diff -uNr meanwhile-1.0.2/src/srvc_store.c meanwhile-1.0.2-r1/src/srvc_store.c
+--- meanwhile-1.0.2/src/srvc_store.c 2005-11-19 02:52:42.000000000 +0100
++++ meanwhile-1.0.2-r1/src/srvc_store.c 2012-03-20 21:11:13.000000000 +0100
+@@ -18,7 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <glib/glist.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_debug.h"
+diff -uNr meanwhile-1.0.2/src/st_list.c meanwhile-1.0.2-r1/src/st_list.c
+--- meanwhile-1.0.2/src/st_list.c 2005-12-08 23:01:27.000000000 +0100
++++ meanwhile-1.0.2-r1/src/st_list.c 2012-03-20 21:11:44.000000000 +0100
+@@ -20,7 +20,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+
+ #include "mw_debug.h"
+ #include "mw_util.h"
diff --git a/net-libs/meanwhile/files/meanwhile-1.0.2-presence.patch b/net-libs/meanwhile/files/meanwhile-1.0.2-presence.patch
new file mode 100644
index 000000000000..e01089eda91c
--- /dev/null
+++ b/net-libs/meanwhile/files/meanwhile-1.0.2-presence.patch
@@ -0,0 +1,42 @@
+# User Mikael Berthe <mikael.berthe@lilotux.net>
+# Date 1194208892 -3600
+Fix Awareness Snapshots with recent Sametime servers
+
+With recent Sametime servers there seem to be 2 bytes
+after the Snapshot Message Blocks.
+This patch tries to use the end of block offset provided
+by the server.
+
+diff -r be8d8f1d3ebc src/common.c
+--- a/src/common.c Sun Nov 04 18:48:00 2007 +0100
++++ b/src/common.c Tue Nov 06 11:46:26 2007 +0100
+@@ -878,23 +878,24 @@ gboolean mwAwareIdBlock_equal(const stru
+ /* 8.4.2.4 Snapshot */
+
+ void mwAwareSnapshot_get(struct mwGetBuffer *b, struct mwAwareSnapshot *idb) {
+- guint32 junk;
+- char *empty = NULL;
++ guint32 end_of_block;
+
+ g_return_if_fail(b != NULL);
+ g_return_if_fail(idb != NULL);
+
+- guint32_get(b, &junk);
++ guint32_get(b, &end_of_block);
+ mwAwareIdBlock_get(b, &idb->id);
+ mwString_get(b, &idb->group);
+ gboolean_get(b, &idb->online);
+-
+- g_free(empty);
+
+ if(idb->online) {
+ mwString_get(b, &idb->alt_id);
+ mwUserStatus_get(b, &idb->status);
+ mwString_get(b, &idb->name);
++ }
++
++ if( b->ptr < b->buf + end_of_block ) {
++ mwGetBuffer_advance(b, b->buf + end_of_block - b->ptr);
+ }
+ }
+
diff --git a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..516115425ddc
--- /dev/null
+++ b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Meanwhile (Sametime protocol) library"
+HOMEPAGE="http://meanwhile.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+IUSE="doc debug"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+
+RDEPEND=">=dev-libs/glib-2:2"
+
+DEPEND="${RDEPEND}
+ dev-libs/gmp
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+src_prepare(){
+ epatch "${FILESDIR}/${P}-presence.patch" #239144
+ epatch "${FILESDIR}/${P}-glib2.31.patch" #409081
+
+ #241298
+ sed -i -e "/sampledir/ s:-doc::" samples/Makefile.in || die
+}
+
+src_configure() {
+ local myconf
+ use doc || myconf="${myconf} --enable-doxygen=no"
+
+ econf ${myconf} \
+ --disable-static \
+ $(use_enable debug)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+ dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/net-libs/meanwhile/metadata.xml b/net-libs/meanwhile/metadata.xml
new file mode 100644
index 000000000000..1985a4043787
--- /dev/null
+++ b/net-libs/meanwhile/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ <name>Default assignee for orphaned packages</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">meanwhile</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/metadata.xml b/net-libs/metadata.xml
new file mode 100644
index 000000000000..80be98ec6ff5
--- /dev/null
+++ b/net-libs/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The net-libs category contains libraries that are network-related.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie net-libs enthält Bibliotheken zur Netzwerkprogrammierung.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría net-libs contiene librerías relacionadas con las redes.
+ </longdescription>
+ <longdescription lang="ja">
+ net-libsカテゴリーにはネットワーク関連のライブラリが含まれています。
+ </longdescription>
+ <longdescription lang="nl">
+ De net-libs categorie bevat bibliotheken voor netwerk-gebruik.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm net-libs chứa các thư viện về mạng.
+ </longdescription>
+ <longdescription lang="it">
+ La categoria net-libs contiene librerie per le reti.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria net-libs contém bibliotecas relacionadas a redes.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria net-libs zawiera związane z siecią biblioteki.
+ </longdescription>
+</catmetadata>
+
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
new file mode 100644
index 000000000000..31c0e459e0ab
--- /dev/null
+++ b/net-libs/miniupnpc/Manifest
@@ -0,0 +1,5 @@
+DIST miniupnpc-1.6.20120509.tar.gz 68205 SHA256 cd023862ae3882246102594fda7dc5efd4feb2531bf7903abc62aa02e76193d8 SHA512 7d6a73676c1ed7e9c54ea1cd1214adb27da432b92a7fa102f1e9c10cf78d30d9a0a7b96dca30de36fce7ca7e66890170d9af78550df220c7d233c69e44917e8d WHIRLPOOL 5a998f2b143ce7deeaba58efe678a8386babc8b58ee5a83e5ba4f5767e7077ac0a741b9b4a685de8d0ed16b6579ea3e706fb12255ee8f989dfd738ee305c73ab
+DIST miniupnpc-1.6.tar.gz 66454 SHA256 bbd6b756e6af44b5a5b0f9b93eada3fb8922ed1d6451b7d6f184d0ae0c813994 SHA512 c635057e40aa2826fb07db51c474a335cbcecbf7bba09773826b1aff4a01024dced8a6122e2b90db544540ae499b687006392d6041f7605467b73111ccb368a8 WHIRLPOOL 13b01fd4afcb05bd3f046e00b9d86c1c1655a262dcce5c50865ad93bae4028de8e16417ee5d3219971979ec2128c71bec03d8efc350157f2fb4744ca2757a597
+DIST miniupnpc-1.7.tar.gz 68327 SHA256 16dd2456be9b4bf290667c00eeb38c77ad47eb2107569b2dadcfcee8c9af6337 SHA512 ad2a689e91da068f2e291336cced9933963c2adc619b5e82dbb684e496d3683adba6a4634dd17265bf8dcc9d8f6c783b66aee1803ce63383997c27de3c16b194 WHIRLPOOL e9c7eed931fa1247ecfa8d9064d6890f6acca7ff41d79ec32716568f78317d972e14ecdee005a61e2a01914c984d0e18c63607ef9e79fef5a3974a8ca7586909
+DIST miniupnpc-1.8.tar.gz 70624 SHA256 bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c SHA512 8eedac9ad473fc952ca8896fe534d6da6b1b234e8b6f35f721394d4c71aca84ed287ca6c4f0455b50d97a45e4cd34e27d99a6813386e0864781364aa607e13d4 WHIRLPOOL 5b76ccbb5ed7daa9bb0d481b424b7c31a5f6dc85c5c812ba10175a29aefc0d3924f3db2aa8c3529d1241be59d67d1d4c702d27aad2de8c8a07fecf3857d73169
+DIST miniupnpc-1.9.20150427.tar.gz 78424 SHA256 b3207ddc0b0001887d6a29260e8d609d0ad2c35bec99a2358281bb8951919837 SHA512 463758b3c104cdc768d99e044acdf607d457eaaefec12fc20e0086de523b9c61ed6354dd2269052ae367b22957158fd813440dce4f51a8d60f8d251d2c85f336 WHIRLPOOL e6f635d1dd5e728a75e9852e0f2e0e6b8c3dfb200d479133fd183e8741628d7c0dd016ffacc7d0d2bfb13798cd7d2e57b26b48a36e1555c721b4c58038c1c5ee
diff --git a/net-libs/miniupnpc/metadata.xml b/net-libs/miniupnpc/metadata.xml
new file mode 100644
index 000000000000..f38aad4d9e51
--- /dev/null
+++ b/net-libs/miniupnpc/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+</maintainer>
+<maintainer>
+ <email>nikoli@gmx.us</email>
+ <name>Nikoli</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-libs/miniupnpc/miniupnpc-1.6-r1.ebuild b/net-libs/miniupnpc/miniupnpc-1.6-r1.ebuild
new file mode 100644
index 000000000000..672fb105b398
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-1.6-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit base toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="static-libs"
+
+RESTRICT="test"
+
+DEPEND="kernel_linux? ( sys-apps/lsb-release )"
+RDEPEND=""
+
+src_prepare() {
+ base_src_prepare
+
+ sed \
+ -e 's/^CFLAGS ?= -O -Wall /CFLAGS += /' \
+ -i Makefile || die
+
+ if use !static-libs; then
+ sed \
+ -e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+ -e '/$(INSTALL) -m 644 $(LIBRARY) $(INSTALLDIRLIB)/d' \
+ -i Makefile || die
+ fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake \
+ PREFIX="${D}" \
+ INSTALLDIRLIB="${D}usr/$(get_libdir)" \
+ install
+
+ dodoc README Changelog.txt
+ doman man3/*
+}
+
+pkg_postinst() {
+ elog "Please note that the python counterpart has been moved to"
+ elog " dev-python/miniupnpc"
+}
diff --git a/net-libs/miniupnpc/miniupnpc-1.6.20120509.ebuild b/net-libs/miniupnpc/miniupnpc-1.6.20120509.ebuild
new file mode 100644
index 000000000000..046899595a2d
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-1.6.20120509.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit multilib toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="kernel_linux static-libs"
+
+RESTRICT="test" #409349
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+ sed -i -e '/CFLAGS.*-O/d' Makefile || die
+
+ if ! use static-libs; then
+ sed -i \
+ -e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+ -e '/$(INSTALL) -m 644 $(LIBRARY) $(INSTALLDIRLIB)/d' \
+ Makefile || die
+ fi
+}
+
+src_compile() {
+ tc-export CC
+ emake upnpc-shared $(use static-libs && echo upnpc-static)
+}
+
+src_install() {
+ emake PREFIX="${D}" INSTALLDIRLIB="${D}/usr/$(get_libdir)" install
+ dodoc Changelog.txt
+}
diff --git a/net-libs/miniupnpc/miniupnpc-1.7.ebuild b/net-libs/miniupnpc/miniupnpc-1.7.ebuild
new file mode 100644
index 000000000000..696ea54a4d09
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-1.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="kernel_linux static-libs"
+
+RESTRICT="test" #409349
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+ epatch_user
+
+ sed -i -e '/CFLAGS.*-O/d' Makefile || die
+ if ! use static-libs; then
+ sed -i \
+ -e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+ -e '/$(INSTALL) -m 644 $(LIBRARY) $(INSTALLDIRLIB)/d' \
+ Makefile || die
+ fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+ tc-export CC
+ emake upnpc-shared $(use static-libs && echo upnpc-static)
+}
+
+src_install() {
+ emake \
+ PREFIX="${D}" \
+ INSTALLDIRLIB="${D}usr/$(get_libdir)" \
+ install
+
+ dodoc README Changelog.txt
+}
diff --git a/net-libs/miniupnpc/miniupnpc-1.8.ebuild b/net-libs/miniupnpc/miniupnpc-1.8.ebuild
new file mode 100644
index 000000000000..5498d1ddd47d
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-1.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="kernel_linux static-libs"
+
+# Tests hang trying to kill server, bug #409349
+RESTRICT="test"
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+ epatch_user
+
+ if ! use static-libs; then
+ sed -i \
+ -e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+ -e '/$(INSTALL) -m 644 $(LIBRARY) $(INSTALLDIRLIB)/d' \
+ Makefile || die
+ fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+ tc-export CC AR
+ emake upnpc-shared $(use static-libs && echo upnpc-static)
+}
+
+src_install() {
+ emake \
+ PREFIX="${D}" \
+ INSTALLDIRLIB="${D}usr/$(get_libdir)" \
+ install
+
+ dodoc README Changelog.txt
+}
diff --git a/net-libs/miniupnpc/miniupnpc-1.9.20150427.ebuild b/net-libs/miniupnpc/miniupnpc-1.9.20150427.ebuild
new file mode 100644
index 000000000000..5bf526700b64
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-1.9.20150427.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/12"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 kernel_linux static-libs"
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+ epatch_user
+
+ # These bins are not installed, upnpc-static requires building static lib
+ sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
+
+ if ! use static-libs; then
+ sed -i \
+ -e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+ -e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
+ Makefile || die
+ fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+ tc-export CC AR
+ emake upnpc-shared $(use static-libs && echo upnpc-static)
+}
+
+src_test() {
+ emake -j1 HAVE_IPV6=$(usex ipv6 yes no) check
+}
+
+src_install() {
+ emake \
+ PREFIX="${D}" \
+ INSTALLDIRLIB="${D}usr/$(get_libdir)" \
+ install
+
+ dodoc README Changelog.txt
+}
diff --git a/net-libs/nacl/Manifest b/net-libs/nacl/Manifest
new file mode 100644
index 000000000000..95565d1e87ac
--- /dev/null
+++ b/net-libs/nacl/Manifest
@@ -0,0 +1 @@
+DIST nacl-20110221.tar.bz2 163415 SHA256 4f277f89735c8b0b8a6bbd043b3efb3fa1cc68a9a5da6a076507d067fc3b3bf8 SHA512 4c031ceffe6a28dc74b46ac003d485531f78de467c802df73c8b22ca53644dabb7d2e3080b7bdd6583f0d07ad76b6d95bc0ffdce319ca2f80ee041e6fe618656 WHIRLPOOL 6fd80c68cf7c644189aba0e2cc72fd382149fc10fc69a208eaf5d51b45c3fbcc9a4a0284bf6dcfd05d34f1ef77ef7f3e735c68ce38dc3c4ca9f0412ac825a98a
diff --git a/net-libs/nacl/metadata.xml b/net-libs/nacl/metadata.xml
new file mode 100644
index 000000000000..5b80fb94c393
--- /dev/null
+++ b/net-libs/nacl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-libs/nacl/nacl-0_p20110221.ebuild b/net-libs/nacl/nacl-0_p20110221.ebuild
new file mode 100644
index 000000000000..5ff2e871e979
--- /dev/null
+++ b/net-libs/nacl/nacl-0_p20110221.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="high-speed software library for network communication, encryption, decryption, signatures"
+HOMEPAGE="http://nacl.cr.yp.to/"
+SRC_URI="http://hyperelliptic.org/nacl/${P/0_p}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/0_p}
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/nacl/cpucycles.h
+ /usr/include/nacl/crypto_core_hsalsa20.h
+ /usr/include/nacl/crypto_hashblocks_sha256.h
+ /usr/include/nacl/crypto_hashblocks_sha512.h
+ /usr/include/nacl/crypto_onetimeauth_poly1305.h
+ /usr/include/nacl/crypto_scalarmult_curve25519.h
+ /usr/include/nacl/crypto_stream_aes128ctr.h
+ /usr/include/nacl/crypto_stream_salsa20.h
+ /usr/include/nacl/crypto_stream_salsa2012.h
+ /usr/include/nacl/crypto_stream_salsa208.h )
+
+src_prepare() {
+ #drop useless path elements, verbose output, predictable include dir
+ sed -e '/^export/d' \
+ -e '/^PATH/d' \
+ -e '/^LD_LIBRARY_PATH/d' \
+ -e '/^DYLD_LIBRARY_PATH/d' \
+ -e '/^exec >/d' \
+ -e '/^shorthostname/s:=.*:=gentoo:' \
+ -i do || die
+ sed -e 's:=== `date` === ::' \
+ -i $(find . -name do) || die
+ rm -r tests
+
+ multilib_copy_sources
+
+ filter-flags "-O*"
+ append-cflags -O3 -fomit-frame-pointer -funroll-loops
+ append-cxxflags -O3 -fomit-frame-pointer -funroll-loops
+}
+
+multilib_src_configure() {
+ echo "$(tc-getCC) ${CFLAGS}" > okcompilers/c
+ echo "$(tc-getCXX) ${CXXFLAGS}" > okcompilers/cpp
+ echo "$(tc-getAR)" > okcompilers/archivers
+
+ sed -e "1aexport PATH=\"${BUILD_DIR}/build/gentoo/bin:${PATH}\"" \
+ -i do || die
+}
+
+multilib_src_compile() {
+ ./do || die
+}
+
+multilib_src_install() {
+ insinto /usr/$(get_libdir)/${PN}
+ doins build/gentoo/lib/*/*
+
+ insinto /usr/include/${PN}
+ doins build/gentoo/include/*/*
+}
diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest
new file mode 100644
index 000000000000..3625af31b677
--- /dev/null
+++ b/net-libs/nativebiginteger/Manifest
@@ -0,0 +1,2 @@
+DIST i2psource_0.8.7.tar.bz2 18473515 RMD160 545e72fab13d6f6ca660b5b74d86648a9160a000 SHA1 61727b1b745d7cd882268300c7913dfd13b9f612 SHA256 31acef3fcd1a5839edc3b931f108944222c833d218bd427fe89a57b4acd92ece
+DIST nativebiginteger-0.6.4.tar.bz2 10248 RMD160 a7ac7832371c74a1e9592a9abd1b6d5ef40a360a SHA1 37b433b3a7a2cf818a7ca3713548153f63da3817 SHA256 ef36fb57c1d885164f00b3e5d239c22349a530fa20df652efc5cb1f1ccea2c32
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch
new file mode 100644
index 000000000000..04cfa599413a
--- /dev/null
+++ b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-asmfix.patch
@@ -0,0 +1,31 @@
+--- jcpuid/src/jcpuid.c 2008-10-06 09:44:53.000000000 -0400
++++ jcpuid/src/jcpuid.c.new2 2010-12-27 09:41:53.000000000 -0500
+@@ -19,6 +19,7 @@
+ mov d, edx
+ }
+ #else
++ #ifdef _LP64
+ //Use GCC assembler notation
+ asm
+ (
+@@ -29,6 +30,20 @@
+ "=d"(d)
+ :"a"(iFunction)
+ );
++ #elif defined(__i386__)
++ asm
++ (
++ "pushl %%ebx\n\t"
++ "cpuid\n\t"
++ "movl %%ebx, %%edi\n\t"
++ "popl %%ebx"
++ : "=a" (a),
++ "=D" (b),
++ "=c" (c),
++ "=d" (d)
++ :"a"(iFunction)
++ );
++ #endif
+ #endif
+ return (*env)->NewObject(env, clsResult,constructor,a,b,c,d);
+ }
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch
new file mode 100644
index 000000000000..5d3c84cd641e
--- /dev/null
+++ b/net-libs/nativebiginteger/files/nativebiginteger-0.6.4-ldflags.patch
@@ -0,0 +1,17 @@
+--- Makefile 2008-11-06 21:09:54.000000000 +0100
++++ Makefile.new 2010-12-27 14:26:45.000000000 +0100
+@@ -1,11 +1,11 @@
+ libjbigi:
+ cd jbigi && rm -f jbigi.o libjbigi.so && $(CC) $(CFLAGS) -c -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
+- jbigi/src/jbigi.c && $(CC) -shared -Wl,-soname,libjbigi.so -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -lgmp \
+- -o libjbigi.so jbigi.o
++ jbigi/src/jbigi.c && $(CC) ${LDFLAGS} -shared -Wl,-soname,libjbigi.so jbigi.o -I. -Ijbigi/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -lgmp \
++ -o libjbigi.so
+
+
+ libjcpuid:
+- cd jcpuid && $(CC) $(CFLAGS) -shared -Wl,-soname,libjbigi-x86-linux.so -I. -Iinclude -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
++ cd jcpuid && $(CC) $(CFLAGS) ${LDFLAGS} -shared -Wl,-soname,libjbigi-x86-linux.so -I. -Iinclude -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
+ src/*.c -o libjcpuid-x86-linux.so
+
+ install:
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch
new file mode 100644
index 000000000000..3443a91c288b
--- /dev/null
+++ b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-asmfix.patch
@@ -0,0 +1,31 @@
+--- c/jcpuid/src/jcpuid.c 2008-10-06 09:44:53.000000000 -0400
++++ c/jcpuid/src/jcpuid.c.new2 2010-12-27 09:41:53.000000000 -0500
+@@ -19,6 +19,7 @@
+ mov d, edx
+ }
+ #else
++ #ifdef _LP64
+ //Use GCC assembler notation
+ asm
+ (
+@@ -29,6 +30,20 @@
+ "=d"(d)
+ :"a"(iFunction)
+ );
++ #elif defined(__i386__)
++ asm
++ (
++ "pushl %%ebx\n\t"
++ "cpuid\n\t"
++ "movl %%ebx, %%edi\n\t"
++ "popl %%ebx"
++ : "=a" (a),
++ "=D" (b),
++ "=c" (c),
++ "=d" (d)
++ :"a"(iFunction)
++ );
++ #endif
+ #endif
+ return (*env)->NewObject(env, clsResult,constructor,a,b,c,d);
+ }
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch
new file mode 100644
index 000000000000..ea298b5d0358
--- /dev/null
+++ b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-build-system.patch
@@ -0,0 +1,22 @@
+--- i2p-0.8.7/core/c/jbigi/build_jbigi.sh.orig 2011-07-29 11:52:43.000000000 +0200
++++ i2p-0.8.7/core/c/jbigi/build_jbigi.sh 2011-07-29 11:53:43.000000000 +0200
+@@ -3,8 +3,8 @@
+ # When executed in Linux/FreeBSD: Produces an libjbigi.so
+ # Darwin produces libjbigi.jnilib, right?
+
+-CC="gcc"
++test -z "$CC" && CC="gcc"
+
+ case `uname -sr` in
+ MINGW*)
+ JAVA_HOME="c:/software/j2sdk1.4.2_05"
+@@ -57,5 +55,7 @@
+
+ echo "Compiling C code..."
+ rm -f jbigi.o $LIBFILE
+-$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c
+-$CC $LINKFLAGS $INCLUDES $INCLUDELIBS -o $LIBFILE jbigi.o $STATICLIBS
++echo $CC -c $COMPILEFLAGS $CFLAGS $CPPFLAGS $INCLUDES ../../jbigi/src/jbigi.c
++$CC -c $COMPILEFLAGS $CFLAGS $CPPFLAGS $INCLUDES ../../jbigi/src/jbigi.c
++echo $CC $LINKFLAGS $LDFLAGS $INCLUDES -o $LIBFILE jbigi.o $STATICLIBS $INCLUDELIBS
++$CC $LINKFLAGS $LDFLAGS $INCLUDES -o $LIBFILE jbigi.o $STATICLIBS $INCLUDELIBS
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch
new file mode 100644
index 000000000000..07dd05227582
--- /dev/null
+++ b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-debug-all.patch
@@ -0,0 +1,35 @@
+--- core/java/src/net/i2p/util/NativeBigInteger.java.orig 2011-07-29 13:14:05.000000000 +0200
++++ core/java/src/net/i2p/util/NativeBigInteger.java 2011-07-29 13:15:16.000000000 +0200
+@@ -481,14 +481,12 @@
+
+ /** @since 0.8.7 */
+ private static void debug(String s) {
+- I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).debug(s);
++ System.err.println("DEBUG: " + s);
+ }
+
+
+ private static void info(String s) {
+- if(_doLog)
+- System.err.println("INFO: " + s);
+- I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).info(s);
++ System.err.println("INFO: " + s);
+ _loadStatus = s;
+ }
+
+@@ -496,12 +496,9 @@
+
+ /** @since 0.8.7 */
+ private static void warn(String s, Throwable t) {
+- if(_doLog) {
+- System.err.println("WARNING: " + s);
+- if (t != null)
+- t.printStackTrace();
+- }
+- I2PAppContext.getGlobalContext().logManager().getLog(NativeBigInteger.class).warn(s, t);
++ System.err.println("WARNING: " + s);
++ if (t != null)
++ t.printStackTrace();
+ if (t != null)
+ _loadStatus = s + ' ' + t;
+ else
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch
new file mode 100644
index 000000000000..a4020a012b98
--- /dev/null
+++ b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-jcpuid-build-system.patch
@@ -0,0 +1,23 @@
+--- i2p-0.8.7/core/c/jcpuid/build.sh.orig 2011-07-29 18:38:44.554000219 +0200
++++ i2p-0.8.7/core/c/jcpuid/build.sh 2011-07-29 18:38:13.789000172 +0200
+@@ -24,8 +24,8 @@
+ mkdir lib/freenet/support
+ mkdir lib/freenet/support/CPUInformation
+
+-CC="gcc"
++test -z "$CC" && CC="gcc"
+
+ case `uname -sr` in
+ MINGW*)
+ JAVA_HOME="/c/software/j2sdk1.4.2_05"
+@@ -50,8 +52,8 @@
+
+ echo "Compiling C code..."
+ rm -f $LIBFILE
+-$CC $COMPILEFLAGS $LINKFLAGS $INCLUDES src/*.c -o $LIBFILE
+-strip $LIBFILE
++echo $CC $COMPILEFLAGS $CPPFLAGS $CFLAGS $LINKFLAGS $LDFLAGS $INCLUDES src/*.c -o $LIBFILE
++$CC $COMPILEFLAGS $CPPFLAGS $CFLAGS $LINKFLAGS $LDFLAGS $INCLUDES src/*.c -o $LIBFILE
+ echo Built $LIBFILE
+
+ #g++ -shared -static -static-libgcc -Iinclude -I$JAVA_HOME/include \
diff --git a/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch
new file mode 100644
index 000000000000..6240d25bcd9b
--- /dev/null
+++ b/net-libs/nativebiginteger/files/nativebiginteger-0.8.7-non-android-warnings.patch
@@ -0,0 +1,11 @@
+--- core/java/src/net/i2p/util/NativeBigInteger.java.orig 2011-07-29 13:22:39.000000000 +0200
++++ core/java/src/net/i2p/util/NativeBigInteger.java 2011-07-29 13:22:55.000000000 +0200
+@@ -526,7 +526,7 @@
+ System.loadLibrary(name);
+ return true;
+ } catch (UnsatisfiedLinkError ule) {
+- if (_isAndroid) {
++ if (!_isAndroid) {
+ // Unfortunately,
+ // this is not interesting on Android, it says "file not found"
+ // on link errors too.
diff --git a/net-libs/nativebiginteger/metadata.xml b/net-libs/nativebiginteger/metadata.xml
new file mode 100644
index 000000000000..fed3658eec53
--- /dev/null
+++ b/net-libs/nativebiginteger/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>tommy@gentoo.org</email>
+ <name>Thomas Sachau (Tommy[D])</name>
+ </maintainer>
+</pkgmetadata>
+
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.6.4-r3.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.6.4-r3.ebuild
new file mode 100644
index 000000000000..17c1a3a3c0bc
--- /dev/null
+++ b/net-libs/nativebiginteger/nativebiginteger-0.6.4-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit flag-o-matic multilib toolchain-funcs java-pkg-2
+
+DESCRIPTION="NativeBigInteger libs for Freenet taken from i2p"
+HOMEPAGE="http://www.i2p2.de"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="|| ( public-domain BSD MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/gmp
+ >=virtual/jdk-1.4"
+RDEPEND="dev-libs/gmp"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-{asmfix,ldflags}.patch
+}
+
+src_compile() {
+ append-flags -fPIC
+ tc-export CC
+ emake libjbigi || die
+ use x86 && filter-flags -fPIC -nopie
+ emake libjcpuid || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" LIBDIR=$(get_libdir) install || die
+}
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.6.4.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.6.4.ebuild
new file mode 100644
index 000000000000..72316feb8bdb
--- /dev/null
+++ b/net-libs/nativebiginteger/nativebiginteger-0.6.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit flag-o-matic multilib toolchain-funcs java-pkg-2
+
+DESCRIPTION="NativeBigInteger libs for Freenet taken from i2p"
+HOMEPAGE="http://www.i2p2.de"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="|| ( public-domain BSD MIT )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-libs/gmp
+ >=virtual/jdk-1.4"
+RDEPEND="dev-libs/gmp"
+
+src_compile() {
+ append-flags -fPIC
+ tc-export CC
+ emake libjbigi || die
+ use x86 && filter-flags -fPIC -nopie
+ emake libjcpuid || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" LIBDIR=$(get_libdir) install || die
+}
diff --git a/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild
new file mode 100644
index 000000000000..a6ccf46e67f4
--- /dev/null
+++ b/net-libs/nativebiginteger/nativebiginteger-0.8.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs multilib java-pkg-2
+
+DESCRIPTION="jbigi JNI library for net.i2p.util.NativeBigInteger java-class from I2P"
+HOMEPAGE="http://www.i2p2.de"
+SRC_URI="http://mirror.i2p2.de/i2psource_${PV}.tar.bz2"
+
+LICENSE="|| ( public-domain BSD MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+
+DEPEND="${RDEPEND}
+ >=virtual/jdk-1.5"
+RDEPEND="dev-libs/gmp"
+
+S=${WORKDIR}/i2p-${PV}/core/
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}"-build-system.patch \
+ "${FILESDIR}/${P}"-jcpuid-build-system.patch \
+ "${FILESDIR}/${P}"-debug-all.patch \
+ "${FILESDIR}/${P}"-non-android-warnings.patch \
+ "${FILESDIR}/${P}"-asmfix.patch
+}
+
+src_compile() {
+ tc-export CC
+
+ cd c/jbigi/jbigi/src || die
+ ../../build_jbigi.sh dynamic || die
+
+ if use test ; then
+ einfo "Building tests ..."
+ cd "${S}"java/src || die
+ ejavac net/i2p/util/NativeBigInteger.java || die
+ eend $?
+ fi
+ if ( use amd64 || use x86 ) ; then
+ cd "${S}"c/jcpuid
+ ./build.sh || die
+ fi
+}
+
+src_test() {
+ cd java/src || die
+ java -Djava.library.path="${S}"/c/jbigi/jbigi/src net/i2p/util/NativeBigInteger || die
+}
+
+src_install() {
+ local os arch
+
+ dolib c/jbigi/jbigi/src/libjbigi.so
+ ( use amd64 || use x86 ) && dolib c/jcpuid/lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so
+
+ ## The following is needed for compatibility with earlier versions of NativeBigInteger ##
+
+ # arch list found by "none" + grep 'JBIGI_OPTIMIZATION_.*=' core/java/src/net/i2p/util/NativeBigInteger.java
+ for arch in none arm k6 k62 k63 athlon x86_64 x86_64_32 pentium pentiummmx pentium2 pentium3 pentium4 ppc ; do
+ dosym libjbigi.so /usr/$(get_libdir)/libjbigi-linux-$arch.so
+ done
+}
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
new file mode 100644
index 000000000000..ec1be1836ca4
--- /dev/null
+++ b/net-libs/neon/Manifest
@@ -0,0 +1,2 @@
+DIST neon-0.30.0.tar.gz 909989 SHA256 2962cfcb5d30f3272e3d2fa0e473434419770a3801afe3d46e5d1650787990c2 SHA512 67f8a6c5549c37d984d8a0af88cd93c8c51593fa995662fd686e47acb630143d7b0c02c09d3c19f6a0181e0ff82940618cf72a76f9cb17bb964293f4118f013e WHIRLPOOL 75df16aae54410e97887ad1b1d45a17e58868cffff7d929f511c4840179ace1500c33228b02de7a038b9620d729e5153e1e14cc916ed1af9ce90bf4c49fb4b71
+DIST neon-0.30.1.tar.gz 911414 SHA256 00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd SHA512 4a9e45c886e04c5e1a1c781f7c2544b73724e09745097b1e8dc9adf9acd79af1762d668d4f18c295d7b4148d57af797834dd3c1203f2529089f7d1972ca71e63 WHIRLPOOL 747385544f0fbacc6c39fa5911ee5a21654ac21ecea89f297c17b43c21a7a649ae47b08b155733e9da0286a24024f4e54dcff3c9c2d678d9abe27f83054d718b
diff --git a/net-libs/neon/files/neon-0.30.1-xml2-config.patch b/net-libs/neon/files/neon-0.30.1-xml2-config.patch
new file mode 100644
index 000000000000..1290101844ca
--- /dev/null
+++ b/net-libs/neon/files/neon-0.30.1-xml2-config.patch
@@ -0,0 +1,15 @@
+locate the $CHOST prefixed version of xml2-config by default
+
+would be better to use pkg-config here, but this patch is minimally invasive
+
+--- a/macros/neon-xml-parser.m4
++++ b/macros/neon-xml-parser.m4
+@@ -44,7 +44,7 @@ AC_CHECK_HEADER(expat.h,
+
+ dnl Find libxml2: run $1 if found, else $2
+ AC_DEFUN([NE_XML_LIBXML2], [
+-AC_CHECK_PROG(XML2_CONFIG, xml2-config, xml2-config)
++AC_CHECK_TOOL(XML2_CONFIG, xml2-config, xml2-config)
+ if test -n "$XML2_CONFIG"; then
+ neon_xml_parser_message="libxml `$XML2_CONFIG --version`"
+ AC_DEFINE(HAVE_LIBXML, 1, [Define if you have libxml])
diff --git a/net-libs/neon/metadata.xml b/net-libs/neon/metadata.xml
new file mode 100644
index 000000000000..25503b43cd02
--- /dev/null
+++ b/net-libs/neon/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>arfrever.fta@gmail.com</email>
+ </maintainer>
+ <longdescription>
+ Neon is an HTTP and WebDAV client library for Unix systems, with a C
+ language API. It provides high-level interfaces to HTTP/1.1 and WebDAV
+ methods, and a low-level interface to HTTP request/response handling,
+ allowing new methods to be easily implemented.
+ </longdescription>
+ <longdescription lang="ja">
+ neon は Unix システムにおける HTTP 及び WebDAV クライアント・ライブラリ
+ であり、C言語 API です。HTTP/1.1 及び WebDAV のメソッドという高い視点
+ でのインターフェイス、HTTP リクエスト/レスポンス のハンドリングという
+ 低い視点でのインターフェイス、簡単に実装できるようにした新しいメソッド
+ といったものを提供します。
+ </longdescription>
+ <use>
+ <flag name="libproxy">Add support for <pkg>net-libs/libproxy</pkg></flag>
+ <flag name="pkcs11">Add support for PKCS#11 using <pkg>dev-libs/pakchois</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/neon/neon-0.30.0-r1.ebuild b/net-libs/neon/neon-0.30.0-r1.ebuild
new file mode 100644
index 000000000000..592d0b4f0e39
--- /dev/null
+++ b/net-libs/neon/neon-0.30.0-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils libtool multilib-minimal
+
+DESCRIPTION="HTTP and WebDAV client library"
+HOMEPAGE="http://www.webdav.org/neon/"
+SRC_URI="http://www.webdav.org/neon/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
+IUSE_LINGUAS="cs de fr ja nn pl ru tr zh_CN"
+for lingua in ${IUSE_LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+unset lingua
+RESTRICT="test"
+
+RDEPEND="expat? ( >=dev-libs/expat-2.1.0-r3:0=[${MULTILIB_USEDEP}] )
+ !expat? ( >=dev-libs/libxml2-2.9.1-r4:2=[${MULTILIB_USEDEP}] )
+ gnutls? (
+ app-misc/ca-certificates
+ >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}]
+ pkcs11? ( >=dev-libs/pakchois-0.4-r1:0=[${MULTILIB_USEDEP}] )
+ )
+ !gnutls? ( ssl? (
+ >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+ pkcs11? ( >=dev-libs/pakchois-0.4-r1:0=[${MULTILIB_USEDEP}] )
+ ) )
+ kerberos? ( >=virtual/krb5-0-r1:0=[${MULTILIB_USEDEP}] )
+ libproxy? ( >=net-libs/libproxy-0.4.11-r1:0=[${MULTILIB_USEDEP}] )
+ nls? ( >=virtual/libintl-0-r1:0=[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+RDEPEND="${RDEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r8
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/neon-config
+)
+
+src_prepare() {
+ local lingua linguas
+ for lingua in ${IUSE_LINGUAS}; do
+ use linguas_${lingua} && linguas+=" ${lingua}"
+ done
+ sed -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/" -i configure.in
+
+ AT_M4DIR="macros" eautoreconf
+
+ elibtoolize
+}
+
+multilib_src_configure() {
+ local myconf=()
+
+ if has_version sys-libs/glibc; then
+ einfo "Enabling SSL library thread-safety using POSIX threads..."
+ myconf+=(--enable-threadsafe-ssl=posix)
+ fi
+
+ if use expat; then
+ myconf+=(--with-expat)
+ else
+ myconf+=(--with-libxml2)
+ fi
+
+ if use gnutls; then
+ myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
+ elif use ssl; then
+ myconf+=(--with-ssl=openssl)
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-shared \
+ $(use_with kerberos gssapi) \
+ $(use_with libproxy) \
+ $(use_enable nls) \
+ $(use_with pkcs11 pakchois) \
+ $(use_enable static-libs static) \
+ $(use_with zlib) \
+ "${myconf[@]}"
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
+
+ if use doc; then
+ emake DESTDIR="${D}" install-html
+ fi
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --all
+
+ dodoc AUTHORS BUGS NEWS README THANKS TODO
+}
diff --git a/net-libs/neon/neon-0.30.0.ebuild b/net-libs/neon/neon-0.30.0.ebuild
new file mode 100644
index 000000000000..79e3aa4a03d6
--- /dev/null
+++ b/net-libs/neon/neon-0.30.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools libtool
+
+DESCRIPTION="HTTP and WebDAV client library"
+HOMEPAGE="http://www.webdav.org/neon/"
+SRC_URI="http://www.webdav.org/neon/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
+IUSE_LINGUAS="cs de fr ja nn pl ru tr zh_CN"
+for lingua in ${IUSE_LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+unset lingua
+RESTRICT="test"
+
+RDEPEND="expat? ( dev-libs/expat:0= )
+ !expat? ( dev-libs/libxml2:2= )
+ gnutls? (
+ app-misc/ca-certificates
+ net-libs/gnutls:0=
+ pkcs11? ( dev-libs/pakchois:0= )
+ )
+ !gnutls? ( ssl? (
+ dev-libs/openssl:0=
+ pkcs11? ( dev-libs/pakchois:0= )
+ ) )
+ kerberos? ( virtual/krb5:0= )
+ libproxy? ( net-libs/libproxy:0= )
+ nls? ( virtual/libintl:0= )
+ zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ local lingua linguas
+ for lingua in ${IUSE_LINGUAS}; do
+ use linguas_${lingua} && linguas+=" ${lingua}"
+ done
+ sed -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/" -i configure.in
+
+ AT_M4DIR="macros" eautoreconf
+
+ elibtoolize
+}
+
+src_configure() {
+ local myconf=()
+
+ if has_version sys-libs/glibc; then
+ einfo "Enabling SSL library thread-safety using POSIX threads..."
+ myconf+=(--enable-threadsafe-ssl=posix)
+ fi
+
+ if use expat; then
+ myconf+=(--with-expat)
+ else
+ myconf+=(--with-libxml2)
+ fi
+
+ if use gnutls; then
+ myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
+ elif use ssl; then
+ myconf+=(--with-ssl=openssl)
+ fi
+
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-shared \
+ $(use_with kerberos gssapi) \
+ $(use_with libproxy) \
+ $(use_enable nls) \
+ $(use_with pkcs11 pakchois) \
+ $(use_enable static-libs static) \
+ $(use_with zlib) \
+ "${myconf[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
+
+ find "${ED}" -name "*.la" -delete
+
+ if use doc; then
+ emake DESTDIR="${D}" install-html
+ fi
+
+ dodoc AUTHORS BUGS NEWS README THANKS TODO
+}
diff --git a/net-libs/neon/neon-0.30.1.ebuild b/net-libs/neon/neon-0.30.1.ebuild
new file mode 100644
index 000000000000..3a4f5a69caec
--- /dev/null
+++ b/net-libs/neon/neon-0.30.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools libtool multilib-minimal
+
+DESCRIPTION="HTTP and WebDAV client library"
+HOMEPAGE="http://www.webdav.org/neon/"
+SRC_URI="http://www.webdav.org/neon/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
+IUSE_LINGUAS="cs de fr ja nn pl ru tr zh_CN"
+for lingua in ${IUSE_LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+unset lingua
+RESTRICT="test"
+
+RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
+ !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+ gnutls? (
+ app-misc/ca-certificates
+ net-libs/gnutls:0=[${MULTILIB_USEDEP}]
+ pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
+ )
+ !gnutls? ( ssl? (
+ dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+ pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
+ ) )
+ kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+ libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
+ nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] )
+ zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig[${MULTILIB_USEDEP}]"
+RDEPEND="${RDEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r8
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/neon-config
+)
+
+src_prepare() {
+ local lingua linguas
+ for lingua in ${IUSE_LINGUAS}; do
+ use linguas_${lingua} && linguas+=" ${lingua}"
+ done
+ sed -e "s/ALL_LINGUAS=.*/ALL_LINGUAS=\"${linguas}\"/" -i configure.ac || die
+
+ epatch "${FILESDIR}"/${P}-xml2-config.patch
+ AT_M4DIR="macros" eautoreconf
+
+ elibtoolize
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myconf=()
+
+ if has_version sys-libs/glibc; then
+ einfo "Enabling SSL library thread-safety using POSIX threads..."
+ myconf+=(--enable-threadsafe-ssl=posix)
+ fi
+
+ if use expat; then
+ myconf+=(--with-expat)
+ else
+ myconf+=(--with-libxml2)
+ fi
+
+ if use gnutls; then
+ myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
+ elif use ssl; then
+ myconf+=(--with-ssl=openssl)
+ fi
+
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-shared \
+ $(use_with kerberos gssapi) \
+ $(use_with libproxy) \
+ $(use_enable nls) \
+ $(use_with pkcs11 pakchois) \
+ $(use_enable static-libs static) \
+ $(use_with zlib) \
+ "${myconf[@]}"
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
+
+ if multilib_is_native_abi && use doc; then
+ dohtml -r doc/html/
+ fi
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name "*.la" -delete
+
+ dodoc AUTHORS BUGS NEWS README THANKS TODO
+}
diff --git a/net-libs/net6/Manifest b/net-libs/net6/Manifest
new file mode 100644
index 000000000000..c602510518a4
--- /dev/null
+++ b/net-libs/net6/Manifest
@@ -0,0 +1 @@
+DIST net6-1.3.14.tar.gz 483549 SHA256 155dd82cbe1f8354205c79ab2bb54af4957047422250482596a34b0e0cc61e21 SHA512 6a604d51da32b13d61a45d3927e937c2fc5dc83061ea4312df363a57ba1a9830215e0a1b794914790d4606411cc71211675ceca86609614718aaeb998598c5c0 WHIRLPOOL d64da0fbf7484718058be2d20491f5cf84165022499b5d80b12a748bff1d978d8cba6dffcb63b6d985d52763761a72a7a6a36a185cc7eb050e0d56321771c83b
diff --git a/net-libs/net6/metadata.xml b/net-libs/net6/metadata.xml
new file mode 100644
index 000000000000..59f1f6712a95
--- /dev/null
+++ b/net-libs/net6/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>dev-zero@gentoo.org</email>
+ <name>Tiziano Müller</name>
+ </maintainer>
+ <longdescription>
+ Network access framework for IPv4/IPv6 written in C++ used by obby
+ </longdescription>
+</pkgmetadata>
diff --git a/net-libs/net6/net6-1.3.14.ebuild b/net-libs/net6/net6-1.3.14.ebuild
new file mode 100644
index 000000000000..516fec415d0d
--- /dev/null
+++ b/net-libs/net6/net6-1.3.14.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit multilib
+
+DESCRIPTION="Network access framework for IPv4/IPv6 written in C++"
+HOMEPAGE="http://gobby.0x539.de/"
+SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc x86"
+IUSE="nls static-libs"
+
+RDEPEND="dev-libs/libsigc++:2
+ >=net-libs/gnutls-1.2.10"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+ econf $(use_enable nls) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib${PN}.la
+}
+
+pkg_postinst() {
+ elog "Please note that because of the use of C++ templates"
+ elog "Gobby 0.4 has to be recompiled against the new ${PN}"
+ elog "to pick up the changes."
+}
diff --git a/net-libs/netembryo/Manifest b/net-libs/netembryo/Manifest
new file mode 100644
index 000000000000..7b329c09d8d5
--- /dev/null
+++ b/net-libs/netembryo/Manifest
@@ -0,0 +1 @@
+DIST netembryo-0.1.1.tar.bz2 265851 RMD160 f67bfd35a4493d1180d14912f1d4f72367a6f8c5 SHA1 e647e71be4091d18c0e628f7f959e2433fbcd824 SHA256 b20c12f09e99f9c00efab3b9588457fd8a2fa6bb3ed26c35ada572c0b172a981
diff --git a/net-libs/netembryo/metadata.xml b/net-libs/netembryo/metadata.xml
new file mode 100644
index 000000000000..b55e0e950209
--- /dev/null
+++ b/net-libs/netembryo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>video</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="sctp">Support for Stream Control Transmission Protocol</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/netembryo/netembryo-0.1.1.ebuild b/net-libs/netembryo/netembryo-0.1.1.ebuild
new file mode 100644
index 000000000000..477964a148e0
--- /dev/null
+++ b/net-libs/netembryo/netembryo-0.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit multilib
+
+DESCRIPTION="a network abstraction library"
+HOMEPAGE="http://lscube.org/projects/netembryo/"
+SRC_URI="http://lscube.org/files/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 +sctp test"
+
+RDEPEND=">=dev-libs/openssl-0.9.8
+ sctp? ( net-misc/lksctp-tools )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( >=dev-libs/glib-2.20:2
+ sys-apps/gawk
+ dev-util/ctags )"
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ --disable-static \
+ $(use_enable ipv6) \
+ $(use_enable sctp) \
+ $(use_enable test tests)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog README TODO
+ find "${D}"usr/$(get_libdir) -name '*.la' -delete
+}
diff --git a/net-libs/netwib/Manifest b/net-libs/netwib/Manifest
new file mode 100644
index 000000000000..41dde5cf381d
--- /dev/null
+++ b/net-libs/netwib/Manifest
@@ -0,0 +1,2 @@
+DIST netwib-5.39.0-doc_html.tgz 139572 SHA256 983cfc810e1a277b952158d4512c0fba36d3f2a83833213f338952ec0f2fdd18 SHA512 0920642854f71b4c20a8b0844d152aa1107b7cfe927524391626bac97185024261e0efbcb681b978fa612d04cb71a804c7ae604d2040c87d27d118c004940345 WHIRLPOOL c94d3b85781b825fd01b452829f49f99e8cf1bc4e256e22daba77632774add15ad496785cdf8e3a9c7206bd6f4ae2611820373afb7128e3ba574d6a92d74f03e
+DIST netwib-5.39.0-src.tgz 641757 SHA256 574d72d9bf8b0ed0c25a6b5e902b768727d404c44d570f769b4b1219aa66946f SHA512 eeb3c51c48ed22762fa0e4215dfd239fb97fc0b34f28382d77ad863ed1f2f4a1f26195517fcd26c4b1a96195c895bd7b7ed121af975b5dc49b1bc378b11ef234 WHIRLPOOL 540b330b76b3f0e82dbc6468d9b2c578e16c942b1bb6351a03f0ae9c11eee70a44c97f952bf212bcf68568dcf6952b946ae454addc3db605d7c0859289e340a4
diff --git a/net-libs/netwib/metadata.xml b/net-libs/netwib/metadata.xml
new file mode 100644
index 000000000000..f1a97d721422
--- /dev/null
+++ b/net-libs/netwib/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>netmon</herd>
+ <longdescription>Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">ntwib</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/netwib/netwib-5.39.0.ebuild b/net-libs/netwib/netwib-5.39.0.ebuild
new file mode 100644
index 000000000000..3750c3ee4fe8
--- /dev/null
+++ b/net-libs/netwib/netwib-5.39.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# NOTE: netwib, netwox and netwag go together, bump all or bump none
+
+EAPI=5
+inherit toolchain-funcs multilib
+
+DESCRIPTION="Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols"
+HOMEPAGE="
+ http://www.laurentconstantin.com/en/netw/netwib/
+ http://ntwib.sourceforge.net/
+"
+SRC_URI="mirror://sourceforge/ntwib/${P}-src.tgz
+ doc? ( mirror://sourceforge/ntwib/${P}-doc_html.tgz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc x86"
+IUSE="doc"
+
+DEPEND="
+ net-libs/libnet:1.1
+ net-libs/libpcap
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src/src
+
+src_prepare() {
+ sed -i \
+ -e 's:/man$:/share/man:g' \
+ -e "s:/lib:/$(get_libdir):" \
+ -e "s:/usr/local:/usr:" \
+ -e "s:=ar:=$(tc-getAR):" \
+ -e "s:=ranlib:=$(tc-getRANLIB):" \
+ -e "s:=gcc:=$(tc-getCC):" \
+ -e "s:-O2:${CFLAGS}:" \
+ config.dat || die
+}
+
+src_configure() {
+ sh genemake || die
+}
+
+src_install() {
+ default
+ dodoc ../README.TXT
+ if use doc; then
+ mkdir "${D}"/usr/share/doc/${PF}/html
+ mv "${WORKDIR}"/${P}-doc_html/{index.html,${PN}} \
+ "${D}"/usr/share/doc/${PF}/html
+ fi
+
+ cd "${S}"/..
+ dodoc \
+ doc/{changelog.txt,credits.txt,integration.txt} \
+ doc/{problemreport.txt,problemusageunix.txt,todo.txt}
+}
diff --git a/net-libs/nfqueue-bindings/Manifest b/net-libs/nfqueue-bindings/Manifest
new file mode 100644
index 000000000000..622138a0c42d
--- /dev/null
+++ b/net-libs/nfqueue-bindings/Manifest
@@ -0,0 +1 @@
+DIST nfqueue-bindings-0.5.tar.xz 20496 SHA256 ebb1ef46681a79d346b6df51bec902316d09ad057abf4a719d276fb694b7ac9b SHA512 52a2cc1a764e3bdc5e97e35a67e4207e5ce3d6a70e336b0d319d1a99581502f955080688c8835b7748fdadadf315fedf5f098ea1832b57f3808e9f563db2f842 WHIRLPOOL 609b0433cbee437664b26a9b3e4550800e2f094a4e6f13fd478a67ad8e67767f742ca336e685345c21096ba61eb15f423f523b3ddd9e87a9924ef61b3fbf57b0
diff --git a/net-libs/nfqueue-bindings/metadata.xml b/net-libs/nfqueue-bindings/metadata.xml
new file mode 100644
index 000000000000..bb8980358b1a
--- /dev/null
+++ b/net-libs/nfqueue-bindings/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>zmedico@gentoo.org</email>
+ </maintainer>
+ <maintainer>
+ <email>chutzpah@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild
new file mode 100644
index 000000000000..35b0d5976eef
--- /dev/null
+++ b/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils perl-module linux-info python-single-r1
+
+DESCRIPTION="High-level language bindings for libnetfilter_queue"
+HOMEPAGE="https://www.wzdftpd.net/redmine/projects/nfqueue-bindings/wiki/"
+SRC_URI="https://www.wzdftpd.net/redmine/attachments/download/68/nfqueue-bindings-0.5.tar.xz"
+
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+LICENSE="GPL-3"
+IUSE="perl python examples"
+REQUIRED_USE="|| ( perl python )"
+
+DEPEND="python? (
+ dev-python/dpkt[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ )
+ perl? ( dev-lang/perl )
+ net-libs/libnetfilter_queue
+ dev-lang/swig"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ # At least one of Python or Perl must be selected
+ use python || useq perl || die "At least one supported language must be selected."
+ # Check kernel configuration for NFQUEUE
+ if linux_config_exists; then
+ ebegin "Checking NETFILTER_NETLINK_QUEUE support"
+ linux_chkconfig_present NETFILTER_NETLINK_QUEUE
+ eend $? || \
+ eerror 'Netfilter NFQUEUE over NFNETLINK interface support not found!'
+ ebegin "Checking NETFILTER_XT_TARGET_NFQUEUE support"
+ linux_chkconfig_present NETFILTER_XT_TARGET_NFQUEUE
+ eend $? || \
+ eerror '"NFQUEUE" target Support not found!'
+ fi
+}
+
+src_prepare() {
+ # Fix Perl destination directory
+ perl_set_version
+ sed -i "s|\${LIB_INSTALL_DIR}/perl\${PERL_VERSION}/|${VENDOR_ARCH}|" perl/CMakeLists.txt || die
+ sed -i "s|\${LIB_INSTALL_DIR}/python\${PYTHON_VERSION}/dist-packages/|$(python_get_sitedir)|" python/CMakeLists.txt || die
+ # Disable Perl/Python from USE flags
+ use perl || sed -i 's|ADD_SUBDIRECTORY(perl)||' CMakeLists.txt || die
+ use python || sed -i 's|ADD_SUBDIRECTORY(python)||' CMakeLists.txt || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install PREFIX=/usr || die
+ docinto examples
+ use examples && dodoc examples/*
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
new file mode 100644
index 000000000000..8c345997583a
--- /dev/null
+++ b/net-libs/nghttp2/Manifest
@@ -0,0 +1,4 @@
+DIST nghttp2-0.7.15.tar.gz 1350366 SHA256 d6344bf52ef33de7ea328a93bd307f5f8ee7160562dd54a9e2f5f6916a71fa64 SHA512 199c339e3c0e20d87d644d9b9fd6ffead5fc2eca4958259aa21156b20cf15f7bb6e90a10f2fd0af97ca10cf876eac65bd769179bf60d8423b77eb62549f6040c WHIRLPOOL 5348f64309a7b1aa0ea456b990adc247bd29151512fb7967862f99ad3ad7ba2a8881db178b6915afc5887452192588bc18895203841c7743f2e4cdd2a6c8f449
+DIST nghttp2-1.0.1.tar.gz 1350918 SHA256 0f9eec47eeeed98929fbae3609d708cf9422b0213edd8daaa792db9e31463d89 SHA512 365b52864d8cc0cc0d1cb4a08f6926abd2886b7c5a225414db7a3dc0e8bdfe7afecea89e09a93b6a7034d4fc75a263b82ee0e35684900e71e21110683e1084bf WHIRLPOOL 37279a2612add1c9b88a74c0dd6d60b0ffcf9fc940b8559c8d0748f4f0cf6fa452b1135041c593bac0fc0cc3c3857d2cc40138857c59a55670df25dc66cd7a71
+DIST nghttp2-1.0.2.tar.gz 1355779 SHA256 6746fa7e282cfe631ad4b69f824bf14951b80e9cb952e825c76eefeb6a3806cd SHA512 6dbd4595dd53cf0a2d429ac5ea16d2f29706a240810c1e9a9d76465b44c6410d8f96b262d640f13331f1b5f0ebdd804a9e9f1ef5ca09f2fb898da2d56902cd64 WHIRLPOOL f0e34ecf30d8ebe3f6325eac7396fbe8fe3df77bbc58796e25fcef7c9e06f0566161c919188b562ba04c5ab84a82150307b70a2890597cc8e32b7bc1437696aa
+DIST nghttp2-1.0.5.tar.gz 1356748 SHA256 64e066816606178188bfaf0aa7298e1f44cef943dd9ae936497dab38b3b2569e SHA512 f8b7a79e6174ff501d93333b25954822098d936720a8f4de8a15c83f16c009006aefd05e24977c219661fd63b9fead70eaf5703211bfd9e2bba6a61facbba9c4 WHIRLPOOL 608b1a4494e2aff0c941545c1f49c3c585846d27f5e509ff16c9217309689c47fd7f8fc398b23c83d8aa0ba3f9c2c52af039cd875e47f38630acc50e7c17f717
diff --git a/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch b/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch
new file mode 100644
index 000000000000..9e5323bc81e8
--- /dev/null
+++ b/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch
@@ -0,0 +1,34 @@
+From 19309823aa5e4e9a65436bbc32430c9092e5d233 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 17 Jun 2015 13:29:37 -0400
+Subject: [PATCH] enable third-party for asio_lib too
+
+Since this library uses the third-party subdir, make sure we auto-enable
+it when that lib is turned on.
+---
+ configure.ac | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index be51a24..8e81741 100644
+--- a/configure
++++ b/configure
+@@ -464,11 +464,12 @@ fi
+
+ AM_CONDITIONAL([ENABLE_EXAMPLES], [ test "x${enable_examples}" = "xyes" ])
+
+-# third-party only be built if either enable_examples or enable_app is
+-# yes
++# third-party only be built when needed
+
+ enable_third_party=no
+-if test "x${enable_examples}" = "xyes" || test "x${enable_app}" = "xyes"; then
++if test "x${enable_examples}" = "xyes" ||
++ test "x${enable_app}" = "xyes" ||
++ test "x${enable_asio_lib}" = "xyes"; then
+ enable_third_party=yes
+ fi
+
+--
+2.4.1
+
diff --git a/net-libs/nghttp2/metadata.xml b/net-libs/nghttp2/metadata.xml
new file mode 100644
index 000000000000..a87a52208ff3
--- /dev/null
+++ b/net-libs/nghttp2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>vapier@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="hpack-tools">Install HPACK (header compression) helper tools</flag>
+ <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for memory allocation</flag>
+ <flag name="utils">Install nghttp, nghttpd and nghttpx</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">tatsuhiro-t/nghttp2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/nghttp2/nghttp2-0.7.15.ebuild b/net-libs/nghttp2/nghttp2-0.7.15.ebuild
new file mode 100644
index 000000000000..48358496a8e2
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-0.7.15.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: Add python support.
+
+EAPI="5"
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
+ inherit git-2
+else
+ SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.5" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
+
+RDEPEND="
+ cxx? ( dev-libs/boost[${MULTILIB_USEDEP},threads] )
+ hpack-tools? ( >=dev-libs/jansson-2.5 )
+ jemalloc? ( dev-libs/jemalloc )
+ utils? (
+ >=dev-libs/libev-4.15
+ >=dev-libs/openssl-1.0.2
+ >=sys-libs/zlib-1.2.3
+ )
+ xml? ( >=dev-libs/libxml2-2.7.7 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+src_prepare() {
+ sed -i \
+ -e '/test.*have_jansson/s:==:=:' \
+ configure || die #550962
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-examples \
+ --disable-failmalloc \
+ --disable-werror \
+ --without-cython \
+ --disable-python-bindings \
+ --without-spdylay \
+ $(use_enable cxx asio-lib) \
+ $(use_enable debug) \
+ $(multilib_native_use_enable hpack-tools) \
+ $(use_enable static-libs static) \
+ $(use_enable threads) \
+ $(multilib_native_use_enable utils app) \
+ $(multilib_native_use_with jemalloc) \
+ $(multilib_native_use_with xml libxml2)
+}
+
+multilib_src_install_all() {
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/nghttp2/nghttp2-1.0.1.ebuild b/net-libs/nghttp2/nghttp2-1.0.1.ebuild
new file mode 100644
index 000000000000..d06dfb928139
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.0.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: Add python support.
+
+EAPI="5"
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
+ inherit git-2
+else
+ SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
+ # Disabled until new curl & mod_h2 releases are made for the new API.
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
+
+RDEPEND="
+ cxx? ( dev-libs/boost[${MULTILIB_USEDEP},threads] )
+ hpack-tools? ( >=dev-libs/jansson-2.5 )
+ jemalloc? ( dev-libs/jemalloc )
+ utils? (
+ >=dev-libs/libev-4.15
+ >=dev-libs/openssl-1.0.2
+ >=sys-libs/zlib-1.2.3
+ )
+ xml? ( >=dev-libs/libxml2-2.7.7 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+src_prepare() {
+ sed -i \
+ -e '/test.*have_jansson/s:==:=:' \
+ configure || die #550962
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-examples \
+ --disable-failmalloc \
+ --disable-werror \
+ --without-cython \
+ --disable-python-bindings \
+ --without-spdylay \
+ $(use_enable cxx asio-lib) \
+ $(use_enable debug) \
+ $(multilib_native_use_enable hpack-tools) \
+ $(use_enable static-libs static) \
+ $(use_enable threads) \
+ $(multilib_native_use_enable utils app) \
+ $(multilib_native_use_with jemalloc) \
+ $(multilib_native_use_with xml libxml2)
+}
+
+multilib_src_install_all() {
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/nghttp2/nghttp2-1.0.2.ebuild b/net-libs/nghttp2/nghttp2-1.0.2.ebuild
new file mode 100644
index 000000000000..190ecb7019c6
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.0.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: Add python support.
+
+EAPI="5"
+
+inherit eutils multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
+ inherit git-2
+else
+ SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
+
+RDEPEND="
+ cxx? ( dev-libs/boost[${MULTILIB_USEDEP},threads] )
+ hpack-tools? ( >=dev-libs/jansson-2.5 )
+ jemalloc? ( dev-libs/jemalloc )
+ utils? (
+ >=dev-libs/libev-4.15
+ >=dev-libs/openssl-1.0.2
+ >=sys-libs/zlib-1.2.3
+ )
+ xml? ( >=dev-libs/libxml2-2.7.7 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-third-party.patch
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-examples \
+ --disable-failmalloc \
+ --disable-werror \
+ --without-cython \
+ --disable-python-bindings \
+ --without-spdylay \
+ $(use_enable cxx asio-lib) \
+ $(use_enable debug) \
+ $(multilib_native_use_enable hpack-tools) \
+ $(use_enable static-libs static) \
+ $(use_enable threads) \
+ $(multilib_native_use_enable utils app) \
+ $(multilib_native_use_with jemalloc) \
+ $(multilib_native_use_with xml libxml2)
+}
+
+multilib_src_install_all() {
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/nghttp2/nghttp2-1.0.5.ebuild b/net-libs/nghttp2/nghttp2-1.0.5.ebuild
new file mode 100644
index 000000000000..3a8f8503cdd2
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.0.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: Add python support.
+
+EAPI="5"
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
+ inherit git-2
+else
+ SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
+
+RDEPEND="
+ cxx? ( dev-libs/boost[${MULTILIB_USEDEP},threads] )
+ hpack-tools? ( >=dev-libs/jansson-2.5 )
+ jemalloc? ( dev-libs/jemalloc )
+ utils? (
+ >=dev-libs/libev-4.15
+ >=dev-libs/openssl-1.0.2
+ >=sys-libs/zlib-1.2.3
+ )
+ xml? ( >=dev-libs/libxml2-2.7.7 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-examples \
+ --disable-failmalloc \
+ --disable-werror \
+ --without-cython \
+ --disable-python-bindings \
+ --without-spdylay \
+ $(use_enable cxx asio-lib) \
+ $(use_enable debug) \
+ $(multilib_native_use_enable hpack-tools) \
+ $(use_enable static-libs static) \
+ $(use_enable threads) \
+ $(multilib_native_use_enable utils app) \
+ $(multilib_native_use_with jemalloc) \
+ $(multilib_native_use_with xml libxml2)
+}
+
+multilib_src_install_all() {
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
new file mode 100644
index 000000000000..3a8f8503cdd2
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: Add python support.
+
+EAPI="5"
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
+ inherit git-2
+else
+ SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
+
+RDEPEND="
+ cxx? ( dev-libs/boost[${MULTILIB_USEDEP},threads] )
+ hpack-tools? ( >=dev-libs/jansson-2.5 )
+ jemalloc? ( dev-libs/jemalloc )
+ utils? (
+ >=dev-libs/libev-4.15
+ >=dev-libs/openssl-1.0.2
+ >=sys-libs/zlib-1.2.3
+ )
+ xml? ( >=dev-libs/libxml2-2.7.7 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-examples \
+ --disable-failmalloc \
+ --disable-werror \
+ --without-cython \
+ --disable-python-bindings \
+ --without-spdylay \
+ $(use_enable cxx asio-lib) \
+ $(use_enable debug) \
+ $(multilib_native_use_enable hpack-tools) \
+ $(use_enable static-libs static) \
+ $(use_enable threads) \
+ $(multilib_native_use_enable utils app) \
+ $(multilib_native_use_with jemalloc) \
+ $(multilib_native_use_with xml libxml2)
+}
+
+multilib_src_install_all() {
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
new file mode 100644
index 000000000000..9258e7dcc7be
--- /dev/null
+++ b/net-libs/nodejs/Manifest
@@ -0,0 +1,5 @@
+DIST node-v0.10.30.tar.gz 13527922 SHA256 3dfcbd307f5f5f266ef174e1443107da853cd3d0aa0b2493a44235d5908625d2 SHA512 7d82eba5bab8b0ac67f6773a03f650dee67bf42fe3b0b2cc5ca581e00170c000a63e0f7ba966ce31e6f2202af7b1179c44b138932f55df39f85b48389097c240 WHIRLPOOL 71a34e115d604669974677d05ac201bc23a495e5e60944bb1f62659d3c1c2a3d689c8a0650a94a6ca0531bb9a5bd9b0c411d52e472cfafedf0709dc872d6db93
+DIST node-v0.10.38.tar.gz 14451274 SHA256 513da8ed5e48abefdfab664f1cabc160238d314a0481148804aff8fc6552b78b SHA512 8586eb4ba67ba6c375296341fb340d48d4f6684f7e62ac54e539e6d76ef9daa86ae3eb6ac2f83dc489f47fe9ac81d4d5c2b50b07c9ef7d2e4c1f4324634d5861 WHIRLPOOL b18012b790d985f99ebbe49e6f04457c2ec3810f5de14e07e1899df6af20e7318b9e3a980890f2213db726f1d0d497ee79307060875c8c66bf98108d0aa6a1a9
+DIST node-v0.12.6.tar.gz 19750717 SHA256 7a3b5ac351973a9dee8edbf0684bc8d0dea44b231e42274ffb008141ffa19ad2 SHA512 a7f1c88d8df0f65d986e283b859466a34459f8ebdd3232f4906f5ebd53c1a019a553eadcc50bcb5fe8252441c567692b9ada36e8b158ed818971cd927bf1b29f WHIRLPOOL 3677bee6016647282e877f4676fc3731ca49d9b5ccda6d99f8fc3f16e56fcf30072adb494539b9714d0b3afb657457a16fecab682ab62fd501e789f008255380
+DIST node-v0.12.7.tar.gz 20063992 SHA256 b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d SHA512 0c9cb7542530463e7703435c8d819949785c1c6497c6d98f9854ca615fe33a62f451833e856f0159b836a698b4dee5d165fa505bad5d474f664e1533090d8606 WHIRLPOOL 647391b8c49fda868c14bd4eb3089cac139f50e710ac6b141ea82e1013c4ff7d40cdb0e88d69604d06e3bd07775876c754211a2b099685cb7353ae5708812525
+DIST node-v0.8.28.tar.gz 13187411 SHA256 50e9a4282a741c923bd41c3ebb76698edbd7b1324024fe70cedc1e34b782d44f SHA512 6b12fa374ca506e2f7cac3cccd9144072a8908e6e7854b7e62b7b0e05b5b687fd16a941377acbb874c7798126695cc3d9263407f24a54e532b5d9487ee9429e6 WHIRLPOOL 15a2482e59e713b1e81497a784ac8dc525f8a7888e655c993cc820c54f7753c3359e42fcb16a435b071da7305071a1f0a5f898933b5d5222bab18f9ed1ef3986
diff --git a/net-libs/nodejs/files/nodejs-v8-3.5.patch b/net-libs/nodejs/files/nodejs-v8-3.5.patch
new file mode 100644
index 000000000000..87a8eeda0a57
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-v8-3.5.patch
@@ -0,0 +1,11 @@
+--- src/node_buffer.cc 2011-10-25 08:45:00.665600749 +0200
++++ src/node_buffer.cc 2011-10-25 08:45:31.168622565 +0200
+@@ -478,7 +478,7 @@
+
+ if (written > 0 && p[written-1] == '\0' && char_written == length) {
+ uint16_t last_char;
+- s->Write(&last_char, length - 1, 1, String::NO_HINTS);
++ s->Write(&last_char, length - 1, 1, String::NO_OPTIONS);
+ if (last_char != 0 || written > s->Utf8Length()) {
+ written--;
+ }
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
new file mode 100644
index 000000000000..4dbbc90e24fd
--- /dev/null
+++ b/net-libs/nodejs/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>bugs@bergstroem.nu</email>
+ <name>Johan Bergstroem</name>
+ </maintainer>
+ <maintainer>
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+ <use>
+ <flag name='npm'>Enable NPM package manager</flag>
+ <flag name='snapshot'>Enable snapshot creation for faster startup</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/nodejs/nodejs-0.10.30.ebuild b/net-libs/nodejs/nodejs-0.10.30.ebuild
new file mode 100644
index 000000000000..17b68d5a98dc
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.10.30.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# has known failures. sigh.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 pax-utils toolchain-funcs
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
+IUSE="+npm +snapshot"
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${PYTHON_DEPS}
+ ${RDEPEND}"
+
+S=${WORKDIR}/node-v${PV}
+
+src_prepare() {
+ # fix compilation on Darwin
+ # http://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+ # make sure we use python2.* while using gyp
+ sed -i -e "s/python/python2/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+
+ # less verbose install output (stating the same as portage, basically)
+ sed -i -e "/print/d" tools/install.py || die
+
+ tc-export CC CXX
+}
+
+src_configure() {
+ local myconf=""
+ ! use npm && myconf="--without-npm"
+ ! use snapshot && myconf="${myconf} --without-snapshot"
+
+ "${PYTHON}" configure --prefix="${EPREFIX}"/usr \
+ --shared-openssl --shared-zlib --without-dtrace ${myconf} || die
+}
+
+src_compile() {
+ local V=1
+ export V
+ emake out/Makefile
+ emake -C out mksnapshot
+ pax-mark m out/Release/mksnapshot
+ emake
+}
+
+src_install() {
+ "${PYTHON}" tools/install.py install "${D}"
+
+ use npm && dohtml -r "${ED}"/usr/lib/node_modules/npm/html/*
+ rm -rf "${ED}"/usr/lib/node_modules/npm/doc "${ED}"/usr/lib/node_modules/npm/html
+ rm -rf "${ED}"/usr/lib/dtrace
+
+ pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+ "${PYTHON}" tools/test.py --mode=release simple message || die
+}
diff --git a/net-libs/nodejs/nodejs-0.10.38.ebuild b/net-libs/nodejs/nodejs-0.10.38.ebuild
new file mode 100644
index 000000000000..369b202008e0
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.10.38.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# has known failures. sigh.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 pax-utils toolchain-funcs
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="+npm +snapshot"
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${PYTHON_DEPS}
+ ${RDEPEND}"
+
+S=${WORKDIR}/node-v${PV}
+
+src_prepare() {
+ # fix compilation on Darwin
+ # http://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+ # make sure we use python2.* while using gyp
+ sed -i -e "s/python/python2/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+
+ # less verbose install output (stating the same as portage, basically)
+ sed -i -e "/print/d" tools/install.py || die
+
+ tc-export CC CXX
+}
+
+src_configure() {
+ local myconf=""
+ ! use npm && myconf="--without-npm"
+ ! use snapshot && myconf="${myconf} --without-snapshot"
+
+ "${PYTHON}" configure --prefix="${EPREFIX}"/usr \
+ --shared-openssl --shared-zlib --without-dtrace ${myconf} || die
+}
+
+src_compile() {
+ local V=1
+ export V
+ emake out/Makefile
+ emake -C out mksnapshot
+ pax-mark m out/Release/mksnapshot
+ emake
+}
+
+src_install() {
+ "${PYTHON}" tools/install.py install "${D}"
+
+ use npm && dohtml -r "${ED}"/usr/lib/node_modules/npm/html/*
+ rm -rf "${ED}"/usr/lib/node_modules/npm/doc "${ED}"/usr/lib/node_modules/npm/html
+ rm -rf "${ED}"/usr/lib/dtrace
+
+ pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+ "${PYTHON}" tools/test.py --mode=release simple message || die
+}
diff --git a/net-libs/nodejs/nodejs-0.12.6.ebuild b/net-libs/nodejs/nodejs-0.12.6.ebuild
new file mode 100644
index 000000000000..d2f5283451fc
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.12.6.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# has known failures. sigh.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
+IUSE="debug icu +npm +snapshot +ssl"
+
+RDEPEND="icu? ( dev-libs/icu )
+ ${PYTHON_DEPS}
+ ssl? ( dev-libs/openssl:0=[-bindist] )
+ >=net-libs/http-parser-2.3
+ >=dev-libs/libuv-1.4.2"
+DEPEND="${RDEPEND}
+ !!net-libs/iojs"
+
+S="${WORKDIR}/node-v${PV}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+ tc-export CC CXX PKG_CONFIG
+ export V=1 # Verbose build
+ export BUILDTYPE=Release
+
+ # fix compilation on Darwin
+ # http://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+ # make sure we use python2.* while using gyp
+ sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+ sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+ # less verbose install output (stating the same as portage, basically)
+ sed -i -e "/print/d" tools/install.py || die
+
+ # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+ local LIBDIR=$(get_libdir)
+ sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+ sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+ sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+ # debug builds. change install path, remove optimisations and override buildtype
+ if use debug; then
+ sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+ BUILDTYPE=Debug
+ fi
+}
+
+src_configure() {
+ local myconf=()
+ local myarch=""
+ use debug && myconf+=( --debug )
+ use icu && myconf+=( --with-intl=system-icu )
+ use npm || myconf+=( --without-npm )
+ use snapshot || myconf+=( --without-snapshot )
+ use ssl || myconf+=( --without-ssl )
+
+ case ${ABI} in
+ x86) myarch="ia32";;
+ amd64) myarch="x64";;
+ arm) myarch="arm";;
+ *) die "Unrecognized ARCH ${ARCH}";;
+ esac
+
+ "${PYTHON}" configure \
+ --prefix="${EPREFIX}"/usr \
+ --dest-cpu=${myarch} \
+ --shared-openssl \
+ --shared-libuv \
+ --shared-http-parser \
+ --shared-zlib \
+ --without-dtrace \
+ "${myconf[@]}" || die
+}
+
+src_compile() {
+ emake -C out mksnapshot
+ pax-mark m "out/${BUILDTYPE}/mksnapshot"
+ emake -C out
+}
+
+src_install() {
+ local LIBDIR="${ED}/usr/$(get_libdir)"
+ emake install DESTDIR="${ED}" PREFIX=/usr
+ use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
+ rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+ find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete
+
+ # set up a symlink structure that npm expects..
+ dodir /usr/include/node/deps/{v8,uv}
+ dosym . /usr/include/node/src
+ for var in deps/{uv,v8}/include; do
+ dosym ../.. /usr/include/node/${var}
+ done
+
+ pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+ declare -xl TESTTYPE="${BUILDTYPE}"
+ "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message simple || die
+}
+
+pkg_postinst() {
+ einfo "When using node-gyp to install native modules, you can avoid"
+ einfo "having to download the full tarball by doing the following:"
+ einfo ""
+ einfo "node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-0.12.7.ebuild b/net-libs/nodejs/nodejs-0.12.7.ebuild
new file mode 100644
index 000000000000..a1409371d6dd
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.12.7.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# has known failures. sigh.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="debug icu +npm +snapshot +ssl"
+
+RDEPEND="icu? ( dev-libs/icu )
+ ${PYTHON_DEPS}
+ ssl? ( dev-libs/openssl:0=[-bindist] )
+ >=net-libs/http-parser-2.3
+ >=dev-libs/libuv-1.4.2"
+DEPEND="${RDEPEND}
+ !!net-libs/iojs"
+
+S="${WORKDIR}/node-v${PV}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+ tc-export CC CXX PKG_CONFIG
+ export V=1 # Verbose build
+ export BUILDTYPE=Release
+
+ # fix compilation on Darwin
+ # http://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+ # make sure we use python2.* while using gyp
+ sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+ sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+ # less verbose install output (stating the same as portage, basically)
+ sed -i -e "/print/d" tools/install.py || die
+
+ # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+ local LIBDIR=$(get_libdir)
+ sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+ sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+ sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+ # debug builds. change install path, remove optimisations and override buildtype
+ if use debug; then
+ sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+ BUILDTYPE=Debug
+ fi
+}
+
+src_configure() {
+ local myconf=()
+ local myarch=""
+ use debug && myconf+=( --debug )
+ use icu && myconf+=( --with-intl=system-icu )
+ use npm || myconf+=( --without-npm )
+ use snapshot || myconf+=( --without-snapshot )
+ use ssl || myconf+=( --without-ssl )
+
+ case ${ABI} in
+ x86) myarch="ia32";;
+ amd64) myarch="x64";;
+ arm) myarch="arm";;
+ *) die "Unrecognized ARCH ${ARCH}";;
+ esac
+
+ "${PYTHON}" configure \
+ --prefix="${EPREFIX}"/usr \
+ --dest-cpu=${myarch} \
+ --shared-openssl \
+ --shared-libuv \
+ --shared-http-parser \
+ --shared-zlib \
+ --without-dtrace \
+ "${myconf[@]}" || die
+}
+
+src_compile() {
+ emake -C out mksnapshot
+ pax-mark m "out/${BUILDTYPE}/mksnapshot"
+ emake -C out
+}
+
+src_install() {
+ local LIBDIR="${ED}/usr/$(get_libdir)"
+ emake install DESTDIR="${ED}" PREFIX=/usr
+ use npm && dodoc -r "${LIBDIR}"/node_modules/npm/html
+ rm -rf "${LIBDIR}"/node_modules/npm/{doc,html} || die
+ find "${LIBDIR}"/node_modules -type f -name "LICENSE*" -or -name "LICENCE*" -delete
+
+ # set up a symlink structure that npm expects..
+ dodir /usr/include/node/deps/{v8,uv}
+ dosym . /usr/include/node/src
+ for var in deps/{uv,v8}/include; do
+ dosym ../.. /usr/include/node/${var}
+ done
+
+ pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+ declare -xl TESTTYPE="${BUILDTYPE}"
+ "${PYTHON}" tools/test.py --mode=${TESTTYPE} -J message simple || die
+}
+
+pkg_postinst() {
+ einfo "When using node-gyp to install native modules, you can avoid"
+ einfo "having to download the full tarball by doing the following:"
+ einfo ""
+ einfo "node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-0.8.28.ebuild b/net-libs/nodejs/nodejs-0.8.28.ebuild
new file mode 100644
index 000000000000..4680955cc1d4
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.8.28.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_DEPEND="2"
+
+inherit python eutils multilib pax-utils
+
+# omgwtf
+RESTRICT="test"
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE=""
+
+DEPEND="dev-libs/openssl"
+RDEPEND="${PYTHON_DEPS}
+ ${DEPEND}"
+
+S=${WORKDIR}/node-v${PV}
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ # fix compilation on Darwin
+ # http://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+ python_convert_shebangs 2 tools/node-waf || die
+}
+
+src_configure() {
+ # this is an autotools lookalike confuserator
+ ./configure --prefix="${EPREFIX}"/usr --openssl-use-sys --shared-zlib || die
+}
+
+src_compile() {
+ emake || die
+}
+
+src_install() {
+ local MYLIB=$(get_libdir)
+ mkdir -p "${ED}"/usr/include/node
+ mkdir -p "${ED}"/usr/bin
+ mkdir -p "${ED}"/usr/"${MYLIB}"/node_modules/npm
+ mkdir -p "${ED}"/usr/"${MYLIB}"/node
+ cp 'src/eio-emul.h' 'src/ev-emul.h' 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff"
+ cp -R deps/uv/include/* "${ED}"/usr/include/node || die "Failed to copy stuff"
+ cp -R deps/v8/include/* "${ED}"/usr/include/node || die "Failed to copy stuff"
+ cp 'out/Release/node' "${ED}"/usr/bin/node || die "Failed to copy stuff"
+ cp -R deps/npm/* "${ED}"/usr/"${MYLIB}"/node_modules/npm || die "Failed to copy stuff"
+ cp -R tools/wafadmin "${ED}"/usr/"${MYLIB}"/node/ || die "Failed to copy stuff"
+ cp 'tools/node-waf' "${ED}"/usr/bin/ || die "Failed to copy stuff"
+
+ # now add some extra stupid just because we can
+ # needs to be a symlink because of hardcoded paths ... no es bueno!
+ dosym /usr/"${MYLIB}"/node_modules/npm/bin/npm-cli.js /usr/bin/npm
+ pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+ emake test || die
+}
diff --git a/net-libs/obby/Manifest b/net-libs/obby/Manifest
new file mode 100644
index 000000000000..d9bcfa950d7b
--- /dev/null
+++ b/net-libs/obby/Manifest
@@ -0,0 +1 @@
+DIST obby-0.4.8.tar.gz 530525 SHA256 7d1d7ba6e800cea1b1a3c47d1189f959ef49a647ebe77170351e2dfd27b89b67 SHA512 39cd01e74f8df805bd6f077afab023f70f6da16d421dd0d12abc82972a9ec3e2563cc4ef6bf99c74b59f1c96e18eb3d5065f8b07add8ecb56c26601715f184d0 WHIRLPOOL bf00c4f68e64e2cf1fb39031f4f0ede396c9842aaecf94dcaed6d8f092fb35194e66475406963b510c66e0814706ceb710dd0a183ba876fe5c3109f1e685ea44
diff --git a/net-libs/obby/metadata.xml b/net-libs/obby/metadata.xml
new file mode 100644
index 000000000000..47040ec30053
--- /dev/null
+++ b/net-libs/obby/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>
+ <email>dev-zero@gentoo.org</email>
+ <name>Tiziano Müller</name>
+ </maintainer>
+ <maintainer>
+ <email>xarthisius@gentoo.org</email>
+ <name>Kacper Kowalik</name>
+ </maintainer>
+ <longdescription>Framework to synchronize changes within a text documents to other participants of a session</longdescription>
+</pkgmetadata>
diff --git a/net-libs/obby/obby-0.4.8.ebuild b/net-libs/obby/obby-0.4.8.ebuild
new file mode 100644
index 000000000000..d0b7c2c74f83
--- /dev/null
+++ b/net-libs/obby/obby-0.4.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit multilib
+
+DESCRIPTION="Library for collaborative text editing"
+HOMEPAGE="http://gobby.0x539.de/"
+SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86"
+IUSE="avahi ipv6 nls static-libs"
+
+RDEPEND="net-libs/net6
+ dev-libs/libsigc++:2
+ avahi? ( net-dns/avahi[dbus] )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_configure() {
+ econf \
+ $(use_with avahi zeroconf) \
+ $(use_enable ipv6) \
+ $(use_enable nls) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib${PN}.la
+}
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
new file mode 100644
index 000000000000..3ac3ffff331e
--- /dev/null
+++ b/net-libs/opal/Manifest
@@ -0,0 +1,4 @@
+DIST opal-3.10.11-htmldoc.tar.bz2 2944338 SHA256 66708e69f1bea6a1160f3aa904643f49b2e2679822c1446d5aeb1f29dd973cea SHA512 6075487344d4cfa5c2e2219376e3eccd98028475eac6f89d20d24d611a8806a27eb354ce8e77e16c620c8cb3d398b9502082f3fe8f67763d3f67feea835819b5 WHIRLPOOL a23aafd7da85d00db2c285641ab75f1c0850c6eaaaa649c8278891282d86312d062be7ac4d89ec3955eac11eb91c018c7b05a89282b35f1b129af90f36e34033
+DIST opal-3.10.11.tar.bz2 8590616 SHA256 f38e7969e88a28dd9a10a6051315aceecde79d0bbd1a35676868dc5787aed706 SHA512 970745375e7ebb29178ce9d0bc29254e69dd952e5f754038979a8613489a26f0fb68d63ec2709ffa1964e50fe9cfde874489f683a451d83e7a075d62d9228fa1 WHIRLPOOL b4387f8a664c2763f1e62dc16772ce869dee6d5aaac271ef0013d1e7f207d19c5e3578c26215ce246c278bc4de9aa538dabae8a3b6a794b250a5f30f9be7d206
+DIST opal-3.12.4-htmldoc.tar.bz2 3094840 SHA256 858cd14bf2de54a6aeb5397d8627a7e50ea6b63e18b0f47c057386d079b07fbc SHA512 c80ed1b0df9fffbfc07ea590a0e80afd9b985ed2971deb640e92776723f12e6a544eaf3441261d34df0ad0bbca6b03a983f7a7b0b92fbf333f1a8688d2ca735d WHIRLPOOL e2d5ba8e4429c60003dd995add2aea12b22a2f23da8dd3ed0025fa451752412805d4f25160809542dd8d61684edca35d73174037650b3546cedc97495faa29b9
+DIST opal-3.12.4.tar.bz2 9694052 SHA256 2786bc27f83c59d74165e318656ada230164ebcba61f0d8cb1b55bfcd13b2d82 SHA512 83c44dbd077e45a5bf63963b8a5348c24c65e9ab8b25afccacbf4632aa55fce26b6133c8c40f06da90fe73865165509c67b19286e868eada0270adefd3e38733 WHIRLPOOL 3063d5b9d64e690898d60e5e26f3936b28b954ce7fb2a2dc2f78cfde05932efc63ec7874dd73c87561d1a3c3f564837855559ca031121e7d9fe18c25508042d7
diff --git a/net-libs/opal/files/opal-3.10.11-libav9-gentoo.patch b/net-libs/opal/files/opal-3.10.11-libav9-gentoo.patch
new file mode 100644
index 000000000000..6288866262d2
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.11-libav9-gentoo.patch
@@ -0,0 +1,262 @@
+--- plugins/video/common/dyna.cxx
++++ plugins/video/common/dyna.cxx
+@@ -37,6 +37,7 @@
+ * Craig Southeren (craigs@postincrement.com)
+ * Matthias Schneider (ma30002000@yahoo.de)
+ */
++#include <stdio.h>
+ #include "dyna.h"
+
+ bool DynaLink::Open(const char *name)
+@@ -210,14 +211,14 @@
+ #endif
+
+
+-FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
++FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
+ {
+ m_codec = codec;
+- if (m_codec==CODEC_ID_H264)
++ if (m_codec==AV_CODEC_ID_H264)
+ snprintf( m_codecString, sizeof(m_codecString), "H264");
+- if (m_codec==CODEC_ID_H263P)
++ if (m_codec==AV_CODEC_ID_H263P)
+ snprintf( m_codecString, sizeof(m_codecString), "H263+");
+- if (m_codec==CODEC_ID_MPEG4)
++ if (m_codec==AV_CODEC_ID_MPEG4)
+ snprintf( m_codecString, sizeof(m_codecString), "MPEG4");
+ m_isLoadedOK = false;
+ }
+@@ -348,12 +349,12 @@
+ return true;
+ }
+
+-AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
++AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id)
+ {
+ return Favcodec_find_encoder(id);
+ }
+
+-AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
++AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id)
+ {
+ WaitAndSignal m(processLock);
+
+--- plugins/video/common/dyna.h
++++ plugins/video/common/dyna.h
+@@ -88,13 +88,13 @@
+ class FFMPEGLibrary
+ {
+ public:
+- FFMPEGLibrary(CodecID codec);
++ FFMPEGLibrary(AVCodecID codec);
+ ~FFMPEGLibrary();
+
+ bool Load();
+
+- AVCodec *AvcodecFindEncoder(enum CodecID id);
+- AVCodec *AvcodecFindDecoder(enum CodecID id);
++ AVCodec *AvcodecFindEncoder(enum AVCodecID id);
++ AVCodec *AvcodecFindDecoder(enum AVCodecID id);
+ AVCodecContext *AvcodecAllocContext(void);
+ AVFrame *AvcodecAllocFrame(void);
+ int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
+@@ -117,15 +117,15 @@
+ DynaLink m_libAvcodec;
+ DynaLink m_libAvutil;
+
+- CodecID m_codec;
++ AVCodecID m_codec;
+ char m_codecString[32];
+
+ void (*Favcodec_init)(void);
+ void (*Fav_init_packet)(AVPacket *pkt);
+
+ void (*Favcodec_register_all)(void);
+- AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
+- AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
++ AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id);
++ AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id);
+ AVCodecContext *(*Favcodec_alloc_context)(void);
+ AVFrame *(*Favcodec_alloc_frame)(void);
+ int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
+--- plugins/video/H.263-1998/h263-1998.cxx
++++ plugins/video/H.263-1998/h263-1998.cxx
+@@ -43,6 +43,12 @@
+ * $Date: 2014/04/29 09:02:06 $
+ */
+
++#define CODEC_FLAG_H263P_UMV 0x02000000
++#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
++#define CODEC_FLAG_H263P_AIV 0x00000008
++#define CODEC_FLAG_OBMC 0x00000001
++#define FF_I_TYPE 1
++
+ #ifndef PLUGIN_CODEC_DLL_EXPORTS
+ #include "plugin-config.h"
+ #endif
+@@ -94,7 +100,7 @@
+ { CIF16_WIDTH, CIF16_HEIGHT, PLUGINCODEC_CIF16_MPI },
+ };
+
+-static FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H263P);
++static FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H263P);
+
+
+ /////////////////////////////////////////////////////////////////////////////
+@@ -203,7 +209,7 @@
+ PTRACE(4, m_prefix, "Encoder closed");
+ }
+
+-bool H263_Base_EncoderContext::Init(CodecID codecId)
++bool H263_Base_EncoderContext::Init(AVCodecID codecId)
+ {
+ PTRACE(5, m_prefix, "Opening encoder");
+
+@@ -616,7 +622,7 @@
+
+ bool H263_RFC2190_EncoderContext::Init()
+ {
+- if (!H263_Base_EncoderContext::Init(CODEC_ID_H263))
++ if (!H263_Base_EncoderContext::Init(AV_CODEC_ID_H263))
+ return false;
+
+ #if LIBAVCODEC_RTP_MODE
+@@ -661,7 +667,7 @@
+
+ bool H263_RFC2429_EncoderContext::Init()
+ {
+- return H263_Base_EncoderContext::Init(CODEC_ID_H263P);
++ return H263_Base_EncoderContext::Init(AV_CODEC_ID_H263P);
+ }
+
+
+@@ -685,7 +691,7 @@
+ if (!FFMPEGLibraryInstance.Load())
+ return;
+
+- if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H263)) == NULL) {
++ if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_H263)) == NULL) {
+ PTRACE(1, m_prefix, "Codec not found for decoder");
+ return;
+ }
+--- plugins/video/H.263-1998/h263-1998.h
++++ plugins/video/H.263-1998/h263-1998.h
+@@ -115,7 +115,7 @@
+ virtual ~H263_Base_EncoderContext();
+
+ virtual bool Init() = 0;
+- virtual bool Init(CodecID codecId);
++ virtual bool Init(AVCodecID codecId);
+
+ virtual bool SetOptions(const char * const * options);
+ virtual void SetOption(const char * option, const char * value);
+--- plugins/video/H.263-1998/Makefile.in
++++ plugins/video/H.263-1998/Makefile.in
+@@ -34,7 +34,7 @@
+ $(COMMONDIR)/mpi.cxx \
+ $(COMMONDIR)/dyna.cxx
+
+-CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -fpermissive
+ LIBS += @DL_LIBS@
+
+ HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
+--- plugins/video/H.264/h264-x264.cxx
++++ plugins/video/H.264/h264-x264.cxx
+@@ -36,6 +36,15 @@
+ * $Date: 2014/04/29 09:02:06 $
+ */
+
++#define FF_ER_AGGRESSIVE 3
++#define CODEC_FLAG2_BRDO 0x00000400
++#define CODEC_FLAG2_MEMC_ONLY 0x00001000
++#define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000
++#define CODEC_FLAG2_SKIP_RD 0x00004000 ///< RD optimal MB level residual skipping
++#define FF_IDCT_H264 11
++
++#include <stdio.h>
++
+ #ifndef PLUGIN_CODEC_DLL_EXPORTS
+ #include "plugin-config.h"
+ #endif
+@@ -104,7 +113,7 @@
+
+ ///////////////////////////////////////////////////////////////////////////////
+
+-FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H264);
++FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H264);
+
+ PLUGINCODEC_CONTROL_LOG_FUNCTION_DEF
+
+@@ -1064,7 +1073,7 @@
+ allows you to fail the create operation (return false), which cannot
+ be done in the normal C++ constructor. */
+
+- if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H264)) == NULL)
++ if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_H264)) == NULL)
+ return false;
+
+ if ((m_context = FFMPEGLibraryInstance.AvcodecAllocContext()) == NULL)
+@@ -1072,7 +1081,7 @@
+
+ m_context->workaround_bugs = FF_BUG_AUTODETECT;
+ #ifdef FF_ER_AGGRESSIVE
+- m_context->error_recognition = FF_ER_AGGRESSIVE;
++ m_context->err_recognition = FF_ER_AGGRESSIVE;
+ #endif
+ m_context->idct_algo = FF_IDCT_H264;
+ m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
+
+--- plugins/video/MPEG4-ffmpeg/mpeg4.cxx
++++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+@@ -53,6 +53,11 @@
+
+ */
+
++#define CODEC_FLAG_H263P_UMV 0x02000000
++#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
++#define FF_I_TYPE 1
++#define CODEC_FLAG_PART 0x0080
++
+ // Plugin specific
+ #define _CRT_SECURE_NO_DEPRECATE
+
+@@ -205,7 +210,7 @@
+ { 0 }
+ };
+
+-FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_MPEG4);
++FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_MPEG4);
+
+
+ static bool mpeg4IsIframe (BYTE * frameBuffer, unsigned int frameLen )
+@@ -701,7 +706,7 @@
+ return false;
+ }
+
+- if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){
++ if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(AV_CODEC_ID_MPEG4)) == NULL){
+ PTRACE(1, "MPEG4", "Encoder not found");
+ return false;
+ }
+@@ -1391,7 +1396,7 @@
+
+ bool MPEG4DecoderContext::OpenCodec()
+ {
+- if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_MPEG4)) == NULL) {
++ if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_MPEG4)) == NULL) {
+ PTRACE(1, "MPEG4", "Decoder not found for encoder");
+ return false;
+ }
+--- plugins/video/MPEG4-ffmpeg/Makefile.in
++++ plugins/video/MPEG4-ffmpeg/Makefile.in
+@@ -30,7 +30,7 @@
+ SRCDIR := .
+ SRCS := mpeg4.cxx $(COMMONDIR)/dyna.cxx
+
+-CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -fpermissive
+ LIBS += @DL_LIBS@
+
+ # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
diff --git a/net-libs/opal/files/opal-3.10.9-avoid_cflags_mixup.patch b/net-libs/opal/files/opal-3.10.9-avoid_cflags_mixup.patch
new file mode 100644
index 000000000000..7f9a3b5c0766
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.9-avoid_cflags_mixup.patch
@@ -0,0 +1,131 @@
+diff -uNr opal-3.10.8.orig/plugins/plugin-inc.mak.in opal-3.10.8/plugins/plugin-inc.mak.in
+--- opal-3.10.8.orig/plugins/plugin-inc.mak.in 2012-10-24 12:07:31.000000000 -0400
++++ opal-3.10.8/plugins/plugin-inc.mak.in 2012-10-24 12:09:22.000000000 -0400
+@@ -31,11 +31,13 @@
+ CC := @CC@
+ CXX := @CXX@
+ CFLAGS += @CFLAGS@ -I@prefix@/include -I$(PLUGINDIR)/../include -I$(PLUGINDIR)
++CXXFLAGS += @CXXFLAGS@ -I@prefix@/include -I$(PLUGINDIR)/../include -I$(PLUGINDIR)
+ LDFLAGS += @LDFLAGS@ @LDSO@
+ PLUGINEXT :=@PLUGINEXT@
+
+ ifneq ($(DEBUG),)
+ CFLAGS += -g
++CXXFLAGS += -g
+ endif
+
+ OBJDIR := $(PLUGINDIR)/../lib_@OSTYPE@_@MACHTYPE@/plugins/$(BASENAME)
+@@ -64,11 +66,11 @@
+
+ $(OBJDIR)/%.o : %.cxx
+ @mkdir -p $(OBJDIR) >/dev/null 2>&1
+- $(Q_CC)$(CXX) -c $(CXXFLAGS) $(CFLAGS) -o $@ $<
++ $(Q_CC)$(CXX) -c $(CXXFLAGS) -o $@ $<
+
+ $(OBJDIR)/%.o : %.cpp
+ @mkdir -p $(OBJDIR) >/dev/null 2>&1
+- $(Q_CC)$(CXX) -c $(CXXFLAGS) $(CFLAGS) -o $@ $<
++ $(Q_CC)$(CXX) -c $(CXXFLAGS) -o $@ $<
+
+ OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(notdir $(SRCS))))))
+
+diff -uNr opal-3.10.8.orig/plugins/video/H.261-vic/Makefile.in opal-3.10.8/plugins/video/H.261-vic/Makefile.in
+--- opal-3.10.8.orig/plugins/video/H.261-vic/Makefile.in 2012-10-24 12:07:46.000000000 -0400
++++ opal-3.10.8/plugins/video/H.261-vic/Makefile.in 2012-10-24 12:04:10.000000000 -0400
+@@ -39,7 +39,7 @@
+ $(SRCDIR)/bv.c \
+
+
+-CFLAGS += -I$(COMMONDIR)
++CXXFLAGS += -I$(COMMONDIR)
+
+ INSTALL_DIR := @VC_PLUGIN_DIR@
+ PLUGINDIR := @PLUGINDIR@
+diff -uNr opal-3.10.8.orig/plugins/video/H.263-1998/Makefile.in opal-3.10.8/plugins/video/H.263-1998/Makefile.in
+--- opal-3.10.8.orig/plugins/video/H.263-1998/Makefile.in 2012-10-24 12:08:02.000000000 -0400
++++ opal-3.10.8/plugins/video/H.263-1998/Makefile.in 2012-10-24 12:04:00.000000000 -0400
+@@ -34,12 +34,12 @@
+ $(COMMONDIR)/mpi.cxx \
+ $(COMMONDIR)/dyna.cxx
+
+-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+ LIBS += @DL_LIBS@
+
+ HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
+ ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes)
+-CFLAGS += -DLIBAVCODEC_RTP_MODE=1
++CXXFLAGS += -DLIBAVCODEC_RTP_MODE=1
+ endif
+
+ vpath %.cxx $(COMMONDIR)
+diff -uNr opal-3.10.8.orig/plugins/video/H.264/gpl/Makefile.in opal-3.10.8/plugins/video/H.264/gpl/Makefile.in
+--- opal-3.10.8.orig/plugins/video/H.264/gpl/Makefile.in 2012-10-24 12:06:15.000000000 -0400
++++ opal-3.10.8/plugins/video/H.264/gpl/Makefile.in 2012-10-24 12:11:11.000000000 -0400
+@@ -47,6 +47,7 @@
+ CC =@CC@
+ CXX =@CXX@
+ CFLAGS =@X264_CFLAGS@ -I.. -I$(PLUGINDIR) -I$(OPALDIR)/include -DGPL_HELPER_APP -DPLUGINCODEC_TRACING
++CXXFLAGS =@X264_CFLAGS@ -I.. -I$(PLUGINDIR) -I$(OPALDIR)/include -DGPL_HELPER_APP -DPLUGINCODEC_TRACING
+ LDFLAGS =@LDFLAGS@ @X264_LIBS@
+
+
+@@ -59,7 +60,7 @@
+
+ $(OBJDIR)/%.o : %.cxx
+ @mkdir -p $(OBJDIR) >/dev/null 2>&1
+- $(Q_CC)$(CXX) $(CFLAGS) -c $< -o $@
++ $(Q_CC)$(CXX) $(CXXFLAGS) -c $< -o $@
+
+ $(OBJDIR)/%.o : %.c
+ @mkdir -p $(OBJDIR) >/dev/null 2>&1
+diff -uNr opal-3.10.8.orig/plugins/video/H.264/Makefile.in opal-3.10.8/plugins/video/H.264/Makefile.in
+--- opal-3.10.8.orig/plugins/video/H.264/Makefile.in 2012-10-24 12:08:17.000000000 -0400
++++ opal-3.10.8/plugins/video/H.264/Makefile.in 2012-10-24 12:04:29.000000000 -0400
+@@ -34,12 +34,12 @@
+ $(SHAREDDIR)/x264wrap.cxx \
+ $(COMMONDIR)/dyna.cxx \
+
+-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"'
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"'
+ LIBS += @DL_LIBS@
+
+ IS_H264_LICENSED:=@IS_H264_LICENSED@
+ ifeq ($(IS_H264_LICENSED),yes)
+- CFLAGS += @X264_CFLAGS@ -DX264_LICENSED
++ CXXFLAGS += @X264_CFLAGS@ -DX264_LICENSED
+ LIBS += @X264_LIBS@
+ else
+ SUBDIRS := gpl
+diff -uNr opal-3.10.8.orig/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.10.8/plugins/video/MPEG4-ffmpeg/Makefile.in
+--- opal-3.10.8.orig/plugins/video/MPEG4-ffmpeg/Makefile.in 2012-10-24 12:08:36.000000000 -0400
++++ opal-3.10.8/plugins/video/MPEG4-ffmpeg/Makefile.in 2012-10-24 12:04:45.000000000 -0400
+@@ -30,14 +30,14 @@
+ SRCDIR := .
+ SRCS := mpeg4.cxx $(COMMONDIR)/dyna.cxx
+
+-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+ LIBS += @DL_LIBS@
+
+ # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
+ # Also add libavutil, so ffmpeg headers can #include "log.h".
+ LIBAVCODEC_SOURCE_DIR := @LIBAVCODEC_SOURCE_DIR@
+ ifneq (,$(LIBAVCODEC_SOURCE_DIR))
+-CFLAGS += -I$(LIBAVCODEC_SOURCE_DIR) -I$(LIBAVCODEC_SOURCE_DIR)/libavutil
++CXXFLAGS += -I$(LIBAVCODEC_SOURCE_DIR) -I$(LIBAVCODEC_SOURCE_DIR)/libavutil
+ endif
+
+ vpath %.cxx $(COMMONDIR)
+diff -uNr opal-3.10.8.orig/plugins/video/THEORA/Makefile.in opal-3.10.8/plugins/video/THEORA/Makefile.in
+--- opal-3.10.8.orig/plugins/video/THEORA/Makefile.in 2012-10-24 12:08:47.000000000 -0400
++++ opal-3.10.8/plugins/video/THEORA/Makefile.in 2012-10-24 12:05:00.000000000 -0400
+@@ -30,7 +30,7 @@
+ SRCDIR := .
+ SRCS := theora_frame.cxx theora_plugin.cxx
+
+-CFLAGS += @THEORA_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @THEORA_CFLAGS@ -I$(COMMONDIR)
+ LIBS += @THEORA_LIBS@
+
+ INSTALL_DIR := @VC_PLUGIN_DIR@
diff --git a/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch b/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch
new file mode 100644
index 000000000000..3d1761566ed1
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch
@@ -0,0 +1,13 @@
+# Sent to upstream on 2012-10-23
+# By Jesus Rivero <neurogeek@gentoo.org>
+diff -uNr opal-3.10.8.orig/include/h323/h323.h opal-3.10.8/include/h323/h323.h
+--- opal-3.10.8.orig/include/h323/h323.h 2012-10-22 07:50:37.000000000 -0400
++++ opal-3.10.8/include/h323/h323.h 2012-10-23 14:10:37.000000000 -0400
+@@ -40,6 +40,7 @@
+ #include <h323/h323con.h>
+ #include <h323/gkclient.h>
+ #include <opal/buildopts.h>
++#include <ptlib.h>
+
+ PString OpalGetVersion();
+ unsigned OpalGetMajorVersion();
diff --git a/net-libs/opal/files/opal-3.10.9-ffmpeg.patch b/net-libs/opal/files/opal-3.10.9-ffmpeg.patch
new file mode 100644
index 000000000000..18608651eaeb
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.9-ffmpeg.patch
@@ -0,0 +1,189 @@
+Note: This is not optimal but is backported from what is in the 3.12 branch.
+
+
+r28871 | rjongbloed | 2013-01-13 02:18:43 -0300 (Sun, 13 Jan 2013) | 2 lines
+
+Fixed compile against latest FFMPEG, specifically Mac OS-X "port" version. Have no idea what all the deprecated symbols are replaced by!
+
+Index: opal-3.10.9/plugins/video/H.263-1998/h263-1998.cxx
+===================================================================
+--- opal-3.10.9.orig/plugins/video/H.263-1998/h263-1998.cxx
++++ opal-3.10.9/plugins/video/H.263-1998/h263-1998.cxx
+@@ -312,6 +312,7 @@ void H263_Base_EncoderContext::SetOption
+ return;
+ }
+
++#ifdef CODEC_FLAG_H263P_UMV
+ if (STRCMPI(option, H263_ANNEX_D) == 0) {
+ // Annex D: Unrestructed Motion Vectors
+ // Level 2+
+@@ -322,7 +323,9 @@ void H263_Base_EncoderContext::SetOption
+ m_context->flags &= ~CODEC_FLAG_H263P_UMV;
+ return;
+ }
++#endif
+
++#ifdef CODEC_FLAG_OBMC
+ #if 0 // DO NOT ENABLE THIS FLAG. FFMPEG IS NOT THREAD_SAFE WHEN THIS FLAG IS SET
+ if (STRCMPI(option, H263_ANNEX_F) == 0) {
+ // Annex F: Advanced Prediction Mode
+@@ -334,7 +337,9 @@ void H263_Base_EncoderContext::SetOption
+ return;
+ }
+ #endif
++#endif
+
++#ifdef CODEC_FLAG_AC_PRED
+ if (STRCMPI(option, H263_ANNEX_I) == 0) {
+ // Annex I: Advanced Intra Coding
+ // Level 3+
+@@ -345,7 +350,9 @@ void H263_Base_EncoderContext::SetOption
+ m_context->flags &= ~CODEC_FLAG_AC_PRED;
+ return;
+ }
++#endif
+
++#ifdef CODEC_FLAG_LOOP_FILTER
+ if (STRCMPI(option, H263_ANNEX_J) == 0) {
+ // Annex J: Deblocking Filter
+ // works with eyeBeam
+@@ -355,7 +362,9 @@ void H263_Base_EncoderContext::SetOption
+ m_context->flags &= ~CODEC_FLAG_LOOP_FILTER;
+ return;
+ }
++#endif
+
++#ifdef CODEC_FLAG_H263P_SLICE_STRUCT
+ if (STRCMPI(option, H263_ANNEX_K) == 0) {
+ // Annex K: Slice Structure
+ // does not work with eyeBeam
+@@ -365,7 +374,9 @@ void H263_Base_EncoderContext::SetOption
+ m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
+ return;
+ }
++#endif
+
++#ifdef CODEC_FLAG_H263P_AIV
+ if (STRCMPI(option, H263_ANNEX_S) == 0) {
+ // Annex S: Alternative INTER VLC mode
+ // does not work with eyeBeam
+@@ -375,6 +386,7 @@ void H263_Base_EncoderContext::SetOption
+ m_context->flags &= ~CODEC_FLAG_H263P_AIV;
+ return;
+ }
++#endif
+
+ if (STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATION) == 0 ||
+ STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATIONS) == 0) {
+@@ -452,12 +464,24 @@ bool H263_Base_EncoderContext::OpenCodec
+
+ #define CODEC_TRACER_FLAG(tracer, flag) \
+ PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled"));
++#ifdef CODEC_FLAG_H263P_UMV
+ CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
++#endif
++#ifdef CODEC_FLAG_OBMC
+ CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
++#endif
++#ifdef CODEC_FLAG_AC_PRED
+ CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
++#endif
++#ifdef CODEC_FLAG_H263P_SLICE_STRUCT
+ CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
++#endif
++#ifdef CODEC_FLAG_LOOP_FILTER
+ CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
++#endif
++#ifdef CODEC_FLAG_H263P_AIV
+ CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
++#endif
+
+ return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
+ }
+@@ -521,7 +545,7 @@ bool H263_Base_EncoderContext::EncodeFra
+
+ // Need to copy to local buffer to guarantee 16 byte alignment
+ memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
+- m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
++ m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
+
+ /*
+ m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
+@@ -603,13 +627,21 @@ bool H263_RFC2190_EncoderContext::Init()
+ m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
+ m_context->opaque = this; // used to separate out packets from different encode threads
+
++#ifdef CODEC_FLAG_H263P_UMV
+ m_context->flags &= ~CODEC_FLAG_H263P_UMV;
++#endif
++#ifdef CODEC_FLAG_4MV
+ m_context->flags &= ~CODEC_FLAG_4MV;
+-#if LIBAVCODEC_RTP_MODE
++#endif
++#if LIBAVCODEC_RTP_MODE && defined(CODEC_FLAG_H263P_AIC)
+ m_context->flags &= ~CODEC_FLAG_H263P_AIC;
+ #endif
++#ifdef CODEC_FLAG_H263P_AIV
+ m_context->flags &= ~CODEC_FLAG_H263P_AIV;
++#endif
++#ifdef CODEC_FLAG_H263P_SLICE_STRUCT
+ m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
++#endif
+
+ return true;
+ }
+Index: opal-3.10.9/plugins/video/H.264/h264-x264.cxx
+===================================================================
+--- opal-3.10.9.orig/plugins/video/H.264/h264-x264.cxx
++++ opal-3.10.9/plugins/video/H.264/h264-x264.cxx
+@@ -1071,13 +1071,13 @@ class MyDecoder : public PluginCodec<MY_
+ return false;
+
+ m_context->workaround_bugs = FF_BUG_AUTODETECT;
++#ifdef FF_ER_AGGRESSIVE
+ m_context->error_recognition = FF_ER_AGGRESSIVE;
++#endif
+ m_context->idct_algo = FF_IDCT_H264;
+ m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
+ m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
+- m_context->flags2 = CODEC_FLAG2_BRDO |
+- CODEC_FLAG2_MEMC_ONLY |
+- CODEC_FLAG2_DROP_FRAME_TIMECODE |
++ m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
+ CODEC_FLAG2_SKIP_RD |
+ CODEC_FLAG2_CHUNKS;
+
+Index: opal-3.10.9/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+===================================================================
+--- opal-3.10.9.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
++++ opal-3.10.9/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+@@ -594,12 +594,10 @@ void MPEG4EncoderContext::SetStaticEncod
+ #else
+ m_avcontext->max_b_frames=0; /*don't use b frames*/
+ m_avcontext->flags|=CODEC_FLAG_AC_PRED;
+- m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
+ /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
+ m_avcontext->flags|=CODEC_FLAG_4MV;
+ m_avcontext->flags|=CODEC_FLAG_GMC;
+ m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
+- m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
+ #endif
+ m_avcontext->opaque = this; // for use in RTP callback
+ }
+@@ -804,7 +802,7 @@ int MPEG4EncoderContext::EncodeFrames(co
+ // Should the next frame be an I-Frame?
+ if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
+ {
+- m_avpicture->pict_type = FF_I_TYPE;
++ m_avpicture->pict_type = AV_PICTURE_TYPE_I;
+ }
+ else // No IFrame requested, let avcodec decide what to do
+ {
+@@ -1325,7 +1323,6 @@ void MPEG4DecoderContext::SetFrameHeight
+
+ void MPEG4DecoderContext::SetStaticDecodingParams() {
+ m_avcontext->flags |= CODEC_FLAG_4MV;
+- m_avcontext->flags |= CODEC_FLAG_PART;
+ m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
+ }
+
diff --git a/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch b/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch
new file mode 100644
index 000000000000..65708635a34d
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch
@@ -0,0 +1,29 @@
+diff -uNr opal-3.10.9.orig/Makefile.in opal-3.10.9/Makefile.in
+--- opal-3.10.9.orig/Makefile.in 2012-12-03 11:09:17.000000000 -0500
++++ opal-3.10.9/Makefile.in 2012-12-03 11:09:35.000000000 -0500
+@@ -371,9 +371,9 @@
+ ifeq ($(OPAL_JAVA), yes)
+
+ JAVA_SRCDIR = $(OPAL_SRCDIR)/java
+-JAVA_WRAPPER = $(JAVA_SRCDIR)/java_swig_wrapper.c
++JAVA_WRAPPER = $(JAVA_SRCDIR)/java_swig_wrapper.cxx
+
+-VPATH_C += $(JAVA_SRCDIR)
++VPATH_CXX += $(JAVA_SRCDIR)
+ SOURCES += $(JAVA_WRAPPER)
+
+ endif
+@@ -384,10 +384,10 @@
+
+ ifeq ($(OPAL_RUBY), yes)
+
+-RUBY_SRCDIR = $(OPAL_SRCDIR)/ruby
+-RUBY_WRAPPER = $(JAVA_SRCDIR)/ruby_swig_wrapper.c
++RUBY_SRCDIR = $(OPAL_SRCDIR)/Ruby
++RUBY_WRAPPER = $(JAVA_SRCDIR)/ruby_swig_wrapper.cxx
+
+-VPATH_C += $(RUBY_SRCDIR)
++VPATH_CXX += $(RUBY_SRCDIR)
+ SOURCES += $(RUBY_WRAPPER)
+
+ endif
diff --git a/net-libs/opal/files/opal-3.10.9-labs_is_in_stdlib.patch b/net-libs/opal/files/opal-3.10.9-labs_is_in_stdlib.patch
new file mode 100644
index 000000000000..ac8a7ef2000f
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.9-labs_is_in_stdlib.patch
@@ -0,0 +1,11 @@
+diff -uNr opal-3.10.8.orig/plugins/audio/G.722.2/AMR-WB/dec_lpc.c opal-3.10.8/plugins/audio/G.722.2/AMR-WB/dec_lpc.c
+--- opal-3.10.8.orig/plugins/audio/G.722.2/AMR-WB/dec_lpc.c 2012-10-22 07:50:37.000000000 -0400
++++ opal-3.10.8/plugins/audio/G.722.2/AMR-WB/dec_lpc.c 2012-10-22 10:20:49.000000000 -0400
+@@ -3,6 +3,7 @@
+ * 3GPP AMR Wideband Floating-point Speech Codec
+ *===================================================================
+ */
++#include <stdlib.h>
+ #include <math.h>
+ #include "typedef.h"
+ #include "dec_util.h"
diff --git a/net-libs/opal/files/opal-3.10.9-svn_revision_override.patch b/net-libs/opal/files/opal-3.10.9-svn_revision_override.patch
new file mode 100644
index 000000000000..c2a15b16ef82
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.9-svn_revision_override.patch
@@ -0,0 +1,15 @@
+diff -uNr opal-3.10.8.orig/src/opal/manager.cxx opal-3.10.8/src/opal/manager.cxx
+--- opal-3.10.8.orig/src/opal/manager.cxx 2012-10-22 07:50:36.000000000 -0400
++++ opal-3.10.8/src/opal/manager.cxx 2012-10-22 08:30:45.000000000 -0400
+@@ -56,7 +56,10 @@
+ #include <ptclib/url.h>
+
+ #include "../../version.h"
+-#include "../../revision.h"
++
++# define SVN_REVISION 0
++//#include "../../revision.h"
++
+
+
+ static const char * const DefaultMediaFormatOrder[] = {
diff --git a/net-libs/opal/files/opal-3.12.4-avoid_cflags_mixup.patch b/net-libs/opal/files/opal-3.12.4-avoid_cflags_mixup.patch
new file mode 100644
index 000000000000..24686110a42e
--- /dev/null
+++ b/net-libs/opal/files/opal-3.12.4-avoid_cflags_mixup.patch
@@ -0,0 +1,132 @@
+diff -urN opal-3.12.4.old/plugins/plugin-inc.mak.in opal-3.12.4/plugins/plugin-inc.mak.in
+--- opal-3.12.4.old/plugins/plugin-inc.mak.in 2013-06-22 21:14:01.528580888 +0200
++++ opal-3.12.4/plugins/plugin-inc.mak.in 2013-06-22 21:14:42.652579425 +0200
+@@ -32,11 +32,13 @@
+ CXX := @CXX@
+ INSTALL := @INSTALL@
+ CFLAGS += @CFLAGS@ -I@prefix@/include -I$(PLUGINDIR)/../include -I$(PLUGINDIR)
++CXXFLAGS += @CXXFLAGS@ -I@prefix@/include -I$(PLUGINDIR)/../include -I$(PLUGINDIR)
+ LDFLAGS += @LDFLAGS@ @LDSO@
+ PLUGINEXT :=@PLUGINEXT@
+
+ ifneq ($(DEBUG),)
+ CFLAGS += -g
++CXXFLAGS += -g
+ endif
+
+ OBJDIR := $(PLUGINDIR)/../lib_@target@/plugins/$(BASENAME)
+@@ -65,11 +67,11 @@
+
+ $(OBJDIR)/%.o : %.cxx
+ @mkdir -p $(OBJDIR) >/dev/null 2>&1
+- $(Q_CC)$(CXX) -c $(CXXFLAGS) $(CFLAGS) -o $@ $<
++ $(Q_CC)$(CXX) -c $(CXXFLAGS) -o $@ $<
+
+ $(OBJDIR)/%.o : %.cpp
+ @mkdir -p $(OBJDIR) >/dev/null 2>&1
+- $(Q_CC)$(CXX) -c $(CXXFLAGS) $(CFLAGS) -o $@ $<
++ $(Q_CC)$(CXX) -c $(CXXFLAGS) -o $@ $<
+
+ OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(notdir $(SRCS))))))
+
+diff -urN opal-3.12.4.old/plugins/video/H.261-vic/Makefile.in opal-3.12.4/plugins/video/H.261-vic/Makefile.in
+--- opal-3.12.4.old/plugins/video/H.261-vic/Makefile.in 2013-06-22 21:14:01.503580889 +0200
++++ opal-3.12.4/plugins/video/H.261-vic/Makefile.in 2013-06-22 21:14:42.652579425 +0200
+@@ -39,7 +39,7 @@
+ $(SRCDIR)/bv.c \
+
+
+-CFLAGS += -I$(COMMONDIR)
++CXXFLAGS += -I$(COMMONDIR)
+
+ INSTALL_DIR := @VC_PLUGIN_DIR@
+ PLUGINDIR := @PLUGINDIR@
+diff -urN opal-3.12.4.old/plugins/video/H.263-1998/Makefile.in opal-3.12.4/plugins/video/H.263-1998/Makefile.in
+--- opal-3.12.4.old/plugins/video/H.263-1998/Makefile.in 2013-06-22 21:14:01.499580889 +0200
++++ opal-3.12.4/plugins/video/H.263-1998/Makefile.in 2013-06-22 21:16:18.196576026 +0200
+@@ -34,12 +34,12 @@
+ $(COMMONDIR)/ffmpeg.cxx \
+ $(COMMONDIR)/dyna.cxx
+
+-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+ LIBS += @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@
+
+ HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
+ ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes)
+-CFLAGS += -DLIBAVCODEC_RTP_MODE=1
++CXXFLAGS += -DLIBAVCODEC_RTP_MODE=1
+ endif
+
+ vpath %.cxx $(COMMONDIR)
+diff -urN opal-3.12.4.old/plugins/video/H.264/gpl/Makefile.in opal-3.12.4/plugins/video/H.264/gpl/Makefile.in
+--- opal-3.12.4.old/plugins/video/H.264/gpl/Makefile.in 2013-06-22 21:14:01.500580889 +0200
++++ opal-3.12.4/plugins/video/H.264/gpl/Makefile.in 2013-06-22 21:16:35.515575410 +0200
+@@ -48,7 +48,7 @@
+
+ CC =@CC@
+ CXX =@CXX@
+-CFLAGS =@X264_CFLAGS@ @LIBAVCODEC_CFLAGS@ -I.. -I$(PLUGINDIR) -I$(OPALDIR)/include -DGPL_HELPER_APP -DPLUGINCODEC_TRACING
++CXXFLAGS =@X264_CFLAGS@ @LIBAVCODEC_CFLAGS@ -I.. -I$(PLUGINDIR) -I$(OPALDIR)/include -DGPL_HELPER_APP -DPLUGINCODEC_TRACING
+ LDFLAGS = @X264_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@ @DL_LIBS@ @LDFLAGS@
+
+
+@@ -61,7 +61,7 @@
+
+ $(OBJDIR)/%.o : %.cxx
+ @mkdir -p $(OBJDIR) >/dev/null 2>&1
+- $(Q_CC)$(CXX) $(CFLAGS) -c $< -o $@
++ $(Q_CC)$(CXX) $(CXXFLAGS) -c $< -o $@
+
+ $(OBJDIR)/%.o : %.c
+ @mkdir -p $(OBJDIR) >/dev/null 2>&1
+diff -urN opal-3.12.4.old/plugins/video/H.264/Makefile.in opal-3.12.4/plugins/video/H.264/Makefile.in
+--- opal-3.12.4.old/plugins/video/H.264/Makefile.in 2013-06-22 21:14:01.500580889 +0200
++++ opal-3.12.4/plugins/video/H.264/Makefile.in 2013-06-22 21:16:52.874574792 +0200
+@@ -35,12 +35,12 @@
+ $(COMMONDIR)/ffmpeg.cxx \
+ $(COMMONDIR)/dyna.cxx
+
+-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"'
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"'
+ LIBS += @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@
+
+ IS_H264_LICENSED:=@IS_H264_LICENSED@
+ ifeq ($(IS_H264_LICENSED),yes)
+- CFLAGS += @X264_CFLAGS@ -DX264_LICENSED
++ CXXFLAGS += @X264_CFLAGS@ -DX264_LICENSED
+ LIBS += @X264_LIBS@
+ else
+ SUBDIRS := gpl
+diff -urN opal-3.12.4.old/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.12.4/plugins/video/MPEG4-ffmpeg/Makefile.in
+--- opal-3.12.4.old/plugins/video/MPEG4-ffmpeg/Makefile.in 2013-06-22 21:14:01.499580889 +0200
++++ opal-3.12.4/plugins/video/MPEG4-ffmpeg/Makefile.in 2013-06-22 21:15:53.183576916 +0200
+@@ -32,14 +32,14 @@
+ $(COMMONDIR)/ffmpeg.cxx \
+ $(COMMONDIR)/dyna.cxx
+
+-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+ LIBS += @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@
+
+ # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
+ # Also add libavutil, so ffmpeg headers can #include "log.h".
+ LIBAVCODEC_SOURCE_DIR := @LIBAVCODEC_SOURCE_DIR@
+ ifneq (,$(LIBAVCODEC_SOURCE_DIR))
+-CFLAGS += -I$(LIBAVCODEC_SOURCE_DIR) -I$(LIBAVCODEC_SOURCE_DIR)/libavutil
++CXXFLAGS += -I$(LIBAVCODEC_SOURCE_DIR) -I$(LIBAVCODEC_SOURCE_DIR)/libavutil
+ endif
+
+ vpath %.cxx $(COMMONDIR)
+diff -urN opal-3.12.4.old/plugins/video/THEORA/Makefile.in opal-3.12.4/plugins/video/THEORA/Makefile.in
+--- opal-3.12.4.old/plugins/video/THEORA/Makefile.in 2013-06-22 21:14:01.503580889 +0200
++++ opal-3.12.4/plugins/video/THEORA/Makefile.in 2013-06-22 21:14:42.654579425 +0200
+@@ -30,7 +30,7 @@
+ SRCDIR := .
+ SRCS := theora_frame.cxx theora_plugin.cxx
+
+-CFLAGS += @THEORA_CFLAGS@ -I$(COMMONDIR)
++CXXFLAGS += @THEORA_CFLAGS@ -I$(COMMONDIR)
+ LIBS += @THEORA_LIBS@
+
+ INSTALL_DIR := @VC_PLUGIN_DIR@
diff --git a/net-libs/opal/files/opal-3.12.4-java-ruby-swig-fix.patch b/net-libs/opal/files/opal-3.12.4-java-ruby-swig-fix.patch
new file mode 100644
index 000000000000..616468ea5772
--- /dev/null
+++ b/net-libs/opal/files/opal-3.12.4-java-ruby-swig-fix.patch
@@ -0,0 +1,28 @@
+--- opal-3.12.4.old/make/toplevel.mak.in 2013-06-22 21:14:01.536580887 +0200
++++ opal-3.12.4/make/toplevel.mak.in 2013-06-22 21:21:08.342565703 +0200
+@@ -407,9 +407,9 @@
+ ifeq ($(OPAL_JAVA), yes)
+
+ JAVA_SRCDIR = $(OPAL_SRCDIR)/java
+-JAVA_WRAPPER = $(JAVA_SRCDIR)/java_swig_wrapper.c
++JAVA_WRAPPER = $(JAVA_SRCDIR)/java_swig_wrapper.cxx
+
+-VPATH_C += $(JAVA_SRCDIR)
++VPATH_CXX += $(JAVA_SRCDIR)
+ SOURCES += $(JAVA_WRAPPER)
+
+ endif
+@@ -420,10 +420,10 @@
+
+ ifeq ($(OPAL_RUBY), yes)
+
+-RUBY_SRCDIR = $(OPAL_SRCDIR)/ruby
+-RUBY_WRAPPER = $(JAVA_SRCDIR)/ruby_swig_wrapper.c
++RUBY_SRCDIR = $(OPAL_SRCDIR)/Ruby
++RUBY_WRAPPER = $(JAVA_SRCDIR)/ruby_swig_wrapper.cxx
+
+-VPATH_C += $(RUBY_SRCDIR)
++VPATH_CXX += $(RUBY_SRCDIR)
+ SOURCES += $(RUBY_WRAPPER)
+
+ endif
diff --git a/net-libs/opal/metadata.xml b/net-libs/opal/metadata.xml
new file mode 100644
index 000000000000..8704acbfbf02
--- /dev/null
+++ b/net-libs/opal/metadata.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="capi">Enable CAPI support</flag>
+ <flag name="celt">Enable CELT ultra-low delay audio codec</flag>
+ <flag name="dtmf">Enable DTMF encoding/decoding support</flag>
+ <flag name="fax">Enable T.38 FAX protocol</flag>
+ <flag name="h224">Enable H.224 real time control protocol</flag>
+ <flag name="h281">Enable H.281 Far-End Camera Control protocol</flag>
+ <flag name="h323">Enable H.323 protocol</flag>
+ <flag name="iax">Enable Inter-Asterisk eXchange protocol</flag>
+ <flag name="ivr">Enable Interactive Voice Response</flag>
+ <flag name="ilbc">Enable iLBC (RFC 3951) speech codec</flag>
+ <flag name="ixj">Enable xJack cards support</flag>
+ <flag name="lid">Enable Line Interface Device</flag>
+ <flag name="plugins">Enable plugins support</flag>
+ <flag name="sbc">Enable the Bluetooth low-complexity, SubBand Codec
+ </flag>
+ <flag name="sip">Enable Session Initiation Protocol</flag>
+ <flag name="sipim">Enable SIP Instant Messages session</flag>
+ <flag name="srtp">Enable Secure Real-time Transport Protocol</flag>
+ <flag name="stats">Enable statistic reporting</flag>
+ <flag name="swig">Use swig to generate bindings</flag>
+ <flag name="video">Enable video support</flag>
+ <flag name="vpb">Enable Voicetronics VPB card support</flag>
+ <flag name="vxml">Enable VXML support</flag>
+ <flag name="wav">Enable WAVFILE support</flag>
+ <flag name="x264-static">Install x264 plugin statically linked with x264
+ </flag>
+ <!-- unused atm
+ <flag name="g711plc">Enable G711 Packet Loss Concealment</flag>
+ <flag name="msrp">Enable Message Session Relay Protocol</flag>
+ <flag name="rfc4103">Enable RTP Payload for Text Conversation</flag>
+ -->
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">opalvoip</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/opal/opal-3.10.11.ebuild b/net-libs/opal/opal-3.10.11.ebuild
new file mode 100644
index 000000000000..d4968eb46db8
--- /dev/null
+++ b/net-libs/opal/opal-3.10.11.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools toolchain-funcs java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="C++ class library normalising numerous telephony protocols"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
+ doc? ( mirror://sourceforge/opalvoip/${P}-htmldoc.tar.bz2 )"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
+ipv6 ivr ixj java ldap lid +plugins sbc sip sipim +sound srtp ssl static-libs
+stats swig theora +video vpb vxml wav x264 x264-static xml"
+
+REQUIRED_USE="x264-static? ( x264 )
+ h281? ( h224 )
+ sip? ( sipim )"
+
+RDEPEND=">=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?]
+ >=media-libs/speex-1.2_beta
+ fax? ( net-libs/ptlib[asn] )
+ h323? ( net-libs/ptlib[asn] )
+ ivr? ( net-libs/ptlib[http,xml,vxml] )
+ java? ( >=virtual/jre-1.4 )
+ plugins? (
+ media-sound/gsm
+ capi? ( net-dialup/capi4k-utils )
+ celt? ( media-libs/celt )
+ ffmpeg? ( virtual/ffmpeg[encode] )
+ ixj? ( sys-kernel/linux-headers )
+ ilbc? ( dev-libs/ilbc-rfc3951 )
+ sbc? ( media-libs/libsamplerate )
+ theora? ( media-libs/libtheora )
+ x264? ( virtual/ffmpeg
+ media-libs/x264 ) )
+ srtp? ( net-libs/libsrtp )
+ vxml? ( net-libs/ptlib[http,vxml] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/gcc-3
+ java? ( swig? ( dev-lang/swig )
+ >=virtual/jdk-1.4 )"
+
+# NOTES:
+# ffmpeg[encode] is for h263 and mpeg4
+# ssl, xml, vxml, ipv6, ldap, sound, wav, and video are use flags
+# herited from ptlib: feature is enabled if ptlib has enabled it
+# however, disabling it if ptlib has it looks hard (coz of buildopts.h)
+# forcing ptlib to disable it for opal is not a solution too
+# atm, accepting the "auto-feature" looks like a good solution
+# (asn is used for fax and config _only_ for examples)
+# OPALDIR should not be used anymore but if a package still need it, create it
+
+pkg_setup() {
+ # workaround for bug 282838
+ append-cxxflags "-fno-visibility-inlines-hidden"
+ append-cxxflags "-fno-strict-aliasing"
+
+ # need >=gcc-3
+ if [[ $(gcc-major-version) -lt 3 ]]; then
+ eerror "You need to use gcc-3 at least."
+ eerror "Please change gcc version with 'gcc-config'."
+ die "You need to use gcc-3 at least."
+ fi
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ # remove visual studio related files from samples/
+ if use examples; then
+ rm -f samples/*/*.vcproj
+ rm -f samples/*/*.sln
+ rm -f samples/*/*.dsp
+ rm -f samples/*/*.dsw
+ fi
+
+ epatch "${FILESDIR}/${PN}-3.10.9-svn_revision_override.patch" \
+ "${FILESDIR}/${PN}-3.10.9-labs_is_in_stdlib.patch" \
+ "${FILESDIR}/${PN}-3.10.9-avoid_cflags_mixup.patch" \
+ "${FILESDIR}/${PN}-3.10.9-ffmpeg.patch" \
+ "${FILESDIR}/${PN}-3.10.11-libav9-gentoo.patch"
+
+ if ! use h323; then
+ # Without this patch, ekiga wont compile, even with
+ # USE=-h323.
+ epatch "${FILESDIR}/${PN}-3.10.9-disable-h323-workaround.patch"
+ fi
+
+ epatch "${FILESDIR}/${PN}-3.10.9-java-ruby-swig-fix.patch"
+
+ sed -i -e "s:\(.*HAS_H224.*\), \[OPAL_H323\]:\1:" configure.ac \
+ || die "sed failed"
+
+ eaclocal
+ eautoconf
+
+ # in plugins
+ cd plugins/
+ eaclocal
+ eautoconf
+ cd ..
+
+ # disable celt if celt is not enabled (prevent auto magic dep)
+ # already in repository
+ if ! use celt; then
+ sed -i -e "s/HAVE_CELT=yes/HAVE_CELT=no/" plugins/configure \
+ || die "sed failed"
+ fi
+
+ # fix automatic swig detection, upstream bug 2712521 (upstream reject it)
+ if ! use swig; then
+ sed -i -e "/^SWIG=/d" configure || die "patching configure failed"
+ fi
+
+ use ilbc || { rm -r plugins/audio/iLBC/ || die "removing iLBC failed"; }
+
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ local forcedconf=""
+
+ # fix bug 277233, upstream bug 2820939
+ if use fax; then
+ forcedconf="${forcedconf} --enable-statistics"
+ fi
+
+ # --with-libavcodec-source-dir should _not_ be set, it's for trunk sources
+ # versioncheck: check for ptlib version
+ # shared: should always be enabled for a lib
+ # localspeex, localspeexdsp, localgsm, localilbc: never use bundled libs
+ # samples: only build some samples, useless
+ # libavcodec-stackalign-hack: prevent hack (default disable by upstream)
+ # default-to-full-capabilties: default enable by upstream
+ # aec: atm, only used when bundled speex, so it's painless for us
+ # zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+ # http://zfoneproject.com/ wich is not in portage
+ # msrp: highly experimental
+ # spandsp: doesn't work with newest spandsp, upstream bug 2796047
+ # g711plc: force enable
+ # rfc4103: not really used, upstream bug 2795831
+ # t38, spandsp: merged in fax
+ # h450, h460, h501: merged in h323 (they are additional features of h323)
+ econf \
+ --enable-versioncheck \
+ --enable-shared \
+ --disable-zrtp \
+ --disable-localspeex \
+ --disable-localspeexdsp \
+ --disable-localgsm \
+ --disable-localilbc \
+ --disable-samples \
+ --disable-libavcodec-stackalign-hack \
+ --enable-default-to-full-capabilties \
+ --enable-aec \
+ --disable-msrp \
+ --disable-spandsp \
+ --enable-g711plc \
+ --enable-rfc4103 \
+ $(use_enable debug) \
+ $(use_enable capi) \
+ $(use_enable fax) \
+ $(use_enable fax t38) \
+ $(use_enable h224) \
+ $(use_enable h281) \
+ $(use_enable h323) \
+ $(use_enable h323 h450) \
+ $(use_enable h323 h460) \
+ $(use_enable h323 h501) \
+ $(use_enable iax) \
+ $(use_enable ivr) \
+ $(use_enable ixj) \
+ $(use_enable java) \
+ $(use_enable lid) \
+ $(use_enable plugins) \
+ $(use_enable sbc) \
+ $(use_enable sip) \
+ $(use_enable sipim) \
+ $(use_enable stats statistics) \
+ $(use_enable video) $(use_enable video rfc4175) \
+ $(use_enable vpb) \
+ $(use_enable x264 h264) \
+ $(use_enable x264-static x264-link-static) \
+ ${forcedconf}
+}
+
+src_compile() {
+ local makeopts=""
+
+ use debug && makeopts="debug"
+
+ emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ # Get rid of static libraries if not requested
+ # There seems to be no easy way to disable this in the build system
+ if ! use static-libs; then
+ rm -v "${D}"/usr/lib*/*.a || die
+ fi
+
+ if use doc; then
+ dohtml -r "${WORKDIR}"/html/* docs/* || die "dohtml failed"
+ fi
+
+ # ChangeLog is not standard and does not exist on 3.10.10
+# dodoc ChangeLog-${PN}-v${PV//./_}.txt || die "dodoc failed"
+
+ if use examples; then
+ local exampledir="/usr/share/doc/${PF}/examples"
+ local basedir="samples"
+ local sampledirs="`ls ${basedir} --hide=configure* \
+ --hide=opal_samples.mak.in`"
+
+ # first, install files
+ insinto ${exampledir}/
+ doins ${basedir}/{configure*,opal_samples*} \
+ || die "doins failed"
+
+ # now, all examples
+ for x in ${sampledirs}; do
+ insinto ${exampledir}/${x}/
+ doins ${basedir}/${x}/* || die "doins failed"
+ done
+
+ # some examples need version.h
+ insinto "/usr/share/doc/${PF}/"
+ doins version.h || die "doins failed"
+ fi
+}
+
+pkg_postinst() {
+ if use examples; then
+ ewarn "All examples have been installed, some of them will not work on your system"
+ ewarn "it will depend of the enabled USE flags in ptlib and opal"
+ fi
+
+ if ! use plugins || ! use sound || ! use video; then
+ ewarn "You have disabled sound, video or plugins USE flags."
+ ewarn "Most audio/video features or plugins have been disabled silently"
+ ewarn "even if enabled via USE flags."
+ ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
+ fi
+}
diff --git a/net-libs/opal/opal-3.12.4.ebuild b/net-libs/opal/opal-3.12.4.ebuild
new file mode 100644
index 000000000000..a3d79b4f8d9d
--- /dev/null
+++ b/net-libs/opal/opal-3.12.4.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools toolchain-funcs java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="C++ class library normalising numerous telephony protocols"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
+ doc? ( mirror://sourceforge/opalvoip/${P}-htmldoc.tar.bz2 )"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="capi celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
+ipv6 ivr ixj java ldap lid +plugins sbc sip sipim +sound srtp ssl static-libs
+stats swig theora +video vpb vxml wav x264 x264-static xml"
+
+REQUIRED_USE="x264-static? ( x264 )
+ h281? ( h224 )
+ sip? ( sipim )"
+
+RDEPEND=">=net-libs/ptlib-2.12.4:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?]
+ >=media-libs/speex-1.2_beta
+ fax? ( net-libs/ptlib[asn] )
+ h323? ( net-libs/ptlib[asn] )
+ ivr? ( net-libs/ptlib[http,xml,vxml] )
+ java? ( >=virtual/jre-1.4 )
+ plugins? (
+ media-sound/gsm
+ capi? ( net-dialup/capi4k-utils )
+ celt? ( media-libs/celt )
+ ffmpeg? ( virtual/ffmpeg[encode] )
+ ixj? ( sys-kernel/linux-headers )
+ ilbc? ( dev-libs/ilbc-rfc3951 )
+ sbc? ( media-libs/libsamplerate )
+ theora? ( media-libs/libtheora )
+ x264? ( virtual/ffmpeg
+ media-libs/x264 ) )
+ srtp? ( net-libs/libsrtp )
+ vxml? ( net-libs/ptlib[http,vxml] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/gcc-3
+ java? ( swig? ( dev-lang/swig )
+ >=virtual/jdk-1.4 )"
+
+# NOTES:
+# ffmpeg[encode] is for h263 and mpeg4
+# ssl, xml, vxml, ipv6, ldap, sound, wav, and video are use flags
+# herited from ptlib: feature is enabled if ptlib has enabled it
+# however, disabling it if ptlib has it looks hard (coz of buildopts.h)
+# forcing ptlib to disable it for opal is not a solution too
+# atm, accepting the "auto-feature" looks like a good solution
+# (asn is used for fax and config _only_ for examples)
+# OPALDIR should not be used anymore but if a package still need it, create it
+
+pkg_setup() {
+ # workaround for bug 282838
+ append-cxxflags "-fno-visibility-inlines-hidden"
+ append-cxxflags "-fno-strict-aliasing"
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ # remove visual studio related files from samples/
+ if use examples; then
+ rm -f samples/*/*.vcproj
+ rm -f samples/*/*.sln
+ rm -f samples/*/*.dsp
+ rm -f samples/*/*.dsw
+ fi
+
+ epatch "${FILESDIR}/${PN}-3.10.9-svn_revision_override.patch"
+ epatch "${FILESDIR}/${PN}-3.10.9-labs_is_in_stdlib.patch"
+ epatch "${FILESDIR}/${PN}-3.12.4-avoid_cflags_mixup.patch"
+
+ if ! use h323; then
+ # Without this patch, ekiga wont compile, even with
+ # USE=-h323.
+ epatch "${FILESDIR}/${PN}-3.10.9-disable-h323-workaround.patch"
+ fi
+
+ epatch "${FILESDIR}/${PN}-3.12.4-java-ruby-swig-fix.patch"
+
+ sed -i -e "s:\(.*HAS_H224.*\), \[OPAL_H323\]:\1:" configure.ac \
+ || die "sed failed"
+
+ eaclocal
+ eautoconf
+
+ # in plugins
+ cd plugins/
+ eaclocal
+ eautoconf
+ cd ..
+
+ # disable celt if celt is not enabled (prevent auto magic dep)
+ # already in repository
+ if ! use celt; then
+ sed -i -e "s/HAVE_CELT=yes/HAVE_CELT=no/" plugins/configure \
+ || die "sed failed"
+ fi
+
+ # fix automatic swig detection, upstream bug 2712521 (upstream reject it)
+ if ! use swig; then
+ sed -i -e "/^SWIG=/d" configure || die "patching configure failed"
+ fi
+
+ use ilbc || { rm -r plugins/audio/iLBC/ || die "removing iLBC failed"; }
+
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ # --with-libavcodec-source-dir should _not_ be set, it's for trunk sources
+ # versioncheck: check for ptlib version
+ # shared: should always be enabled for a lib
+ # localspeex, localspeexdsp, localgsm, localilbc: never use bundled libs
+ # samples: only build some samples, useless
+ # libavcodec-stackalign-hack: prevent hack (default disable by upstream)
+ # default-to-full-capabilties: default enable by upstream
+ # aec: atm, only used when bundled speex, so it's painless for us
+ # zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+ # http://zfoneproject.com/ wich is not in portage
+ # msrp: highly experimental
+ # spandsp: doesn't work with newest spandsp, upstream bug 2796047
+ # g711plc: force enable
+ # rfc4103: not really used, upstream bug 2795831
+ # t38, spandsp: merged in fax
+ # h450, h460, h501: merged in h323 (they are additional features of h323)
+ econf \
+ --enable-versioncheck \
+ --enable-shared \
+ --disable-zrtp \
+ --disable-localspeex \
+ --disable-localspeexdsp \
+ --disable-localgsm \
+ --disable-localilbc \
+ --disable-samples \
+ --disable-libavcodec-stackalign-hack \
+ --enable-default-to-full-capabilties \
+ --enable-aec \
+ --disable-msrp \
+ --disable-spandsp \
+ --enable-g711plc \
+ --enable-rfc4103 \
+ $(use_enable debug) \
+ $(use_enable capi) \
+ $(use_enable fax) \
+ $(use_enable fax t38) \
+ $(use_enable h224) \
+ $(use_enable h281) \
+ $(use_enable h323) \
+ $(use_enable h323 h450) \
+ $(use_enable h323 h460) \
+ $(use_enable h323 h501) \
+ $(use_enable iax) \
+ $(use_enable ivr) \
+ $(use_enable ixj) \
+ $(use_enable java) \
+ $(use_enable lid) \
+ $(use_enable plugins) \
+ $(use_enable sbc) \
+ $(use_enable sip) \
+ $(use_enable sipim) \
+ $(use_enable stats statistics) \
+ $(use_enable video) $(use_enable video rfc4175) \
+ $(use_enable vpb) \
+ $(use_enable x264 h264) \
+ $(use_enable x264-static x264-link-static)
+}
+
+src_compile() {
+ local makeopts=""
+
+ use debug && makeopts="debug"
+
+ emake ${makeopts}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Get rid of static libraries if not requested
+ # There seems to be no easy way to disable this in the build system
+ if ! use static-libs; then
+ rm -v "${D}"/usr/lib*/*.a || die
+ fi
+
+ if use doc; then
+ dohtml -r "${WORKDIR}"/html/* docs/*
+ fi
+
+ # ChangeLog is not standard and does not exist on 3.10.10
+# dodoc ChangeLog-${PN}-v${PV//./_}.txt || die "dodoc failed"
+
+ if use examples; then
+ local exampledir="/usr/share/doc/${PF}/examples"
+ local basedir="samples"
+ local sampledirs="`ls ${basedir} --hide=configure* \
+ --hide=opal_samples.mak.in --hide=ReadMe.txt`"
+
+ # first, install files
+ insinto ${exampledir}/
+ doins ${basedir}/{configure*,opal_samples*,ReadMe.txt}
+
+ # now, all examples
+ for x in ${sampledirs}; do
+ insinto ${exampledir}/${x}/
+ doins ${basedir}/${x}/*
+ done
+
+ # some examples need version.h
+ insinto "/usr/share/doc/${PF}/"
+ doins version.h
+ fi
+}
+
+pkg_postinst() {
+ if use examples; then
+ ewarn "All examples have been installed, some of them will not work on your system"
+ ewarn "it will depend of the enabled USE flags in ptlib and opal"
+ fi
+
+ if ! use plugins || ! use sound || ! use video; then
+ ewarn "You have disabled sound, video or plugins USE flags."
+ ewarn "Most audio/video features or plugins have been disabled silently"
+ ewarn "even if enabled via USE flags."
+ ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
+ fi
+}
diff --git a/net-libs/openmq-cclient/Manifest b/net-libs/openmq-cclient/Manifest
new file mode 100644
index 000000000000..ee94b1d18684
--- /dev/null
+++ b/net-libs/openmq-cclient/Manifest
@@ -0,0 +1 @@
+DIST openmq4.4u1b7-final-source.zip 6892740 RMD160 30c1f1e4b78a8010aeb5a6b8436f46db8a15a4ae SHA1 7feb726d7401eae48328d6d97e3a4dac6dd3c15a SHA256 56e3c5e2c53cee12076f4974236c7f72a5069bb7034b633747c3721d42d57346
diff --git a/net-libs/openmq-cclient/files/Makefile.in-4 b/net-libs/openmq-cclient/files/Makefile.in-4
new file mode 100644
index 000000000000..8d536b927566
--- /dev/null
+++ b/net-libs/openmq-cclient/files/Makefile.in-4
@@ -0,0 +1,69 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+top_srcdir=@top_srcdir@
+top_builddir=@top_builddir@
+
+CC = @CC@
+CXX = @CXX@
+LIBTOOL = @LIBTOOL@
+
+CFLAGS = @CFLAGS@
+CXXFLAGS = @CXXFLAGS@
+LDFLAGS = @LDFLAGS@
+
+LTCC = $(LIBTOOL) --mode=compile --tag=CC $(CC)
+LTCXX = $(LIBTOOL) --mode=compile --tag=CXX $(CXX)
+LTLD = $(LIBTOOL) --mode=link --tag=CXX $(CXX)
+
+NS_S_PR_CFLAGS = $(shell pkg-config --cflags nss nspr)
+NS_S_PR_LIBS = $(shell pkg-config --libs nss nspr)
+
+SRCS = $(shell find "$(top_srcdir)" -name examples -prune -o -type f '(' -name '*.cpp' -o -name '*.c' -not -name '*Test*' ')')
+LTOBJS = $(subst .c,.lo,$(subst .cpp,.lo,$(SRCS)))
+
+HDRS = $(top_srcdir)/cshim/mq/xa.h $(shell find "$(top_srcdir)"/cshim -type f -name 'mq*.h')
+INSTHDRS = $(subst $(top_srcdir)/cshim,$(DESTDIR)$(includedir),$(HDRS))
+
+LTLIBRARY = libmqcrt.la
+INSTLTLIBRARY = $(DESTDIR)$(libdir)/$(LTLIBRARY)
+
+.SUFFIXES:
+.SUFFIXES: .cpp .c .lo
+
+default: all
+
+all: $(LTLIBRARY)
+
+Makefile: Makefile.in
+ $(top_builddir)/config.status $@
+
+.cpp.lo:
+ $(LTCXX) -o $@ $(NS_S_PR_CFLAGS) $(CXXFLAGS) -c $<
+
+.c.lo:
+ $(LTCC) -o $@ $(NS_S_PR_CFLAGS) $(CFLAGS) -c $<
+
+VERSIONNUMBER = $(shell { echo '#include "cshim/mqversion.h"'; echo '-version-number MQ_VMAJOR:MQ_VMINOR:MQ_VMICRO'; } | ${CC} -E - | grep version-number)
+
+$(LTLIBRARY): $(LTOBJS)
+ version=` \
+ { echo '#include "cshim/mqversion.h"' \
+ ; echo '-version-number MQ_VMAJOR:MQ_VMINOR:MQ_VMICRO' \
+ ; } \
+ | ${CC} -E - \
+ | grep version-number \
+ ` \
+ && $(LTLD) -o $@ --no-undefined $${version} $(CXXFLAGS) $(NS_S_PR_LIBS) $(LDFLAGS) -rpath $(libdir) $?
+
+$(INSTLTLIBRARY): $(LTLIBRARY)
+ $(top_srcdir)/install-sh -d "$(dir $@)"
+ $(LIBTOOL) --mode=install cp $(LTLIBRARY) $@
+
+$(DESTDIR)$(includedir)/%: $(top_srcdir)/cshim/%
+ $(top_srcdir)/install-sh -d "$(dir $@)"
+ cp -f "$<" "$@"
+
+install: $(INSTLTLIBRARY) $(INSTHDRS)
diff --git a/net-libs/openmq-cclient/files/openmq-cclient-4.4.1-aix-gcc.patch b/net-libs/openmq-cclient/files/openmq-cclient-4.4.1-aix-gcc.patch
new file mode 100644
index 000000000000..e9a9d7281738
--- /dev/null
+++ b/net-libs/openmq-cclient/files/openmq-cclient-4.4.1-aix-gcc.patch
@@ -0,0 +1,13 @@
+Seems they've never seen gcc on AIX.
+
+--- cshim/mqbasictypes.h.orig 2010-03-01 18:00:38 +0100
++++ cshim/mqbasictypes.h 2010-03-01 18:00:58 +0100
+@@ -64,7 +64,7 @@
+ #endif
+ #endif
+
+-#if (defined(__IBMC__) || defined (__IBMCPP__)) && defined(__unix__)
++#if ((defined(__IBMC__) || defined (__IBMCPP__)) && defined(__unix__)) || defined(_AIX)
+ #ifndef AIX
+ #define AIX
+ #endif
diff --git a/net-libs/openmq-cclient/metadata.xml b/net-libs/openmq-cclient/metadata.xml
new file mode 100644
index 000000000000..dd4cd930c2f0
--- /dev/null
+++ b/net-libs/openmq-cclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>haubi@gentoo.org</email>
+ <name>Michael Haubenwallner</name>
+ </maintainer>
+ <longdescription lang="en">
+ Open message queue is an enterprise quality, production ready, scalable
+ messaging server. It provides a complete Java Message Service (JMS)
+ implementation for message oriented system integration. In addition,
+ Open MQ provides the additional enterprise features that are necessary
+ for enterprise deployments, large and small. It gets its roots from Java
+ Message Queue and provides all the features, functions and capabilities
+ of the currently available licensed product: Java System Message Queue.
+ These ebuilds install the c-client library only.
+ </longdescription>
+</pkgmetadata>
+
diff --git a/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
new file mode 100644
index 000000000000..37345f651cc8
--- /dev/null
+++ b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit versionator autotools
+
+DESCRIPTION="C-Client Library for Open Source Java Message Service (JMS)"
+HOMEPAGE="https://mq.dev.java.net/"
+
+# set this for rc and final versions to the build-number of open-mq
+MY_BUILDV="b7"
+
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-aix"
+IUSE=""
+
+if [[ $(x=( $(get_all_version_components) ); echo ${x[3]}) == '.' ]]; then
+ MY_PV=$(replace_version_separator 2 'u' $(get_version_component_range 1-3))
+else
+ MY_PV=$(get_version_component_range 1-2)
+fi
+
+if [[ ${PV} == *rc* || ${PV} == *beta* ]]; then
+ for x in $(get_version_components); do
+ if [[ ${x} == rc* ]]; then
+ MY_BUILDV="${MY_BUILDV}-${x}"
+ break
+ fi
+ if [[ ${x} == beta* ]]; then
+ MY_BUILDV=b${x#beta}
+ break
+ fi
+ done
+else
+ MY_BUILDV="${MY_BUILDV}-final"
+fi
+
+MY_ZIPV=$(replace_version_separator 1 _ $(get_version_component_range 1-2))
+SRC_URI="http://download.java.net/mq/open-mq/${MY_PV}/${MY_BUILDV}/openmq${MY_ZIPV}-source.zip -> openmq${MY_PV}${MY_BUILDV}-source.zip"
+
+RDEPEND="
+ dev-libs/nss
+ dev-libs/nspr
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ app-arch/unzip
+"
+
+S="${WORKDIR}/mq/src/share/cclient"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-aix-gcc.patch
+
+ einfo "avoiding potential conflict with <xa.h>"
+ mkdir cshim/mq || die
+ mv cshim/xa.h cshim/mq/ || die
+ ln -s mq/xa.h cshim/xa.h || die
+ sed -i -e 's,"xa.h","mq/xa.h",' cshim/mqxaswitch.h || die
+ eend $?
+
+ cp "${FILESDIR}"/Makefile.in-4 Makefile.in || die
+ cat > configure.ac <<-EOF
+ AC_INIT(local-libtool, 0)
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
+ AC_OUTPUT(Makefile)
+ EOF
+
+ eautoreconf
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+}
diff --git a/net-libs/openpgm/Manifest b/net-libs/openpgm/Manifest
new file mode 100644
index 000000000000..732db69b4598
--- /dev/null
+++ b/net-libs/openpgm/Manifest
@@ -0,0 +1,2 @@
+DIST libpgm-5.1.118~dfsg.tar.gz 1046589 SHA256 b74c11be9fe226d03e19839c6d841765955f736ae0d12db9baf1447d107e63ef SHA512 9ee358fb473431da99d9382329625cd146c2447dd6567c8b394aebc1d67d53bb4f3423a9b824180884658c34c103ed03915a4d93d3a66c78bb5947c2166c01a9 WHIRLPOOL 38cdbf203a21256da2d374a079e936ab541048fd07f206c772f29eaa380747690f06d75aa6ba8e3cb23249d7d3f21e4a8a0a4da16838a91970f53185ea4099f4
+DIST libpgm-5.2.122~dfsg.tar.gz 951536 SHA256 e296f714d7057e3cdb87f4e29b1aecb3b201b9fcb60aa19ed4eec29524f08bd8 SHA512 4eb562d2663b72cb9f4401c3319014e7b98670e1cc02b930d0ef87bb96a3e7e624f6d8a0935db9808a4987e464aaee50118ddadf4502003e0381d0e385fd9eee WHIRLPOOL 397ab4ce9ee51e791d8ced8b083ec44b282eb739de7b6a71d7d27b82a48b50a3ab3e2b83731ac0d8a065f89932947dd4a5883ae429d285c7bdea44aaeeabcdc4
diff --git a/net-libs/openpgm/metadata.xml b/net-libs/openpgm/metadata.xml
new file mode 100644
index 000000000000..3bb2eef1b8a4
--- /dev/null
+++ b/net-libs/openpgm/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>qnikst@gentoo.org</email>
+ <name>Alexander Vershilov</name>
+ </maintainer>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <name>Justin Lecher</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="google-code">openpgm</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/openpgm/openpgm-5.1.118.ebuild b/net-libs/openpgm/openpgm-5.1.118.ebuild
new file mode 100644
index 000000000000..2c79d0de1413
--- /dev/null
+++ b/net-libs/openpgm/openpgm-5.1.118.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit autotools
+
+DESCRIPTION="OpenPGM is an open source implementation of the Pragmatic General
+Multicast (PGM) specification"
+HOMEPAGE="http://code.google.com/p/openpgm"
+SRC_URI="http://openpgm.googlecode.com/files/libpgm-${PV}~dfsg.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~x86-fbsd"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/libpgm-${PV}~dfsg/${PN}/pgm"
+
+src_prepare() {
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ --disable-dependency-tracking
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed."
+ dodoc "${S}"/../doc/* "${S}"/README
+
+ # remove useless .la files
+ find "${D}" -name '*.la' -delete
+
+ # remove useless .a (only for non static compilation)
+ use static-libs || find "${D}" -name '*.a' -delete
+}
diff --git a/net-libs/openpgm/openpgm-5.2.122.ebuild b/net-libs/openpgm/openpgm-5.2.122.ebuild
new file mode 100644
index 000000000000..023987ac0442
--- /dev/null
+++ b/net-libs/openpgm/openpgm-5.2.122.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils python-any-r1
+
+DESCRIPTION="Open source implementation of the Pragmatic General Multicast specification"
+HOMEPAGE="http://code.google.com/p/openpgm"
+SRC_URI="http://openpgm.googlecode.com/files/libpgm-${PV}~dfsg.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~x86-fbsd"
+IUSE="static-libs"
+
+DEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}/libpgm-${PV}~dfsg/${PN}/pgm"
+
+src_install() {
+ DOCS=( "${S}"/../doc/. "${S}"/README )
+
+ autotools-utils_src_install
+}
diff --git a/net-libs/openslp/Manifest b/net-libs/openslp/Manifest
new file mode 100644
index 000000000000..70a0a214ae70
--- /dev/null
+++ b/net-libs/openslp/Manifest
@@ -0,0 +1,2 @@
+DIST openslp-1.2.1.tar.gz 886195 SHA256 08c7ec1e76fdd66461b3784d52047f594405f31ba2791ab0c1ec7c97639f5fbd SHA512 34742d88e772d7dba5c6fab1ccb7bf27d6174c5ca429aec406472994bcd806bfaf16dd86fce2ae4c51659587e99cced2436cf36772f6e086f7b87275fb1b19b6 WHIRLPOOL 391f735f3a05d0054dec6cbfcc217f3567c2a09ed7931bb57c8289cab9e7f566e01524ead861ef34afe00e2fd2c2feb4262d4410bf83641e26615adef80ba7a8
+DIST openslp-2.0.0.tar.gz 5424646 SHA256 924337a2a8e5be043ebaea2a78365c7427ac6e9cee24610a0780808b2ba7579b SHA512 e7627417d45d5d0cc83d6e13d62fe192702ce7b763f1b4fb51aa5da8285405b16a34c3ac4f0a1ecffdf59557b29ec7d24925941e56ddee277c8897162f597ade WHIRLPOOL 03600b4e19732c4cde1b8843c91267eaa781024060feead7127f397f1c016d10758d9ac99dde39046e5746d54af16e60002b9b40f813c5e5c930cb24eaed700c
diff --git a/net-libs/openslp/files/openslp-1.2.1-cflags.patch b/net-libs/openslp/files/openslp-1.2.1-cflags.patch
new file mode 100644
index 000000000000..a9a1d2634e7f
--- /dev/null
+++ b/net-libs/openslp/files/openslp-1.2.1-cflags.patch
@@ -0,0 +1,11 @@
+diff -ruN openslp-1.2.1.orig/configure.in openslp-1.2.1/configure.in
+--- openslp-1.2.1.orig/configure.in 2005-02-15 21:06:02.000000000 +0100
++++ openslp-1.2.1/configure.in 2012-01-24 23:49:13.000000000 +0100
+@@ -153,7 +153,6 @@
+ OPTFLAGS="-O"
+ fi
+ fi
+-CFLAGS="$CFLAGS $OPTFLAGS"
+
+ dnl ***********************************************************************
+ dnl Checks for header files.
diff --git a/net-libs/openslp/files/openslp-1.2.1-fbsd.patch b/net-libs/openslp/files/openslp-1.2.1-fbsd.patch
new file mode 100644
index 000000000000..dac041516f23
--- /dev/null
+++ b/net-libs/openslp/files/openslp-1.2.1-fbsd.patch
@@ -0,0 +1,12 @@
+Index: openslp-1.2.1/common/Makefile.am
+===================================================================
+--- openslp-1.2.1.orig/common/Makefile.am
++++ openslp-1.2.1/common/Makefile.am
+@@ -24,6 +24,7 @@ libcommonlibslp_la_SOURCES = \
+ slp_parse.c \
+ slp_pid.c \
+ slp_dhcp.c \
++ slp_net.c \
+ $(slp_v1message_SRCS) \
+ $(slp_security_SRCS)
+
diff --git a/net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch b/net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch
new file mode 100644
index 000000000000..c02d8407fb3b
--- /dev/null
+++ b/net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch
@@ -0,0 +1,11 @@
+--- a/openslp-1.2.1/slpd/slpd_socket.c 2010-09-11 16:31:47.325871093 -0500
++++ b/openslp-1.2.1/slpd/slpd_socket.c 2010-09-11 16:31:55.706851189 -0500
+@@ -183,7 +183,7 @@
+ memcpy(&mreq.imr_multiaddr, maddr, sizeof(struct in_addr));
+
+ /* drop for the specified interface */
+- memcpy(&mreq.imr_interface,addr,sizeof(addr));
++ memcpy(&mreq.imr_interface,addr,sizeof(struct in_addr));
+
+ return setsockopt(sockfd, IPPROTO_IP, IP_DROP_MEMBERSHIP, (char*)&mreq,sizeof(mreq));
+ }
diff --git a/net-libs/openslp/files/openslp-2.0.0-cflags.patch b/net-libs/openslp/files/openslp-2.0.0-cflags.patch
new file mode 100644
index 000000000000..b77261ee1f6d
--- /dev/null
+++ b/net-libs/openslp/files/openslp-2.0.0-cflags.patch
@@ -0,0 +1,25 @@
+diff -ruN openslp-2.0.0.orig/configure.ac openslp-2.0.0/configure.ac
+--- openslp-2.0.0.orig/configure.ac 2013-06-08 06:58:54.000000000 +0200
++++ openslp-2.0.0/configure.ac 2013-07-12 22:17:15.000000000 +0200
+@@ -240,7 +240,6 @@
+ OPTFLAGS="-O"
+ fi
+ fi
+-CFLAGS="$CFLAGS $OPTFLAGS"
+
+ #
+ # Configuration and output
+diff -ruN openslp-2.0.0.orig/etc/Makefile.am openslp-2.0.0/etc/Makefile.am
+--- openslp-2.0.0.orig/etc/Makefile.am 2012-11-28 18:07:04.000000000 +0100
++++ openslp-2.0.0/etc/Makefile.am 2013-07-12 22:28:20.000000000 +0200
+@@ -3,8 +3,8 @@
+ dist_sysconf_DATA = slp.conf slp.reg slp.spi
+
+ #make sure the slpd log directory is there
+-install-data-hook:
+- mkdir -p $(localstatedir)/log
++#install-data-hook:
++# mkdir -p $(localstatedir)/log
+
+ ##install-data-local:
+ ## mkdir -p $(DESTDIR)$(sysconfdir)
diff --git a/net-libs/openslp/files/openslp-compile_fix.patch b/net-libs/openslp/files/openslp-compile_fix.patch
new file mode 100644
index 000000000000..22bb3d6e2b7c
--- /dev/null
+++ b/net-libs/openslp/files/openslp-compile_fix.patch
@@ -0,0 +1,14 @@
+--- openslp-1.3.0/common/slp_spi.c~ 2004-03-04 03:38:49.000000000 +0100
++++ openslp-1.3.0/common/slp_spi.c 2004-03-04 03:38:49.000000000 +0100
+@@ -267,9 +267,9 @@
+ fp = fopen(spifile,"r");
+ if(fp)
+ {
+- result = xmalloc(sizeof(structSLPSpiHandle));
++ result = xmalloc(sizeof(struct _SLPSpiHandle));
+ if(result == 0) return 0;
+- memset(result, 0, sizeof(structSLPSpiHandle));
++ memset(result, 0, sizeof(struct _SLPSpiHandle));
+
+ result->spifile = xstrdup(spifile);
+ result->cacheprivate = cacheprivate;
diff --git a/net-libs/openslp/files/openslp-no_install_doc.patch b/net-libs/openslp/files/openslp-no_install_doc.patch
new file mode 100644
index 000000000000..9f7e3d2ee562
--- /dev/null
+++ b/net-libs/openslp/files/openslp-no_install_doc.patch
@@ -0,0 +1,21 @@
+--- openslp-1.3.0/Makefile.am~ 2004-03-04 03:56:37.000000000 +0100
++++ openslp-1.3.0/Makefile.am 2004-03-04 03:56:37.000000000 +0100
+@@ -5,7 +5,6 @@
+
+ SUBDIRS = common libslpattr slpd libslp slptool test
+ EXTRA_DIST = win32 doc etc README.W32 FAQ
+-DOC_DIR = $(prefix)/doc/openslp-$(VERSION)
+
+ install-data-local:
+ mkdir -p $(DESTDIR)$(sysconfdir)
+@@ -22,10 +21,6 @@
+ if [ -f $$file ]; then true;\
+ else cp -f $(srcdir)/etc/slp.spi $(DESTDIR)$(sysconfdir);\
+ fi
+- rm -rf $(DESTDIR)$(DOC_DIR)
+- mkdir -p $(DESTDIR)$(DOC_DIR)
+- cp -r $(srcdir)/doc/* $(DESTDIR)$(DOC_DIR)
+-# rm -rf `find $(DESTDIR)$(DOC_DIR) -name CVS`
+
+ dist-hook:
+ # rm -rf `find $(distdir)/doc -name CVS`
diff --git a/net-libs/openslp/files/openslp-opt.patch b/net-libs/openslp/files/openslp-opt.patch
new file mode 100644
index 000000000000..0fe9af3c947d
--- /dev/null
+++ b/net-libs/openslp/files/openslp-opt.patch
@@ -0,0 +1,25 @@
+--- openslp-1.0.11/configure.in.orig 2003-03-11 05:20:05.000000000 +0100
++++ openslp-1.0.11/configure.in 2003-04-18 00:34:27.000000000 +0200
+@@ -120,9 +120,6 @@
+ if test X"$debug" = X"yes"; then
+ CFLAGS="$CFLAGS -Werror"
+ fi
+- if test X"$debug" = X"no"; then
+- OPTFLAGS="-O3"
+- fi
+
+ elif $CC -V 2>&1 | grep "WorkShop Compilers"; then
+ dnl Allow C++ style comments
+@@ -161,9 +158,9 @@
+ dnl ***********************************************************************
+ dnl Checks for libraries.
+ dnl ***********************************************************************
+-AC_CHECK_LIB(resolv, inet_aton)
+-AC_CHECK_LIB(socket, main)
+-AC_CHECK_LIB(nsl, gethostbyname)
++AC_SEARCH_LIBS(inet_aton, resolv)
++AC_SEARCH_LIBS(socket, socket)
++AC_SEARCH_LIBS(gethostbyname, nsl)
+ AC_CHECK_LIB(m, main)
+ AC_CHECK_FUNCS(ceil log10 strncasecmp strcasecmp )
+ AC_OUTPUT(Makefile common/Makefile libslpattr/Makefile libslp/Makefile \
diff --git a/net-libs/openslp/files/slpd-init b/net-libs/openslp/files/slpd-init
new file mode 100644
index 000000000000..d4c759974f07
--- /dev/null
+++ b/net-libs/openslp/files/slpd-init
@@ -0,0 +1,89 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need net
+}
+
+#
+# Does nothing if a route exists that supports multicast traffic.
+# If no routes supporting multicast traffic exists, the function
+# tries to add one. A 0 is returned on success and a 1 on failure.
+# One parameter must be passed in. This variable determins verbosity.
+# If parameter is non-zero debugging will appear.
+#
+multicast_route_set() {
+ PING_OPTIONS_1='-c1 -w1'
+ PING_OPTIONS_2='-c1 -i1'
+ MULTICAST_ADDRESS='239.255.255.253'
+ TMP_FILE=/tmp/route.check
+ PING_ERROR_NO_ROUTE='unreachable'
+
+ MSG_FAILED_TO_FIND='Failed to Detect Multicast Route'
+ MSG_SUCCESS_ON_FIND='Multicast Route Enabled'
+ MSG_ADDING_ROUTE='Attempting to Add Multicast Route ...'
+ MSG_FAILED_TO_ADD=' FAILED - Route NOT Added.'
+ MSG_SUCCES_ON_ADD=' SUCCESS - Route Added.'
+
+ CMD_GET_INTERFACE="netstat -i | awk 'BEGIN{}(NR>2)&&(!/^lo*/){print \$1;exit}'"
+ CMD_ADD_ROUTE="route add -net 224.0.0.0 netmask 240.0.0.0"
+
+ ping $PING_OPTIONS_1 $MULTICAST_ADDRESS 2> $TMP_FILE 1> /dev/null
+ if [ $? = 2 ]; then
+ ping $PING_OPTIONS_2 $MULTICAST_ADDRESS 2> $TMP_FILE 1> /dev/null
+ fi
+
+ grep $PING_ERROR_NO_ROUTE $TMP_FILE > /dev/null 2>&1
+ err_unreachable_found=$?
+
+ #If errors, add route. Otherwise, do nothing
+ if [ -s $TMP_FILE ] && [ $err_unreachable_found = 0 ]; then
+
+ if [ $1 != 0 ]; then
+ echo $MSG_FAILED_TO_FIND
+ echo $MSG_ADDING_ROUTE
+ fi
+
+ $CMD_ADD_ROUTE `eval $CMD_GET_INTERFACE` > /dev/null 2>&1
+ retval=$?
+ if [ $1 != 0 ]; then
+
+ if [ $retval = 0 ]; then
+ echo $MSG_SUCCES_ON_ADD
+ else
+ echo $MSG_FAILED_TO_ADD
+ fi
+ fi
+ else
+ if [ $1 != 0 ]; then
+ echo -n $MSG_SUCCESS_ON_FIND
+ fi
+ retval=0
+ fi
+
+ rm -f $TMP_FILE # Clean up
+ return $retval
+}
+
+checkconfig() {
+ multicast_route_set 0
+ if [ $? -ne 0 ]; then
+ eerror "No route available for multicast traffic!"
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting slpd"
+ start-stop-daemon --start --quiet --exec /usr/sbin/slpd --pidfile /var/run/slpd.pid
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping slpd"
+ start-stop-daemon --stop --quiet --pidfile /var/run/slpd.pid
+ eend $?
+}
diff --git a/net-libs/openslp/files/slpd.service b/net-libs/openslp/files/slpd.service
new file mode 100644
index 000000000000..ab5c02f3b773
--- /dev/null
+++ b/net-libs/openslp/files/slpd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Service Location Protocol
+After=network-online.target
+
+[Service]
+ExecStart=/usr/sbin/slpd -l /var/log/slpd.log -d
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=network.target
diff --git a/net-libs/openslp/metadata.xml b/net-libs/openslp/metadata.xml
new file mode 100644
index 000000000000..92e1c97fcca8
--- /dev/null
+++ b/net-libs/openslp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>printing</herd>
+ <upstream>
+ <remote-id type="sourceforge">openslp</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/openslp/openslp-1.2.1-r3.ebuild b/net-libs/openslp/openslp-1.2.1-r3.ebuild
new file mode 100644
index 000000000000..52c7131ed65f
--- /dev/null
+++ b/net-libs/openslp/openslp-1.2.1-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils autotools systemd
+
+DESCRIPTION="An open-source implementation of Service Location Protocol"
+HOMEPAGE="http://www.openslp.org/"
+SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-fbsd.patch
+ epatch "${FILESDIR}"/${P}-fixoverflow.patch
+ epatch "${FILESDIR}"/${P}-cflags.patch
+ eautoreconf
+}
+
+src_compile() {
+ econf || die
+ emake -j1 || die "make failed"
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "make install failed"
+ dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
+ rm -rf "${D}"/usr/doc
+ dohtml -r .
+ newinitd "${FILESDIR}"/slpd-init slpd
+ systemd_dounit "${FILESDIR}"/slpd.service
+}
diff --git a/net-libs/openslp/openslp-2.0.0.ebuild b/net-libs/openslp/openslp-2.0.0.ebuild
new file mode 100644
index 000000000000..e7b3ed9ea0bc
--- /dev/null
+++ b/net-libs/openslp/openslp-2.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools systemd
+
+DESCRIPTION="An open-source implementation of Service Location Protocol"
+HOMEPAGE="http://www.openslp.org/"
+SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+RESTRICT="test"
+
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.0.0-cflags.patch
+ eautoreconf
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "make install failed"
+ dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
+ rm -rfv "${D}"/usr/doc
+ dohtml -r .
+ newinitd "${FILESDIR}"/slpd-init slpd
+ systemd_dounit "${FILESDIR}"/slpd.service
+}
diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
new file mode 100644
index 000000000000..ae06cb5381ea
--- /dev/null
+++ b/net-libs/ortp/Manifest
@@ -0,0 +1,3 @@
+DIST ortp-0.20.0.tar.gz 515505 SHA256 f2a8263f8242756e2ce092c710ac068cd4b21051fc70c1937b275193a2bfb3d3 SHA512 a4d666be6b6825eeb28204001d5d1263c80ef3c07931586e753d3efa8c72d76e993335c4eeaa558209b5d10d5e991ba0c88e2f5c9a35aff46b36d6e76f92b706 WHIRLPOOL cc1a9473580748a76d26bde42f074bd9bbb1bd066a7b514b0016dd75d2d5b57ff29eba18e10139457acc406593bb566fdc8c256a4241a77718d965419ecd8b50
+DIST ortp-0.22.0.tar.gz 538024 SHA256 6e37e29b3c3559bac1f2ae0c977f6ceb4d4ce8dc713b691dea8bae57bda92d0b SHA512 0453f19fd3388c3dcd12f118dbfc1a460fae77e4f9e82b1b71f4014e3bbba4d480f811d07bc781dced1fb2685901eaea364c8276c0d083f5e8d6b7074f7c4fba WHIRLPOOL 00f31d4de912dcf29778e68f5c88001eb845653303048d5c29a3c1488b1fae42399292df91596cabe1a223a4171a409af452cee97a3f075230918b068212e99c
+DIST ortp-0.23.0.tar.gz 540135 SHA256 91a5ada15f62ce5f08beceef4d0adb65469211e2f208bd96e493a8df9f84fcdb SHA512 70560168f1b138ad825e4e836e7ee218bd24b92a2d76666ba2794a4b31cadbdd8fdd40fee78d612187cde6a827005cbd836cdfc13a70947374356fb84a853ea4 WHIRLPOOL cb9dc4c925ed92816d58dc66bab9f179d6a99abe64a218710cd92763422cb8b5f81ce4bdc5ad935798e792d7a5f3ab74e9b8cbdfc9bbde7781ce92d7b90ef507
diff --git a/net-libs/ortp/metadata.xml b/net-libs/ortp/metadata.xml
new file mode 100644
index 000000000000..caea1a2964c9
--- /dev/null
+++ b/net-libs/ortp/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>chainsaw@gentoo.org</email></maintainer>
+ <use>
+ <flag name='ntp-timestamp'>Turn on NTP timestamping on received packet</flag>
+ <flag name='srtp'>Add support for Secure RTP</flag>
+ <flag name='zrtp'>Add support for ZRTP key negotiation</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/ortp/ortp-0.20.0.ebuild b/net-libs/ortp/ortp-0.20.0.ebuild
new file mode 100644
index 000000000000..075791ee66a3
--- /dev/null
+++ b/net-libs/ortp/ortp-0.20.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Open Real-time Transport Protocol (RTP, RFC3550) stack"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="mirror://nongnu/linphone/${PN}/sources/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc examples ipv6 minimal srtp ssl" # zrtp"
+
+# Note:
+# This package supposedly requires libzrtpcpp-2.0.0
+# but it is incompatible with its API...
+
+RDEPEND="srtp? ( net-libs/libsrtp )
+ ssl? ( dev-libs/openssl )"
+# zrtp? ( >=net-libs/libzrtpcpp-2.0.0 )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig"
+
+#REQUIRED_USE="zrtp? ( srtp )"
+
+src_prepare() {
+ # ${P} is added after ${docdir}
+ if use doc; then
+ sed -i -e 's/$(docdir)\/$(PACKAGE)-$(VERSION)/$(docdir)/' Makefile.in \
+ || die "patching Makefile.in failed"
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ # memcheck is for HP-UX only
+ --disable-memcheck
+ # mode64bit adds +DA2.0W +DS2.0 CFLAGS wich are needed for HP-UX
+ --disable-mode64bit
+ # strict adds -Werror, don't want it
+ --disable-strict
+ # they seriously failed to understand AC_ARG_ENABLE...
+ --disable-tests_enabled
+ --enable-fast-install
+ --enable-libtool-lock
+
+ $(use_enable debug)
+ $(use_enable ipv6)
+ $(use_enable minimal perf)
+ $(use_enable ssl ssl-hmac)
+# $(use_enable zrtp)
+ --disable-zrtp
+
+ "--with-srtp=$(usex srtp "${EPREFIX}"/usr none)"
+ $(use doc || echo ac_cv_path_DOXYGEN=false)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+ install
+ dodoc AUTHORS ChangeLog NEWS README TODO
+
+ prune_libtool_files
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins src/tests/*.c
+ fi
+}
diff --git a/net-libs/ortp/ortp-0.22.0.ebuild b/net-libs/ortp/ortp-0.22.0.ebuild
new file mode 100644
index 000000000000..855362c6e3db
--- /dev/null
+++ b/net-libs/ortp/ortp-0.22.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Open Real-time Transport Protocol (RTP, RFC3550) stack"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="mirror://nongnu/linphone/${PN}/sources/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/9"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc examples ipv6 minimal ntp-timestamp ssl" # srtp zrtp"
+
+# Note:
+# This package supposedly requires libzrtpcpp-2.0.0
+# but it is incompatible with its API...
+#
+# This package supposedly requires libsrtp
+# but it is incompatible with its API...
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+# srtp? ( net-libs/libsrtp )
+# zrtp? ( >=net-libs/libzrtpcpp-2.0.0 )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig"
+
+#REQUIRED_USE="zrtp? ( srtp )"
+
+src_prepare() {
+ # ${P} is added after ${docdir}
+ if use doc; then
+ sed -i -e 's/$(docdir)\/$(PACKAGE)-$(VERSION)/$(docdir)/' Makefile.in \
+ || die "patching Makefile.in failed"
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ # memcheck is for HP-UX only
+ --disable-memcheck
+ # mode64bit adds +DA2.0W +DS2.0 CFLAGS wich are needed for HP-UX
+ --disable-mode64bit
+ # strict adds -Werror, don't want it
+ --disable-strict
+ # they seriously failed to understand AC_ARG_ENABLE...
+ --disable-tests_enabled
+ --enable-fast-install
+ --enable-libtool-lock
+
+ $(use_enable debug)
+ $(use_enable ipv6)
+ $(use_enable minimal perf)
+ $(use_enable ntp-timestamp)
+ $(use_enable ssl ssl-hmac)
+# $(use_enable zrtp)
+ --disable-zrtp
+
+# "--with-srtp=$(usex srtp "${EPREFIX}"/usr none)"
+ --with-srtp=none
+ $(use doc || echo ac_cv_path_DOXYGEN=false)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+ install
+ dodoc AUTHORS ChangeLog NEWS README TODO
+
+ prune_libtool_files
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins src/tests/*.c
+ fi
+}
diff --git a/net-libs/ortp/ortp-0.23.0.ebuild b/net-libs/ortp/ortp-0.23.0.ebuild
new file mode 100644
index 000000000000..18a80ad47548
--- /dev/null
+++ b/net-libs/ortp/ortp-0.23.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Open Real-time Transport Protocol (RTP, RFC3550) stack"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="mirror://nongnu/linphone/${PN}/sources/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/9"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc examples ipv6 minimal ntp-timestamp ssl srtp zrtp"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )
+ srtp? ( net-libs/libsrtp:0= )
+ zrtp? ( >=net-libs/libzrtpcpp-4.0.0:0= )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig"
+
+REQUIRED_USE="zrtp? ( srtp )"
+
+src_prepare() {
+ # ${P} is added after ${docdir}
+ if use doc; then
+ sed -i -e 's/$(docdir)\/$(PACKAGE)-$(VERSION)/$(docdir)/' Makefile.in \
+ || die "patching Makefile.in failed"
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ # memcheck is for HP-UX only
+ --disable-memcheck
+ # mode64bit adds +DA2.0W +DS2.0 CFLAGS wich are needed for HP-UX
+ --disable-mode64bit
+ # strict adds -Werror, do not want it
+ --disable-strict
+ # they seriously failed to understand AC_ARG_ENABLE...
+ --disable-tests_enabled
+ --enable-fast-install
+ --enable-libtool-lock
+ # this is fine as long as we do not link to polarssl
+ --enable-broken-srtp
+
+ $(use_enable debug)
+ $(use_enable ipv6)
+ $(use_enable minimal perf)
+ $(use_enable ntp-timestamp)
+ $(use_enable ssl ssl-hmac)
+ $(use_enable zrtp)
+
+ --with-srtp=$(usex srtp "${EPREFIX}"/usr none)
+ $(use doc || echo ac_cv_path_DOXYGEN=false)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+ install
+ dodoc AUTHORS ChangeLog NEWS README TODO
+
+ prune_libtool_files
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins src/tests/*.c
+ fi
+}
diff --git a/net-libs/osptoolkit/Manifest b/net-libs/osptoolkit/Manifest
new file mode 100644
index 000000000000..e8e047e8b423
--- /dev/null
+++ b/net-libs/osptoolkit/Manifest
@@ -0,0 +1,2 @@
+DIST OSPToolkit-3.5.0.tar.gz 393788 SHA256 b15e2b8deec032c1e12dcbf28e2fe2b3f964ebab647e0705ec051bf17932d7b1
+DIST OSPToolkit-4.1.5.tar.gz 408481 SHA256 a0bf3247494375e63a75b4520c5c9aaaa0ed1423df54a013598c83a95846fccf SHA512 cc6244c0a62167ce90c85e646b13c991cac6d3663888ca4738666675f3c6c4904463e8502de376eab40cfd89e1d5c3d208d4ccaa58a95ed7a5895d74ea31aecc WHIRLPOOL 86111ab57301cf056a0ae9da56ce6a3bf2bbfcdd3c590f2447985420f204321a7e92ae747d2abae8e27d80e500f364f4982395311547c903de00eeaf1eef1d91
diff --git a/net-libs/osptoolkit/metadata.xml b/net-libs/osptoolkit/metadata.xml
new file mode 100644
index 000000000000..f6e0bd03f5ae
--- /dev/null
+++ b/net-libs/osptoolkit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>chainsaw@gentoo.org</email>
+ <name>Tony Vroon</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">osp-toolkit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/osptoolkit/osptoolkit-3.5.0.ebuild b/net-libs/osptoolkit/osptoolkit-3.5.0.ebuild
new file mode 100644
index 000000000000..b19794eb3d1f
--- /dev/null
+++ b/net-libs/osptoolkit/osptoolkit-3.5.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs
+
+S_DATE="20090302"
+
+DESCRIPTION="Open Settlement Protocol development kit"
+HOMEPAGE="http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/OSP%20Toolkit%20Documents.htm"
+SRC_URI="mirror://sourceforge/osp-toolkit/OSPToolkit-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/TK-${PV//./_}-${S_DATE}
+
+# TODO:
+# generate a shared lib
+
+# NOTES:
+# osptest isn't a test that can be used for src_test, it's part of the toolkit
+
+src_prepare() {
+ # remove -O and use users CFLAGS, see bug 241034
+ sed -i -e "s/ -O//" -e "s/^CFLAGS =/CFLAGS +=/" src/Makefile test/Makefile \
+ enroll/Makefile || die "patching Makefiles failed"
+
+ # use users LDFLAGS
+ sed -i -e "s:LFLAGS:LDFLAGS:" test/Makefile \
+ || die "patching test/Makefile failed"
+ sed -i -e "s:\(\$(LIBS\):\$(LDFLAGS) \1:" enroll/Makefile \
+ || die "patching enroll/Makefile failed"
+
+ # change lib dir to $(get_libdir)
+ sed -i -e "s:\$(INSTALL_PATH)/lib:\$(INSTALL_PATH)/$(get_libdir):" \
+ src/Makefile || die "patching src/Makefile failed"
+
+ # test.cfg is located in /etc/${PN}/test.cfg
+ sed -i -e \
+ "s:\(^#define CONFIG_FILENAME.*\"\).*\(test.cfg\"\):\1/etc/${PN}/\2:" \
+ test/test_app.c || die "patching test/test_app.c failed"
+
+ # configure enroll.sh
+ sed -i -e "s:^\(OPENSSL_CONF\).*:\1=/etc/${PN}/openssl.cnf:" \
+ -e "s:^\(RANDFILE\).*:\1=\/etc/${PN}/.rnd:" \
+ bin/enroll.sh || die "patching bin/enroll.sh failed"
+
+ # change enroll path
+ sed -i -e "s:^\(enroll\):/usr/lib/${PN}/\1:" \
+ bin/enroll.sh || die "patching bin/enroll.sh failed"
+}
+
+src_compile() {
+ local my_cc=$(tc-getCC)
+
+ emake -C src CC="${my_cc}" build || die "emake libosp failed"
+ emake -C enroll CC="${my_cc}" linux || die "emake enroll failed"
+ emake -C test CC="${my_cc}" linux || die "emake test failed"
+}
+
+src_install() {
+ local ospdir="/usr/$(get_libdir)/${PN}"
+
+ emake -C src INSTALL_PATH="${D}"/usr install || die "emake install failed"
+
+ insinto /etc/${PN}
+ doins bin/test.cfg bin/.rnd bin/openssl.cnf || die "doins failed"
+
+ # install enroll and enroll.sh in lib dir to prevent executing them
+ dodir ${ospdir}
+ exeinto ${ospdir}
+ doexe bin/enroll bin/enroll.sh || die "doexe failed"
+
+ # use the symlink to execute enroll.sh
+ dosym ${ospdir}/enroll.sh /usr/bin/ospenroll || die "dosym failed"
+
+ newbin bin/test_app osptest || die "newbin failed"
+
+ dodoc README.txt RELNOTES.txt || die "dodoc failed"
+}
+
+pkg_postinst() {
+ elog "OSP test application is now available with 'osptest' command"
+ elog "OSP enroll application is now available with 'ospenroll' command"
+ elog "ospenroll is using /etc/${PN}/openssl.cnf as an openssl configuration"
+}
diff --git a/net-libs/osptoolkit/osptoolkit-4.1.5.ebuild b/net-libs/osptoolkit/osptoolkit-4.1.5.ebuild
new file mode 100644
index 000000000000..c97becdbf499
--- /dev/null
+++ b/net-libs/osptoolkit/osptoolkit-4.1.5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib toolchain-funcs
+
+S_DATE="20130819"
+
+DESCRIPTION="Open Settlement Protocol development kit"
+HOMEPAGE="http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/OSP%20Toolkit%20Documents.htm"
+SRC_URI="mirror://sourceforge/osp-toolkit/OSPToolkit-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/TK-${PV//./_}-${S_DATE}
+
+# TODO:
+# generate a shared lib
+
+# NOTES:
+# osptest isn't a test that can be used for src_test, it's part of the toolkit
+
+src_prepare() {
+ # remove -O and use users CFLAGS, see bug 241034
+ sed -i -e "s/ -O//" -e "s/^CFLAGS =/CFLAGS +=/" src/Makefile test/Makefile \
+ enroll/Makefile || die "patching Makefiles failed"
+
+ # use users LDFLAGS
+ sed -i -e "s:LFLAGS:LDFLAGS:" test/Makefile \
+ || die "patching test/Makefile failed"
+ sed -i -e "s:\(\$(LIBS\):\$(LDFLAGS) \1:" enroll/Makefile \
+ || die "patching enroll/Makefile failed"
+
+ # change lib dir to $(get_libdir)
+ sed -i -e "s:\$(INSTALL_PATH)/lib:\$(INSTALL_PATH)/$(get_libdir):" \
+ src/Makefile || die "patching src/Makefile failed"
+
+ # test.cfg is located in /etc/${PN}/test.cfg
+ sed -i -e \
+ "s:\(^#define CONFIG_FILENAME.*\"\).*\(test.cfg\"\):\1/etc/${PN}/\2:" \
+ test/test_app.c || die "patching test/test_app.c failed"
+
+ # configure enroll.sh
+ sed -i -e "s:^\(OPENSSL_CONF\).*:\1=/etc/${PN}/openssl.cnf:" \
+ -e "s:^\(RANDFILE\).*:\1=\/etc/${PN}/.rnd:" \
+ bin/enroll.sh || die "patching bin/enroll.sh failed"
+
+ # change enroll path
+ sed -i -e "s:^\(enroll\):/usr/lib/${PN}/\1:" \
+ bin/enroll.sh || die "patching bin/enroll.sh failed"
+}
+
+src_compile() {
+ local my_cc=$(tc-getCC)
+
+ emake -C src CC="${my_cc}" build || die "emake libosp failed"
+ emake -C enroll CC="${my_cc}" linux || die "emake enroll failed"
+ emake -C test CC="${my_cc}" linux || die "emake test failed"
+}
+
+src_install() {
+ local ospdir="/usr/$(get_libdir)/${PN}"
+
+ emake -C src INSTALL_PATH="${D}"/usr install || die "emake install failed"
+
+ insinto /etc/${PN}
+ doins bin/test.cfg bin/.rnd bin/openssl.cnf || die "doins failed"
+
+ # install enroll and enroll.sh in lib dir to prevent executing them
+ dodir ${ospdir}
+ exeinto ${ospdir}
+ doexe bin/enroll bin/enroll.sh || die "doexe failed"
+
+ # use the symlink to execute enroll.sh
+ dosym ${ospdir}/enroll.sh /usr/bin/ospenroll || die "dosym failed"
+
+ newbin bin/test_app osptest || die "newbin failed"
+
+ dodoc README.txt RELNOTES.txt || die "dodoc failed"
+}
+
+pkg_postinst() {
+ elog "OSP test application is now available with 'osptest' command"
+ elog "OSP enroll application is now available with 'ospenroll' command"
+ elog "ospenroll is using /etc/${PN}/openssl.cnf as an openssl configuration"
+}
diff --git a/net-libs/pacparser/Manifest b/net-libs/pacparser/Manifest
new file mode 100644
index 000000000000..7eb5deafff1a
--- /dev/null
+++ b/net-libs/pacparser/Manifest
@@ -0,0 +1 @@
+DIST pacparser-1.3.1.tar.gz 1229362 SHA256 040fb94c420f6aaad295b0b60cf1659f996fee1997c332bec2a6390955276585 SHA512 20295667d92eb5385429c085c14ca8dc1ba216487ff474304433f99119216934be2dd1647452173418de31f5345679dd7159eafd331e40a2b87564f878d31349 WHIRLPOOL 47caf428b4574d9fbb40cffe46afb38cc6bb786382805754f1653e3d554af60e695e1718902c94822b229b7fb4f9748257745a1b3faedfa02cc7b06ba457768f
diff --git a/net-libs/pacparser/files/pacparser-1.3.1-makefile.patch b/net-libs/pacparser/files/pacparser-1.3.1-makefile.patch
new file mode 100644
index 000000000000..a1434075d18a
--- /dev/null
+++ b/net-libs/pacparser/files/pacparser-1.3.1-makefile.patch
@@ -0,0 +1,66 @@
+diff -Nur pacparser-1.3.1.orig/src/Makefile pacparser-1.3.1/src/Makefile
+--- pacparser-1.3.1.orig/src/Makefile 2013-11-26 04:21:24.000000000 +0000
++++ pacparser-1.3.1/src/Makefile 2013-11-26 04:27:11.000000000 +0000
+@@ -55,7 +55,7 @@
+ endif
+ endif
+
+-CFLAGS = -g -DXP_UNIX -Wall -DVERSION=$(VERSION)
++CFLAGS := $(CFLAGS) -g -DXP_UNIX -Wall -DVERSION=$(VERSION)
+
+ ifndef PYTHON
+ PYTHON = python
+@@ -67,13 +67,14 @@
+
+ LIBRARY_LINK = $(LIBRARY_NAME).$(SO_SUFFIX)
+ PREFIX := $(DESTDIR)$(PREFIX)
+-LIB_PREFIX = $(PREFIX)/lib
+-INC_PREFIX = $(PREFIX)/include
+-BIN_PREFIX = $(PREFIX)/bin
+-MAN_PREFIX = $(PREFIX)/share/man
++LIB_PREFIX := $(PREFIX)/lib
++INC_PREFIX := $(PREFIX)/include
++BIN_PREFIX := $(PREFIX)/bin
++MAN_PREFIX := $(PREFIX)/share/man
++DOC_PREFIX := $(PREFIX)/share/doc/pacparser
+
+ .PHONY: clean pymod install-pymod
+-all: testpactester
++all: pactester
+
+ spidermonkey/js/src: spidermonkey/js-?.?.?.tar.gz
+ tar xzvf spidermonkey/js-?.?.?.tar.gz -C spidermonkey
+@@ -97,7 +98,7 @@
+ ln -sf $(LIBRARY) $(LIBRARY_LINK)
+
+ pactester: pactester.c pacparser.h $(LIBRARY_LINK)
+- $(CC) pactester.c -o pactester -lpacparser -L. -I.
++ $(CC) $(CFLAGS) $(LDFLAGS) pactester.c -o pactester -lpacparser -L. -I.
+
+ testpactester: pactester
+ echo "Running tests for pactester."
+@@ -118,16 +119,20 @@
+ # install pacparser manpages
+ install -d $(MAN_PREFIX)/man3/
+ (test -d ../docs && install -m 644 ../docs/man/man3/*.3 $(MAN_PREFIX)/man3/) || true
++
++install-docs:
+ # install html docs
+- install -d $(PREFIX)/share/doc/pacparser/html/
+- (test -d ../docs/html && install -m 644 ../docs/html/* $(PREFIX)/share/doc/pacparser/html/) || true
++ install -d $(DOC_PREFIX)/html/
++ (test -d ../docs/html && install -m 644 ../docs/html/* $(DOC_PREFIX)/html/) || true
+ # install examples
+- install -d $(PREFIX)/share/doc/pacparser/examples/
+- (test -d ../examples && install -m 644 ../examples/* $(PREFIX)/share/doc//pacparser/examples/) || true
++ install -d $(DOC_PREFIX)/examples/
++ (test -d ../examples && install -m 644 ../examples/* $(DOC_PREFIX)/examples/) || true
+
+ # Targets to build python module
+ pymod: pacparser.o pacparser.h libjs.a
+ cd pymod && ARCHFLAGS="" $(PYTHON) setup.py build
++
++test-pymod: pymod
+ $(PYTHON) ../tests/runtests.py
+
+ install-pymod: pymod
diff --git a/net-libs/pacparser/metadata.xml b/net-libs/pacparser/metadata.xml
new file mode 100644
index 000000000000..67c25ef2c2c0
--- /dev/null
+++ b/net-libs/pacparser/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>bicatali@gentoo.org</email>
+</maintainer>
+<longdescription>
+ A library to parse proxy auto-config (PAC) files. Proxy auto-config
+ files are a vastly used proxy configuration method these days. Web
+ browsers can use a PAC file to determine which proxy server to use
+ or whether to go direct for a given URL. PAC files are written in
+ JavaScript and can be programmed to return different proxy methods
+ (e.g. "PROXY proxy1:port; DIRECT") depending upon URL, source IP
+ address, protocol, time of the day etc. PAC files introduce a lot
+ of possibilities.
+ Needless to say, PAC files are now a widely accepted method for
+ proxy configuration management and companies all over are using
+ them in corporate environments. Almost all popular web browsers
+ support PAC files. The idea behind pacparser is to make it easy to
+ add this PAC file parsing capability to any program (C and Python
+ supported right now).
+</longdescription>
+<upstream>
+ <remote-id type="google-code">pacproxy</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/net-libs/pacparser/pacparser-1.3.1.ebuild b/net-libs/pacparser/pacparser-1.3.1.ebuild
new file mode 100644
index 000000000000..5f631d081f00
--- /dev/null
+++ b/net-libs/pacparser/pacparser-1.3.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils python-r1 multilib
+
+DESCRIPTION="Library to parse proxy auto-config files"
+HOMEPAGE="http://code.google.com/p/pacparser/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc python"
+
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# spidermonkey-1.7.0 is bundled
+# tested unbundling with spidermonkey-1.8* and 17
+# failures : unbundling not worth
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-makefile.patch
+ export NO_INTERNET=yes
+}
+
+src_compile() {
+ emake -j1 -C src
+ use python && python_foreach_impl emake -j1 -C src pymod
+}
+
+src_test() {
+ emake -j1 -C src testpactester
+ use python && emake -j1 -C src test-pymod
+}
+
+src_install() {
+ emake DESTDIR="${ED}" LIB_PREFIX="${ED}/usr/$(get_libdir)" -C src install
+ dodoc README
+ use python && python_foreach_impl \
+ emake DESTDIR="${D}" \
+ LIB_PREFIX="${D}/usr/$(get_libdir)" -C src install-pymod
+ use doc && emake DESTDIR="${ED}" \
+ DOC_PREFIX="${ED}/usr/share/doc/${PF}" -C src install-docs
+ # conflicts (bug #509168), and useless
+ rm "${ED}"/usr/share/man/man3/deprecated.3 || die
+}
diff --git a/net-libs/phodav/Manifest b/net-libs/phodav/Manifest
new file mode 100644
index 000000000000..9588534e30d0
--- /dev/null
+++ b/net-libs/phodav/Manifest
@@ -0,0 +1,2 @@
+DIST phodav-0.4.tar.xz 272476 SHA256 5d14bfd4d733f680fca6875586308879b78a3c4892bd95a2d8dc4aabd24614b6 SHA512 f6d624fb3df945e1b5fad1d31e849949a8c784a9f48adcf35b4714605a7f181c53b878bce307f8ca868d9a66425adddb0341db21294f7f25777b62dca7a1c662 WHIRLPOOL 767b3888f870e3e4739c9432cb162cb2e595ac4ac2582abc3174b4220455adbbfdeed8f70f39477ca3557c1f93af6bb8c03d62277fca7ffe6a14d0a83ae8f1d3
+DIST phodav-2.0.tar.xz 277672 SHA256 53b42faf2d6edfb0072dbbbe9b8360d8603cca2cacd142df8d1781b9ba0cb9ed SHA512 4da0f3ef7ce2ffd89e43569ad00456f9580f4005a6830a8cc36a7787cc9e06d285326376373a0d690a1868b1c10da0f3ba49b4eb8dcff3042f5c64cbe1fe0aba WHIRLPOOL 5d1ba19f502a72a86e7dbf47ca43cd5d711241fcdb936364c98de88df57cb49db88cdd0768c133bb936c40be98107f06d8b6d8f8cb1b51d2a05e33b83d36f8a4
diff --git a/net-libs/phodav/files/70-spice-webdavd.rules b/net-libs/phodav/files/70-spice-webdavd.rules
new file mode 100644
index 000000000000..80c3b02bc933
--- /dev/null
+++ b/net-libs/phodav/files/70-spice-webdavd.rules
@@ -0,0 +1 @@
+ACTION=="add", SUBSYSTEM=="virtio-ports", ENV{DEVLINKS}=="/dev/virtio-ports/org.spice-space.webdav.0", RUN+="/bin/env /etc/init.d/spice-webdavd --quiet start"
diff --git a/net-libs/phodav/files/phodav-2.0-slot.patch b/net-libs/phodav/files/phodav-2.0-slot.patch
new file mode 100644
index 000000000000..afbefe55c3c6
--- /dev/null
+++ b/net-libs/phodav/files/phodav-2.0-slot.patch
@@ -0,0 +1,39 @@
+From 65b410ddd9b6a797eb54c865e6365365604bc847 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
+Date: Tue, 24 Feb 2015 22:41:39 +0100
+Subject: [PATCH] Add version prefix to gettext and doc directories
+
+---
+ configure.ac | 2 +-
+ doc/reference/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0fe907e..d87524e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@ gl_WARN_ADD([-Wno-sign-compare])
+ gl_WARN_ADD([-Wno-unused-parameter])
+ gl_WARN_ADD([-Wno-missing-field-initializers])
+
+-GETTEXT_PACKAGE=phodav
++GETTEXT_PACKAGE=phodav-2.0
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name])
+ AC_SUBST(GETTEXT_PACKAGE)
+ IT_PROG_INTLTOOL([0.40.0])
+diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
+index dfad455..c89ab35 100644
+--- a/doc/reference/Makefile.am
++++ b/doc/reference/Makefile.am
+@@ -1,7 +1,7 @@
+ NULL =
+ AUTOMAKE_OPTIONS = 1.6
+
+-DOC_MODULE = phodav
++DOC_MODULE = phodav-2.0
+ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+ DOC_SOURCE_DIR = $(top_srcdir)/libphodav
+
+--
+2.4.3
+
diff --git a/net-libs/phodav/files/spice-webdavd.initd b/net-libs/phodav/files/spice-webdavd.initd
new file mode 100644
index 000000000000..5f6bf478824e
--- /dev/null
+++ b/net-libs/phodav/files/spice-webdavd.initd
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="Spice guest utility for file sharing via WebDAV"
+
+command="/usr/sbin/spice-webdavd"
+command_args="--port 9843"
+
+pidfile="/run/${SVCNAME}.pid"
+command_background="yes"
+
+depend() {
+ need dbus
+ use avahi
+}
diff --git a/net-libs/phodav/metadata.xml b/net-libs/phodav/metadata.xml
new file mode 100644
index 000000000000..a8b26c11f754
--- /dev/null
+++ b/net-libs/phodav/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <herd>virtualization</herd>
+ <use>
+ <flag name='spice'>Install the spice-webdavd guest agent</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/phodav/phodav-0.4.ebuild b/net-libs/phodav/phodav-0.4.ebuild
new file mode 100644
index 000000000000..88c6c37fe315
--- /dev/null
+++ b/net-libs/phodav/phodav-0.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 systemd udev
+
+DESCRIPTION="WebDav server implementation using libsoup"
+HOMEPAGE="https://wiki.gnome.org/phodav"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.0"
+KEYWORDS="alpha amd64 arm ppc ppc64 x86"
+IUSE="avahi spice systemd"
+
+RDEPEND="
+ dev-libs/glib:2
+ net-libs/libsoup:2.4
+ dev-libs/libxml2
+ avahi? ( net-dns/avahi )"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40.0
+ >=dev-util/gtk-doc-am-1.10
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_with avahi) \
+ --with-udevdir=$(get_udevdir) \
+ --with-systemdsystemunitdir=$(systemd_get_unitdir)
+
+ if ! use avahi ; then
+ sed -i -e 's|avahi-daemon.service||' data/spice-webdavd.service || die
+ fi
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use spice ; then
+ if ! use systemd ; then
+ newinitd "${FILESDIR}/spice-webdavd.initd" spice-webdavd
+ udev_dorules "${FILESDIR}/70-spice-webdavd.rules"
+ rm -r "${D}$(systemd_get_unitdir)" || die
+ fi
+ else
+ rm -r "${D}"{/usr/sbin,$(get_udevdir),$(systemd_get_unitdir)} || die
+ fi
+}
diff --git a/net-libs/phodav/phodav-2.0-r1.ebuild b/net-libs/phodav/phodav-2.0-r1.ebuild
new file mode 100644
index 000000000000..5bd28f85f407
--- /dev/null
+++ b/net-libs/phodav/phodav-2.0-r1.ebuild
@@ -0,0 +1,75 @@
+# 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 autotools gnome2 systemd udev
+
+DESCRIPTION="WebDav server implementation using libsoup"
+HOMEPAGE="https://wiki.gnome.org/phodav"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="spice systemd zeroconf"
+
+RDEPEND="
+ dev-libs/glib:2
+ >=net-libs/libsoup-2.48:2.4
+ dev-libs/libxml2
+ zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/intltool-0.40.0
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Make doc parallel installable
+ cd "${S}"/doc/reference
+ sed -e "s/\(<book.*name=\"\)${PN}/\1${PN}-${SLOT}/" \
+ -i html/${PN}.devhelp2 || die
+ mv ${PN}-docs{,-${SLOT}}.sgml || die
+ mv ${PN}-overrides{,-${SLOT}}.txt || die
+ mv ${PN}-sections{,-${SLOT}}.txt || die
+ mv html/${PN}{,-${SLOT}}.devhelp2
+ cd "${S}"
+
+ # Fix locale slottability, from master
+ epatch "${FILESDIR}"/${P}-slot.patch
+ eautoreconf
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ --program-suffix=-${SLOT} \
+ $(use_with zeroconf avahi) \
+ --with-udevdir=$(get_udevdir) \
+ --with-systemdsystemunitdir=$(systemd_get_unitdir)
+
+ if ! use zeroconf ; then
+ sed -i -e 's|avahi-daemon.service||' data/spice-webdavd.service || die
+ fi
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use spice ; then
+ if ! use systemd ; then
+ newinitd "${FILESDIR}/spice-webdavd.initd" spice-webdavd
+ udev_dorules "${FILESDIR}/70-spice-webdavd.rules"
+ rm -r "${D}$(systemd_get_unitdir)" || die
+ fi
+ else
+ rm -r "${D}"{/usr/sbin,$(get_udevdir),$(systemd_get_unitdir)} || die
+ fi
+}
diff --git a/net-libs/polarssl/Manifest b/net-libs/polarssl/Manifest
new file mode 100644
index 000000000000..c71837e3c470
--- /dev/null
+++ b/net-libs/polarssl/Manifest
@@ -0,0 +1,2 @@
+DIST polarssl-1.3.8-gpl.tgz 1725531 SHA256 318171db41335cacbb5b0047c94f1faf91442ab70a223b5223436703c9406ff1 SHA512 e1bf2b111510582ebf071b11d9d0663fbd02ac61f6ded9611e2f0eb5ff64b421d72768dd94ec5e52353d3bde06bc62d673211c26debab2cd7b3c86108d2de627 WHIRLPOOL ac482015949417b44b8d2800acdf042d8cfd217e3ab8d9aef17f3ef2f3bee8802f7413fd48d613bb1b61cbb13c0a3a71ad1f6a8de98a026de6730f9d2d74f126
+DIST polarssl-1.3.9-gpl.tgz 1741396 SHA256 d3605afc28ed4b7d1d9e3142d72e42855e4a23c07c951bbb0299556b02d36755 SHA512 e8958f834fd80ac996ac58152a0a5d4e31449e8b7b79ee6daac6f45bed60c5c5ad31f84b211d5e36ad0d6c82a742841e986a738735af048c286bce0e8fe4d62d WHIRLPOOL 21f27e50a8563df18c9b27a595da47715b1f04114d900dee2dfac3de51db58e4094da680a44007cf9f02fcc30689bca02d79a957509d1715dce1673d7713fa93
diff --git a/net-libs/polarssl/files/polarssl-1.3.8-ssl_pthread_server.patch b/net-libs/polarssl/files/polarssl-1.3.8-ssl_pthread_server.patch
new file mode 100644
index 000000000000..0c6ca92773e0
--- /dev/null
+++ b/net-libs/polarssl/files/polarssl-1.3.8-ssl_pthread_server.patch
@@ -0,0 +1,40 @@
+diff --git a/programs/ssl/ssl_pthread_server.c b/programs/ssl/ssl_pthread_server.c
+index cc6ad89..019e4e8 100644
+--- a/programs/ssl/ssl_pthread_server.c
++++ b/programs/ssl/ssl_pthread_server.c
+@@ -129,6 +129,10 @@ static void *handle_ssl_connection( void *data )
+ ssl_context ssl;
+ ctr_drbg_context ctr_drbg;
+
++ /* Make sure memory references are valid */
++ memset( &ssl, 0, sizeof( ssl_context ) );
++ memset( &ctr_drbg, 0, sizeof( ctr_drbg_context ) );
++
+ snprintf( pers, sizeof(pers), "SSL Pthread Thread %d", thread_id );
+ printf( " [ #%d ] Client FD %d\n", thread_id, client_fd );
+ printf( " [ #%d ] Seeding the random number generator...\n", thread_id );
+@@ -176,7 +180,7 @@ static void *handle_ssl_connection( void *data )
+ if( ( ret = ssl_set_own_cert( &ssl, thread_info->server_cert, thread_info->server_key ) ) != 0 )
+ {
+ printf( " failed\n ! ssl_set_own_cert returned %d\n\n", ret );
+- goto exit;
++ goto thread_exit;
+ }
+
+ printf( " [ #%d ] ok\n", thread_id );
+@@ -308,6 +312,7 @@ thread_exit:
+ #endif
+
+ net_close( client_fd );
++ ctr_drbg_free( &ctr_drbg );
+ ssl_free( &ssl );
+
+ thread_info->thread_complete = 1;
+@@ -492,7 +497,6 @@ exit:
+ #if defined(POLARSSL_SSL_CACHE_C)
+ ssl_cache_free( &cache );
+ #endif
+- ctr_drbg_free( &ctr_drbg );
+ entropy_free( &entropy );
+
+ polarssl_mutex_free( &debug_mutex );
diff --git a/net-libs/polarssl/files/polarssl-1.3.9-respect-cflags.patch b/net-libs/polarssl/files/polarssl-1.3.9-respect-cflags.patch
new file mode 100644
index 000000000000..45dffd53041c
--- /dev/null
+++ b/net-libs/polarssl/files/polarssl-1.3.9-respect-cflags.patch
@@ -0,0 +1,15 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Oct 25 17:12:43 UTC 2014
+Subject: respect system cflags
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}")
+
+ if(CMAKE_COMPILER_IS_GNUCC)
+- set(CMAKE_C_FLAGS "-Wall -Wextra -W -Wdeclaration-after-statement -Wlogical-op -Wwrite-strings")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement -Wlogical-op -Wwrite-strings")
+ set(CMAKE_C_FLAGS_RELEASE "-O2")
+ set(CMAKE_C_FLAGS_DEBUG "-g3 -O0")
+ set(CMAKE_C_FLAGS_COVERAGE "-g3 -O0 --coverage")
diff --git a/net-libs/polarssl/metadata.xml b/net-libs/polarssl/metadata.xml
new file mode 100644
index 000000000000..807a87415f43
--- /dev/null
+++ b/net-libs/polarssl/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>tommy@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
+ The aim of the PolarSSL project is to provide a quality, open-source
+ cryptographic library written in C and targeted at embedded systems.
+ </longdescription>
+ <use>
+ <flag name="havege">Enable the HAVEGE random generator.
+ Warning: the HAVEGE random generator is not suitable for
+ virtualized environments
+ </flag>
+ <flag name='programs'>Build PolarSSL programs</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/polarssl/polarssl-1.3.8.ebuild b/net-libs/polarssl/polarssl-1.3.8.ebuild
new file mode 100644
index 000000000000..b991111ad29b
--- /dev/null
+++ b/net-libs/polarssl/polarssl-1.3.8.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="http://polarssl.org/"
+SRC_URI="http://polarssl.org/download/${P}-gpl.tgz"
+
+LICENSE="GPL-2"
+SLOT="0/7"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc havege programs cpu_flags_x86_sse2 static-libs test threads zlib"
+
+RDEPEND="
+ programs? ( dev-libs/openssl:0 )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen media-gfx/graphviz )
+ test? ( dev-lang/perl )"
+
+enable_polarssl_option() {
+ local myopt="$@"
+ # check that config.h syntax is the same at version bump
+ sed -i \
+ -e "s://#define ${myopt}:#define ${myopt}:" \
+ include/polarssl/config.h || die
+}
+
+src_prepare() {
+ use cpu_flags_x86_sse2 && enable_polarssl_option POLARSSL_HAVE_SSE2
+ use zlib && enable_polarssl_option POLARSSL_ZLIB_SUPPORT
+ use havege && enable_polarssl_option POLARSSL_HAVEGE_C
+ use threads && enable_polarssl_option POLARSSL_THREADING_C
+ use threads && enable_polarssl_option POLARSSL_THREADING_PTHREAD
+
+ epatch "${FILESDIR}"/${P}-ssl_pthread_server.patch
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ $(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \
+ || echo -DENABLE_PROGRAMS=OFF)
+ $(cmake-utils_use_enable zlib ZLIB_SUPPORT)
+ $(cmake-utils_use_use static-libs STATIC_POLARSSL_LIBRARY)
+ $(cmake-utils_use_enable test TESTING)
+ -DUSE_SHARED_POLARSSL_LIBRARY=ON
+ -DINSTALL_POLARSSL_HEADERS=ON
+ -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+ cmake-utils_src_test
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ use doc && dohtml -r apidoc
+
+ if use programs ; then
+ # avoid file collisions with sys-apps/coreutils
+ local p e
+ for p in "${ED%/}"/usr/bin/* ; do
+ if [[ -x "${p}" && ! -d "${p}" ]] ; then
+ mv "${p}" "${ED%/}"/usr/bin/polarssl_${p##*/} || die
+ fi
+ done
+ for e in aes hash pkey ssl test ; do
+ docinto "${e}"
+ dodoc programs/"${e}"/*.c
+ dodoc programs/"${e}"/*.txt
+ done
+ fi
+}
diff --git a/net-libs/polarssl/polarssl-1.3.9.ebuild b/net-libs/polarssl/polarssl-1.3.9.ebuild
new file mode 100644
index 000000000000..14654d0367aa
--- /dev/null
+++ b/net-libs/polarssl/polarssl-1.3.9.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="http://polarssl.org/"
+SRC_URI="http://polarssl.org/download/${P}-gpl.tgz"
+
+LICENSE="GPL-2"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc havege programs cpu_flags_x86_sse2 static-libs test threads zlib"
+
+RDEPEND="
+ programs? ( dev-libs/openssl:0 )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen media-gfx/graphviz )
+ test? ( dev-lang/perl )"
+
+enable_polarssl_option() {
+ local myopt="$@"
+ # check that config.h syntax is the same at version bump
+ sed -i \
+ -e "s://#define ${myopt}:#define ${myopt}:" \
+ include/polarssl/config.h || die
+}
+
+src_prepare() {
+ use cpu_flags_x86_sse2 && enable_polarssl_option POLARSSL_HAVE_SSE2
+ use zlib && enable_polarssl_option POLARSSL_ZLIB_SUPPORT
+ use havege && enable_polarssl_option POLARSSL_HAVEGE_C
+ use threads && enable_polarssl_option POLARSSL_THREADING_C
+ use threads && enable_polarssl_option POLARSSL_THREADING_PTHREAD
+
+ epatch "${FILESDIR}"/${PN}-1.3.9-respect-cflags.patch
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ $(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \
+ || echo -DENABLE_PROGRAMS=OFF)
+ $(cmake-utils_use_enable zlib ZLIB_SUPPORT)
+ $(cmake-utils_use_use static-libs STATIC_POLARSSL_LIBRARY)
+ $(cmake-utils_use_enable test TESTING)
+ -DUSE_SHARED_POLARSSL_LIBRARY=ON
+ -DINSTALL_POLARSSL_HEADERS=ON
+ -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+ cmake-utils_src_test
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ use doc && dohtml -r apidoc
+
+ if use programs ; then
+ # avoid file collisions with sys-apps/coreutils
+ local p e
+ for p in "${ED%/}"/usr/bin/* ; do
+ if [[ -x "${p}" && ! -d "${p}" ]] ; then
+ mv "${p}" "${ED%/}"/usr/bin/polarssl_${p##*/} || die
+ fi
+ done
+ for e in aes hash pkey ssl test ; do
+ docinto "${e}"
+ dodoc programs/"${e}"/*.c
+ dodoc programs/"${e}"/*.txt
+ done
+ fi
+}
diff --git a/net-libs/ptlib/Manifest b/net-libs/ptlib/Manifest
new file mode 100644
index 000000000000..25ccec0b196b
--- /dev/null
+++ b/net-libs/ptlib/Manifest
@@ -0,0 +1,4 @@
+DIST ptlib-2.10.10-htmldoc.tar.bz2 4504867 SHA256 bce8a9eeb32f5e556acab3a753844500e751cd4a6db6ce88778fba692d24019a SHA512 7db5d169ad107132d2bca945a1269bae0dd0100b7566b1766dda83d0559a6f2044ffc21905520f7f15d218dd0b1290eaa13d5150d81340c6b0a9a464a713741d WHIRLPOOL 1832acdaded357471c5db982195723dfbf30d22359427d7dc7ac880d2a997a73d9963f7003cae70c6d17874daf1984f5c24c3c600656b078edcec3fa6552ce36
+DIST ptlib-2.10.11.tar.bz2 3736259 SHA256 27a8ba1fd147195c0b310897f81d26f73996b77b18147e587638444cfacd681a SHA512 ac8af8962330abf11986ccb863be0990c2e78ae611666d17c68068b72c4a5ea523ba74c55566284c3549e2346e407ccfffb5cc509fbf6ef19f1eb51dcb8b5f15 WHIRLPOOL 3dafe50df538b8d24a20b58252c5dfa578ac81f25d9086f748af928f54658533e1bf28dc1f40cbbeadd5062d57072ad71e243c0275428f155077ee752e26e4ab
+DIST ptlib-2.12.9-htmldoc.tar.bz2 6069775 SHA256 1c03474f1c27a8b7648497b1cc95296f07aa398f1b45d9ae4dc2cfad95b1c7f7 SHA512 08800ef09be97573d9e861da80d98723ffbf55ec76c3e3a7788f811cf7d04bbad35d4c2363cc696a2aff9f890dd8e09967825266cbba4a6cfdb916f9df26d70d WHIRLPOOL 9606e2538bb842fea5382dfd95a83b41fd7062336b058e2a95615725e688ad4b40a95cf0ce9669cd786c3c94884cb82f77660ee490ae6e780f8307d55767713d
+DIST ptlib-2.12.9.tar.bz2 4134345 SHA256 e38d31a24a41546b7a84673f9c42ffab60ebd83727254cf5bdfb85da46565adf SHA512 1a7869203aff7779d318c6a2f70e0fe6181381696493f7c1ea69113c9795e6a13e4423ed3609b5e6d8900388eedc3bcdb6a19e9d6f03357348b21e1003ef917a WHIRLPOOL 5652bdee09d5d8ed3079080bc1d4b8bb495a8812bd49b2e963645c47673af3789a80c9d0a9aeaf0d4ec9d2782637b8763e625db340c0cc94ce362bb952c9fb9e
diff --git a/net-libs/ptlib/files/ptlib-2.10.10-mga-bison-parameter.patch b/net-libs/ptlib/files/ptlib-2.10.10-mga-bison-parameter.patch
new file mode 100644
index 000000000000..fcc8d0d2e7a8
--- /dev/null
+++ b/net-libs/ptlib/files/ptlib-2.10.10-mga-bison-parameter.patch
@@ -0,0 +1,39 @@
+--- ptlib-2.10.11/./src/ptlib/common/getdate.y 2013-08-15 01:20:26.000000000 +0200
++++ /mnt/chroot/cauldron/home/dan/rpm/BUILD/ptlib-2.10.11/src/ptlib/common/getdate.y 2013-12-15 00:24:27.866481490 +0100
+@@ -121,9 +121,9 @@
+ static int yylex();
+
+ #ifdef __GNUC__
+-static int yyerror(char const *msg);
++static int yyerror(void *, char const *msg);
+ #else
+-static void yyerror(char const *msg);
++static void yyerror(void *, char const *msg);
+ #endif
+
+
+@@ -132,7 +132,8 @@
+
+ %}
+
+-%pure_parser
++%pure-parser
++%parse-param {void *parseParam}
+
+ %union {
+ time_t Number;
+@@ -1018,12 +1019,12 @@
+ #endif
+
+ #ifdef __GNUC__
+-int yyerror(const char * s)
++int yyerror(void *var, const char * s)
+ {
+ return 0;
+ }
+ #else
+-static void yyerror(const char * s)
++static void yyerror(void *var, const char * s)
+ {
+ }
+ #endif
diff --git a/net-libs/ptlib/files/ptlib-2.10.10-respect_cflags_cxxflags.patch b/net-libs/ptlib/files/ptlib-2.10.10-respect_cflags_cxxflags.patch
new file mode 100644
index 000000000000..4442d333fcd1
--- /dev/null
+++ b/net-libs/ptlib/files/ptlib-2.10.10-respect_cflags_cxxflags.patch
@@ -0,0 +1,14 @@
+diff -ur ptlib-2.10.10.orig/make/ptbuildopts.mak.in ptlib-2.10.10/make/ptbuildopts.mak.in
+--- ptlib-2.10.10.orig/make/ptbuildopts.mak.in 2014-08-04 18:11:02.000000000 +0000
++++ ptlib-2.10.10/make/ptbuildopts.mak.in 2014-08-04 18:11:32.000000000 +0000
+@@ -15,8 +15,8 @@
+ OSTYPE = @OSTYPE@
+ OSRELEASE = @OSRELEASE@
+
+-STDCCFLAGS += @STDCCFLAGS@ @CPPFLAGS@
+-STDCXXFLAGS += @STDCXXFLAGS@ @CPPFLAGS@
++STDCCFLAGS += @STDCCFLAGS@ @CFLAGS@
++STDCXXFLAGS += @STDCXXFLAGS@ @CXXFLAGS@
+ OPTSTDCCFLAGS += @OPTSTDCCFLAGS@
+ LDFLAGS += @LDFLAGS@
+ ENDLDLIBS += @ENDLDLIBS@ \ No newline at end of file
diff --git a/net-libs/ptlib/files/ptlib-2.10.9-disable-telnet-symbols.patch b/net-libs/ptlib/files/ptlib-2.10.9-disable-telnet-symbols.patch
new file mode 100644
index 000000000000..0a3012c8510a
--- /dev/null
+++ b/net-libs/ptlib/files/ptlib-2.10.9-disable-telnet-symbols.patch
@@ -0,0 +1,19 @@
+diff -uNr ptlib-2.10.8.orig/src/ptclib/cli.cxx ptlib-2.10.8/src/ptclib/cli.cxx
+--- ptlib-2.10.8.orig/src/ptclib/cli.cxx 2012-10-19 13:45:35.000000000 -0400
++++ ptlib-2.10.8/src/ptclib/cli.cxx 2012-10-22 16:02:58.000000000 -0400
+@@ -858,6 +858,7 @@
+
+ ///////////////////////////////////////////////////////////////////////////////
+
++#ifdef HAS_TELNET
+ PCLITelnet::PCLITelnet(WORD port, const char * prompt, bool singleThreadForAll)
+ : PCLISocket(port, prompt, singleThreadForAll)
+ {
+@@ -868,6 +869,7 @@
+ {
+ return new PTelnetSocket();
+ }
++#endif
+
+
+ ///////////////////////////////////////////////////////////////////////////////
diff --git a/net-libs/ptlib/files/ptlib-2.10.9-pkgconfig_ldflags.patch b/net-libs/ptlib/files/ptlib-2.10.9-pkgconfig_ldflags.patch
new file mode 100644
index 000000000000..acd531977c3b
--- /dev/null
+++ b/net-libs/ptlib/files/ptlib-2.10.9-pkgconfig_ldflags.patch
@@ -0,0 +1,11 @@
+diff -uNr ptlib-2.10.8.orig/ptlib.pc.in ptlib-2.10.8/ptlib.pc.in
+--- ptlib-2.10.8.orig/ptlib.pc.in 2012-10-19 13:45:35.000000000 -0400
++++ ptlib-2.10.8/ptlib.pc.in 2012-10-19 14:03:26.000000000 -0400
+@@ -11,7 +11,7 @@
+ Name: ptlib
+ Description: PT Library
+ Version: @PTLIB_VERSION@
+-Libs: @LDFLAGS@ -L${libdir} -lpt${suffix}
++Libs: @ENDLDLIBS@ -L${libdir} -lpt${suffix}
+ Libs.private: @ENDLDLIBS@
+ Cflags: -I${includedir} @STDCCFLAGS@
diff --git a/net-libs/ptlib/files/ptlib-2.10.9-respect_cxxflags.patch b/net-libs/ptlib/files/ptlib-2.10.9-respect_cxxflags.patch
new file mode 100644
index 000000000000..dc09f960f05a
--- /dev/null
+++ b/net-libs/ptlib/files/ptlib-2.10.9-respect_cxxflags.patch
@@ -0,0 +1,10 @@
+diff -uNr ptlib-2.10.8.orig/configure.ac ptlib-2.10.8/configure.ac
+--- ptlib-2.10.8.orig/configure.ac 2012-10-19 13:45:35.000000000 -0400
++++ ptlib-2.10.8/configure.ac 2012-10-23 08:08:57.000000000 -0400
+@@ -538,7 +540,7 @@
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+- STDCXXFLAGS="$STDCCFLAGS -frtti"
++ STDCXXFLAGS="$STDCXXFLAGS -frtti"
+ fi
diff --git a/net-libs/ptlib/files/ptlib-2.10.9-svn_revision_override.patch b/net-libs/ptlib/files/ptlib-2.10.9-svn_revision_override.patch
new file mode 100644
index 000000000000..5531fd9f6fcb
--- /dev/null
+++ b/net-libs/ptlib/files/ptlib-2.10.9-svn_revision_override.patch
@@ -0,0 +1,18 @@
+diff -uNr ptlib-2.10.8.orig/src/ptlib/common/osutils.cxx ptlib-2.10.8/src/ptlib/common/osutils.cxx
+--- ptlib-2.10.8.orig/src/ptlib/common/osutils.cxx 2012-10-19 13:45:35.000000000 -0400
++++ ptlib-2.10.8/src/ptlib/common/osutils.cxx 2012-10-19 13:52:50.000000000 -0400
+@@ -43,13 +43,13 @@
+ #include <ptlib/svcproc.h>
+ #include <ptlib/pluginmgr.h>
+ #include "../../../version.h"
+-#include "../../../revision.h"
++# define SVN_REVISION 0
++//#include "../../../revision.h"
+
+ #ifdef _WIN32
+ #include <ptlib/msos/ptlib/debstrm.h>
+ #endif
+
+-
+ static const char * const VersionStatus[PProcess::NumCodeStatuses] = { "alpha", "beta", "." };
+ static const char DefaultRollOverPattern[] = "_yyyy_MM_dd_hh_mm";
diff --git a/net-libs/ptlib/files/ptlib-2.12.4-respect_cxxflags.patch b/net-libs/ptlib/files/ptlib-2.12.4-respect_cxxflags.patch
new file mode 100644
index 000000000000..85f590c8c88d
--- /dev/null
+++ b/net-libs/ptlib/files/ptlib-2.12.4-respect_cxxflags.patch
@@ -0,0 +1,12 @@
+diff -urN ptlib-2.12.4.old/configure.ac ptlib-2.12.4/configure.ac
+--- ptlib-2.12.4.old/configure.ac 2013-06-22 21:01:51.392606863 +0200
++++ ptlib-2.12.4/configure.ac 2013-06-22 21:02:02.991606450 +0200
+@@ -448,7 +448,7 @@
+ ],
+ [
+ AC_MSG_RESULT(no)
+- PTLIB_CXXFLAGS="$PTLIB_CFLAGS -frtti"
++ PTLIB_CXXFLAGS="$PTLIB_CXXFLAGS -frtti"
+ ]
+ )
+
diff --git a/net-libs/ptlib/files/ptlib-2.12.4-sdl-linking.patch b/net-libs/ptlib/files/ptlib-2.12.4-sdl-linking.patch
new file mode 100644
index 000000000000..91e5c0811d5d
--- /dev/null
+++ b/net-libs/ptlib/files/ptlib-2.12.4-sdl-linking.patch
@@ -0,0 +1,11 @@
+diff -urN ptlib-2.12.4/configure.ac ptlib-2.12.4.new/configure.ac
+--- ptlib-2.12.4/configure.ac 2013-06-21 07:02:48.000000000 +0200
++++ ptlib-2.12.4.new/configure.ac 2013-06-24 11:51:18.356368722 +0200
+@@ -1735,6 +1735,7 @@
+ PTLIB_CFLAGS="$PTLIB_CFLAGS ${SDL_CFLAGS}"
+ LDFLAGS="$LDFLAGS `pkg-config --libs sdl`"
+ ],[HAS_SDL=])
++ ENDLDLIBS="$ENDLDLIBS ${SDL_LIBS}"
+ fi
+ fi
+ AC_SUBST(HAS_SDL)
diff --git a/net-libs/ptlib/metadata.xml b/net-libs/ptlib/metadata.xml
new file mode 100644
index 000000000000..334072904b0a
--- /dev/null
+++ b/net-libs/ptlib/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="asn">Enable ASN decoding/encoding support</flag>
+ <flag name="dtmf">Enable DTMF encoding/decoding support</flag>
+ <flag name="http">Enable HTTP support</flag>
+ <flag name="mail">Enable mail protocols (POP3/SMTP)</flag>
+ <flag name="qos">Enable QOS support</flag>
+ <flag name="remote">Enable remote connection support</flag>
+ <flag name="serial">Enable serial port support</flag>
+ <flag name="shmvideo">Enable shared memory video devices</flag>
+ <flag name="socks">Enable SOCKS protocol support</flag>
+ <flag name="stun">Enable STUN support</flag>
+ <flag name="telnet">Enable telnet protocol support</flag>
+ <flag name="tts">Enable Text-To-Speech server support</flag>
+ <flag name="video">Enable video support</flag>
+ <flag name="vxml">Enable VoiceXML support</flag>
+ <flag name="wav">Enable WAVFILE support</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">opalvoip</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/ptlib/ptlib-2.10.11.ebuild b/net-libs/ptlib/ptlib-2.10.11.ebuild
new file mode 100644
index 000000000000..e112122027c1
--- /dev/null
+++ b/net-libs/ptlib/ptlib-2.10.11.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Network focused portable C++ class library providing high level functions"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
+ doc? ( mirror://sourceforge/opalvoip/${PN}-2.10.10-htmldoc.tar.bz2 )"
+
+LICENSE="MPL-1.0"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
+# default enabled are features from 'minsize', the most used according to ptlib
+IUSE="alsa +asn debug doc +dtmf examples ffmpeg ftp +http ipv6
+xmpp ldap lua mail odbc oss pch pulseaudio qos remote sasl sdl serial
+shmvideo snmp soap socks +sound ssl static-libs +stun telnet tts v4l +video
+vxml wav xml xmlrpc"
+
+CDEPEND="
+ ldap? ( net-nds/openldap )
+ lua? ( dev-lang/lua )
+ odbc? ( dev-db/unixODBC )
+ pulseaudio? ( media-sound/pulseaudio )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ sdl? ( media-libs/libsdl )
+ sound? ( alsa? ( media-libs/alsa-lib ) )
+ ssl? ( dev-libs/openssl )
+ video? ( v4l? ( media-libs/libv4l ) )
+ xml? ( dev-libs/expat )
+ !!dev-libs/pwlib"
+RDEPEND="${CDEPEND}
+ ffmpeg? ( virtual/ffmpeg )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ sys-devel/bison
+ sys-devel/flex
+ video? ( v4l? ( sys-kernel/linux-headers ) )"
+
+# NOTES:
+# media-libs/libdc1394:2 should be supported but headers location have changed
+# tools/ directory is ignored
+# avc plugin is disabled to fix bug 276514, see upstream bug 2821744
+
+conditional_use_warn_msg() {
+ ewarn "To enable ${1} USE flag, you need ${2} USE flag to be enabled"
+ ewarn "Please, enable ${2} or disable ${1}"
+}
+
+REQUIRED_USE="sdl? ( video )
+ xmpp? ( xml )
+ vxml? ( http tts xml )
+ xmlrpc? ( http xml )
+ soap? ( http xml )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.10.9-svn_revision_override.patch" \
+ "${FILESDIR}/${PN}-2.10.9-pkgconfig_ldflags.patch" \
+ "${FILESDIR}/${PN}-2.10.9-respect_cxxflags.patch" \
+ "${FILESDIR}/${PN}-2.10.10-mga-bison-parameter.patch" \
+ "${FILESDIR}/${PN}-2.10.10-respect_cflags_cxxflags.patch"
+
+ if ! use telnet; then
+ epatch "${FILESDIR}/${PN}-2.10.9-disable-telnet-symbols.patch"
+ fi
+
+ # remove visual studio related files from samples/
+ if use examples; then
+ rm -f samples/*/*.vcproj
+ rm -f samples/*/*.sln
+ rm -f samples/*/*.dsp
+ rm -f samples/*/*.dsw
+ fi
+
+ if [[ ! -z ${TARGET+set} ]]; then
+ ewarn "TARGET variable is set. Removing as it would break the build, bug #465722."
+ unset TARGET
+ fi
+}
+
+src_configure() {
+ local myconf=""
+
+ # plugins are disabled only if ! sound and ! video
+ if ! use sound && ! use video; then
+ myconf="${myconf} --disable-plugins"
+ else
+ myconf="${myconf} --enable-plugins"
+ fi
+
+ # minsize: presets of features (overwritten by use flags)
+ # ansi-bool, atomicity: there is no reason to disable those features
+ # internalregex: we want to use system one
+ # sunaudio and bsdvideo are respectively for SunOS and BSD's
+ # appshare, vfw: only for windows
+ # samples: no need to build samples
+ # avc: disabled, bug 276514, upstream bug 2821744
+ # mlib: SUN mediaLibs. Not in tree.
+ # pipechan, configfile, resolver, url: force enabling
+ econf ${myconf} \
+ --disable-minsize \
+ --enable-ansi-bool \
+ --enable-atomicity \
+ --disable-internalregex \
+ --disable-sunaudio \
+ --disable-bsdvideo \
+ --disable-appshare \
+ --disable-vfw \
+ --disable-samples \
+ --disable-avc \
+ --disable-mlib \
+ --enable-configfile \
+ --enable-pipechan \
+ --enable-resolver \
+ --enable-url \
+ $(use_enable alsa) \
+ $(use_enable asn) \
+ $(use_enable debug exceptions) \
+ $(use_enable debug memcheck) \
+ $(use_enable debug tracing) \
+ $(use_enable dtmf) \
+ --disable-esd \
+ $(use_enable ffmpeg ffvdev) \
+ $(use_enable ftp) \
+ $(use_enable http) \
+ $(use_enable http httpforms) \
+ $(use_enable http httpsvc) \
+ --disable-dc \
+ $(use_enable ipv6) \
+ $(use_enable xmpp jabber) \
+ $(use_enable ldap openldap) \
+ $(use_enable lua) \
+ $(use_enable mail pop3smtp) \
+ $(use_enable pulseaudio pulse) \
+ $(use_enable odbc) \
+ $(use_enable oss) \
+ $(use_enable pch) \
+ $(use_enable qos) \
+ $(use_enable remote remconn) \
+ $(use_enable sasl) \
+ $(use_enable sdl) \
+ $(use_enable serial) \
+ $(use_enable shmvideo) \
+ $(use_enable snmp) \
+ $(use_enable soap) \
+ $(use_enable socks) \
+ $(use_enable sound audio) \
+ $(use_enable ssl openssl) \
+ $(use_enable stun) \
+ $(use_enable telnet) \
+ $(use_enable tts) \
+ --disable-v4l \
+ $(use_enable v4l v4l2) \
+ $(use_enable video) $(use_enable video vidfile) \
+ $(use_enable vxml) \
+ $(use_enable wav wavfile) \
+ $(use_enable xml expat) \
+ $(use_enable xmlrpc)
+}
+
+src_compile() {
+ local makeopts=""
+ tc-env_build
+
+ use debug && makeopts="debug"
+
+ emake ${makeopts} V=1 || die "emake failed"
+}
+
+src_install() {
+ local makeopts=""
+
+ use debug && makeopts="DEBUG=1"
+
+ emake DESTDIR="${D}" ${makeopts} install || die "emake install failed"
+
+ # Get rid of static libraries if not requested
+ # There seems to be no easy way to disable this in the build system
+ if ! use static-libs; then
+ rm -v "${D}"/usr/lib*/*.a || die
+ fi
+
+ if use doc; then
+ dohtml -r "${WORKDIR}"/html/* || die "dohtml failed"
+ fi
+
+ dodoc History.txt ReadMe.txt ReadMe_QOS.txt || die "dodoc failed"
+
+ if use sound || use video; then
+ newdoc plugins/ReadMe.txt ReadMe-Plugins.txt || die "newdoc failed"
+ fi
+
+ if use examples; then
+ local exampledir="/usr/share/doc/${PF}/examples"
+ local basedir="samples"
+ local sampledirs="`ls samples --hide=Makefile`"
+
+ # first, install Makefile
+ insinto ${exampledir}/
+ doins ${basedir}/Makefile || die "doins failed"
+
+ # now, all examples
+ for x in ${sampledirs}; do
+ insinto ${exampledir}/${x}/
+ doins ${basedir}/${x}/* || die "doins failed"
+ done
+ fi
+}
+
+pkg_postinst() {
+ if use examples; then
+ ewarn "All examples have been installed, some of them will not work on your system"
+ ewarn "it will depend of the enabled USE flags."
+ ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
+ fi
+
+ if ! use sound || ! use video; then
+ ewarn "You have disabled sound or video USE flags."
+ ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
+ ewarn "Having a feature enabled via use flag but disabled can lead to issues."
+ fi
+
+ ewarn "If you've just removed pwlib to install ptlib, some packages will be broken."
+ ewarn "Please use 'revdep-rebuild' from app-portage/gentoolkit to check."
+ ewarn "If some packages need pwlib, consider removing ptlib and re-installing pwlib"
+ ewarn "or help us to make them live together."
+}
diff --git a/net-libs/ptlib/ptlib-2.12.9.ebuild b/net-libs/ptlib/ptlib-2.12.9.ebuild
new file mode 100644
index 000000000000..58fc5f203961
--- /dev/null
+++ b/net-libs/ptlib/ptlib-2.12.9.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Network focused portable C++ class library providing high level functions"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
+ doc? ( mirror://sourceforge/opalvoip/${P}-htmldoc.tar.bz2 )"
+
+LICENSE="MPL-1.0"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# default enabled are features from 'minsize', the most used according to ptlib
+IUSE="alsa +asn debug doc +dtmf examples ffmpeg ftp +http ipv6
+xmpp ldap lua mail odbc oss pch pulseaudio remote sasl sdl serial
+shmvideo snmp soap socks +sound ssl static-libs +stun telnet tts v4l +video
+vxml wav xml xmlrpc"
+
+CDEPEND="
+ ldap? ( net-nds/openldap )
+ lua? ( dev-lang/lua )
+ odbc? ( dev-db/unixODBC )
+ pulseaudio? ( media-sound/pulseaudio )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ sdl? ( media-libs/libsdl )
+ sound? ( alsa? ( media-libs/alsa-lib ) )
+ ssl? ( dev-libs/openssl )
+ video? ( v4l? ( media-libs/libv4l ) )
+ xml? ( dev-libs/expat )
+ !!dev-libs/pwlib"
+RDEPEND="${CDEPEND}
+ ffmpeg? ( virtual/ffmpeg )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ sys-devel/bison
+ sys-devel/flex
+ video? ( v4l? ( sys-kernel/linux-headers ) )"
+
+# NOTES:
+# media-libs/libdc1394:2 should be supported but headers location have changed
+# tools/ directory is ignored
+# avc plugin is disabled to fix bug 276514, see upstream bug 2821744
+
+REQUIRED_USE="sdl? ( video )
+ xmpp? ( xml )
+ vxml? ( http tts xml )
+ xmlrpc? ( http xml )
+ soap? ( http xml )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.10.9-svn_revision_override.patch" \
+ "${FILESDIR}/${PN}-2.10.9-pkgconfig_ldflags.patch" \
+ "${FILESDIR}/${PN}-2.12.4-respect_cxxflags.patch" \
+ "${FILESDIR}/${PN}-2.12.4-sdl-linking.patch"
+
+ if ! use telnet; then
+ epatch "${FILESDIR}/${PN}-2.10.9-disable-telnet-symbols.patch"
+ fi
+
+ # remove visual studio related files from samples/
+ if use examples; then
+ rm -f samples/*/*.vcproj
+ rm -f samples/*/*.sln
+ rm -f samples/*/*.dsp
+ rm -f samples/*/*.dsw
+ fi
+
+ if [[ ! -z ${TARGET+set} ]]; then
+ ewarn "TARGET variable is set. Removing as it would break the build, bug #465722."
+ unset TARGET
+ fi
+}
+
+src_configure() {
+ local myconf=""
+
+ # plugins are disabled only if ! sound and ! video
+ if ! use sound && ! use video; then
+ myconf+=" --disable-plugins"
+ else
+ myconf+=" --enable-plugins"
+ fi
+
+ # minsize: presets of features (overwritten by use flags)
+ # ansi-bool, atomicity: there is no reason to disable those features
+ # internalregex: we want to use system one
+ # sunaudio and bsdvideo are respectively for SunOS and BSD's
+ # appshare, vfw: only for windows
+ # samples: no need to build samples
+ # avc: disabled, bug 276514, upstream bug 2821744
+ # mlib: SUN mediaLibs. Not in tree.
+ # pipechan, configfile, resolver, url: force enabling
+ econf ${myconf} \
+ --disable-minsize \
+ --enable-ansi-bool \
+ --enable-atomicity \
+ --disable-internalregex \
+ --disable-sunaudio \
+ --disable-bsdvideo \
+ --disable-appshare \
+ --disable-vfw \
+ --disable-samples \
+ --disable-avc \
+ --disable-mlib \
+ --enable-configfile \
+ --enable-pipechan \
+ --enable-resolver \
+ --enable-url \
+ $(use_enable alsa) \
+ $(use_enable asn) \
+ $(use_enable debug exceptions) \
+ $(use_enable debug memcheck) \
+ $(use_enable debug tracing) \
+ $(use_enable dtmf) \
+ --disable-esd \
+ $(use_enable ffmpeg ffvdev) \
+ $(use_enable ftp) \
+ $(use_enable http) \
+ $(use_enable http httpforms) \
+ $(use_enable http httpsvc) \
+ --disable-dc \
+ $(use_enable ipv6) \
+ $(use_enable xmpp jabber) \
+ $(use_enable ldap openldap) \
+ $(use_enable lua) \
+ $(use_enable mail pop3smtp) \
+ $(use_enable pulseaudio pulse) \
+ $(use_enable odbc) \
+ $(use_enable oss) \
+ $(use_enable pch) \
+ $(use_enable remote remconn) \
+ $(use_enable sasl) \
+ $(use_enable sdl) \
+ $(use_enable serial) \
+ $(use_enable shmvideo) \
+ $(use_enable snmp) \
+ $(use_enable soap) \
+ $(use_enable socks) \
+ $(use_enable sound audio) \
+ $(use_enable ssl openssl) \
+ $(use_enable stun) \
+ $(use_enable telnet) \
+ $(use_enable tts) \
+ --disable-v4l \
+ $(use_enable v4l v4l2) \
+ $(use_enable video) $(use_enable video vidfile) \
+ $(use_enable vxml) \
+ $(use_enable wav wavfile) \
+ $(use_enable xml expat) \
+ $(use_enable xmlrpc)
+}
+
+src_compile() {
+ local makeopts=""
+ tc-env_build
+
+ use debug && makeopts="debug"
+
+ emake ${makeopts}
+}
+
+src_install() {
+ local makeopts=""
+
+ use debug && makeopts="DEBUG=1"
+
+ emake DESTDIR="${D}" ${makeopts} install
+
+ # Get rid of static libraries if not requested
+ # There seems to be no easy way to disable this in the build system
+ if ! use static-libs; then
+ rm -v "${D}"/usr/lib*/*.a || die
+ fi
+
+ if use doc; then
+ dohtml -r "${WORKDIR}"/html/*
+ fi
+
+ dodoc History.txt ReadMe.txt ReadMe_QOS.txt
+
+ if use sound || use video; then
+ newdoc plugins/ReadMe.txt ReadMe-Plugins.txt
+ fi
+
+ if use examples; then
+ local exampledir="/usr/share/doc/${PF}/examples"
+ local basedir="samples"
+ local sampledirs="`ls samples --hide=Makefile`"
+
+ # first, install Makefile
+ insinto ${exampledir}/
+ doins ${basedir}/Makefile || die "doins failed"
+
+ # now, all examples
+ for x in ${sampledirs}; do
+ insinto ${exampledir}/${x}/
+ doins ${basedir}/${x}/* || die "doins failed"
+ done
+ fi
+}
+
+pkg_postinst() {
+ if use examples; then
+ ewarn "All examples have been installed, some of them will not work on your system"
+ ewarn "it will depend of the enabled USE flags."
+ ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
+ fi
+
+ if ! use sound || ! use video; then
+ ewarn "You have disabled sound or video USE flags."
+ ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
+ ewarn "Having a feature enabled via use flag but disabled can lead to issues."
+ fi
+
+ ewarn "If you've just removed pwlib to install ptlib, some packages will be broken."
+ ewarn "Please use 'revdep-rebuild' from app-portage/gentoolkit to check."
+ ewarn "If some packages need pwlib, consider removing ptlib and re-installing pwlib"
+ ewarn "or help us to make them live together."
+}
diff --git a/net-libs/qmf/Manifest b/net-libs/qmf/Manifest
new file mode 100644
index 000000000000..a1e0e90ef920
--- /dev/null
+++ b/net-libs/qmf/Manifest
@@ -0,0 +1 @@
+DIST qmf-4.0.3.tar.gz 2099647 SHA256 0de3f27a49d5c7d67db3266ba62b61e260a850ea88420efb03db00502e45e39a SHA512 2df508ccc5d14bd1f0e68c2e07bded8b89c0c970302a130975c1ae3e49935ff46e77741a5c63580394c423fc56e526d3ac7738c740fc29f5d2eaec7fe2c8005d WHIRLPOOL 907315c32a900c60dd4b4a2122fef97454f5c922936b6c9ea269ec4c0d4d74ccea4f2d2248f348bb691057f4cbf36ddf11a2f3ab2192ff886db81873bcec60d3
diff --git a/net-libs/qmf/files/qmf-4.0.2-tests.patch b/net-libs/qmf/files/qmf-4.0.2-tests.patch
new file mode 100644
index 000000000000..38a7f4c7b714
--- /dev/null
+++ b/net-libs/qmf/files/qmf-4.0.2-tests.patch
@@ -0,0 +1,13 @@
+diff -Naur qmf-9999.orig/tests/tests.pri qmf-9999/tests/tests.pri
+--- qmf-9999.orig/tests/tests.pri 2013-04-13 12:05:32.323423194 -0700
++++ qmf-9999/tests/tests.pri 2013-04-13 12:09:25.068513480 -0700
+@@ -11,7 +11,8 @@
+ INCLUDEPATH += . $$QMFPATH $$QMFPATH/support
+ LIBS += -L$$QMFPATH/build
+ macx:LIBS += -F$$QMFPATH/build
+-QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH
++QMAKE_LFLAGS += -Wl,-rpath,\\\$$ORIGIN/$$QMFPATH/build
+
+ include(../common.pri)
+
++DESTDIR =
diff --git a/net-libs/qmf/metadata.xml b/net-libs/qmf/metadata.xml
new file mode 100644
index 000000000000..4fd5a5f7ed23
--- /dev/null
+++ b/net-libs/qmf/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qt</herd>
+<maintainer>
+ <email>pesa@gentoo.org</email>
+ <name>Davide Pesavento</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-libs/qmf/qmf-4.0.3.ebuild b/net-libs/qmf/qmf-4.0.3.ebuild
new file mode 100644
index 000000000000..eb5e32e7eefd
--- /dev/null
+++ b/net-libs/qmf/qmf-4.0.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI=(
+ "git://code.qt.io/qt-labs/messagingframework.git"
+ "https://code.qt.io/git/qt-labs/messagingframework.git"
+ )
+else
+ SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${P}.tar.gz"
+ S=${WORKDIR}/qt-labs-messagingframework
+fi
+
+DESCRIPTION="The Qt Messaging Framework"
+HOMEPAGE="https://code.qt.io/cgit/qt-labs/messagingframework.git/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="debug doc examples icu test zlib"
+
+RDEPEND="
+ >=dev-qt/qtcore-4.8:4
+ >=dev-qt/qtgui-4.8:4
+ >=dev-qt/qtsql-4.8:4
+ examples? ( >=dev-qt/qtwebkit-4.8:4 )
+ icu? ( dev-libs/icu:= )
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( >=dev-qt/qttest-4.8:4 )
+"
+
+DOCS=( CHANGES )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.2-tests.patch"
+)
+
+src_prepare() {
+ qt4-r2_src_prepare
+
+ sed -i -e '/SUBDIRS.*=/s/benchmarks//' messagingframework.pro || die
+
+ if ! use examples; then
+ sed -i -e '/SUBDIRS.*=/s/examples//' messagingframework.pro || die
+ fi
+ if ! use test; then
+ sed -i -e '/SUBDIRS.*=/s/tests//' messagingframework.pro || die
+ fi
+
+ # disable automagic deps
+ if ! use icu; then
+ sed -i -e 's/packagesExist(icu-uc)/false:&/' \
+ src/libraries/qmfclient/qmfclient.pro || die
+ fi
+ if ! use zlib; then
+ sed -i -e 's/packagesExist(zlib)/false:&/' \
+ src/plugins/messageservices/imap/imap.pro || die
+ fi
+
+ # fix libdir
+ find "${S}" -name '*.pro' -type f -print0 | xargs -0 \
+ sed -i -re "s:/lib(/|$):/$(get_libdir)\1:" || die
+ sed -i -e "s:/lib/:/$(get_libdir)/:" \
+ src/libraries/qmfclient/support/qmailnamespace.cpp || die
+}
+
+src_configure() {
+ eqmake4 QMF_INSTALL_ROOT="${EPREFIX}/usr"
+}
+
+src_test() {
+ cd "${S}"/tests
+
+ export QMF_DATA=${T}
+ local fail=false test=
+ for test in tst_*; do
+ # skip test that requires messageserver to be running
+ [[ ${test} == tst_qmailstorageaction ]] && continue
+
+ if ! LC_ALL=C ./${test}/${test}; then
+ eerror "${test#tst_} test failed!"
+ fail=true
+ fi
+ echo
+ done
+
+ ${fail} && die "some tests have failed!"
+}
+
+src_install() {
+ qt4-r2_src_install
+
+ if use doc; then
+ emake docs
+
+ dodoc -r doc/html
+ dodoc doc/html/qmf.qch
+ docompress -x /usr/share/doc/${PF}/qmf.qch
+ fi
+}
diff --git a/net-libs/qtweetlib/Manifest b/net-libs/qtweetlib/Manifest
new file mode 100644
index 000000000000..52344268ff24
--- /dev/null
+++ b/net-libs/qtweetlib/Manifest
@@ -0,0 +1 @@
+DIST qtweetlib-0.5.tar.gz 96649 SHA256 c06d3e35529aa6a5daf27a2a22d6fa99f22488abc4cf2bf5b959adf118691039 SHA512 d4fe5150b3a41164e0563eb53e83ef1bd19a5d0b40bcf4d4041a2cb718b5fdd2f8a021e0b345b69be49a13066107b89f904a9c48cfa26a877aa3f6bdf2d9c9ad WHIRLPOOL 5ae723f5963b33383361836c2b75ff45f182930c97fc8b1c041bf9e0aea3f91331d622f9d8d8a13977114b78262f227f78ed29770af364d002d41fa6a61767ec
diff --git a/net-libs/qtweetlib/metadata.xml b/net-libs/qtweetlib/metadata.xml
new file mode 100644
index 000000000000..e297298a1cdb
--- /dev/null
+++ b/net-libs/qtweetlib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+ <upstream>
+ <remote-id type="github">minimoog/QTweetLib</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/qtweetlib/qtweetlib-0.5.ebuild b/net-libs/qtweetlib/qtweetlib-0.5.ebuild
new file mode 100644
index 000000000000..768136ecc3cc
--- /dev/null
+++ b/net-libs/qtweetlib/qtweetlib-0.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_PN=QTweetLib
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/minimoog/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+else
+ GIT_ECLASS="git-2"
+ EGIT_REPO_URI="git://github.com/minimoog/QTweetLib.git"
+ KEYWORDS=""
+fi
+
+inherit qt4-r2 cmake-utils ${GIT_ECLASS}
+
+DESCRIPTION="Qt based Twitter library"
+HOMEPAGE="https://github.com/minimoog/QTweetLib"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="
+ >=dev-libs/qjson-0.7.1
+ >=dev-qt/qtcore-4.6.0:4[ssl]
+ >=dev-qt/qtgui-4.6.0:4
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ if [[ ${PV} != *9999* ]]; then
+ unpack ${A}
+ mv *-${MY_PN}-* "${S}"
+ else
+ git-2_src_unpack
+ fi
+}
diff --git a/net-libs/qtweetlib/qtweetlib-9999.ebuild b/net-libs/qtweetlib/qtweetlib-9999.ebuild
new file mode 100644
index 000000000000..768136ecc3cc
--- /dev/null
+++ b/net-libs/qtweetlib/qtweetlib-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_PN=QTweetLib
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/minimoog/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+else
+ GIT_ECLASS="git-2"
+ EGIT_REPO_URI="git://github.com/minimoog/QTweetLib.git"
+ KEYWORDS=""
+fi
+
+inherit qt4-r2 cmake-utils ${GIT_ECLASS}
+
+DESCRIPTION="Qt based Twitter library"
+HOMEPAGE="https://github.com/minimoog/QTweetLib"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="
+ >=dev-libs/qjson-0.7.1
+ >=dev-qt/qtcore-4.6.0:4[ssl]
+ >=dev-qt/qtgui-4.6.0:4
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ if [[ ${PV} != *9999* ]]; then
+ unpack ${A}
+ mv *-${MY_PN}-* "${S}"
+ else
+ git-2_src_unpack
+ fi
+}
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
new file mode 100644
index 000000000000..213b5c9b9577
--- /dev/null
+++ b/net-libs/qxmpp/Manifest
@@ -0,0 +1,5 @@
+DIST qxmpp-0.7.4.tar.gz 1076965 SHA256 0aef904b29024d8435bde9d5e73e3e9ce47577f487a497cf2e8d10774fdf3b8d SHA512 a11c6073ba10ef699f1cf3d5a2001989a9babcfae3a6760525d808ce15a077b7031bcfc83dd73fd417d1e7415ae256eb7008457cac2e3204856444e5db53883d WHIRLPOOL 0bc602b03ff9d9ff5221fe2ff4a8c5b4564e758438492be7df4e8d0f76105ec9d3a867614210ae905975ee15c855d59eb2dcf68596d13426d122a54f4444f6cc
+DIST qxmpp-0.7.5.tar.gz 1075987 SHA256 0137da4b176e16bb72c5efde4cec7da750f25ce7d0f6bbb0fcfdccc8765e3d35 SHA512 399a034a7a30f545a890e3a8193de4c6a83d844ec3e6f75084b91f3260662d49d57ecf1f45c8df08136626077535ee7e580ff049a5950f0813352118e36873ea WHIRLPOOL 7c6c872523ff4403660bbb3d53696ecb90e7791f7d95347cfd09747499f8ad045480977aa08dcbdd7f031be24ac80d9df4d7730c52f9cdabdd98a584f1fc7848
+DIST qxmpp-0.7.6.tar.gz 1070098 SHA256 4218582cfe09df1999532b25297264fce4f14ff87e5277a35b2e359716b6d240 SHA512 a5d317c9948fdfad379578c186fec749537d250814575f87aefff9eb5fc1d5ef9983373ce36f19d6f8d727032e576bb5381e883ba2ce9430b13a315905475b3a WHIRLPOOL 9f32965b6ab21f826b4d3614059494bac803d8a6654ff86ae2922bc486c6bec955ad702f2d8e150ecba4bd93db4499779cbe368f4a925fc1c6ba0628ee618cfa
+DIST qxmpp-0.8.0.tar.gz 1115730 SHA256 6a5e40b67bfbc2315f2b8bc0210e7556b0b9903e18b4f68267072f3421f74712 SHA512 b4e3afa9a4ffdc03d2baf9660986d0cf4de5c2c7d1518ad83cd9b252ff7822da66d9356eab49ce9bd642884a41ec3b72f8d4e2cda964a9276d525d4895c6165f WHIRLPOOL 4694ec5ee96512516fc3b195857db247e81cf8677c1f97870f8f89463c03b83d67a550dc8571c32ae44e57a48d5ce87f5e237eecc9ccde73fccc273a8f688711
+DIST qxmpp-0.8.2.tar.gz 282577 SHA256 518e156198a10404d7d3eae55ab4b91528e9422f636e7856cc8bfe59a8ceb326 SHA512 5442d9f3b5be5f1e13416fca0d865324c2d0103fe81f83d3b63d36bda23fcf633e28e349c2a3e1b826f6e2c5c082c0b2e67962173650f4aae024313e7a345fc0 WHIRLPOOL e1bb3b12189153443141ee1902d4a08db20c8bd89044356eca8883b3c30b5b933ccedbd72c3a787e470ab543c0b1364d970817a36fa7c28483c4d3dafc1a331e
diff --git a/net-libs/qxmpp/metadata.xml b/net-libs/qxmpp/metadata.xml
new file mode 100644
index 000000000000..497e5eb601ba
--- /dev/null
+++ b/net-libs/qxmpp/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>leechcraft</herd>
+<upstream>
+ <bugs-to>https://github.com/qxmpp-project/qxmpp/issues</bugs-to>
+ <changelog>https://raw.githubusercontent.com/qxmpp-project/qxmpp/master/CHANGELOG</changelog>
+ <remote-id type="github">qxmpp-project/qxmpp</remote-id>
+</upstream>
+<use>
+ <flag name="opus">Enable Opus codec support via <pkg>media-libs/opus</pkg></flag>
+ <flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/net-libs/qxmpp/qxmpp-0.7.4.ebuild b/net-libs/qxmpp/qxmpp-0.7.4.ebuild
new file mode 100644
index 000000000000..d6872867009c
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-0.7.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit qt4-r2 multilib
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
+HOMEPAGE="http://code.google.com/p/qxmpp/"
+SRC_URI="http://qxmpp.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="debug doc test"
+
+RDEPEND="dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ media-libs/speex"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qttest:4 )"
+
+src_prepare(){
+ if ! use doc; then
+ sed -i \
+ -e '/SUBDIRS/s/doc//' \
+ -e '/INSTALLS/d' \
+ qxmpp.pro || die "sed for removing docs failed"
+ fi
+ if ! use test; then
+ sed -i -e '/SUBDIRS/s/tests//' \
+ qxmpp.pro || die "sed for removing tests failed"
+ fi
+ qt4-r2_src_prepare
+}
+
+src_configure(){
+ eqmake4 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)"
+}
+
+src_install() {
+ qt4-r2_src_install
+ if use doc; then
+ # Use proper path for documentation
+ mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${P} || die "doc mv failed"
+ fi
+}
diff --git a/net-libs/qxmpp/qxmpp-0.7.5.ebuild b/net-libs/qxmpp/qxmpp-0.7.5.ebuild
new file mode 100644
index 000000000000..6878e8bc57c1
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-0.7.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2 multilib
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
+HOMEPAGE="http://code.google.com/p/qxmpp/"
+SRC_URI="http://qxmpp.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux"
+IUSE="debug doc test"
+
+RDEPEND="dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ media-libs/speex"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qttest:4 )"
+
+src_prepare(){
+ if ! use doc; then
+ sed -i \
+ -e '/SUBDIRS/s/doc//' \
+ -e '/INSTALLS/d' \
+ qxmpp.pro || die "sed for removing docs failed"
+ fi
+ if ! use test; then
+ sed -i -e '/SUBDIRS/s/tests//' \
+ qxmpp.pro || die "sed for removing tests failed"
+ fi
+ qt4-r2_src_prepare
+}
+
+src_configure(){
+ eqmake4 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)"
+}
+
+src_install() {
+ qt4-r2_src_install
+ if use doc; then
+ # Use proper path for documentation
+ mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed"
+ fi
+}
diff --git a/net-libs/qxmpp/qxmpp-0.7.6-r1.ebuild b/net-libs/qxmpp/qxmpp-0.7.6-r1.ebuild
new file mode 100644
index 000000000000..9e9b18d4de93
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-0.7.6-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2 multilib
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
+HOMEPAGE="http://code.google.com/p/qxmpp/"
+SRC_URI="http://qxmpp.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux"
+IUSE="debug doc +speex test theora vpx"
+
+RDEPEND="dev-qt/qtcore:4
+ speex? ( media-libs/speex )
+ theora? ( media-libs/libtheora )
+ vpx? ( media-libs/libvpx )"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qttest:4 )"
+
+src_prepare(){
+ if ! use doc; then
+ sed -i \
+ -e '/SUBDIRS/s/doc//' \
+ -e '/INSTALLS/d' \
+ qxmpp.pro || die "sed for removing docs failed"
+ fi
+ if ! use test; then
+ sed -i -e '/SUBDIRS/s/tests//' \
+ qxmpp.pro || die "sed for removing tests failed"
+ fi
+ qt4-r2_src_prepare
+}
+
+src_configure(){
+ local conf_speex
+ local conf_theora
+ local conf_vpx
+
+ use speex && conf_speex="QXMPP_USE_SPEEX=1"
+ use theora && conf_theora="QXMPP_USE_THEORA=1"
+ use vpx && conf_vpx="QXMPP_USE_VPX=1"
+
+ eqmake4 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_speex}" "${conf_theora}" "${conf_vpx}"
+}
+
+src_install() {
+ qt4-r2_src_install
+ if use doc; then
+ # Use proper path for documentation
+ mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed"
+ fi
+}
diff --git a/net-libs/qxmpp/qxmpp-0.7.6.ebuild b/net-libs/qxmpp/qxmpp-0.7.6.ebuild
new file mode 100644
index 000000000000..9ad8d645387d
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-0.7.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2 multilib
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
+HOMEPAGE="http://code.google.com/p/qxmpp/"
+SRC_URI="http://qxmpp.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="debug doc test"
+
+RDEPEND="dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ media-libs/speex"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qttest:4 )"
+
+src_prepare(){
+ if ! use doc; then
+ sed -i \
+ -e '/SUBDIRS/s/doc//' \
+ -e '/INSTALLS/d' \
+ qxmpp.pro || die "sed for removing docs failed"
+ fi
+ if ! use test; then
+ sed -i -e '/SUBDIRS/s/tests//' \
+ qxmpp.pro || die "sed for removing tests failed"
+ fi
+ qt4-r2_src_prepare
+}
+
+src_configure(){
+ eqmake4 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)"
+}
+
+src_install() {
+ qt4-r2_src_install
+ if use doc; then
+ # Use proper path for documentation
+ mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed"
+ fi
+}
diff --git a/net-libs/qxmpp/qxmpp-0.8.0.ebuild b/net-libs/qxmpp/qxmpp-0.8.0.ebuild
new file mode 100644
index 000000000000..c95975b1a3c3
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-0.8.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2 multilib
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
+HOMEPAGE="http://code.google.com/p/qxmpp/"
+SRC_URI="http://download.qxmpp.org/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="debug doc +speex test theora vpx"
+
+RDEPEND="dev-qt/qtcore:4
+ speex? ( media-libs/speex )
+ theora? ( media-libs/libtheora )
+ vpx? ( media-libs/libvpx )"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qttest:4 )"
+
+src_prepare(){
+ if ! use doc; then
+ sed -i \
+ -e '/SUBDIRS/s/doc//' \
+ -e '/INSTALLS/d' \
+ qxmpp.pro || die "sed for removing docs failed"
+ fi
+ if ! use test; then
+ sed -i -e '/SUBDIRS/s/tests//' \
+ qxmpp.pro || die "sed for removing tests failed"
+ fi
+ # There is no point in building examples. Also, they require dev-qt/qtgui
+ sed -i -e '/SUBDIRS/s/examples//' \
+ qxmpp.pro || die "sed for removing examples failed"
+ qt4-r2_src_prepare
+}
+
+src_configure(){
+ local conf_speex
+ local conf_theora
+ local conf_vpx
+
+ use speex && conf_speex="QXMPP_USE_SPEEX=1"
+ use theora && conf_theora="QXMPP_USE_THEORA=1"
+ use vpx && conf_vpx="QXMPP_USE_VPX=1"
+
+ eqmake4 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_speex}" "${conf_theora}" "${conf_vpx}"
+}
+
+src_install() {
+ qt4-r2_src_install
+ if use doc; then
+ # Use proper path for documentation
+ mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed"
+ fi
+}
diff --git a/net-libs/qxmpp/qxmpp-0.8.2.ebuild b/net-libs/qxmpp/qxmpp-0.8.2.ebuild
new file mode 100644
index 000000000000..054dd1517c6e
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-0.8.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2 multilib
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
+HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
+SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="debug doc opus +speex test theora vpx"
+
+RDEPEND="dev-qt/qtcore:4
+ opus? ( media-libs/opus )
+ speex? ( media-libs/speex )
+ theora? ( media-libs/libtheora )
+ vpx? ( media-libs/libvpx )"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qttest:4 )"
+
+src_prepare(){
+ if ! use doc; then
+ sed -i \
+ -e '/SUBDIRS/s/doc//' \
+ -e '/INSTALLS/d' \
+ qxmpp.pro || die "sed for removing docs failed"
+ fi
+ if ! use test; then
+ sed -i -e '/SUBDIRS/s/tests//' \
+ qxmpp.pro || die "sed for removing tests failed"
+ fi
+ # There is no point in building examples. Also, they require dev-qt/qtgui
+ sed -i -e '/SUBDIRS/s/examples//' \
+ qxmpp.pro || die "sed for removing examples failed"
+ qt4-r2_src_prepare
+}
+
+src_configure(){
+ local conf_speex
+ local conf_theora
+ local conf_vpx
+
+ use opus && conf_opus="QXMPP_USE_OPUS=1"
+ use speex && conf_speex="QXMPP_USE_SPEEX=1"
+ use theora && conf_theora="QXMPP_USE_THEORA=1"
+ use vpx && conf_vpx="QXMPP_USE_VPX=1"
+
+ eqmake4 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_opus}" "${conf_speex}" "${conf_theora}" "${conf_vpx}"
+}
+
+src_install() {
+ qt4-r2_src_install
+ if use doc; then
+ # Use proper path for documentation
+ mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed"
+ fi
+}
diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild
new file mode 100644
index 000000000000..8812db4a4615
--- /dev/null
+++ b/net-libs/qxmpp/qxmpp-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="https://github.com/qxmpp-project/qxmpp"
+
+inherit qt4-r2 multilib git-2
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
+HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug doc +speex test theora vpx"
+
+RDEPEND="dev-qt/qtcore:4
+ speex? ( media-libs/speex )
+ theora? ( media-libs/libtheora )
+ vpx? ( media-libs/libvpx )"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qttest:4 )"
+
+src_prepare(){
+ if ! use doc; then
+ sed -i \
+ -e '/SUBDIRS/s/doc//' \
+ -e '/INSTALLS/d' \
+ qxmpp.pro || die "sed for removing docs failed"
+ fi
+ if ! use test; then
+ sed -i -e '/SUBDIRS/s/tests//' \
+ qxmpp.pro || die "sed for removing tests failed"
+ fi
+ qt4-r2_src_prepare
+}
+
+src_configure(){
+ local conf_speex
+ local conf_theora
+ local conf_vpx
+
+ use speex && conf_speex="QXMPP_USE_SPEEX=1"
+ use theora && conf_theora="QXMPP_USE_THEORA=1"
+ use vpx && conf_vpx="QXMPP_USE_VPX=1"
+
+ eqmake4 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_speex}" "${conf_theora}" "${conf_vpx}"
+}
+
+src_install() {
+ qt4-r2_src_install
+ if use doc; then
+ # Use proper path for documentation
+ mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed"
+ fi
+}
diff --git a/net-libs/rabbitmq-c/Manifest b/net-libs/rabbitmq-c/Manifest
new file mode 100644
index 000000000000..f04b9bff1fd9
--- /dev/null
+++ b/net-libs/rabbitmq-c/Manifest
@@ -0,0 +1,2 @@
+DIST rabbitmq-c-v0.3.0.zip 156945 SHA256 77554c6d83c72af5248ad0179edd6fa227545d611159f3ad18e2ade5eb07a1b6 SHA512 8b05bb5847caae6e383de0aff0b5544cc44722da4af86b0c4670780e04de4cf8ee681ab848e44c16b082b8ea2025cec841b41703b0fe34747a81f53042f61050 WHIRLPOOL 3bd908f9fe454dcae6d5aa17c36a4d427cb5192a2bd31afc14b9fa1ae5b32f98b924a10dfc4958d09a7b1b98935e52039e0d0c46a5ae0f865f1903cb131c84bb
+DIST rabbitmq-c-v0.5.0.zip 234929 SHA256 91e883c5cc3c72c5cb351c598b39e2e531c891b5a3e6ad1f82ee261caa5a3e6c SHA512 7b30ecc4831f0145db68a1811b5cb7e4eb55a6b826efa0834a705c03f2ecba3d6d2b8187cdf1472e7da2af8dc77b67674916ec31fa6086e00a01304a097b4430 WHIRLPOOL acf08d02c0ddcc9f651aae2e5cef5f37f0748179cbd015d7c550405e2efb380c5d921faec49cb5eebdd442985aa73236cc9861b74925e8c3370a589dba7af602
diff --git a/net-libs/rabbitmq-c/files/xmlto.patch b/net-libs/rabbitmq-c/files/xmlto.patch
new file mode 100644
index 000000000000..b1b97edd2edd
--- /dev/null
+++ b/net-libs/rabbitmq-c/files/xmlto.patch
@@ -0,0 +1,25 @@
+--- CMakeLists.txt.orig 2013-01-19 02:58:22.179338944 -0700
++++ CMakeLists.txt 2013-01-19 03:18:40.936984417 -0700
+@@ -49,6 +49,7 @@
+ include(CheckFunctionExists)
+ include(CheckLibraryExists)
+ include(CMakePushCheckState)
++include(FindXmlTo)
+
+ # Detect if we need to link against a socket library:
+ cmake_push_check_state()
+@@ -195,7 +196,13 @@
+ endif (REGENERATE_AMQP_FRAMING)
+
+ find_package(POPT)
+-find_package(XmlTo)
++
++set ( XmlTo_FOUND false )
++find_program ( XMLTO_EXECUTABLE NAMES xmlto
++ DOC "path to the xmlto docbook xslt frontend" )
++if ( XMLTO_EXECUTABLE )
++ set ( XmlTo_FOUND true )
++endif ( XMLTO_EXECUTABLE )
+
+ if (POPT_FOUND AND XmlTo_FOUND)
+ set(DO_DOCS ON)
diff --git a/net-libs/rabbitmq-c/metadata.xml b/net-libs/rabbitmq-c/metadata.xml
new file mode 100644
index 000000000000..fbdb4b0dc859
--- /dev/null
+++ b/net-libs/rabbitmq-c/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>olemarkus@gentoo.org</email>
+ <name>Ole Markus With</name>
+ </maintainer>
+ <use>
+ <flag name="tools">Builds cli tools to interact with brokers</flag>
+ </use>
+ <longdescription lang="en">
+ </longdescription>
+ <upstream>
+ <remote-id type="github">alanxz/rabbitmq-c</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.3.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.3.0.ebuild
new file mode 100644
index 000000000000..1ccde502da36
--- /dev/null
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils eutils multilib
+
+DESCRIPTION="RabbitMQ C client"
+HOMEPAGE="https://github.com/alanxz/rabbitmq-c"
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://github.com/alanxz/rabbitmq-c.git"
+ KEYWORDS="-*"
+else
+ SRC_URI="https://github.com/alanxz/rabbitmq-c/archive/${PN}-v${PV}.zip"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="tools"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DOCS=( "AUTHORS" "README.md" "THANKS" "TODO" )
+PATCHES=( "${FILESDIR}/xmlto.patch" )
+
+src_unpack() {
+ if [[ ${PV} == *9999* ]]; then
+ git-2_src_unpack
+ else
+ unpack ${A}
+ mv ${PN}* ${P} || die
+ fi
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=ON
+ $(cmake-utils_use tools BUILD_TOOLS)
+ $(cmake-utils_use tools BUILD_TOOLS_DOCS)
+ )
+ cmake-utils_src_configure
+}
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild
new file mode 100644
index 000000000000..50275ebf5fb9
--- /dev/null
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.5.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils eutils multilib
+
+DESCRIPTION="RabbitMQ C client"
+HOMEPAGE="https://github.com/alanxz/rabbitmq-c"
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://github.com/alanxz/rabbitmq-c.git"
+else
+ SRC_URI="https://github.com/alanxz/rabbitmq-c/archive/v${PV}.zip -> ${PN}-v${PV}.zip"
+ KEYWORDS="amd64 ~arm hppa x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="tools"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DOCS=( "AUTHORS" "README.md" "THANKS" "TODO" )
+
+src_unpack() {
+ if [[ ${PV} == *9999* ]]; then
+ git-2_src_unpack
+ else
+ unpack ${A}
+ fi
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=ON
+ $(cmake-utils_use tools BUILD_TOOLS)
+ $(cmake-utils_use tools BUILD_TOOLS_DOCS)
+ )
+ cmake-utils_src_configure
+}
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
new file mode 100644
index 000000000000..a72c2ce358d1
--- /dev/null
+++ b/net-libs/rb_libtorrent/Manifest
@@ -0,0 +1,4 @@
+DIST libtorrent-rasterbar-0.16.17.tar.gz 3018881 SHA256 67a1d29c626d991d6e39c2f9828ca70c4053d057070ce01fff9b4ad37e64aff0 SHA512 532b2438e24c3ecad239480a1bd6241a0d73d40f8d5bdcf61ddfcee1a41f1644c9004d4f234968efd50158224219b78852ec936a05b75b15f3442b594460cdd6 WHIRLPOOL 755e201741ed77cf91cb0976cbaa83c645647341d2cfe40564552599f2792ba76bd02e82a94669d80b199f1a1d6290824686d2bb52d6b0da8663d2274176f3eb
+DIST libtorrent-rasterbar-0.16.19.tar.gz 3030253 SHA256 9ebd3fa8accfa27d0c81cdbbe15d7b411ea1deec34ac6325dec7197f05d82982 SHA512 8e605802cb1ae80228d253adba44da6f5af39e7d65c59f65e15444ed1122500529ee068f6d3608b1c2a249f18b4de695073f7b67772fa445618757697d779340 WHIRLPOOL 4429d07bd95f398a09f283a7cbcf6611aeb8ac5d2b8ed76d98f89d601aa6ed66e6eb8f044b351fad6cca3606351ccc67081dba7c8dd8d9c3c433eae84aedeb2c
+DIST libtorrent-rasterbar-1.0.4.tar.gz 3297242 SHA256 1f567823133b1493b9717afc8334eed691bf0ab452d4a2e0f644989f13ce9db0 SHA512 1917d1207171d23dbcbbb17f0c3afdadcec059e8e603e2009bb72a610be598f2ff5a5ebdfc5a1b0e07563a05e774b395e24e04fabb17847b6a757f47f41a2313 WHIRLPOOL acbb9658d80f42bc6fe00cbe491e58bc059b6eeb96c0e34f7c86ad549104dabc4c9e2df5c931fd719f064bff6c4d06376022cf0e221034fc5e88af88d258f8f1
+DIST libtorrent-rasterbar-1.0.5.tar.gz 3302804 SHA256 474a43da2147bec7e333c10f70b07221f4732dd67e071d5e90acc7edb8f657b0 SHA512 1ec54dfac1555ac1a843d12e239d781e940ef81ca13a943c58812b0fb62686e89bc5e0135feb94267fb624077cb0ad9971d496d8474b91f3687ef3b90a524df6 WHIRLPOOL a84f7895fdfda2020630c387eedd9b5a82ddc51af6b35fe8a2e7216495baaf9901a58ef2335c254fa3c2e0c713c7e6a1d9f976984fa5998329e47bc95ae22a63
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.16.17-python.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.16.17-python.patch
new file mode 100644
index 000000000000..6f8432040842
--- /dev/null
+++ b/net-libs/rb_libtorrent/files/rb_libtorrent-0.16.17-python.patch
@@ -0,0 +1,37 @@
+ bindings/python/setup.py.in | 6 +++---
+ configure.ac | 4 ----
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in
+index adc474c..3faf982 100644
+--- a/bindings/python/setup.py.in
++++ b/bindings/python/setup.py.in
+@@ -61,10 +61,10 @@ if "CFLAGS" in config_vars and "-Wstrict-prototypes" in config_vars["CFLAGS"]:
+ if "OPT" in config_vars and "-Wstrict-prototypes" in config_vars["OPT"]:
+ config_vars["OPT"] = config_vars["OPT"].replace("-Wstrict-prototypes", " ")
+
+-source_list = os.listdir(os.path.join(os.path.dirname(__file__), "src"))
+-source_list = [os.path.join("src", s) for s in source_list if s.endswith(".cpp")]
++source_list = os.listdir(os.path.join('@srcdir@', "src"))
++source_list = [os.path.join('@srcdir@', "src", s) for s in source_list if s.endswith(".cpp")]
+
+-extra_cmd = '@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_SYSTEM_LIB@ @BOOST_PYTHON_LIB@ @PTHREAD_LIBS@ @OPENSSL_LIBS@ @OPENSSL_LDFLAGS@ @OPENSSL_INCLUDES@'
++extra_cmd = '@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_SYSTEM_LIB@ @PTHREAD_LIBS@ @OPENSSL_LIBS@ @OPENSSL_LDFLAGS@ @OPENSSL_INCLUDES@' + '-lboost_python-%s-mt' % (platform.python_version()[:3])
+
+ setup( name='python-libtorrent',
+ version='@PACKAGE_VERSION@',
+diff --git a/configure.ac b/configure.ac
+index 55ee13a..bdbf2a3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -559,10 +559,6 @@ AS_CASE(["$ARG_ENABLE_PYTHON_BINDING"],
+
+ AM_PATH_PYTHON([2.4], [], AC_MSG_ERROR([Python interpreter not found.]))
+ AX_PYTHON_DEVEL([>= '2.4'])
+- AX_BOOST_PYTHON()
+-
+- AS_IF([test -z "$BOOST_PYTHON_LIB"],
+- [AC_MSG_ERROR([Boost.Python library not found. Try using --with-boost-python=lib.])])
+ ],
+ ["no"], [
+ AC_MSG_RESULT([no])
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.2-python.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.2-python.patch
new file mode 100644
index 000000000000..e729a190c79a
--- /dev/null
+++ b/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.2-python.patch
@@ -0,0 +1,32 @@
+ bindings/python/setup.py | 2 +-
+ configure.ac | 4 ----
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/bindings/python/setup.py b/bindings/python/setup.py
+index 961395f..c38ef52 100644
+--- a/bindings/python/setup.py
++++ b/bindings/python/setup.py
+@@ -36,7 +36,7 @@ def target_specific():
+
+ try:
+ with open('compile_flags') as _file:
+- extra_cmd = _file.read()
++ extra_cmd = _file.read() + '-lboost_python-%s-mt' % (platform.python_version()[:3])
+
+ except:
+ extra_cmd = None
+diff --git a/configure.ac b/configure.ac
+index ebb1f7e..3e07828 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -540,10 +540,6 @@ AS_CASE(["$ARG_ENABLE_PYTHON_BINDING"],
+
+ AM_PATH_PYTHON([2.4], [], AC_MSG_ERROR([Python interpreter not found.]))
+ AX_PYTHON_DEVEL([>= '2.4'])
+- AX_BOOST_PYTHON()
+-
+- AS_IF([test -z "$BOOST_PYTHON_LIB"],
+- [AC_MSG_ERROR([Boost.Python library not found. Try using --with-boost-python=lib.])])
+ ],
+ ["no"], [
+ AC_MSG_RESULT([no])
diff --git a/net-libs/rb_libtorrent/metadata.xml b/net-libs/rb_libtorrent/metadata.xml
new file mode 100644
index 000000000000..24e4e69507e7
--- /dev/null
+++ b/net-libs/rb_libtorrent/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-p2p</herd>
+ <maintainer>
+ <email>hwoarang@gentoo.org</email>
+ <name>Markos Chandras</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="google-code">libtorrent</remote-id>
+ <remote-id type="sourceforge">libtorrent</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild
new file mode 100644
index 000000000000..f5445dd422bd
--- /dev/null
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils multilib distutils-r1
+
+MY_P=${P/rb_/}
+MY_P=${MY_P/torrent/torrent-rasterbar}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="http://www.rasterbar.com/products/libtorrent/"
+SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc examples python ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-libs/boost-1.48:=[threads]
+ sys-libs/zlib
+ examples? ( !net-p2p/mldonkey )
+ ssl? ( dev-libs/openssl:0= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-libs/boost[python,${PYTHON_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/libtool-2.2"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${P}-python.patch )
+
+src_configure() {
+ local myeconfargs=(
+ --disable-silent-rules # bug 441842
+ --with-boost-libdir=/usr/$(get_libdir)
+ $(use_enable debug)
+ $(use_enable test tests)
+ $(use_enable examples)
+ $(use_enable ssl encryption)
+ $(use_enable python python-binding)
+ $(usex debug "--enable-logging=verbose" "")
+ )
+
+ use python && python_setup
+
+ autotools-utils_src_configure
+ use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+ use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_compile
+}
+
+src_install() {
+ use doc && HTML_DOCS=( docs/. )
+
+ autotools-utils_src_install
+ use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_install
+}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.17.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.17.ebuild
new file mode 100644
index 000000000000..21530dc43907
--- /dev/null
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.16.17.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.7"
+PYTHON_USE_WITH="threads"
+PYTHON_USE_WITH_OPT="python"
+
+inherit multilib python versionator
+
+MY_P=${P/rb_/}
+MY_P=${MY_P/torrent/torrent-rasterbar}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="http://www.rasterbar.com/products/libtorrent/"
+SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="debug doc examples python ssl static-libs test"
+RESTRICT="test"
+
+DEPEND=">=dev-libs/boost-1.48[python?,threads(+)]
+ >=sys-devel/libtool-2.2
+ sys-libs/zlib
+ examples? ( !net-p2p/mldonkey )
+ ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ use python && python_convert_shebangs -r 2 .
+}
+
+src_configure() {
+ local myconf
+
+ # bug 441842
+ myconf="--disable-silent-rules"
+
+ # use multi-threading versions of boost libs
+ if has_version '>=dev-libs/boost-1.52.0-r1'; then
+ myconf+=" --with-boost-python=boost_python-${PYTHON_ABI}"
+ else
+ myconf+=" --with-boost-system=boost_system-mt \
+ --with-boost-python=boost_python-${PYTHON_ABI}-mt"
+ fi
+
+ local LOGGING
+ use debug && myconf+=" --enable-logging=verbose"
+
+ econf $(use_enable debug) \
+ $(use_enable test tests) \
+ $(use_enable examples) \
+ $(use_enable python python-binding) \
+ $(use_enable ssl encryption) \
+ $(use_enable static-libs static) \
+ --with-boost-libdir=/usr/$(get_libdir) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
+ dodoc ChangeLog AUTHORS NEWS README
+ if use doc; then
+ dohtml docs/*
+ fi
+}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild
new file mode 100644
index 000000000000..00757de8ae56
--- /dev/null
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils multilib distutils-r1
+
+MY_P=${P/rb_/}
+MY_P=${MY_P/torrent/torrent-rasterbar}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="http://www.rasterbar.com/products/libtorrent/"
+SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc examples python ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-libs/boost-1.48:=[threads]
+ sys-libs/zlib
+ examples? ( !net-p2p/mldonkey )
+ ssl? ( dev-libs/openssl:0= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-libs/boost[python,${PYTHON_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/libtool-2.2"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.16.17-python.patch )
+
+src_configure() {
+ local myeconfargs=(
+ --disable-silent-rules # bug 441842
+ --with-boost-libdir=/usr/$(get_libdir)
+ $(use_enable debug)
+ $(use_enable test tests)
+ $(use_enable examples)
+ $(use_enable ssl encryption)
+ $(use_enable python python-binding)
+ $(usex debug "--enable-logging=verbose" "")
+ )
+
+ use python && python_setup
+
+ autotools-utils_src_configure
+ use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+ use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_compile
+}
+
+src_install() {
+ use doc && HTML_DOCS=( docs/. )
+
+ autotools-utils_src_install
+ use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_install
+}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.4.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.4.ebuild
new file mode 100644
index 000000000000..8a01bd11ea84
--- /dev/null
+++ b/net-libs/rb_libtorrent/rb_libtorrent-1.0.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils multilib distutils-r1
+
+MY_P=${P/rb_/}
+MY_P=${MY_P/torrent/torrent-rasterbar}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="http://www.rasterbar.com/products/libtorrent/"
+SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc examples python ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-libs/boost-1.53:=[threads]
+ sys-libs/zlib
+ examples? ( !net-p2p/mldonkey )
+ ssl? ( dev-libs/openssl:0= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-libs/boost[python,${PYTHON_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/libtool-2.2"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-python.patch )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_configure() {
+ local myeconfargs=(
+ --disable-silent-rules # bug 441842
+ --with-boost-libdir=/usr/$(get_libdir)
+ $(use_enable debug)
+ $(use_enable test tests)
+ $(use_enable examples)
+ $(use_enable ssl encryption)
+ $(use_enable python python-binding)
+ $(usex debug "--enable-logging=verbose" "")
+ )
+
+ use python && python_setup
+
+ autotools-utils_src_configure
+ use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+ use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_compile
+}
+
+src_install() {
+ use doc && HTML_DOCS=( "${S}"/docs/. )
+
+ autotools-utils_src_install
+ use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_install
+}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.5.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.5.ebuild
new file mode 100644
index 000000000000..f8f4d390fc07
--- /dev/null
+++ b/net-libs/rb_libtorrent/rb_libtorrent-1.0.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils multilib distutils-r1
+
+MY_P=${P/rb_/}
+MY_P=${MY_P/torrent/torrent-rasterbar}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="http://www.rasterbar.com/products/libtorrent/"
+SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc examples python ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-libs/boost-1.53:=[threads]
+ sys-libs/zlib
+ examples? ( !net-p2p/mldonkey )
+ ssl? ( dev-libs/openssl:0= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-libs/boost:=[python,${PYTHON_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/libtool-2.2"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-python.patch )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_configure() {
+ local myeconfargs=(
+ --disable-silent-rules # bug 441842
+ --with-boost-libdir=/usr/$(get_libdir)
+ $(use_enable debug)
+ $(use_enable test tests)
+ $(use_enable examples)
+ $(use_enable ssl encryption)
+ $(use_enable python python-binding)
+ $(usex debug "--enable-logging=verbose" "")
+ )
+
+ use python && python_setup
+
+ autotools-utils_src_configure
+ use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+ use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_compile
+}
+
+src_install() {
+ use doc && HTML_DOCS=( "${S}"/docs/. )
+
+ autotools-utils_src_install
+ use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_install
+}
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
new file mode 100644
index 000000000000..e4f0f8290186
--- /dev/null
+++ b/net-libs/rest/Manifest
@@ -0,0 +1,2 @@
+DIST rest-0.7.92.tar.xz 321580 SHA256 07548c8785a3e743daf54a82b952ff5f32af94fee68997df4c83b00d52f9c0ec SHA512 9e30e185b0c2bdbbc507cef35f7c2e286917d2a9a0c97b075b8dea3eb9312e1a0a757185679109ca569de5dda7fee7fd2e6e19a24d7ca66aa9fcf5166dd5de86 WHIRLPOOL 1ade25a20d81e08a937c37f36c051c07eaef1792be1be118e4baf26d283e4ee1ce351b34d698b69bda591641af5644c406e8be8c11a0f8b94c8aedf252ea0d68
+DIST rest-0.7.93.tar.xz 321072 SHA256 c710644455340a44ddc005c645c466f05c0d779993138ea21a62c6082108b216 SHA512 50afb6730b8065d418e724c8afdb903521582669fb8744d91f400ebdbdb52323117193d3039ef4320b1bf7e3f60cc19ee6826ff7cb6c9bd680fc1ced067dff3b WHIRLPOOL 0cee91748750d7afc4a1108a8db91529400bdfb79fac122e11e631b96e9b694fb4bac8f0ca1554e221b9eff9268f4bea2d5802d199c3e69e0c9890d877e775cf
diff --git a/net-libs/rest/files/rest-0.7.92-oauth-missing-include.patch b/net-libs/rest/files/rest-0.7.92-oauth-missing-include.patch
new file mode 100644
index 000000000000..2fafa2c52758
--- /dev/null
+++ b/net-libs/rest/files/rest-0.7.92-oauth-missing-include.patch
@@ -0,0 +1,25 @@
+From b50ace7738ea03817acdad87fb2b338a86018329 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau@redhat.com>
+Date: Wed, 3 Sep 2014 11:31:49 +0200
+Subject: [PATCH 2/3] oauth: Add missing include
+
+This fixes a compilation warning about a missing prototype.
+---
+ rest/oauth-proxy-call.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rest/oauth-proxy-call.c b/rest/oauth-proxy-call.c
+index dce2c66..ab77b1a 100644
+--- a/rest/oauth-proxy-call.c
++++ b/rest/oauth-proxy-call.c
+@@ -25,6 +25,7 @@
+ #include <rest/rest-proxy-call.h>
+ #include "oauth-proxy-call.h"
+ #include "oauth-proxy-private.h"
++#include "rest-proxy-call-private.h"
+ #include "sha1.h"
+
+ G_DEFINE_TYPE (OAuthProxyCall, oauth_proxy_call, REST_TYPE_PROXY_CALL)
+--
+2.3.1
+
diff --git a/net-libs/rest/files/rest-0.7.92-tests-GError-pointers.patch b/net-libs/rest/files/rest-0.7.92-tests-GError-pointers.patch
new file mode 100644
index 000000000000..edc8b7075905
--- /dev/null
+++ b/net-libs/rest/files/rest-0.7.92-tests-GError-pointers.patch
@@ -0,0 +1,40 @@
+From 1bd0dc67914b7398acf60aaa42aa03bb4d36b839 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Thu, 5 Mar 2015 13:05:21 -0500
+Subject: [PATCH] tests: GError pointers must be initialized
+
+https://bugzilla.gnome.org/show_bug.cgi?id=745694
+---
+ tests/custom-serialize.c | 2 +-
+ tests/proxy-continuous.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/custom-serialize.c b/tests/custom-serialize.c
+index b50405d..f683941 100644
+--- a/tests/custom-serialize.c
++++ b/tests/custom-serialize.c
+@@ -115,7 +115,7 @@ main (int argc, char **argv)
+ RestProxy *proxy;
+ RestProxyCall *call;
+ char *url;
+- GError *error;
++ GError *error = NULL;
+
+ #if !GLIB_CHECK_VERSION (2, 36, 0)
+ g_type_init ();
+diff --git a/tests/proxy-continuous.c b/tests/proxy-continuous.c
+index 9395cd2..22ad0f7 100644
+--- a/tests/proxy-continuous.c
++++ b/tests/proxy-continuous.c
+@@ -139,7 +139,7 @@ static void
+ stream_test (RestProxy *proxy)
+ {
+ RestProxyCall *call;
+- GError *error;
++ GError *error = NULL;
+
+ client_count = 1;
+
+--
+2.3.1
+
diff --git a/net-libs/rest/files/rest-0.7.92-xml-parser-missing-break.patch b/net-libs/rest/files/rest-0.7.92-xml-parser-missing-break.patch
new file mode 100644
index 000000000000..7f2b5c40be77
--- /dev/null
+++ b/net-libs/rest/files/rest-0.7.92-xml-parser-missing-break.patch
@@ -0,0 +1,26 @@
+From 272db68e131a20652c98453b75b9c743cda2b327 Mon Sep 17 00:00:00 2001
+From: Rob Bradford <rob@linux.intel.com>
+Date: Fri, 19 Sep 2014 17:06:00 +0100
+Subject: [PATCH 3/3] xml-parser: Add missing break in switch statement
+
+This would result in an inappropriate debug message appearing on valid
+text data.
+---
+ rest/rest-xml-parser.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rest/rest-xml-parser.c b/rest/rest-xml-parser.c
+index 49b49b4..4447a1a 100644
+--- a/rest/rest-xml-parser.c
++++ b/rest/rest-xml-parser.c
+@@ -197,6 +197,7 @@ rest_xml_parser_parse_from_data (RestXmlParser *parser,
+ cur_node->content = g_strdup (G(xmlTextReaderConstValue (reader)));
+ REST_DEBUG (XML_PARSER, "Text content found: %s",
+ cur_node->content);
++ break;
+ default:
+ REST_DEBUG (XML_PARSER, "Found unknown content with type: 0x%x",
+ xmlTextReaderNodeType (reader));
+--
+2.3.1
+
diff --git a/net-libs/rest/metadata.xml b/net-libs/rest/metadata.xml
new file mode 100644
index 000000000000..49d7ac9b6b3f
--- /dev/null
+++ b/net-libs/rest/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="gnome">Extract proxy information using
+ <pkg>net-libs/libsoup-gnome</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/rest/rest-0.7.92-r1.ebuild b/net-libs/rest/rest-0.7.92-r1.ebuild
new file mode 100644
index 000000000000..f46fd77c4577
--- /dev/null
+++ b/net-libs/rest/rest-0.7.92-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Helper library for RESTful services"
+HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
+
+LICENSE="LGPL-2.1"
+SLOT="0.7"
+IUSE="+gnome +introspection test"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Coverage testing should not be enabled
+RDEPEND="
+ app-misc/ca-certificates
+ >=dev-libs/glib-2.24:2[${MULTILIB_USEDEP}]
+ dev-libs/libxml2:2[${MULTILIB_USEDEP}]
+ net-libs/libsoup:2.4[${MULTILIB_USEDEP}]
+ gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.13
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+ test? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+"
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static \
+ --disable-gcov \
+ --with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+ $(use_with gnome) \
+ $(multilib_native_use_enable introspection)
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/reference/rest/html docs/reference/rest/html || die
+ fi
+}
+
+multilib_src_test() {
+ # Tests need dbus
+ Xemake check
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/net-libs/rest/rest-0.7.92-r2.ebuild b/net-libs/rest/rest-0.7.92-r2.ebuild
new file mode 100644
index 000000000000..badf67e54e82
--- /dev/null
+++ b/net-libs/rest/rest-0.7.92-r2.ebuild
@@ -0,0 +1,65 @@
+# 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 eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Helper library for RESTful services"
+HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
+
+LICENSE="LGPL-2.1"
+SLOT="0.7"
+IUSE="+gnome +introspection test"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+# Coverage testing should not be enabled
+RDEPEND="
+ app-misc/ca-certificates
+ >=dev-libs/glib-2.24:2[${MULTILIB_USEDEP}]
+ dev-libs/libxml2:2[${MULTILIB_USEDEP}]
+ net-libs/libsoup:2.4[${MULTILIB_USEDEP}]
+ gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.13
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+ test? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+"
+
+src_prepare() {
+ # fixed in 0.7.93
+ epatch "${FILESDIR}/${P}-oauth-missing-include.patch" #542264
+ epatch "${FILESDIR}/${P}-xml-parser-missing-break.patch"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=745694
+ epatch "${FILESDIR}/${P}-tests-GError-pointers.patch"
+
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static \
+ --disable-gcov \
+ --with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+ $(use_with gnome) \
+ $(multilib_native_use_enable introspection)
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/reference/rest/html docs/reference/rest/html || die
+ fi
+}
+
+multilib_src_test() {
+ # Tests need dbus
+ Xemake check
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/net-libs/rest/rest-0.7.93.ebuild b/net-libs/rest/rest-0.7.93.ebuild
new file mode 100644
index 000000000000..39dd6a34de4e
--- /dev/null
+++ b/net-libs/rest/rest-0.7.93.ebuild
@@ -0,0 +1,60 @@
+# 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 eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Helper library for RESTful services"
+HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
+
+LICENSE="LGPL-2.1"
+SLOT="0.7"
+IUSE="+gnome +introspection test"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+# Coverage testing should not be enabled
+RDEPEND="
+ app-misc/ca-certificates
+ >=dev-libs/glib-2.24:2[${MULTILIB_USEDEP}]
+ dev-libs/libxml2:2[${MULTILIB_USEDEP}]
+ net-libs/libsoup:2.4[${MULTILIB_USEDEP}]
+ gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.13
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+ test? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+"
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static \
+ --disable-gcov \
+ --with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+ $(use_with gnome) \
+ $(multilib_native_use_enable introspection)
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/reference/rest/html docs/reference/rest/html || die
+ fi
+}
+
+multilib_src_test() {
+ # Tests need dbus
+ Xemake check
+}
+
+multilib_src_compile() {
+ gnome2_src_compile
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
diff --git a/net-libs/roadrunner/Manifest b/net-libs/roadrunner/Manifest
new file mode 100644
index 000000000000..aac15dd7194e
--- /dev/null
+++ b/net-libs/roadrunner/Manifest
@@ -0,0 +1 @@
+DIST roadrunner-0.9.1.tar.gz 338564 SHA256 fd6d051c071f468d622d81e4baf7135ba36d97ff0bddb9142fed655d9de8fc5e
diff --git a/net-libs/roadrunner/metadata.xml b/net-libs/roadrunner/metadata.xml
new file mode 100644
index 000000000000..ff62877c67ae
--- /dev/null
+++ b/net-libs/roadrunner/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-libs/roadrunner/roadrunner-0.9.1.ebuild b/net-libs/roadrunner/roadrunner-0.9.1.ebuild
new file mode 100644
index 000000000000..d868bfff66b4
--- /dev/null
+++ b/net-libs/roadrunner/roadrunner-0.9.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# EBuild details
+DESCRIPTION="RoadRunner library provides API for using Blocks Extensible Exchange Protocol"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" #was http://rr.codefactory.se
+# upstream Died
+SRC_URI="mirror://gentoo/roadrunner-${PV}.tar.gz"
+
+LICENSE="Sleepycat"
+SLOT="0"
+KEYWORDS="x86 ppc"
+
+# doc = include documentation
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2.2.1
+ >=dev-libs/libxml2-2.5.11"
+
+DEPEND="
+ >=dev-libs/glib-2.2.1
+ >=dev-libs/libxml2-2.5.11
+ virtual/pkgconfig
+ doc? ( dev-util/gtk-doc )"
+
+src_compile() {
+ econf \
+ $(use_enable doc gtk-doc) \
+ || die "configure failed"
+
+ emake || die "emake failed"
+}
+
+src_install() {
+ # Seems that the Makefiles are OK
+ emake DESTDIR="${D}" install || die
+}
diff --git a/net-libs/rpc2/Manifest b/net-libs/rpc2/Manifest
new file mode 100644
index 000000000000..efc1ccb3cab4
--- /dev/null
+++ b/net-libs/rpc2/Manifest
@@ -0,0 +1,3 @@
+DIST rpc2-2.0.tar.gz 623373 SHA256 d0aa0620173faeff36a2a4628eb9602125d64556d5126eb28a2d36d06bb0025b
+DIST rpc2-2.10.tar.gz 595825 SHA256 b381f0a51aab470f4698f0143cf04b22c64e9176d6e4f11c0a50d28b3169fa07 SHA512 45d67a1eab7938c120a933aaa1c938d569fabe5d4e90f190c327d48a75de17a324f0717eeed05ae2874db59dd45d4dd604d3df61209807aed6ae357317e4b0bb WHIRLPOOL a567fefb17800367079fc3e54d2f177d19417a168926ae75479b9ecb77b76c0c5643d659a0e649d97fc59028953baec7f62a79cd2dc0de6ecaccca0ef66fa56c
+DIST rpc2-2.8.tar.gz 622919 SHA256 6364d2a9d3cd149d5b94056008760d99e4090b684a844764275b346273b137ba
diff --git a/net-libs/rpc2/metadata.xml b/net-libs/rpc2/metadata.xml
new file mode 100644
index 000000000000..ca66751dee2f
--- /dev/null
+++ b/net-libs/rpc2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-fs</herd>
+</pkgmetadata>
diff --git a/net-libs/rpc2/rpc2-2.0.ebuild b/net-libs/rpc2/rpc2-2.0.ebuild
new file mode 100644
index 000000000000..7f175fb57a63
--- /dev/null
+++ b/net-libs/rpc2/rpc2-2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Remote procedure call package for IP/UDP (used by Coda)"
+HOMEPAGE="http://www.coda.cs.cmu.edu/"
+SRC_URI="http://www.coda.cs.cmu.edu/pub/rpc2/src/${P}.tar.gz"
+IUSE=""
+SLOT="1"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
+
+RDEPEND=">=sys-libs/lwp-2.1"
+
+DEPEND="${RDEPEND}
+ sys-apps/gawk
+ sys-apps/sed
+ sys-apps/grep
+ sys-devel/libtool"
+
+src_install() {
+ make DESTDIR="${D}" install || die "make install failed"
+
+ dodoc NEWS README.ipv6
+}
diff --git a/net-libs/rpc2/rpc2-2.10.ebuild b/net-libs/rpc2/rpc2-2.10.ebuild
new file mode 100644
index 000000000000..64f403b452f0
--- /dev/null
+++ b/net-libs/rpc2/rpc2-2.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Remote procedure call package for IP/UDP (used by Coda)"
+HOMEPAGE="http://www.coda.cs.cmu.edu/"
+SRC_URI="http://www.coda.cs.cmu.edu/pub/rpc2/src/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/lwp-2.5"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ dodoc README.ipv6
+ use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/net-libs/rpc2/rpc2-2.8.ebuild b/net-libs/rpc2/rpc2-2.8.ebuild
new file mode 100644
index 000000000000..e6de90b66aa3
--- /dev/null
+++ b/net-libs/rpc2/rpc2-2.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Remote procedure call package for IP/UDP (used by Coda)"
+HOMEPAGE="http://www.coda.cs.cmu.edu/"
+SRC_URI="http://www.coda.cs.cmu.edu/pub/rpc2/src/${P}.tar.gz"
+IUSE=""
+SLOT="1"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+
+RDEPEND=">=sys-libs/lwp-2.1"
+
+DEPEND="${RDEPEND}
+ sys-apps/gawk
+ sys-apps/sed
+ sys-apps/grep
+ sys-devel/libtool"
+
+src_install() {
+ make DESTDIR="${D}" install || die "make install failed"
+
+ dodoc NEWS README.ipv6
+}
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
new file mode 100644
index 000000000000..40a079763b81
--- /dev/null
+++ b/net-libs/serf/Manifest
@@ -0,0 +1 @@
+DIST serf-1.3.8.tar.bz2 143337 SHA256 e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590 SHA512 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205 WHIRLPOOL 951b1ff92e739998f24bd44e2541c10352c83594cbfdb82ba915ced32509df7d6f2bbec8bd8fbf4c75116dab114970d1a8ec2fc0157912303bfbd065ea6739ac
diff --git a/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch b/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch
new file mode 100644
index 000000000000..f86646a28d89
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.2-disable_linking_against_unneeded_libraries.patch
@@ -0,0 +1,13 @@
+--- SConstruct
++++ SConstruct
+@@ -345,8 +345,8 @@
+ ### there is probably a better way to run/capture output.
+ ### env.ParseConfig() may be handy for getting this stuff into the build
+ if CALLOUT_OKAY:
+- apr_libs = os.popen(env.subst('$APR --link-libtool --libs')).read().strip()
+- apu_libs = os.popen(env.subst('$APU --link-libtool --libs')).read().strip()
++ apr_libs = os.popen(env.subst('$APR --link-ld')).read().strip()
++ apu_libs = os.popen(env.subst('$APU --link-ld')).read().strip()
+ else:
+ apr_libs = ''
+ apu_libs = ''
diff --git a/net-libs/serf/files/serf-1.3.8-scons_variables.patch b/net-libs/serf/files/serf-1.3.8-scons_variables.patch
new file mode 100644
index 000000000000..b51e846d8932
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.8-scons_variables.patch
@@ -0,0 +1,110 @@
+https://code.google.com/p/serf/issues/detail?id=151
+https://code.google.com/p/serf/source/detail?r=2413
+
+--- SConstruct
++++ SConstruct
+@@ -223,12 +223,12 @@
+
+ if sys.platform == 'darwin':
+ # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,))
+- env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,))
++ env.Append(LINKFLAGS=['-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)])
+
+ if sys.platform != 'win32':
+ ### gcc only. figure out appropriate test / better way to check these
+ ### flags, and check for gcc.
+- env.Append(CFLAGS='-std=c89')
++ env.Append(CFLAGS=['-std=c89'])
+
+ ### These warnings are not available on Solaris
+ if sys.platform != 'sunos5':
+@@ -237,17 +237,17 @@
+ '-Wall'])
+
+ if debug:
+- env.Append(CCFLAGS='-g')
++ env.Append(CCFLAGS=['-g'])
+ env.Append(CPPDEFINES=['DEBUG', '_DEBUG'])
+ else:
+- env.Append(CCFLAGS='-O2')
+- env.Append(CPPDEFINES='NDEBUG')
++ env.Append(CCFLAGS=['-O2'])
++ env.Append(CPPDEFINES=['NDEBUG'])
+
+ ### works for Mac OS. probably needs to change
+ env.Append(LIBS=['ssl', 'crypto', 'z', ])
+
+ if sys.platform == 'sunos5':
+- env.Append(LIBS='m')
++ env.Append(LIBS=['m'])
+ else:
+ # Warning level 4, no unused argument warnings
+ env.Append(CCFLAGS=['/W4', '/wd4100'])
+@@ -260,8 +260,8 @@
+ else:
+ # Optimize for speed, use DLL runtime
+ env.Append(CCFLAGS=['/O2', '/MD'])
+- env.Append(CPPDEFINES='NDEBUG')
+- env.Append(LINKFLAGS='/RELEASE')
++ env.Append(CPPDEFINES=['NDEBUG'])
++ env.Append(LINKFLAGS=['/RELEASE'])
+
+ # PLAN THE BUILD
+ SHARED_SOURCES = []
+@@ -307,25 +307,25 @@
+ CPPPATH=['$APR/include', '$APU/include'])
+
+ # zlib
+- env.Append(LIBS='zlib.lib')
++ env.Append(LIBS=['zlib.lib'])
+ if not env.get('SOURCE_LAYOUT', None):
+- env.Append(CPPPATH='$ZLIB/include',
+- LIBPATH='$ZLIB/lib')
++ env.Append(CPPPATH=['$ZLIB/include'],
++ LIBPATH=['$ZLIB/lib'])
+ else:
+- env.Append(CPPPATH='$ZLIB',
+- LIBPATH='$ZLIB')
++ env.Append(CPPPATH=['$ZLIB'],
++ LIBPATH=['$ZLIB'])
+
+ # openssl
+ env.Append(LIBS=['libeay32.lib', 'ssleay32.lib'])
+ if not env.get('SOURCE_LAYOUT', None):
+- env.Append(CPPPATH='$OPENSSL/include/openssl',
+- LIBPATH='$OPENSSL/lib')
++ env.Append(CPPPATH=['$OPENSSL/include/openssl'],
++ LIBPATH=['$OPENSSL/lib'])
+ elif 0: # opensslstatic:
+- env.Append(CPPPATH='$OPENSSL/inc32',
+- LIBPATH='$OPENSSL/out32')
++ env.Append(CPPPATH=['$OPENSSL/inc32'],
++ LIBPATH=['$OPENSSL/out32'])
+ else:
+- env.Append(CPPPATH='$OPENSSL/inc32',
+- LIBPATH='$OPENSSL/out32dll')
++ env.Append(CPPPATH=['$OPENSSL/inc32'],
++ LIBPATH=['$OPENSSL/out32dll'])
+ else:
+ if os.path.isdir(apr):
+ apr = os.path.join(apr, 'bin', 'apr-1-config')
+@@ -351,8 +351,8 @@
+ apr_libs = ''
+ apu_libs = ''
+
+- env.Append(CPPPATH='$OPENSSL/include')
+- env.Append(LIBPATH='$OPENSSL/lib')
++ env.Append(CPPPATH=['$OPENSSL/include'])
++ env.Append(LIBPATH=['$OPENSSL/lib'])
+
+
+ # If build with gssapi, get its information and define SERF_HAVE_GSSAPI
+@@ -362,7 +362,7 @@
+ env['GSSAPI_LIBS'] = cmd.strip()
+ return env.MergeFlags(cmd, unique)
+ env.ParseConfig('$GSSAPI --libs gssapi', parse_libs)
+- env.Append(CPPDEFINES='SERF_HAVE_GSSAPI')
++ env.Append(CPPDEFINES=['SERF_HAVE_GSSAPI'])
+ if sys.platform == 'win32':
+ env.Append(CPPDEFINES=['SERF_HAVE_SSPI'])
+
diff --git a/net-libs/serf/files/serf-1.3.8-tests.patch b/net-libs/serf/files/serf-1.3.8-tests.patch
new file mode 100644
index 000000000000..65b9962f2529
--- /dev/null
+++ b/net-libs/serf/files/serf-1.3.8-tests.patch
@@ -0,0 +1,95 @@
+https://code.google.com/p/serf/source/detail?r=2443
+https://code.google.com/p/serf/source/detail?r=2444
+https://code.google.com/p/serf/source/detail?r=2445
+
+--- test/test_buckets.c
++++ test/test_buckets.c
+@@ -1232,9 +1232,9 @@
+
+ /* The largest buffer we should need is 0.1% larger than the
+ uncompressed data, + 12 bytes. This info comes from zlib.h.
++ buf_size = orig_len + (orig_len / 1000) + 12;
+ Note: This isn't sufficient when using Z_NO_FLUSH and extremely compressed
+ data. Use a buffer bigger than what we need. */
+-// buf_size = orig_len + (orig_len / 1000) + 12;
+ buf_size = 100000;
+
+ write_buf = apr_palloc(pool, buf_size);
+@@ -1309,12 +1309,12 @@
+ expected_len);
+ }
+
+-static void deflate_buckets(CuTest *tc, int nr_of_loops)
++static void deflate_buckets(CuTest *tc, int nr_of_loops, apr_pool_t *pool)
+ {
+ const char *msg = "12345678901234567890123456789012345678901234567890";
+
+ test_baton_t *tb = tc->testBaton;
+- serf_bucket_alloc_t *alloc = serf_bucket_allocator_create(tb->pool, NULL,
++ serf_bucket_alloc_t *alloc = serf_bucket_allocator_create(pool, NULL,
+ NULL);
+ z_stream zdestr;
+ int i;
+@@ -1333,8 +1333,8 @@
+ {
+ serf_config_t *config;
+
+- serf_context_t *ctx = serf_context_create(tb->pool);
+- /* status = */ serf__config_store_get_config(ctx, NULL, &config, tb->pool);
++ serf_context_t *ctx = serf_context_create(pool);
++ /* status = */ serf__config_store_get_config(ctx, NULL, &config, pool);
+
+ serf_bucket_set_config(defbkt, config);
+ }
+@@ -1356,11 +1356,11 @@
+ if (i == nr_of_loops - 1) {
+ CuAssertIntEquals(tc, APR_SUCCESS,
+ deflate_compress(&data, &len, &zdestr, msg,
+- strlen(msg), 1, tb->pool));
++ strlen(msg), 1, pool));
+ } else {
+ CuAssertIntEquals(tc, APR_SUCCESS,
+ deflate_compress(&data, &len, &zdestr, msg,
+- strlen(msg), 0, tb->pool));
++ strlen(msg), 0, pool));
+ }
+
+ if (len == 0)
+@@ -1378,10 +1378,15 @@
+ static void test_deflate_buckets(CuTest *tc)
+ {
+ int i;
++ apr_pool_t *iterpool;
++ test_baton_t *tb = tc->testBaton;
+
++ apr_pool_create(&iterpool, tb->pool);
+ for (i = 1; i < 1000; i++) {
+- deflate_buckets(tc, i);
++ apr_pool_clear(iterpool);
++ deflate_buckets(tc, i, iterpool);
+ }
++ apr_pool_destroy(iterpool);
+ }
+
+ static apr_status_t discard_data(serf_bucket_t *bkt,
+--- test/test_util.c
++++ test/test_util.c
+@@ -363,10 +363,18 @@
+ return status;
+ }
+
++static int pool_abort_func(int retcode)
++{
++ fprintf(stderr, "Out of memory\n");
++ abort();
++ return 0;
++}
++
+ void *test_setup(void *dummy)
+ {
+ apr_pool_t *test_pool;
+ apr_pool_create(&test_pool, NULL);
++ apr_pool_abort_set(pool_abort_func, test_pool);
+ return test_pool;
+ }
+
diff --git a/net-libs/serf/metadata.xml b/net-libs/serf/metadata.xml
new file mode 100644
index 000000000000..d5a616789e6a
--- /dev/null
+++ b/net-libs/serf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>arfrever.fta@gmail.com</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="google-code">serf</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/serf/serf-1.3.8.ebuild b/net-libs/serf/serf-1.3.8.ebuild
new file mode 100644
index 000000000000..f244b51a9768
--- /dev/null
+++ b/net-libs/serf/serf-1.3.8.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils scons-utils toolchain-funcs
+
+DESCRIPTION="HTTP client library"
+HOMEPAGE="https://code.google.com/p/serf/"
+SRC_URI="https://serf.googlecode.com/svn/src_releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="kerberos"
+
+RDEPEND="dev-libs/apr:1=
+ dev-libs/apr-util:1=
+ dev-libs/openssl:0=
+ sys-libs/zlib:0=
+ kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+ >=dev-util/scons-2.3.0"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.3.2-disable_linking_against_unneeded_libraries.patch"
+ epatch "${FILESDIR}/${PN}-1.3.8-scons_variables.patch"
+ epatch "${FILESDIR}/${PN}-1.3.8-tests.patch"
+
+ # https://code.google.com/p/serf/issues/detail?id=133
+ sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct
+}
+
+src_compile() {
+ local myesconsargs=(
+ PREFIX="${EPREFIX}/usr"
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+ APR="${EPREFIX}/usr/bin/apr-1-config"
+ APU="${EPREFIX}/usr/bin/apu-1-config"
+ OPENSSL="${EPREFIX}/usr"
+ CC="$(tc-getCC)"
+ CPPFLAGS="${CPPFLAGS}"
+ CFLAGS="${CFLAGS}"
+ LINKFLAGS="${LDFLAGS}"
+ )
+
+ if use kerberos; then
+ myesconsargs+=(GSSAPI="${EPREFIX}/usr/bin/krb5-config")
+ fi
+
+ escons
+}
+
+src_test() {
+ escons check
+}
+
+src_install() {
+ escons install --install-sandbox="${D}"
+}
diff --git a/net-libs/socket++/Manifest b/net-libs/socket++/Manifest
new file mode 100644
index 000000000000..e524a0f17836
--- /dev/null
+++ b/net-libs/socket++/Manifest
@@ -0,0 +1,2 @@
+DIST socket++-1.12.12.tar.gz 64373 SHA256 e779cfe92ee2fd73841f91b0192350e5b796bedc11f1e69c4f1d792851cdc28d SHA512 3cc45721da058114586553e9d758fbbba5a135cd09289b5362dd573a2070aa3330d7b7d08b42a39fbb874314aa7e6f05bf571d36628ef63ba95ff6e1e9b356b6 WHIRLPOOL 5e2f2bfc6ef4433db3ab2e26e3c94eeb301c85283602a60b8eeef6379c609dbbd2d649810ca15f822cc4d8774b0d7a59ce04c15692f004d7420ad6bcdafaf67d
+DIST socket++-1.12.13.tar.gz 64263 SHA256 755cdcac06d40fcca2b221f840e05f89a86298bc3bfc518b51a57b42f0512b19 SHA512 080f4cc71c4edcf56d81b8574ff357bc24f7a740a6a3c7e92a2dfd7d8910193e919fc270fcc8e96ea769518854b6e45ec79b949ecaef69f30edf821ae4bd625b WHIRLPOOL c08fd6641089107933f8c91a4b483881a7798aecf88702f17bd83f880698abcbb20f2951c39c4a0e49e495bbf9092ed614cb2aca1c99f86951b4598b6bdfe3d1
diff --git a/net-libs/socket++/files/socket++-1.12.12-gcc47.patch b/net-libs/socket++/files/socket++-1.12.12-gcc47.patch
new file mode 100644
index 000000000000..62a62b090041
--- /dev/null
+++ b/net-libs/socket++/files/socket++-1.12.12-gcc47.patch
@@ -0,0 +1,20 @@
+--- test/thostnames.C~ 2004-06-29 08:47:52.000000000 +0200
++++ test/thostnames.C 2013-09-07 10:30:24.159157101 +0200
+@@ -23,7 +23,7 @@
+ {
+ public:
+ test () : iosockinet (sockbuf::sock_stream) {
+- cout << "Constructor rdbuf: " << (unsigned int) rdbuf() << endl;
++ cout << "Constructor rdbuf: " << (size_t) rdbuf() << endl;
+ }
+ };
+
+@@ -39,7 +39,7 @@
+ }
+
+ sio.rdbuf()->setname ("Testsocket");
+- cout << "rdbuf: " << (unsigned int) sio.rdbuf() << "\n";
++ cout << "rdbuf: " << (size_t) sio.rdbuf() << "\n";
+ cout << "socketname: " << sio.rdbuf()->getname() << endl;
+
+ try {
diff --git a/net-libs/socket++/files/socket++.pc b/net-libs/socket++/files/socket++.pc
new file mode 100644
index 000000000000..4faaa9c62149
--- /dev/null
+++ b/net-libs/socket++/files/socket++.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=/usr/bin
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: socket++
+Version: PV
+Description: A C++ Socket Library
+Requires:
+Libs: -L/usr/lib -lsocket++
+Cflags: -I/usr/include
diff --git a/net-libs/socket++/metadata.xml b/net-libs/socket++/metadata.xml
new file mode 100644
index 000000000000..54cb0feb0740
--- /dev/null
+++ b/net-libs/socket++/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>cpp</herd>
+ <longdescription>Socket++ library defines a family of C++ classes that can be used more effectively than directly calling the underlying low-level system functions.</longdescription>
+</pkgmetadata>
diff --git a/net-libs/socket++/socket++-1.12.12-r2.ebuild b/net-libs/socket++/socket++-1.12.12-r2.ebuild
new file mode 100644
index 000000000000..c223ff7933c1
--- /dev/null
+++ b/net-libs/socket++/socket++-1.12.12-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
+
+DESCRIPTION="C++ Socket Library"
+HOMEPAGE="http://www.linuxhacker.at/socketxx/"
+SRC_URI="http://www.linuxhacker.at/linux/downloads/src/${P}.tar.gz"
+
+LICENSE="freedist GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~mips x86"
+
+IUSE="debug static-libs"
+
+RESTRICT="bindist"
+
+DEPEND="sys-apps/texinfo"
+RDEPEND=""
+
+DOCS=( AUTHORS ChangeLog NEWS README README2 README3 THANKS )
+
+PATCHES=( "${FILESDIR}/${P}-gcc47.patch" )
+
+src_prepare() {
+ # bug #514246
+ sed -i -e 's/@subsection t/@section t/g' doc/socket++.texi || die
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ )
+ autotools-utils_src_configure
+}
diff --git a/net-libs/socket++/socket++-1.12.13.ebuild b/net-libs/socket++/socket++-1.12.13.ebuild
new file mode 100644
index 000000000000..7fe0dcc5953e
--- /dev/null
+++ b/net-libs/socket++/socket++-1.12.13.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
+
+DESCRIPTION="C++ Socket Library"
+HOMEPAGE="http://www.linuxhacker.at/socketxx/"
+SRC_URI="http://src.linuxhacker.at/socket++/${P}.tar.gz"
+
+LICENSE="freedist GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~x86"
+
+IUSE="debug static-libs"
+
+RESTRICT="bindist"
+
+DEPEND="sys-apps/texinfo"
+RDEPEND=""
+
+DOCS=( AUTHORS ChangeLog NEWS README README2 README3 THANKS )
+
+PATCHES=( "${FILESDIR}/${PN}-1.12.12-gcc47.patch" )
+
+src_prepare() {
+ # bug #514246
+ sed -i -e 's/@subsection t/@section t/g' doc/socket++.texi || die
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ )
+ autotools-utils_src_configure
+}
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
new file mode 100644
index 000000000000..deae4ad9a0d9
--- /dev/null
+++ b/net-libs/socket_wrapper/Manifest
@@ -0,0 +1 @@
+DIST socket_wrapper-1.1.3.tar.gz 50412 SHA256 a337db45f451495e6f095510add1e2a3e7a9dc399dd6a7aa1f462a063d51ae13 SHA512 691cd1db877661959d8ded6fe4df8c8e2e4300b2c800897bd3ecf62ea24dcc634188376ba4377868dbd67a8156af3051f53311b7320873b2daead91645473b5a WHIRLPOOL 9009ee4516111e31bd263d91163fc8e1ff7367420dcdc8283b38ea3ab0e9d990639c3804ba3861609af30a65f714629cea465b72dce58b671242b043865c7d04
diff --git a/net-libs/socket_wrapper/metadata.xml b/net-libs/socket_wrapper/metadata.xml
new file mode 100644
index 000000000000..c2d9e83c908a
--- /dev/null
+++ b/net-libs/socket_wrapper/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>samba</herd>
+ <maintainer>
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.3.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.1.3.ebuild
new file mode 100644
index 000000000000..9f2fd922828b
--- /dev/null
+++ b/net-libs/socket_wrapper/socket_wrapper-1.1.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="A library passing all socket communications through unix sockets"
+HOMEPAGE="https://cwrap.org/socket_wrapper.html"
+SRC_URI="ftp://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+}
diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
new file mode 100644
index 000000000000..868b0fda2547
--- /dev/null
+++ b/net-libs/sofia-sip/Manifest
@@ -0,0 +1 @@
+DIST sofia-sip-1.12.11.tar.gz 2927808 SHA256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c WHIRLPOOL 81231856b974847a384ce8539306f3175960085381e031fb53594f86ab924e04811f76f68f4882cabdd4b5771de10da90fd35e4d4b4398db7f99c9e2d71f52fb
diff --git a/net-libs/sofia-sip/metadata.xml b/net-libs/sofia-sip/metadata.xml
new file mode 100644
index 000000000000..1779ea8f4a27
--- /dev/null
+++ b/net-libs/sofia-sip/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <upstream>
+ <remote-id type="sourceforge">sofia-sip</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
new file mode 100644
index 000000000000..e7a7b4daf7da
--- /dev/null
+++ b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="RFC3261 compliant SIP User-Agent library"
+HOMEPAGE="http://sofia-sip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+ BSD public-domain" # See COPYRIGHT
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~x86-linux"
+IUSE="ssl static-libs"
+
+RDEPEND="dev-libs/glib:2
+ ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+# tests are broken, see bugs 304607 and 330261
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog README README.developers RELEASE TODO )
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_with ssl openssl)
+}
+
+src_install() {
+ default
+ rm -f "${ED}"usr/lib*/lib${PN}*.la
+}
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
new file mode 100644
index 000000000000..1767ea31330a
--- /dev/null
+++ b/net-libs/stem/Manifest
@@ -0,0 +1,3 @@
+DIST stem-1.3.0.tar.bz2 1481513 SHA256 770e370156e0e92a9862e4670ee3f4ac385742006e578608528ee16cbab9d416 SHA512 dea65d026a27985432b291614dc3c8da7a628fad945a755abb706177864edd387c8ea96cd8358af60825b342896d57ea1daa96365efd5156bf8885e7a7aa9714 WHIRLPOOL 1e3d9f800ed9670a347d41c565250a42e1a166e24c55dc3a0128cd3b2c5d9a8f0e926e73338a4cdd846997911c11db5e2fa98f2b7dd5a259da523951d8bf1626
+DIST stem-1.4.0.tar.bz2 1569644 SHA256 6c8af06a6fa9553ad4da3e397cffa42d7ddd9396a1425b2757f125e7699ef83c SHA512 0d93355659ff04d8846133845636c0596e06331b6646a62c597c2d6156be39705ed182d480dde3e49653c4b5341f663e4da83610110383d9d8c395ac1e473191 WHIRLPOOL 3eb30be403980a6a446fa0fe666fe628ef1f732e5a7da6ae3db323e4053c7df866142faad979a69cfeecb031077896e4883c58fdb6b3db84f7c5502141b4df7c
+DIST stem-1.4.1.tar.bz2 1570151 SHA256 f2c460df59d63f60e5046221994be655a361c31b81cda0120e594999587869e8 SHA512 40ed898efd55d749dad9e02ff00cc4770f588f9d0fd40995d3a0ed4d13ac3bd7cf1fba011a01729668be30ef9627bd6b140d4fbd76cedb5fa5793d9750aa48b7 WHIRLPOOL 2a52c1bc4a0acb18ebaf12654f0f4a8c167992f994336db1c16d6e3d49039007a5832fb0e80ac78ba82e789144bb374f7ce1105bba3e5edd14e99e83c2514ebf
diff --git a/net-libs/stem/metadata.xml b/net-libs/stem/metadata.xml
new file mode 100644
index 000000000000..479e90dafa8a
--- /dev/null
+++ b/net-libs/stem/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ </maintainer>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">stem</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/stem/stem-1.3.0.ebuild b/net-libs/stem/stem-1.3.0.ebuild
new file mode 100644
index 000000000000..659782bc791f
--- /dev/null
+++ b/net-libs/stem/stem-1.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+# Python3.3 fails to execute the test script
+PYTHON_COMPAT=(python2_7)
+
+inherit vcs-snapshot distutils-r1
+
+DESCRIPTION="Stem is a Python controller library for Tor"
+HOMEPAGE="https://stem.torproject.org"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
+ net-misc/tor )
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="net-misc/tor"
+
+DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
+
+python_prepare_all() {
+ # Disable failing test
+ sed -i -e "/test_expand_path/a \
+ \ \ \ \ return" test/integ/util/system.py || die
+ sed -i -e "/test_get_connections_by_ss/,+1d"\
+ test/integ/util/connection.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ ${PYTHON} run_tests.py --all --target RUN_ALL || die
+}
diff --git a/net-libs/stem/stem-1.4.0.ebuild b/net-libs/stem/stem-1.4.0.ebuild
new file mode 100644
index 000000000000..c2722cc644cc
--- /dev/null
+++ b/net-libs/stem/stem-1.4.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+
+inherit vcs-snapshot distutils-r1
+
+DESCRIPTION="Stem is a Python controller library for Tor"
+HOMEPAGE="https://stem.torproject.org"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
+ net-misc/tor )
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="net-misc/tor"
+
+DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
+
+python_prepare_all() {
+ # Disable failing test
+ sed -i -e "/test_expand_path/a \
+ \ \ \ \ return" test/integ/util/system.py || die
+ sed -i -e "/test_get_connections_by_ss/,+1d"\
+ test/integ/util/connection.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ ${PYTHON} run_tests.py --all --target RUN_ALL || die
+}
diff --git a/net-libs/stem/stem-1.4.1.ebuild b/net-libs/stem/stem-1.4.1.ebuild
new file mode 100644
index 000000000000..c2722cc644cc
--- /dev/null
+++ b/net-libs/stem/stem-1.4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+
+inherit vcs-snapshot distutils-r1
+
+DESCRIPTION="Stem is a Python controller library for Tor"
+HOMEPAGE="https://stem.torproject.org"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
+ net-misc/tor )
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="net-misc/tor"
+
+DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
+
+python_prepare_all() {
+ # Disable failing test
+ sed -i -e "/test_expand_path/a \
+ \ \ \ \ return" test/integ/util/system.py || die
+ sed -i -e "/test_get_connections_by_ss/,+1d"\
+ test/integ/util/connection.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ ${PYTHON} run_tests.py --all --target RUN_ALL || die
+}
diff --git a/net-libs/telepathy-farstream/Manifest b/net-libs/telepathy-farstream/Manifest
new file mode 100644
index 000000000000..f6efde71d48e
--- /dev/null
+++ b/net-libs/telepathy-farstream/Manifest
@@ -0,0 +1 @@
+DIST telepathy-farstream-0.6.2.tar.gz 601409 SHA256 6fa099f22d13a2a49240445a13e918928aef097675d76e5cc9f98ab496087e0a SHA512 ef9c07df607add411df404f5e2dfbf92afde8387291980e59f9e0b85d6edf0904582f10491316ae01349fe242d44a3579a27663127d5a91cb7b06ad163b6e4a6 WHIRLPOOL e71dfadaf68c3a221dcd8ac40c8ed6d36031f03d2d765a3852b0d3dc67e8e39101d15a364f546efd6c0e8970803fb0191e9bc66fd1c44d369f9a14e8f709cc92
diff --git a/net-libs/telepathy-farstream/metadata.xml b/net-libs/telepathy-farstream/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/net-libs/telepathy-farstream/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild b/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild
new file mode 100644
index 000000000000..040de2451aef
--- /dev/null
+++ b/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Telepathy client library that uses Farstream to handle Call channels"
+HOMEPAGE="http://telepathy.freedesktop.org"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/3"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="examples +introspection"
+
+RDEPEND="
+ >=dev-libs/glib-2.32:2
+ >=sys-apps/dbus-0.60
+ >=dev-libs/dbus-glib-0.60
+ media-libs/gstreamer:1.0[introspection?]
+ >=net-libs/telepathy-glib-0.21[introspection?]
+ net-libs/farstream:0.2=[introspection?]
+ introspection? ( >=dev-libs/gobject-introspection-1.30 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.17
+ virtual/pkgconfig
+"
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ --disable-Werror \
+ $(use_enable introspection)
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/*.c
+ insinto /usr/share/doc/${PF}/examples/python
+ doins examples/python/*.py
+ fi
+}
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
new file mode 100644
index 000000000000..b2d877904c5e
--- /dev/null
+++ b/net-libs/telepathy-glib/Manifest
@@ -0,0 +1,2 @@
+DIST telepathy-glib-0.24.0.tar.gz 3890992 SHA256 ae0002134991217f42e503c43dea7817853afc18863b913744d51ffa029818cf SHA512 97b30f9ea7996252c21777a72b98b3106c346e7cbf3185cb6d0ee75466a43447000d77b3dabd92cf93c59340baa830b9c07356939ba39fd2c8cf98738bc1ffb2 WHIRLPOOL bd9aecfbfdf302ed2365ec4b7d0d81b28ffc3e425c4e6280c3621a581fe8f9d4df7bf590c44357c98f3c64481600a8137d41d5842d9cc7a8bc7941af8f6348e7
+DIST telepathy-glib-0.24.1.tar.gz 3898149 SHA256 9e0df1d8f857e0270cf0b32e2d1ca5a24aa7282873361785d573f72ad7f7d5eb SHA512 2fed94f76a19d6069f671cdd45d2fd8a4b4ad27c4601aff66041ca205456be397c76a86f92cc9bf20fa4eb6d4c15a67ed8196644c143c37e945f382229a63335 WHIRLPOOL bc1c48cbc961d0a4c263dbdd4a31ff6a4ca3a32bfc3b9bc12f2691f46028f7c371ae16a4cd2908f425f49e8eaa84158e5122523f24e2d669defbf8868fb6cd17
diff --git a/net-libs/telepathy-glib/metadata.xml b/net-libs/telepathy-glib/metadata.xml
new file mode 100644
index 000000000000..455620cf3c8e
--- /dev/null
+++ b/net-libs/telepathy-glib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.0.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.0.ebuild
new file mode 100644
index 000000000000..757cb8bf9c10
--- /dev/null
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 python-r1 vala virtualx
+
+DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol"
+HOMEPAGE="http://telepathy.freedesktop.org"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+IUSE="debug +introspection +vala"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ vala? ( introspection )
+"
+
+# Broken for a long time and upstream doesn't care
+# https://bugs.freedesktop.org/show_bug.cgi?id=63212
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/glib-2.36:2
+ >=dev-libs/dbus-glib-0.90
+ introspection? ( >=dev-libs/gobject-introspection-1.30 )
+"
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+ ${PYTHON_DEPS}
+"
+# See bug 504744 for reference
+PDEPEND="
+ net-im/telepathy-mission-control
+"
+
+src_configure() {
+ python_export_best
+
+ gnome2_src_configure \
+ --disable-static \
+ --disable-installed-tests \
+ $(use_enable debug backtrace) \
+ $(use_enable debug debug-cache) \
+ $(use_enable introspection) \
+ $(use_enable vala vala-bindings)
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ # Needs dbus for tests (auto-launched)
+ Xemake -j1 check
+}
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
new file mode 100644
index 000000000000..e7cb802eb8d6
--- /dev/null
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 python-r1 vala virtualx
+
+DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol"
+HOMEPAGE="http://telepathy.freedesktop.org"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+IUSE="debug +introspection +vala"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ vala? ( introspection )
+"
+
+# Broken for a long time and upstream doesn't care
+# https://bugs.freedesktop.org/show_bug.cgi?id=63212
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/glib-2.36:2
+ >=dev-libs/dbus-glib-0.90
+ introspection? ( >=dev-libs/gobject-introspection-1.30 )
+"
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+ ${PYTHON_DEPS}
+"
+# See bug 504744 for reference
+PDEPEND="
+ net-im/telepathy-mission-control
+"
+
+src_configure() {
+ python_export_best
+
+ gnome2_src_configure \
+ --disable-static \
+ --disable-installed-tests \
+ $(use_enable debug backtrace) \
+ $(use_enable debug debug-cache) \
+ $(use_enable introspection) \
+ $(use_enable vala vala-bindings)
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ # Needs dbus for tests (auto-launched)
+ Xemake -j1 check
+}
diff --git a/net-libs/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest
new file mode 100644
index 000000000000..ab9fff8bd272
--- /dev/null
+++ b/net-libs/telepathy-logger-qt/Manifest
@@ -0,0 +1 @@
+DIST telepathy-logger-qt-0.8.0.tar.bz2 108403 SHA256 6d674ee72e7b6efbfb912d5741c1e1b8a55f78f83e2754588f800582a128ec08 SHA512 3481002c8e25b65068d17ae7f8a0e53a05e896db49b001c24731e216fdc35629a5d50ce1075236f97225d0d7995fa299a0e3974d39f908886c7dcfb1d9e67731 WHIRLPOOL 3f9f072089fec6617273fccd257519248adc6c4a0478910b63bde9047ae5d58724e0aa27c4c8dcef7b590f2ccc97212ef69d58058f8a2e62b05169635a1f05d0
diff --git a/net-libs/telepathy-logger-qt/metadata.xml b/net-libs/telepathy-logger-qt/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/net-libs/telepathy-logger-qt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-0.8.0.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-0.8.0.ebuild
new file mode 100644
index 000000000000..98d7651245f2
--- /dev/null
+++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-0.8.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+KDE_REQUIRED="never"
+inherit kde4-base python-any-r1
+
+DESCRIPTION="Qt4 bindings for the Telepathy logger"
+HOMEPAGE="https://projects.kde.org/projects/extragear/network/telepathy/telepathy-logger-qt"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+ media-libs/qt-gstreamer[qt4(+)]
+ >=net-im/telepathy-logger-0.8.0
+ net-libs/telepathy-glib
+ >=net-libs/telepathy-qt-0.9.1
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ sys-devel/bison
+ sys-devel/flex
+"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ kde4-base_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ )
+ kde4-base_src_configure
+}
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
new file mode 100644
index 000000000000..54fc6a82fdac
--- /dev/null
+++ b/net-libs/telepathy-qt/Manifest
@@ -0,0 +1,2 @@
+DIST telepathy-qt-0.9.5.tar.gz 5862803 SHA256 93474858efe55bf45ee9352f88b852d4a24505939dc81a3a3c6fa5a686809c8e SHA512 2cc141037fbd2cc993f16e2ba52b3f6dda7841ff150f9d40d9e659eafdee67dd23563662954247f46bd8a34db7d87b7ec770da90725a19f634cd396a2d74e34b WHIRLPOOL cfef1a61725d0e07b65995155def64120d7d6993772511971eb7c8f7bcd956ed462544afbf52559cf2d5cc1825aeb1ce1f17371700d5a5e7f540b69da38d0709
+DIST telepathy-qt-0.9.6.1.tar.gz 6067468 SHA256 496eb4951ea9b181d7d68a2122a885474c4f73b519319496aa1b97d9b361a1f8 SHA512 d15bdf94ef2b546270130012e8636fb2801b0c4fb50513ac0dbc0e1f6255d84da6df12195b3d26dc6df5a9466929a1073e87d2a9e600c7bf26c3e1aa112113b7 WHIRLPOOL 621137fc10ce3db1d834711aaf876adf98056a5ca8bab22c011e881e71522060cd6110733880db4f6646872501b870305d3590428ea3d809b4b512bbc21e653b
diff --git a/net-libs/telepathy-qt/files/0.9.6.1-default-source.patch b/net-libs/telepathy-qt/files/0.9.6.1-default-source.patch
new file mode 100644
index 000000000000..0366b0fa7f37
--- /dev/null
+++ b/net-libs/telepathy-qt/files/0.9.6.1-default-source.patch
@@ -0,0 +1,25 @@
+From 2a460afdbd0cb39d8dcecaf6cea5ce9ce7d3216b Mon Sep 17 00:00:00 2001
+From: Niels Ole Salscheider <niels_ole@salscheider-online.de>
+Date: Fri, 5 Jun 2015 12:47:13 +0200
+Subject: CMake: Fixed deprecated _BSD_SOURCE.
+
+Since glibc-2.20 _DEFAULT_SOURCE definition is also required.
+
+Reviewed-by: Alexandr Akulich
+
+diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake
+index d34b24d..dc98697 100644
+--- a/cmake/modules/TelepathyDefaults.cmake
++++ b/cmake/modules/TelepathyDefaults.cmake
+@@ -108,7 +108,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ endif(${NOT_RELEASE} EQUAL 1)
+
+ if(CMAKE_SYSTEM_NAME MATCHES Linux)
+- add_definitions(-D_BSD_SOURCE)
++ add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE)
+ endif(CMAKE_SYSTEM_NAME MATCHES Linux)
+
+ # Compiler coverage
+--
+cgit v0.10.2
+
diff --git a/net-libs/telepathy-qt/files/0.9.6.1-yes-release.patch b/net-libs/telepathy-qt/files/0.9.6.1-yes-release.patch
new file mode 100644
index 000000000000..97a880c72ca7
--- /dev/null
+++ b/net-libs/telepathy-qt/files/0.9.6.1-yes-release.patch
@@ -0,0 +1,17 @@
+diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake
+index d34b24d..eb51454 100644
+--- a/cmake/modules/TelepathyDefaults.cmake
++++ b/cmake/modules/TelepathyDefaults.cmake
+@@ -59,11 +59,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ set(DEPRECATED_DECLARATIONS_FLAGS)
+ endif (CXX_DEPRECATED_DECLARATIONS)
+
+- if(${TP_QT_NANO_VERSION} EQUAL 0)
+- set(NOT_RELEASE 0)
+- else(${TP_QT_NANO_VERSION} EQUAL 0)
+- set(NOT_RELEASE 1)
+- endif(${TP_QT_NANO_VERSION} EQUAL 0)
++ set(NOT_RELEASE 0)
+
+ set(desired
+ all
diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml
new file mode 100644
index 000000000000..1e6e07184330
--- /dev/null
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>qt</herd>
+ <herd>kde</herd>
+ <use>
+ <flag name='farstream'>Enable support for audio/video calls via farstream</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild
new file mode 100644
index 000000000000..a5c3ba2d7103
--- /dev/null
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 cmake-utils virtualx multibuild
+
+DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
+HOMEPAGE="http://telepathy.freedesktop.org/"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="debug farstream +qt4 qt5 test"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+ farstream? (
+ >=net-libs/telepathy-farstream-0.2.2
+ >=net-libs/telepathy-glib-0.18.0
+ )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtxml:5
+ )
+ !net-libs/telepathy-qt4
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ test? (
+ dev-libs/dbus-glib
+ dev-libs/glib:2
+ dev-python/dbus-python
+ qt4? ( dev-qt/qttest:4 )
+ qt5? ( dev-qt/qttest:5 )
+ )
+"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable debug DEBUG_OUTPUT)
+ $(cmake-utils_use_enable farstream)
+ $(cmake-utils_use_enable test TESTS)
+ -DENABLE_EXAMPLES=OFF
+ -ENABLE_SERVICE_SUPPORT=ON
+ )
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+ mycmakeargs+=(-DDESIRED_QT_VERSION=4)
+ fi
+ if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+ mycmakeargs+=(-DDESIRED_QT_VERSION=5)
+ fi
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ mytest() {
+ pushd "${BUILD_DIR}" > /dev/null
+ VIRTUALX_COMMAND="ctest -E '(CallChannel)'" virtualmake || die "tests failed"
+ popd > /dev/null
+ }
+
+ multibuild_foreach_variant mytest
+}
+
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
+}
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
new file mode 100644
index 000000000000..22f541532ec0
--- /dev/null
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.6.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 cmake-utils virtualx multibuild
+
+DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
+HOMEPAGE="http://telepathy.freedesktop.org/"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug farstream +qt4 qt5 test"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+ farstream? (
+ >=net-libs/telepathy-farstream-0.2.2
+ >=net-libs/telepathy-glib-0.18.0
+ )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtxml:5
+ )
+ !net-libs/telepathy-qt4
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ test? (
+ dev-libs/dbus-glib
+ dev-libs/glib:2
+ dev-python/dbus-python
+ qt4? ( dev-qt/qttest:4 )
+ qt5? ( dev-qt/qttest:5 )
+ )
+"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+PATCHES=(
+ "${FILESDIR}/${PV}-default-source.patch"
+ "${FILESDIR}/${PV}-yes-release.patch"
+)
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable debug DEBUG_OUTPUT)
+ $(cmake-utils_use_enable farstream)
+ $(cmake-utils_use_enable test TESTS)
+ -DENABLE_EXAMPLES=OFF
+ )
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+ mycmakeargs+=(-DDESIRED_QT_VERSION=4)
+ fi
+ if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+ mycmakeargs+=(-DDESIRED_QT_VERSION=5)
+ fi
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ mytest() {
+ pushd "${BUILD_DIR}" > /dev/null
+ VIRTUALX_COMMAND="ctest -E '(CallChannel)'" virtualmake || die "tests failed"
+ popd > /dev/null
+ }
+
+ multibuild_foreach_variant mytest
+}
+
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
+}
diff --git a/net-libs/txtorcon/Manifest b/net-libs/txtorcon/Manifest
new file mode 100644
index 000000000000..7f060945e6f4
--- /dev/null
+++ b/net-libs/txtorcon/Manifest
@@ -0,0 +1 @@
+DIST txtorcon-0.13.0.tar.gz 208077 SHA256 3218d0fa0c22f49eee9324a5862b2d53ef77d5cb8e555e2bcffc24070aaeca7d SHA512 45f94a8a147b176ced1b93b5949df84e7321090aa0a755f1a4232050ebe09812986200b31ef63433b8c2f24b2066b5f3b746e4c3677529c7d7be8aebd1c97e25 WHIRLPOOL db91499f39dd79295af35abcdeaf08e2d92988994800bfea4662ddcbc2d5b252dbace08b6429c08f66fad9a76f8bd0aeb7dbe2e28e467f3c17f8aa4601158666
diff --git a/net-libs/txtorcon/metadata.xml b/net-libs/txtorcon/metadata.xml
new file mode 100644
index 000000000000..9ce1c0433878
--- /dev/null
+++ b/net-libs/txtorcon/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>
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">txtorcon</remote-id>
+ <remote-id type="github">meejah/txtorcon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/txtorcon/txtorcon-0.13.0.ebuild b/net-libs/txtorcon/txtorcon-0.13.0.ebuild
new file mode 100644
index 000000000000..9be62daf5363
--- /dev/null
+++ b/net-libs/txtorcon/txtorcon-0.13.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+
+inherit distutils-r1
+
+DESCRIPTION="Twisted-based Tor controller client, with state-tracking and configuration abstractions"
+HOMEPAGE="https://github.com/meejah/txtorcon https://pypi.python.org/pypi/txtorcon"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/twisted-core[${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ net-misc/tor
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ dev-python/geoip-python[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_test() {
+ trial --reporter=text test || die
+}
diff --git a/net-libs/udns/Manifest b/net-libs/udns/Manifest
new file mode 100644
index 000000000000..01d9dca635f4
--- /dev/null
+++ b/net-libs/udns/Manifest
@@ -0,0 +1 @@
+DIST udns-0.4.tar.gz 84716 SHA256 115108dc791a2f9e99e150012bcb459d9095da2dd7d80699b584ac0ac3768710 SHA512 2990d57b3b6bf176a12ee07fd4391921e13634fc8409e8ce4df8dbe7b3556a116ae59ab328a1b6a95ebc94298f6b56ec7197a06a649d8d642b371b8ecef3e40b WHIRLPOOL 363522b4a9fb813b494d312f2dd8556f246bb4589f68940f1de8daef9009fe09025a7d988e6e415eee33a3c1c04c520aa174dfd67a1ea2280b97292e97de4d7d
diff --git a/net-libs/udns/metadata.xml b/net-libs/udns/metadata.xml
new file mode 100644
index 000000000000..93d64bde5f89
--- /dev/null
+++ b/net-libs/udns/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>
+ <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+<use>
+ <flag name="tools">Build and install dnsget, ex-rdns and rblcheck tools</flag>
+</use>
+<longdescription>
+UDNS is a stub DNS resolver library with ability to perform both syncronous and asyncronous DNS queries.
+</longdescription>
+</pkgmetadata>
diff --git a/net-libs/udns/udns-0.4.ebuild b/net-libs/udns/udns-0.4.ebuild
new file mode 100644
index 000000000000..4180cfb0c5b4
--- /dev/null
+++ b/net-libs/udns/udns-0.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Async-capable DNS stub resolver library"
+HOMEPAGE="http://www.corpit.ru/mjt/udns.html"
+SRC_URI="http://www.corpit.ru/mjt/udns/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
+IUSE="ipv6 static +tools"
+
+# Yes, this doesn't depend on any other library beside "system" set
+DEPEND=""
+RDEPEND=""
+
+src_configure() {
+ # Uses non-standard configure script, econf doesn't work
+ CC=$(tc-getCC) ./configure $(use_enable ipv6) || die "Configure failed"
+}
+
+src_compile() {
+ if use tools; then
+ emake shared
+ else
+ emake sharedlib
+ fi
+}
+
+src_install() {
+ dolib.so libudns.so.0
+ dosym libudns.so.0 "/usr/$(get_libdir)/libudns.so"
+
+ if use tools; then
+ newbin dnsget_s dnsget
+ newbin ex-rdns_s ex-rdns
+ newbin rblcheck_s rblcheck
+ fi
+
+ insinto /usr/include
+ doins udns.h
+
+ doman udns.3
+ if use tools; then
+ doman dnsget.1 rblcheck.1
+ fi
+ dodoc NEWS NOTES TODO
+}
diff --git a/net-libs/uhttpmock/Manifest b/net-libs/uhttpmock/Manifest
new file mode 100644
index 000000000000..56218729a9ae
--- /dev/null
+++ b/net-libs/uhttpmock/Manifest
@@ -0,0 +1,2 @@
+DIST uhttpmock-0.4.0.tar.xz 295392 SHA256 0d9a75ac66070879a14caabddfaa7bd4e888e2abb03f9ac73610921ed341b571 SHA512 0f98db886aa02a911fc94c957a371651f9be5784602ea0492d04798dcf12c4a519a292ede9d37b25a965832e5d96ca9da7ce0ca8127af74d3986c4ef74e1f527 WHIRLPOOL 2d5a00407ed9c5022cb86773ee87580b6e8573c451beee9eeec535cbfb0b8e8d7847d6ec7f35914b9d4f3a3744d608383db181779dbc2ca2cb86667545b5f4f4
+DIST uhttpmock-0.5.0.tar.xz 296908 SHA256 26da182a2db2579c5ba4dad9096d52099e0766228c295cfbaed6de4046f7d16e SHA512 952b618f3a12d7190f3812bc0bd53dd655a83d27f29bb749e62b36a08492bf535b85db7f5ff66f15c72bf5574696149f00476041f225ca6039ad87b221f5a1c6 WHIRLPOOL 8b85b70b18f47195726298dea99e8b3546d1a62bb15fc84839a152dfe050e5f599246a31394f9c542b8d3c5ff10ac9f403a9c467f95f2a2e2e112ad72abb250b
diff --git a/net-libs/uhttpmock/metadata.xml b/net-libs/uhttpmock/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/net-libs/uhttpmock/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/net-libs/uhttpmock/uhttpmock-0.4.0.ebuild b/net-libs/uhttpmock/uhttpmock-0.4.0.ebuild
new file mode 100644
index 000000000000..105b2a47ddc3
--- /dev/null
+++ b/net-libs/uhttpmock/uhttpmock-0.4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="HTTP web service mocking library"
+HOMEPAGE="https://gitlab.com/uhttpmock/uhttpmock"
+SRC_URI="http://tecnocode.co.uk/downloads/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.36.0:2
+ >=net-libs/libsoup-2.37.91:2.4
+ introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.14
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.0.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.0.ebuild
new file mode 100644
index 000000000000..ce0470b82849
--- /dev/null
+++ b/net-libs/uhttpmock/uhttpmock-0.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="HTTP web service mocking library"
+HOMEPAGE="https://gitlab.com/uhttpmock/uhttpmock"
+SRC_URI="http://tecnocode.co.uk/downloads/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.36.0:2
+ >=net-libs/libsoup-2.37.91:2.4
+ introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.14
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
diff --git a/net-libs/vanessa-mcast/Manifest b/net-libs/vanessa-mcast/Manifest
new file mode 100644
index 000000000000..2c2e14059687
--- /dev/null
+++ b/net-libs/vanessa-mcast/Manifest
@@ -0,0 +1 @@
+DIST vanessa_mcast-1.0.0.tar.gz 292643 RMD160 6b096148583dca97d61d7620ea35ee7115494479 SHA1 8c412688b189aa8ec393b2207cf606adb2d9994c SHA256 a028bbfda0c9331f0ca00d4393dace9eaf4d5678fb1ae2f5abc911f6dbab3694
diff --git a/net-libs/vanessa-mcast/metadata.xml b/net-libs/vanessa-mcast/metadata.xml
new file mode 100644
index 000000000000..46db27f9fd86
--- /dev/null
+++ b/net-libs/vanessa-mcast/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/vanessa-mcast/vanessa-mcast-1.0.0.ebuild b/net-libs/vanessa-mcast/vanessa-mcast-1.0.0.ebuild
new file mode 100644
index 000000000000..11811366f51b
--- /dev/null
+++ b/net-libs/vanessa-mcast/vanessa-mcast-1.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Multicast Helper Library"
+HOMEPAGE="http://www.vergenet.net/linux/vanessa/"
+SRC_URI="http://www.vergenet.net/linux/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND=">=dev-libs/vanessa-logger-0.0.6
+ >=net-libs/vanessa-socket-0.0.7"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+ make DESTDIR="${D}" install || die
+ dodoc README NEWS AUTHORS TODO INSTALL
+}
diff --git a/net-libs/vanessa-socket/Manifest b/net-libs/vanessa-socket/Manifest
new file mode 100644
index 000000000000..1c15f0329b72
--- /dev/null
+++ b/net-libs/vanessa-socket/Manifest
@@ -0,0 +1,2 @@
+DIST vanessa_socket-0.0.12.tar.gz 346375 SHA256 809f11da9507c69d72839e672149d391c036be57cd49cc9a35ac64bdefbf51bc SHA512 24767cd77b6017156eb82df6c76b364bcc379d043562528d389b994497bbc041d29aaf72fc94bb877e7df19f196f8cce8879e203ac679570a92ff0782bef2d42 WHIRLPOOL da6890d4470e74f6bf6759e97886c2d29014fd53d08075b58792d0d33ed735b74772d808f58859cacc44111525bdc382018721570c012dc07959c61394eca9de
+DIST vanessa_socket-0.0.13.tar.gz 384431 SHA256 13f837fd70d3ec0f8ffdf02bb326aa5cb9985167bf06365f8ba228f389ddee15 SHA512 c25ddabb3ead8e88fc924277ed1aac3a932f35f31974ee6340310cb8c6dabbe9ab163ebe475c9eb7b2dc66f79a07b1c70e00b228f57ba2b06bce87e5e0e3ac65 WHIRLPOOL 84848d09d991cf1c393dee48081a507ce62d949a30d28dc8c78b1dca6d0c1a57673a7c74e325a68b5d71016f88336cea94062758441ecd46b4b74d46a5e2758f
diff --git a/net-libs/vanessa-socket/files/vanessa-socket-0.0.7-version.patch b/net-libs/vanessa-socket/files/vanessa-socket-0.0.7-version.patch
new file mode 100644
index 000000000000..d3a74677425e
--- /dev/null
+++ b/net-libs/vanessa-socket/files/vanessa-socket-0.0.7-version.patch
@@ -0,0 +1,21 @@
+--- vanessa_socket-0.0.7/libvanessa_socket/Makefile.in.chris 2004-03-23 03:11:54.000000000 +0000
++++ vanessa_socket-0.0.7/libvanessa_socket/Makefile.in 2005-01-22 00:51:14.481612464 +0000
+@@ -120,7 +120,7 @@
+ libvanessa_socket_la_SOURCES = vanessa_socket.h vanessa_socket_client.c vanessa_socket_host.c vanessa_socket_daemon.c vanessa_socket_handler.c vanessa_socket_host_port.c vanessa_socket_pipe.c vanessa_socket_port.c vanessa_socket_server.c
+
+
+-libvanessa_socket_la_LDFLAGS = -version-info 0:4:0
++libvanessa_socket_la_LDFLAGS = -version-info 0:7:0
+
+ libvanessa_socket_la_LIBADD = @extra_libs@ -lvanessa_logger
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+--- vanessa_socket-0.0.7/libvanessa_socket/Makefile.am.chris 2004-03-23 02:09:56.000000000 +0000
++++ vanessa_socket-0.0.7/libvanessa_socket/Makefile.am 2005-01-22 00:51:05.629958120 +0000
+@@ -38,6 +38,6 @@
+ vanessa_socket_port.c \
+ vanessa_socket_server.c
+
+-libvanessa_socket_la_LDFLAGS = -version-info 0:4:0
++libvanessa_socket_la_LDFLAGS = -version-info 0:7:0
+
+ libvanessa_socket_la_LIBADD = @extra_libs@ -lvanessa_logger
diff --git a/net-libs/vanessa-socket/metadata.xml b/net-libs/vanessa-socket/metadata.xml
new file mode 100644
index 000000000000..6b1d02987300
--- /dev/null
+++ b/net-libs/vanessa-socket/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/net-libs/vanessa-socket/vanessa-socket-0.0.12.ebuild b/net-libs/vanessa-socket/vanessa-socket-0.0.12.ebuild
new file mode 100644
index 000000000000..f0b7ec412d1d
--- /dev/null
+++ b/net-libs/vanessa-socket/vanessa-socket-0.0.12.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Simplifies TCP/IP socket operations"
+HOMEPAGE="http://www.vergenet.net/linux/vanessa/"
+SRC_URI="http://www.vergenet.net/linux/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+DEPEND=">=dev-libs/vanessa-logger-0.0.6"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+ econf || die "error configure"
+ emake || die "error compiling"
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "error installing"
+ dodoc README NEWS AUTHORS TODO
+}
diff --git a/net-libs/vanessa-socket/vanessa-socket-0.0.13.ebuild b/net-libs/vanessa-socket/vanessa-socket-0.0.13.ebuild
new file mode 100644
index 000000000000..ec2f97e50d6a
--- /dev/null
+++ b/net-libs/vanessa-socket/vanessa-socket-0.0.13.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Simplifies TCP/IP socket operations"
+HOMEPAGE="http://www.vergenet.net/linux/vanessa/"
+SRC_URI="http://www.vergenet.net/linux/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/vanessa-logger-0.0.6"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+ make DESTDIR="${D}" install || die "error installing"
+ dodoc README NEWS AUTHORS TODO
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
new file mode 100644
index 000000000000..724448af95f3
--- /dev/null
+++ b/net-libs/webkit-gtk/Manifest
@@ -0,0 +1,3 @@
+DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
+DIST webkitgtk-2.6.6.tar.xz 10000888 SHA256 541e114a203b0f649e89b3ad6b6fdeea1726739320a6b6a52b464cb66ea38eb9 SHA512 faac38cbd64daf180f2e2f9e7df9e1162ccd0b4f5c76b0133ef6d2b95b413b699923fda3a5026ba3c76562de59e4913c45a97cd654797867490633dd3099f5b4 WHIRLPOOL 20be78255c917ecd930e034e38053af054a4271445eaa43319f45db6fde6b369f002f2be5269a696c53200b2bf56b74959e7970932fd62f6c89e3ea1236ce72b
+DIST webkitgtk-2.8.3.tar.xz 10437676 SHA256 b3de60c8676ed54bb3d6201c742bbd702ee176fdfef5ca06f2fc514783792f16 SHA512 29a8f17d921a3015cea8e1e156c42b8f7d5504643157381888c9613a706070b2bde1435cc83048969cc24b525a3f7cd27a493d9636a4bace6bac921b2179874d WHIRLPOOL 03c6f1206203f79ae69c50dab085872a9920982ac556b7e611e114c4d5753ec31d7c6bf3ccf62ae08929886a02bff001a8ac74ad8a4e0ed96879f74539c0c3c4
diff --git a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper b/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
new file mode 100755
index 000000000000..d4f270c2fce7
--- /dev/null
+++ b/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Wrapper for $(LIBTOOL) that performs PaX marking on the dumper binary
+# generated by g-ir-scanner.
+# PaX marking code stolen from pax-utils.eclass
+
+flags=${1//-}; shift
+
+echo ${LIBTOOL} "$@"
+${LIBTOOL} "$@"
+
+retval=$?
+
+files=$(find . -path "*tmp-introspect*/.libs/*")
+
+if type -p paxctl > /dev/null; then
+ echo "PT PaX marking -${flags} ${files}"
+ for f in ${files}; do
+ # First, try modifying the existing PAX_FLAGS header
+ paxctl -q${flags} "${f}" && continue
+ # Second, try stealing the (unused under PaX) PT_GNU_STACK header
+ paxctl -qc${flags} "${f}" && continue
+ # Third, try pulling the base down a page, to create space and
+ # insert a PT_GNU_STACK header (works on ET_EXEC)
+ paxctl -qC${flags} "${f}" && continue
+ done
+elif type -p scanelf > /dev/null; then
+ # Try scanelf, the Gentoo swiss-army knife ELF utility
+ # Currently this sets PT if it can, no option to control what it does.
+ echo "Fallback PaX marking -${flags} ${files}"
+ scanelf -Xxz ${flags} ${files}
+fi
+
+exit ${retval}
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
new file mode 100644
index 000000000000..8f56ab227148
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
@@ -0,0 +1,10 @@
+--- configure.ac.old 2013-03-02 09:22:53.791750644 +0200
++++ configure.ac 2013-03-02 09:24:56.725213764 +0200
+@@ -24,6 +24,7 @@
+ m4_include([Source/autotools/SetupLibtool.m4])
+ m4_include([Source/autotools/ReadCommandLineArguments.m4])
+ m4_include([Source/autotools/FindDependencies.m4])
++GTK_DOC_CHECK([1.10])
+ m4_include([Source/autotools/SetupCompilerFlags.m4])
+ m4_include([Source/autotools/SetupAutoconfHeader.m4])
+
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
new file mode 100644
index 000000000000..5ad357e9eeed
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
@@ -0,0 +1,67 @@
+Original from:
+http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
+http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
+
+Adapted for 1.6.1
+
+--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
++++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
+@@ -70,6 +70,8 @@
+ #endif
+ #include <gtk/gtk.h>
+
++#undef XP_UNIX
++
+ #if defined(XP_UNIX)
+ #include "RefPtrCairo.h"
+ #include "gtk2xtbin.h"
+@@ -439,9 +441,9 @@
+ event->setDefaultHandled();
+ }
+
+-#if defined(XP_UNIX)
+ void PluginView::handleFocusInEvent()
+ {
++#if defined(XP_UNIX)
+ if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
+ return;
+
+@@ -454,10 +456,12 @@
+ event.detail = NotifyDetailNone;
+
+ dispatchNPEvent(npEvent);
++#endif
+ }
+
+ void PluginView::handleFocusOutEvent()
+ {
++#if defined(XP_UNIX)
+ if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
+ return;
+
+@@ -470,8 +474,8 @@
+ event.detail = NotifyDetailNone;
+
+ dispatchNPEvent(npEvent);
+-}
+ #endif
++}
+
+ void PluginView::setParent(ScrollView* parent)
+ {
+--- Source/WebCore/plugins/gtk/gtk2xtbin.c
++++ Source/WebCore/plugins/gtk/gtk2xtbin.c
+@@ -41,7 +41,7 @@
+ * The GtkXtBin widget allows for Xt toolkit code to be used
+ * inside a GTK application.
+ */
+-
++#if 0
+ #include "GtkVersioning.h"
+ #include "xembed.h"
+ #include "gtk2xtbin.h"
+@@ -966,3 +966,4 @@
+
+ return;
+ }
++#endif
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch
new file mode 100644
index 000000000000..854a11201720
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch
@@ -0,0 +1,95 @@
+Description: deadlock in gobject introspection
+Bug-Dyson: http://osdyson.org/issues/161
+Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=463960
+Stack:
+25849: /home/pashev/packaging/webkitgtk/webkitgtk-2.0.4/build-2.0/tmp-introsp
+----------------- lwp# 1 / thread# 1 --------------------
+ fffffd7ffeeaf957 lwp_park (0, 0, 0)
+ fffffd7ffeea8036 mutex_lock_impl () + 156
+ fffffd7ffeea810b mutex_lock () + b
+ fffffd7ffee340fa _preexec_atfork_unload () + 3a
+ fffffd7ffee343ab _preexec_exit_handlers () + bb
+ fffffd7fff5ccf0d purge_exit_handlers () + 10d
+ fffffd7fff5cec18 remove_hdl () + ce8
+ fffffd7fff5c8895 dlclose_core () + c5
+ fffffd7fff5c88e5 dlclose_intn () + 15
+ fffffd7fff5c89bb dlclose_check () + 7b
+ fffffd7fff5c8a21 dlclose () + 41
+ fffffd7ffaa03c41 px_module_manager_load () + 191
+ fffffd7ffaa03cf6 px_module_manager_load_dir () + 66
+ fffffd7ffaa050d7 px_proxy_factory_new () + 107
+ fffffd7ffb201671 ???????? ()
+ fffffd7feca30eca g_type_create_instance () + 16a
+ fffffd7feca1597c ???????? ()
+ fffffd7feca17472 g_object_newv () + 792
+ fffffd7feca17aec g_object_new () + ec
+ fffffd7fece5d052 ???????? ()
+ fffffd7fece5d1d8 ???????? ()
+ fffffd7fc98659a5 ???????? ()
+ fffffd7feca173f6 g_object_newv () + 716
+ fffffd7feca17aec g_object_new () + ec
+ fffffd7fc986da24 soup_session_add_feature_by_type () + e4
+ fffffd7fc986fb43 ???????? ()
+ fffffd7feca17e00 g_object_set_valist () + 300
+ fffffd7feca186d7 g_object_set () + e7
+ fffffd7fc5724f87 WebCore::ResourceHandle::defaultSession() () + a7
+ fffffd7fc48da299 webkitExit() () + 9
+ fffffd7ffee33f56 _exithandle () + 66
+ fffffd7ffee1e191 exit () + 11
+ 00000000004086af ???????? ()
+ 000000000040724c _start () + 6c
+----------------- lwp# 2 / thread# 2 --------------------
+ fffffd7ffeeaf957 lwp_park (0, 0, 0)
+ fffffd7ffeea94bf cond_wait_queue () + 4f
+ fffffd7ffeea9b12 __cond_wait () + b2
+ fffffd7ffeea9b42 cond_wait () + 22
+ fffffd7ffeea9b79 pthread_cond_wait () + 9
+ fffffd7fc4eed04b WebCore::IconDatabase::syncThreadMainLoop() () + 12b
+ fffffd7fc4eed278 WebCore::IconDatabase::iconDatabaseSyncThread() () + 138
+ fffffd7fc3b2bc59 WTF::wtfThreadEntryPoint(void*) () + 19
+ fffffd7ffeeaf617 _thrp_setup () + 77
+ fffffd7ffeeaf910 _lwp_start ()
+----------------- lwp# 3 / thread# 3 --------------------
+ fffffd7ffeeaf957 lwp_park (0, 0, 0)
+ fffffd7ffeea8036 mutex_lock_impl () + 156
+ fffffd7ffeea810b mutex_lock () + b
+ fffffd7ffee33e17 atexit_locks () + 17
+ fffffd7ffee58ce9 libc_prepare_atfork () + 9
+ fffffd7ffee34533 _prefork_handler () + 33
+ fffffd7ffee9fc85 forkx () + 275
+ fffffd7ffee9fcab fork () + b
+ fffffd7fec68aacb ???????? ()
+ fffffd7fec68b2a7 g_spawn_sync () + 167
+ fffffd7fec68b994 g_spawn_command_line_sync () + 74
+ fffffd7feceb2748 ???????? ()
+ fffffd7feceb4019 g_dbus_address_get_for_bus_sync () + 2c9
+ fffffd7fecebd11e ???????? ()
+ fffffd7fecec4643 g_bus_get_sync () + 63
+ fffffd7ffc60700b ???????? ()
+ fffffd7ffc60714f ???????? ()
+ fffffd7fec648ad0 g_main_context_dispatch () + 130
+ fffffd7fec648e40 ???????? ()
+ fffffd7fec648f08 g_main_context_iteration () + 38
+ fffffd7ffc606f65 ???????? ()
+ fffffd7fec66d50d ???????? ()
+ fffffd7ffeeaf617 _thrp_setup () + 77
+ fffffd7ffeeaf910 _lwp_start ()
+Index: webkit/Source/WebKit/gtk/webkit/webkitglobals.cpp
+===================================================================
+--- webkit.orig/Source/WebKit/gtk/webkit/webkitglobals.cpp 2013-12-02 00:06:10.504150531 +0400
++++ webkit/Source/WebKit/gtk/webkit/webkitglobals.cpp 2013-12-03 14:08:05.956932011 +0400
+@@ -564,6 +564,14 @@
+
+ WebCore::SchemeRegistry::registerURLSchemeAsLocal("resource");
+
++ // http://osdyson.org/issues/161
++ // WebKitGTK FTBFS when building GObject introspection due to deadlock.
++ // When gobject introspection is done, a simple program call exit()
++ // exit() -> webkitExit() -> g_object_unref() -> webkit_get_default_session()
++ // -> ResourceHandle::defaultSession() => default session doesn't exist! AND
++ // we try to create it! Thus deadlock. So, create default session earlier:
++ (void) webkit_get_default_session();
++
+ atexit(webkitExit);
+ }
+
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch
new file mode 100644
index 000000000000..8aee778c1bb9
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch
@@ -0,0 +1,20 @@
+Index: webkitgtk/Source/WTF/wtf/Platform.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/Platform.h
++++ webkitgtk/Source/WTF/wtf/Platform.h
+@@ -72,6 +72,15 @@
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
+
++/* CPU(HPPA) - HP PARISC */
++#if defined(__hppa__)
++#define WTF_CPU_HPPA 1
++#define WTF_CPU_BIG_ENDIAN 1
++#define ENABLE_JIT 0
++#define ENABLE_YARR_JIT 0
++#define ENABLE_ASSEMBLER 0
++#endif
++
+ /* CPU(IA64) - Itanium / IA-64 */
+ #if defined(__ia64__)
+ #define WTF_CPU_IA64 1
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch
new file mode 100644
index 000000000000..5f0542c4bd02
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch
@@ -0,0 +1,20 @@
+Description: Fix wide pointer issues on ia64 (closes: #642750).
+Author: Stephan Schreiber <info@fs-driver.org>
+Index: webkitgtk/Source/WTF/wtf/Platform.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/Platform.h
++++ webkitgtk/Source/WTF/wtf/Platform.h
+@@ -705,6 +705,13 @@
+ #define ENABLE_JIT 1
+ #endif
+
++/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
++ some memory barriers are missing in the thread-unsafe code around the
++ pagemap_cache_ object. */
++#if CPU(IA64) || CPU(IA64_32)
++#define USE_SYSTEM_MALLOC 1
++#endif
++
+ /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms. */
+ #if !defined(ENABLE_JIT) \
+ && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch
new file mode 100644
index 000000000000..a63e9e82e31a
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch
@@ -0,0 +1,12 @@
+--- a/Source/WTF/wtf/Platform.h 2014-02-25 00:33:16.561606810 +0100
++++ b/Source/WTF/wtf/Platform.h 2014-02-25 00:49:52.895512955 +0100
+@@ -79,6 +79,9 @@
+ #if !defined(__LP64__)
+ #define WTF_CPU_IA64_32 1
+ #endif
++#define ENABLE_JIT 0
++#define ENABLE_YARR_JIT 0
++#define ENABLE_ASSEMBLER 0
+ #endif
+
+ /* CPU(MIPS) - MIPS 32-bit */
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch
new file mode 100644
index 000000000000..8c387ffecb61
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch
@@ -0,0 +1,20 @@
+Description: Fix wide pointer issues on ia64 (closes: #642750).
+Author: Stephan Schreiber <info@fs-driver.org>
+Index: webkitgtk/Source/WTF/wtf/Platform.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/Platform.h
++++ webkitgtk/Source/WTF/wtf/Platform.h
+@@ -705,6 +705,13 @@
+ #define ENABLE_JIT 1
+ #endif
+
++/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
++ some memory barriers are missing in the thread-unsafe code around the
++ pagemap_cache_ object. */
++#if CPU(IA64) || CPU(IA64_32)
++#define USE_SYSTEM_MALLOC 1
++#endif
++
+ /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except Win64. */
+ #if !defined(ENABLE_JIT) \
+ && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
new file mode 100644
index 000000000000..3c0ea88b8964
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
@@ -0,0 +1,32 @@
+$OpenBSD: patch-Source_WebKit2_Platform_IPC_Connection_h,v 1.2 2014/07/14 21:13:31 ajacoutot Exp $
+https://bugs.webkit.org/show_bug.cgi?id=130837
+--- Source/WebKit2/Platform/IPC/Connection.h.orig Fri Jul 4 11:06:55 2014
++++ Source/WebKit2/Platform/IPC/Connection.h Mon Jul 14 19:31:35 2014
+@@ -216,7 +216,11 @@ class Connection : public ThreadSafeRefCounted<Connect
+
+ Client* m_client;
+ bool m_isServer;
++#if CPU(PPC)
++ uint64_t m_syncRequestID;
++#else
+ std::atomic<uint64_t> m_syncRequestID;
++#endif
+
+ bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage;
+ bool m_shouldExitOnSyncMessageSendFailure;
+$OpenBSD: patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp,v 1.3 2014/03/27 22:03:48 landry Exp $
+https://bugs.webkit.org/show_bug.cgi?id=130837
+--- Source/WebKit2/UIProcess/StatisticsRequest.cpp.orig Thu Mar 27 21:13:49 2014
++++ Source/WebKit2/UIProcess/StatisticsRequest.cpp Thu Mar 27 21:14:23 2014
+@@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest()
+
+ uint64_t StatisticsRequest::addOutstandingRequest()
+ {
++#if CPU(PPC)
++ static int64_t uniqueRequestID;
++#else
+ static std::atomic<int64_t> uniqueRequestID;
++#endif
+
+ uint64_t requestID = ++uniqueRequestID;
+ m_outstandingRequests.add(requestID);
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
new file mode 100644
index 000000000000..4226f2fb0780
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/481688
+http://trac.webkit.org/changeset/166490/trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+
+--- Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
++++ Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+@@ -334,5 +334,5 @@
+ case JPEG_HEADER:
+ // Read file parameters with jpeg_read_header().
+- if (jpeg_read_header(&m_info, true) == JPEG_SUSPENDED)
++ if (jpeg_read_header(&m_info, TRUE) == JPEG_SUSPENDED)
+ return false; // I/O suspension.
+
+@@ -420,7 +420,7 @@
+ m_info.dct_method = dctMethod();
+ m_info.dither_mode = ditherMode();
+- m_info.do_fancy_upsampling = doFancyUpsampling();
+- m_info.enable_2pass_quant = false;
+- m_info.do_block_smoothing = true;
++ m_info.do_fancy_upsampling = doFancyUpsampling() ? TRUE : FALSE;
++ m_info.enable_2pass_quant = FALSE;
++ m_info.do_block_smoothing = TRUE;
+
+ // Start decompressor.
+@@ -573,5 +573,5 @@
+ // called, then we have hit the end of the buffer. A return value of false
+ // indicates that we have no data to supply yet.
+- return false;
++ return FALSE;
+ }
+
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch
new file mode 100644
index 000000000000..67760e2878ba
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch
@@ -0,0 +1,11 @@
+--- webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp 2014-09-26 11:40:44.000000000 +0400
++++ webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp 2014-10-13 15:38:38.496444600 +0400
+@@ -17,7 +17,7 @@
+ */
+
+ #include "config.h"
+-#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS)
++#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS) || USE(EGL) || USE(GLX)
+
+ #define DISABLE_SHIMS
+ #include "OpenGLShims.h"
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-atomic-ppc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-atomic-ppc.patch
new file mode 100644
index 000000000000..af6d467e232a
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-atomic-ppc.patch
@@ -0,0 +1,48 @@
+From 7960c437511c650ad33708f4e42457118d95a13d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 19 Oct 2014 19:43:09 +0200
+Subject: [PATCH 4/4] Do not use std::atomic on PPC
+
+$OpenBSD: patch-Source_WebKit2_Platform_IPC_Connection_h,v 1.2 2014/07/14 21:13:31 ajacoutot Exp $
+
+https://bugs.webkit.org/show_bug.cgi?id=130837
+---
+ Source/WebKit2/Platform/IPC/Connection.h | 4 ++++
+ Source/WebKit2/UIProcess/StatisticsRequest.cpp | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/Source/WebKit2/Platform/IPC/Connection.h b/Source/WebKit2/Platform/IPC/Connection.h
+index b52cf1e..5597e94 100644
+--- a/Source/WebKit2/Platform/IPC/Connection.h
++++ b/Source/WebKit2/Platform/IPC/Connection.h
+@@ -233,7 +233,11 @@ private:
+
+ Client* m_client;
+ bool m_isServer;
++#if CPU(PPC)
++ uint64_t m_syncRequestID;
++#else
+ std::atomic<uint64_t> m_syncRequestID;
++#endif
+
+ bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage;
+ bool m_shouldExitOnSyncMessageSendFailure;
+diff --git a/Source/WebKit2/UIProcess/StatisticsRequest.cpp b/Source/WebKit2/UIProcess/StatisticsRequest.cpp
+index bc0a1e6..ef259d1 100644
+--- a/Source/WebKit2/UIProcess/StatisticsRequest.cpp
++++ b/Source/WebKit2/UIProcess/StatisticsRequest.cpp
+@@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest()
+
+ uint64_t StatisticsRequest::addOutstandingRequest()
+ {
++#if CPU(PPC)
++ static int64_t uniqueRequestID;
++#else
+ static std::atomic<int64_t> uniqueRequestID;
++#endif
+
+ uint64_t requestID = ++uniqueRequestID;
+ m_outstandingRequests.add(requestID);
+--
+2.1.2
+
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch
new file mode 100644
index 000000000000..06235829395c
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-hppa-platform.patch
@@ -0,0 +1,34 @@
+From 8ba68225e9ad35958197aacc03a7a1716741b14c Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 19 Oct 2014 19:37:40 +0200
+Subject: [PATCH 1/4] Fix support for HPPA
+
+Debian patches to fix support for some arches
+https://bugs.webkit.org/show_bug.cgi?id=129540
+---
+ Source/WTF/wtf/Platform.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 7712ddb..65f1379 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -71,6 +71,15 @@
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
+
++/* CPU(HPPA) - HP PARISC */
++#if defined(__hppa__)
++#define WTF_CPU_HPPA 1
++#define WTF_CPU_BIG_ENDIAN 1
++#define ENABLE_JIT 0
++#define ENABLE_YARR_JIT 0
++#define ENABLE_ASSEMBLER 0
++#endif
++
+ /* CPU(IA64) - Itanium / IA-64 */
+ #if defined(__ia64__)
+ #define WTF_CPU_IA64 1
+--
+2.1.2
+
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch
new file mode 100644
index 000000000000..0b7808bd1ace
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-malloc.patch
@@ -0,0 +1,31 @@
+From 9348d1c7fbbd9fcbb1702c0c6d81c723ec0b6879 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 19 Oct 2014 19:40:21 +0200
+Subject: [PATCH 3/4] Use system malloc for IA64
+
+https://bugs.webkit.org/show_bug.cgi?id=129542
+---
+ Source/WTF/wtf/Platform.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index d9afcd7..c4cf1d2 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -662,6 +662,13 @@
+ #endif
+ #endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */
+
++/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
++ some memory barriers are missing in the thread-unsafe code around the
++ pagemap_cache_ object. */
++#if CPU(IA64) || CPU(IA64_32)
++#define USE_SYSTEM_MALLOC 1
++#endif
++
+ /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k and Windows. */
+ #if !defined(ENABLE_JIT) \
+ && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
+--
+2.1.2
+
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch
new file mode 100644
index 000000000000..57587e91fec0
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.6.0-ia64-platform.patch
@@ -0,0 +1,26 @@
+From d98ac8c1040318e648f8417fa5ca6df66cc00b35 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 19 Oct 2014 19:38:18 +0200
+Subject: [PATCH 2/4] Fix support for IA64
+
+---
+ Source/WTF/wtf/Platform.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 65f1379..d9afcd7 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -87,6 +87,9 @@
+ #if !defined(__LP64__)
+ #define WTF_CPU_IA64_32 1
+ #endif
++#define ENABLE_JIT 0
++#define ENABLE_YARR_JIT 0
++#define ENABLE_ASSEMBLER 0
+ #endif
+
+ /* CPU(MIPS) - MIPS 32-bit */
+--
+2.1.2
+
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.1-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.1-ia64-malloc.patch
new file mode 100644
index 000000000000..57be875e6aae
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.1-ia64-malloc.patch
@@ -0,0 +1,31 @@
+From 9348d1c7fbbd9fcbb1702c0c6d81c723ec0b6879 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 19 Oct 2014 19:40:21 +0200
+Subject: [PATCH 3/4] Use system malloc for IA64
+
+https://bugs.webkit.org/show_bug.cgi?id=129542
+---
+ Source/WTF/wtf/Platform.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index d9afcd7..c4cf1d2 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -662,6 +662,13 @@
+ #endif
+ #endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */
+
++/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
++ some memory barriers are missing in the thread-unsafe code around the
++ pagemap_cache_ object. */
++#if CPU(IA64) || CPU(IA64_32)
++#define USE_SYSTEM_MALLOC 1
++#endif
++
+ /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k. */
+ #if !defined(ENABLE_JIT) \
+ && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
+--
+2.1.2
+
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
new file mode 100644
index 000000000000..b49dc036b1ef
--- /dev/null
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="coverage">Enable code coverage support</flag>
+ <flag name='egl'>Enable EGL support.</flag>
+ <flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
+ <flag name='gles2'>Enable GLESv2 support.</flag>
+ <flag name="libsecret">Enable libsecret support to store login credentials</flag>
+ <flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
new file mode 100644
index 000000000000..d58738ca35bb
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="2" # no usable subslot
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl +X"
+# bugs 372493, 416331
+REQUIRED_USE="
+ geoloc? ( introspection )
+ gles2? ( egl )
+ introspection? ( gstreamer )
+ webgl? ( ^^ ( gles2 opengl ) )
+ !webgl? ( ?? ( gles2 opengl ) )
+ || ( aqua X )
+"
+
+# use sqlite, svg by default
+RDEPEND="
+ dev-db/sqlite:3=
+ >=dev-libs/glib-2.36:2
+ >=dev-libs/icu-3.8.1-r1:=
+ >=dev-libs/libxml2-2.6:2
+ >=dev-libs/libxslt-1.1.7
+ >=media-libs/fontconfig-2.5:1.0
+ >=media-libs/freetype-2.4.2:2
+ >=media-libs/harfbuzz-0.9.7:=[icu(+)]
+ >=media-libs/libpng-1.4:0=
+ media-libs/libwebp:=
+ >=net-libs/libsoup-2.42:2.4[introspection?]
+ virtual/jpeg:0=
+ >=x11-libs/cairo-1.10:=[X]
+ >=x11-libs/gtk+-2.24.10:2[aqua?,introspection?]
+ x11-libs/libXrender
+ x11-libs/libXt
+ >=x11-libs/pango-1.30.0
+
+ egl? ( media-libs/mesa[egl] )
+ geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+ gles2? ( media-libs/mesa[gles2] )
+ gstreamer? (
+ >=media-libs/gstreamer-1.2:1.0
+ >=media-libs/gst-plugins-base-1.2:1.0 )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
+ libsecret? ( app-crypt/libsecret )
+ opengl? ( virtual/opengl )
+ spell? ( >=app-text/enchant-0.22:= )
+ webgl? (
+ x11-libs/cairo[opengl]
+ x11-libs/libXcomposite
+ x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=dev-lang/perl-5.10
+ || (
+ virtual/rubygems[ruby_targets_ruby20]
+ virtual/rubygems[ruby_targets_ruby21]
+ virtual/rubygems[ruby_targets_ruby22]
+ virtual/rubygems[ruby_targets_ruby19]
+ )
+ >=dev-libs/atk-2.8.0
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/gperf-3.0.1
+ >=sys-devel/bison-2.4.3
+ >=sys-devel/flex-2.5.34
+ || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
+ sys-devel/gettext
+ >=sys-devel/make-3.82-r4
+ virtual/pkgconfig
+
+ geoloc? ( dev-util/gdbus-codegen )
+ introspection? ( jit? ( sys-apps/paxctl ) )
+ test? (
+ dev-lang/python:2.7
+ dev-python/pygobject:3[python_targets_python2_7]
+ x11-themes/hicolor-icon-theme
+ jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+ check-reqs_pkg_pretend
+ fi
+
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+ die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+ fi
+}
+
+pkg_setup() {
+ # Check whether any of the debugging flags is enabled
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
+ replace-flags -ggdb -g
+ ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
+ ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
+ ewarn "large for current binutils releases (bug #432784) and has very"
+ ewarn "high temporary build space and memory requirements."
+ ewarn "If you really want to build ${PN} with \"-ggdb\", add"
+ ewarn "WEBKIT_GTK_GGDB=yes"
+ ewarn "to your make.conf file."
+ fi
+ einfo "You need to have at least 18GB of temporary build space available"
+ einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
+ einfo "not be enough, as the total space requirements depend on the flags"
+ einfo "(-ggdb vs -g1) and enabled features."
+ check-reqs_pkg_setup
+ fi
+
+ [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # intermediate MacPorts hack while upstream bug is not fixed properly
+ # https://bugs.webkit.org/show_bug.cgi?id=28727
+ use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
+
+ # Leave optimization level to user CFLAGS
+ # FORTIFY_SOURCE is enabled by default in Gentoo
+ sed -e 's/-O[012]//g' \
+ -e 's/-D_FORTIFY_SOURCE=2//g' \
+ -i Source/autotools/SetupCompilerFlags.m4 || die
+
+ # Failing tests
+ # * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
+ # * keyevents is interactive
+ # * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
+ # * webdatasource test needs a network connection and intermittently fails with icedtea-web
+ # * webplugindatabase intermittently fails with icedtea-web, bug #????
+# sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
+# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
+# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
+# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
+# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
+# -i Tools/TestWebKitAPI/GNUmakefile.am || die
+
+ # bug #459978, upstream bug #113397
+ epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
+
+ # Debian patches to fix support for some arches
+ # https://bugs.webkit.org/show_bug.cgi?id=129540
+ epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
+ # https://bugs.webkit.org/show_bug.cgi?id=129542
+ epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
+
+ # Fix build with recent libjpeg, bug #481688
+ # https://bugs.webkit.org/show_bug.cgi?id=122412
+ epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
+
+ # Fix building with --disable-webgl, bug #500966
+ # https://bugs.webkit.org/show_bug.cgi?id=131267
+ epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
+
+ AT_M4DIR=Source/autotools eautoreconf
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Respect CC, otherwise fails on prefix #395875
+ tc-export CC
+
+ # Arches without JIT support also need this to really disable it in all places
+ use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+ # It does not compile on alpha without this in LDFLAGS
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ # Sigbuses on SPARC with mcpu and co., bug #???
+ use sparc && filter-flags "-mvis"
+
+ # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+ use ppc64 && append-flags "-mminimal-toc"
+
+ # Try to use less memory, bug #469942 (see Fedora .spec for reference)
+ # --no-keep-memory doesn't work on ia64, bug #502492
+ if ! use ia64; then
+ append-ldflags "-Wl,--no-keep-memory"
+ fi
+ if ! $(tc-getLD) --version | grep -q "GNU gold"; then
+ append-ldflags "-Wl,--reduce-memory-overheads"
+ fi
+
+ local ruby_interpreter=""
+
+ if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+ ruby_interpreter="RUBY=$(type -P ruby22)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+ ruby_interpreter="RUBY=$(type -P ruby21)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+ ruby_interpreter="RUBY=$(type -P ruby20)"
+ else
+ ruby_interpreter="RUBY=$(type -P ruby19)"
+ fi
+
+ # TODO: Check Web Audio support
+ # should somehow let user select between them?
+ #
+ # * dependency-tracking is required so parallel builds won't fail
+ gnome2_src_configure \
+ $(use_enable aqua quartz-target) \
+ $(use_enable coverage) \
+ $(use_enable debug) \
+ $(use_enable egl) \
+ $(use_enable geoloc geolocation) \
+ $(use_enable gles2) \
+ $(use_enable gstreamer video) \
+ $(use_enable gstreamer web-audio) \
+ $(use_enable introspection) \
+ $(use_enable jit) \
+ $(use_enable libsecret credential_storage) \
+ $(use_enable opengl glx) \
+ $(use_enable spell spellcheck) \
+ $(use_enable webgl) \
+ $(use_enable webgl accelerated-compositing) \
+ $(use_enable X x11-target) \
+ --with-gtk=2.0 \
+ --disable-webkit2 \
+ --enable-dependency-tracking \
+ --disable-gtk-doc \
+ ${ruby_interpreter}
+}
+
+src_compile() {
+ # Try to avoid issues like bug #463960
+ unset DISPLAY
+ gnome2_src_compile
+}
+
+src_test() {
+ # Tests expect an out-of-source build in WebKitBuild
+ ln -s . WebKitBuild || die "ln failed"
+
+ # Prevents test failures on PaX systems
+ use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+ unset DISPLAY
+ # Tests need virtualx, bug #294691, bug #310695
+ # Parallel tests sometimes fail
+ Xemake -j1 check
+}
+
+src_install() {
+ DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+ # https://bugs.webkit.org/show_bug.cgi?id=129242
+ MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+
+ newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+ newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+ newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+ # Prevents crashes on PaX systems
+ use jit && pax-mark m "${ED}usr/bin/jsc-1"
+
+ # File collisions with slot 3
+ # bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
+ rm -rf "${ED}usr/share/gtk-doc" || die
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
new file mode 100644
index 000000000000..dcf3c4515295
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="3/25" # soname version of libwebkit2gtk-3.0
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
+# bugs 372493, 416331
+REQUIRED_USE="
+ geoloc? ( introspection )
+ gles2? ( egl )
+ introspection? ( gstreamer )
+ webgl? ( ^^ ( gles2 opengl ) )
+ !webgl? ( ?? ( gles2 opengl ) )
+ || ( aqua wayland X )
+"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support
+# gtk3-3.10 required for wayland
+RDEPEND="
+ dev-db/sqlite:3=
+ >=dev-libs/glib-2.36:2
+ >=dev-libs/icu-3.8.1-r1:=
+ >=dev-libs/libxml2-2.6:2
+ >=dev-libs/libxslt-1.1.7
+ >=media-libs/fontconfig-2.5:1.0
+ >=media-libs/freetype-2.4.2:2
+ >=media-libs/harfbuzz-0.9.7:=[icu(+)]
+ >=media-libs/libpng-1.4:0=
+ media-libs/libwebp:=
+ >=net-libs/libsoup-2.42:2.4[introspection?]
+ virtual/jpeg:0=
+ >=x11-libs/cairo-1.10:=[X?]
+ >=x11-libs/gtk+-3.6.0:3[X?,aqua?,introspection?]
+ >=x11-libs/pango-1.30.0
+
+ >=x11-libs/gtk+-2.24.10:2
+
+ egl? ( media-libs/mesa[egl] )
+ geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+ gles2? ( media-libs/mesa[gles2] )
+ gstreamer? (
+ >=media-libs/gstreamer-1.2:1.0
+ >=media-libs/gst-plugins-base-1.2:1.0 )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
+ libsecret? ( app-crypt/libsecret )
+ opengl? ( virtual/opengl )
+ spell? ( >=app-text/enchant-0.22:= )
+ wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
+ webgl? (
+ x11-libs/cairo[opengl]
+ x11-libs/libXcomposite
+ x11-libs/libXdamage )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=dev-lang/perl-5.10
+ || (
+ virtual/rubygems[ruby_targets_ruby20]
+ virtual/rubygems[ruby_targets_ruby21]
+ virtual/rubygems[ruby_targets_ruby22]
+ virtual/rubygems[ruby_targets_ruby19]
+ )
+ >=app-accessibility/at-spi2-core-2.5.3
+ >=dev-libs/atk-2.8.0
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/gperf-3.0.1
+ >=sys-devel/bison-2.4.3
+ >=sys-devel/flex-2.5.34
+ || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
+ sys-devel/gettext
+ >=sys-devel/make-3.82-r4
+ virtual/pkgconfig
+
+ geoloc? ( dev-util/gdbus-codegen )
+ introspection? ( jit? ( sys-apps/paxctl ) )
+ test? (
+ dev-lang/python:2.7
+ dev-python/pygobject:3[python_targets_python2_7]
+ x11-themes/hicolor-icon-theme
+ jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+ check-reqs_pkg_pretend
+ fi
+
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+ die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+ fi
+}
+
+pkg_setup() {
+ # Check whether any of the debugging flags is enabled
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
+ replace-flags -ggdb -g
+ ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
+ ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
+ ewarn "large for current binutils releases (bug #432784) and has very"
+ ewarn "high temporary build space and memory requirements."
+ ewarn "If you really want to build ${PN} with \"-ggdb\", add"
+ ewarn "WEBKIT_GTK_GGDB=yes"
+ ewarn "to your make.conf file."
+ fi
+ einfo "You need to have at least 18GB of temporary build space available"
+ einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
+ einfo "not be enough, as the total space requirements depend on the flags"
+ einfo "(-ggdb vs -g1) and enabled features."
+ check-reqs_pkg_setup
+ fi
+
+ [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # intermediate MacPorts hack while upstream bug is not fixed properly
+ # https://bugs.webkit.org/show_bug.cgi?id=28727
+ use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
+
+ # Leave optimization level to user CFLAGS
+ # FORTIFY_SOURCE is enabled by default in Gentoo
+ sed -e 's/-O[012]//g' \
+ -e 's/-D_FORTIFY_SOURCE=2//g' \
+ -i Source/autotools/SetupCompilerFlags.m4 || die
+
+ # Failing tests
+ # * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
+ # * keyevents is interactive
+ # * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
+ # * webdatasource test needs a network connection and intermittently fails with icedtea-web
+ # * webplugindatabase intermittently fails with icedtea-web, bug #????
+# sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
+# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
+# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
+# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
+# -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
+# -i Tools/TestWebKitAPI/GNUmakefile.am || die
+
+ # bug #459978, upstream bug #113397
+ epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
+
+ # Debian patches to fix support for some arches
+ # https://bugs.webkit.org/show_bug.cgi?id=129540
+ epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
+ # https://bugs.webkit.org/show_bug.cgi?id=129542
+ epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
+
+ # Fix building on ppc (from OpenBSD, only needed on slot 3)
+ # https://bugs.webkit.org/show_bug.cgi?id=130837
+ epatch "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
+
+ # Fix build with recent libjpeg, bug #481688
+ # https://bugs.webkit.org/show_bug.cgi?id=122412
+ epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
+
+ # Fix building with --disable-webgl, bug #500966
+ # https://bugs.webkit.org/show_bug.cgi?id=131267
+ epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
+
+ AT_M4DIR=Source/autotools eautoreconf
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Respect CC, otherwise fails on prefix #395875
+ tc-export CC
+
+ # Arches without JIT support also need this to really disable it in all places
+ use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+ # It does not compile on alpha without this in LDFLAGS
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ # Sigbuses on SPARC with mcpu and co., bug #???
+ use sparc && filter-flags "-mvis"
+
+ # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+ use ppc64 && append-flags "-mminimal-toc"
+
+ # Try to use less memory, bug #469942 (see Fedora .spec for reference)
+ # --no-keep-memory doesn't work on ia64, bug #502492
+ if ! use ia64; then
+ append-ldflags "-Wl,--no-keep-memory"
+ fi
+ if ! $(tc-getLD) --version | grep -q "GNU gold"; then
+ append-ldflags "-Wl,--reduce-memory-overheads"
+ fi
+
+ local ruby_interpreter=""
+
+ if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+ ruby_interpreter="RUBY=$(type -P ruby22)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+ ruby_interpreter="RUBY=$(type -P ruby21)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+ ruby_interpreter="RUBY=$(type -P ruby20)"
+ else
+ ruby_interpreter="RUBY=$(type -P ruby19)"
+ fi
+
+ # TODO: Check Web Audio support
+ # should somehow let user select between them?
+ #
+ # * Aqua support in gtk3 is untested
+ # * dependency-tracking is required so parallel builds won't fail
+ gnome2_src_configure \
+ $(use_enable aqua quartz-target) \
+ $(use_enable coverage) \
+ $(use_enable debug) \
+ $(use_enable egl) \
+ $(use_enable geoloc geolocation) \
+ $(use_enable gles2) \
+ $(use_enable gstreamer video) \
+ $(use_enable gstreamer web-audio) \
+ $(use_enable introspection) \
+ $(use_enable jit) \
+ $(use_enable libsecret credential_storage) \
+ $(use_enable opengl glx) \
+ $(use_enable spell spellcheck) \
+ $(use_enable webgl) \
+ $(use_enable webgl accelerated-compositing) \
+ $(use_enable wayland wayland-target) \
+ $(use_enable X x11-target) \
+ --with-gtk=3.0 \
+ --enable-dependency-tracking \
+ --disable-gtk-doc \
+ ${ruby_interpreter}
+}
+
+src_compile() {
+ # Try to avoid issues like bug #463960
+ unset DISPLAY
+ gnome2_src_compile
+}
+
+src_test() {
+ # Tests expect an out-of-source build in WebKitBuild
+ ln -s . WebKitBuild || die "ln failed"
+
+ # Prevents test failures on PaX systems
+ use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+ unset DISPLAY
+ # Tests need virtualx, bug #294691, bug #310695
+ # Parallel tests sometimes fail
+ Xemake -j1 check
+}
+
+src_install() {
+ DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+ # https://bugs.webkit.org/show_bug.cgi?id=129242
+ MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+
+ newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+ newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+ newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+ # Prevents crashes on PaX systems, bug #522808
+ use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess"
+ pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
new file mode 100644
index 000000000000..0f23ff9e944f
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_MAKEFILE_GENERATOR="ninja"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="coverage doc +egl +geoloc +gstreamer +introspection +jit libsecret +opengl spell +webgl"
+# gles2 wayland X
+# bugs 372493, 416331
+REQUIRED_USE="
+ geoloc? ( introspection )
+ introspection? ( gstreamer )
+ webgl? ( opengl )
+"
+# gles2? ( egl )
+# webgl? ( ^^ ( gles2 opengl ) )
+# !webgl? ( ?? ( gles2 opengl ) )
+# || ( wayland X )
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support, should we add a USE flag to configure this?
+# gtk3-3.10 required for wayland
+RDEPEND="
+ dev-db/sqlite:3=
+ >=dev-libs/glib-2.36:2
+ >=dev-libs/icu-3.8.1-r1:=
+ >=dev-libs/libxml2-2.8:2
+ >=dev-libs/libxslt-1.1.7
+ >=media-libs/fontconfig-2.8:1.0
+ >=media-libs/freetype-2.4.2:2
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ >=media-libs/libpng-1.4:0=
+ media-libs/libwebp:=
+ >=net-libs/libsoup-2.42:2.4[introspection?]
+ virtual/jpeg:0=
+ >=x11-libs/cairo-1.10.2:=[X]
+ >=x11-libs/gtk+-3.6.0:3[X,introspection?]
+ >=x11-libs/pango-1.30.0
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-libs/libXt
+
+ >=x11-libs/gtk+-2.24.10:2
+
+ egl? ( media-libs/mesa[egl] )
+ geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+ gstreamer? (
+ >=media-libs/gstreamer-1.2:1.0
+ >=media-libs/gst-plugins-base-1.2:1.0 )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
+ libsecret? ( app-crypt/libsecret )
+ opengl? ( virtual/opengl )
+ spell? ( >=app-text/enchant-0.22:= )
+ webgl? (
+ x11-libs/cairo[opengl]
+ x11-libs/libXcomposite
+ x11-libs/libXdamage )
+"
+# gles2? ( media-libs/mesa[gles2] )
+# wayland? ( >=x11-libs/gtk+-3.12:3[wayland] )
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=dev-lang/perl-5.10
+ || (
+ virtual/rubygems[ruby_targets_ruby20]
+ virtual/rubygems[ruby_targets_ruby21]
+ virtual/rubygems[ruby_targets_ruby22]
+ virtual/rubygems[ruby_targets_ruby19]
+ )
+ >=app-accessibility/at-spi2-core-2.5.3
+ >=dev-libs/atk-2.8.0
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/gperf-3.0.1
+ >=sys-devel/bison-2.4.3
+ >=sys-devel/flex-2.5.34
+ || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
+ sys-devel/gettext
+ virtual/pkgconfig
+
+ doc? ( >=dev-util/gtk-doc-1.10 )
+ geoloc? ( dev-util/gdbus-codegen )
+ introspection? ( jit? ( sys-apps/paxctl ) )
+ test? (
+ dev-lang/python:2.7
+ dev-python/pygobject:3[python_targets_python2_7]
+ x11-themes/hicolor-icon-theme
+ jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+ check-reqs_pkg_pretend
+ fi
+
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+ die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+ fi
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ check-reqs_pkg_setup
+ fi
+
+ [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Debian patches to fix support for some arches
+ # https://bugs.webkit.org/show_bug.cgi?id=129540
+ epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch
+ # https://bugs.webkit.org/show_bug.cgi?id=129542
+ epatch "${FILESDIR}"/${PN}-2.6.0-ia64-malloc.patch
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Respect CC, otherwise fails on prefix #395875
+ tc-export CC
+
+ # Arches without JIT support also need this to really disable it in all places
+ use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+ # It does not compile on alpha without this in LDFLAGS
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ # Sigbuses on SPARC with mcpu and co., bug #???
+ use sparc && filter-flags "-mvis"
+
+ # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+ use ppc64 && append-flags "-mminimal-toc"
+
+ # Try to use less memory, bug #469942 (see Fedora .spec for reference)
+ # --no-keep-memory doesn't work on ia64, bug #502492
+ if ! use ia64; then
+ append-ldflags "-Wl,--no-keep-memory"
+ fi
+ if ! $(tc-getLD) --version | grep -q "GNU gold"; then
+ append-ldflags "-Wl,--reduce-memory-overheads"
+ fi
+
+ # older glibc needs this for INTPTR_MAX, bug #533976
+ if has_version "<sys-libs/glibc-2.18" ; then
+ append-cppflags "-D__STDC_LIMIT_MACROS"
+ fi
+
+ local ruby_interpreter=""
+
+ if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+ ruby_interpreter="RUBY=$(type -P ruby22)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+ ruby_interpreter="RUBY=$(type -P ruby21)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+ ruby_interpreter="RUBY=$(type -P ruby20)"
+ else
+ ruby_interpreter="RUBY=$(type -P ruby19)"
+ fi
+
+ # TODO: Check Web Audio support
+ # should somehow let user select between them?
+ #
+ # FTL_JIT requires llvm + libcxxabi
+ # $(cmake-utils_use_enable wayland WAYLAND_TARGET)
+ # $(cmake-utils_use_enable X X11_TARGET)
+ # $(cmake-utils_use_find_package gles2 OpenGLES2)
+ local mycmakeargs=(
+ $(cmake-utils_use_enable test API_TESTS)
+ $(cmake-utils_use_enable doc GTKDOC)
+ $(cmake-utils_use_enable geoloc GEOLOCATION)
+ $(cmake-utils_use_enable gstreamer VIDEO)
+ $(cmake-utils_use_enable gstreamer WEB_AUDIO)
+ $(cmake-utils_use_enable introspection)
+ $(cmake-utils_use_enable jit)
+ $(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE)
+ $(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
+ $(cmake-utils_use_enable webgl WEBGL)
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ -DCMAKE_BUILD_TYPE=Release
+ -DENABLE_X11_TARGET=ON
+ -DPORT=GTK
+ -DENABLE_PLUGIN_PROCESS_GTK2=ON
+ ${ruby_interpreter}
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_test() {
+ # Prevents test failures on PaX systems
+ use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+ cmake-utils_src_test
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # Prevents crashes on PaX systems, bug #522808
+ use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2}
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
new file mode 100644
index 000000000000..b70a7890dbbb
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_MAKEFILE_GENERATOR="ninja"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="coverage doc +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl X"
+REQUIRED_USE="
+ geoloc? ( introspection )
+ gles2? ( egl )
+ introspection? ( gstreamer )
+ webgl? ( ^^ ( gles2 opengl ) )
+ !webgl? ( ?? ( gles2 opengl ) )
+ || ( wayland X )
+"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support, should we add a USE flag to configure this?
+RDEPEND="
+ dev-db/sqlite:3=
+ >=dev-libs/glib-2.36:2
+ >=dev-libs/icu-3.8.1-r1:=
+ >=dev-libs/libxml2-2.8:2
+ >=dev-libs/libxslt-1.1.7
+ >=media-libs/fontconfig-2.8:1.0
+ >=media-libs/freetype-2.4.2:2
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ >=media-libs/libpng-1.4:0=
+ media-libs/libwebp:=
+ >=net-libs/gnutls-3
+ >=net-libs/libsoup-2.42:2.4[introspection?]
+ virtual/jpeg:0=
+ >=x11-libs/cairo-1.10.2:=
+ >=x11-libs/gtk+-3.14:3[introspection?]
+ x11-libs/libnotify
+ >=x11-libs/pango-1.30.0
+
+ >=x11-libs/gtk+-2.24.10:2
+
+ egl? ( media-libs/mesa[egl] )
+ geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+ gles2? ( media-libs/mesa[gles2] )
+ gstreamer? (
+ >=media-libs/gstreamer-1.2:1.0
+ >=media-libs/gst-plugins-base-1.2:1.0 )
+ introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
+ libsecret? ( app-crypt/libsecret )
+ opengl? ( virtual/opengl )
+ spell? ( >=app-text/enchant-0.22:= )
+ wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+ webgl? (
+ x11-libs/cairo[opengl]
+ x11-libs/libXcomposite
+ x11-libs/libXdamage )
+ X? (
+ x11-libs/cairo[X]
+ >=x11-libs/gtk+-3.14:3[X]
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=dev-lang/perl-5.10
+ || (
+ virtual/rubygems[ruby_targets_ruby20]
+ virtual/rubygems[ruby_targets_ruby21]
+ virtual/rubygems[ruby_targets_ruby22]
+ virtual/rubygems[ruby_targets_ruby19]
+ )
+ >=app-accessibility/at-spi2-core-2.5.3
+ >=dev-libs/atk-2.8.0
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/gperf-3.0.1
+ >=sys-devel/bison-2.4.3
+ >=sys-devel/flex-2.5.34
+ || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
+ sys-devel/gettext
+ virtual/pkgconfig
+
+ doc? ( >=dev-util/gtk-doc-1.10 )
+ geoloc? ( dev-util/gdbus-codegen )
+ introspection? ( jit? ( sys-apps/paxctl ) )
+ test? (
+ dev-lang/python:2.7
+ dev-python/pygobject:3[python_targets_python2_7]
+ x11-themes/hicolor-icon-theme
+ jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+ check-reqs_pkg_pretend
+ fi
+
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+ die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+ fi
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ check-reqs_pkg_setup
+ fi
+
+ [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Debian patches to fix support for some arches
+ # https://bugs.webkit.org/show_bug.cgi?id=129540
+ epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch
+ # https://bugs.webkit.org/show_bug.cgi?id=129542
+ epatch "${FILESDIR}"/${PN}-2.8.1-ia64-malloc.patch
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Respect CC, otherwise fails on prefix #395875
+ tc-export CC
+
+ # Arches without JIT support also need this to really disable it in all places
+ use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+ # It does not compile on alpha without this in LDFLAGS
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ # Sigbuses on SPARC with mcpu and co., bug #???
+ use sparc && filter-flags "-mvis"
+
+ # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+ use ppc64 && append-flags "-mminimal-toc"
+
+ # Try to use less memory, bug #469942 (see Fedora .spec for reference)
+ # --no-keep-memory doesn't work on ia64, bug #502492
+ if ! use ia64; then
+ append-ldflags "-Wl,--no-keep-memory"
+ fi
+ if ! $(tc-getLD) --version | grep -q "GNU gold"; then
+ append-ldflags "-Wl,--reduce-memory-overheads"
+ fi
+
+ # older glibc needs this for INTPTR_MAX, bug #533976
+ if has_version "<sys-libs/glibc-2.18" ; then
+ append-cppflags "-D__STDC_LIMIT_MACROS"
+ fi
+
+ # Multiple rendering bugs on youtube, github, etc without this, bug #547224
+ append-flags $(test-flags -fno-strict-aliasing)
+
+ local ruby_interpreter=""
+
+ if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+ ruby_interpreter="RUBY=$(type -P ruby22)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+ ruby_interpreter="RUBY=$(type -P ruby21)"
+ elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+ ruby_interpreter="RUBY=$(type -P ruby20)"
+ else
+ ruby_interpreter="RUBY=$(type -P ruby19)"
+ fi
+
+ # TODO: Check Web Audio support
+ # should somehow let user select between them?
+ #
+ # FTL_JIT requires llvm
+ local mycmakeargs=(
+ $(cmake-utils_use_enable test API_TESTS)
+ $(cmake-utils_use_enable doc GTKDOC)
+ $(cmake-utils_use_enable geoloc GEOLOCATION)
+ $(cmake-utils_use_find_package gles2 OpenGLES2)
+ $(cmake-utils_use_enable gstreamer VIDEO)
+ $(cmake-utils_use_enable gstreamer WEB_AUDIO)
+ $(cmake-utils_use_enable introspection)
+ $(cmake-utils_use_enable jit)
+ $(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE)
+ $(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
+ $(cmake-utils_use_enable wayland WAYLAND_TARGET)
+ $(cmake-utils_use_enable webgl WEBGL)
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ $(cmake-utils_use_enable X X11_TARGET)
+ -DCMAKE_BUILD_TYPE=Release
+ -DPORT=GTK
+ -DENABLE_PLUGIN_PROCESS_GTK2=ON
+ ${ruby_interpreter}
+ )
+ if $(tc-getLD) --version | grep -q "GNU gold"; then
+ mycmakeargs+=( -DUSE_LD_GOLD=ON )
+ else
+ mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_test() {
+ # Prevents test failures on PaX systems
+ use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+ cmake-utils_src_test
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # Prevents crashes on PaX systems, bug #522808
+ use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+ pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2}
+}
diff --git a/net-libs/wt/Manifest b/net-libs/wt/Manifest
new file mode 100644
index 000000000000..c619f6fb4011
--- /dev/null
+++ b/net-libs/wt/Manifest
@@ -0,0 +1,2 @@
+DIST wt-3.2.2-p1.tar.gz 17312758 SHA256 1610b1950eda3614a12e915f5968d7b8659eb17231622681c9a1eafc586c8f05 SHA512 4ffce2ab65fc8286a9d54194cdd4efaa521245f78fa6cce9b24694611cbf392b7d8072e02c8d75115f40594893086c5646ec3926f2e8c8e404369bdd30df0164 WHIRLPOOL 48d2cd14866a510350cec6afce18466abaa9cc12af8b55bc6986ca89fbd5f8998b1ce328cac0b706b06fc497e4580d444cfd64e0553d72e90573cc3aa9558d93
+DIST wt-3.3.1.tar.gz 30754232 SHA256 9725707ec6de24b69d2e7528974fb0a3c324ff69ce94a609653be8783c7777d2 SHA512 065a47b68f0fc1a5c324eee7be4db30a21a9b42be592dc9276f5cec5af66fc02ef1a97363c2ba9b3e9da86a6deb3db9d22c8a2a81ec34e2daf40eb86ed70017c WHIRLPOOL 1a2ade13a23f3b48f92187b61a6ca07c5dd1c44165bc68e15cb40eb81c6077d325689f3bbc2b44b2ce2c365934a53c88bec6930513dfebdb617e32deca30f3e3
diff --git a/net-libs/wt/files/cmakelist.patch b/net-libs/wt/files/cmakelist.patch
new file mode 100644
index 000000000000..a121d00ff9cc
--- /dev/null
+++ b/net-libs/wt/files/cmakelist.patch
@@ -0,0 +1,5 @@
+--- CMakeLists.txt 2012-07-04 00:50:36.000000000 -0700
++++ CMakeLists-new 2012-10-02 11:25:05.860077447 -0700
+@@ -451 +451 @@ IF(NOT EXISTS ${DESTDIR}${CONFIGDIR}/wt_
+- INSTALL(FILES ${WT_BINARY_DIR}/wt_config.xml DESTINATION ${DESTDIR}${CONFIGDIR})
++ INSTALL(FILES ${WT_BINARY_DIR}/wt_config.xml DESTINATION ${CONFIGDIR})
diff --git a/net-libs/wt/files/wt-fix-automagic.patch b/net-libs/wt/files/wt-fix-automagic.patch
new file mode 100644
index 000000000000..ea7ca59b90a1
--- /dev/null
+++ b/net-libs/wt/files/wt-fix-automagic.patch
@@ -0,0 +1,282 @@
+From 414ad3a07f4bb9a4a6678d25e992d337771684b3 Mon Sep 17 00:00:00 2001
+From: Nikoli <nikoli@lavabit.com>
+Date: Wed, 22 Sep 2010 08:18:48 +0400
+Subject: [PATCH] cmake: fix automagic, config installation; make examples and resources optional
+
+---
+ CMakeLists.txt | 30 ++++++++++++++++++----------
+ examples/mandelbrot/CMakeLists.txt | 6 ++--
+ examples/style/CMakeLists.txt | 6 ++--
+ src/CMakeLists.txt | 28 +++++++++++++++-----------
+ src/Wt/CMakeLists.txt | 12 ++++++++++-
+ src/Wt/Dbo/backend/CMakeLists.txt | 17 ++++++++++++---
+ test/CMakeLists.txt | 37 +++++++++++++++++++++--------------
+ 7 files changed, 87 insertions(+), 49 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 896bd2d..9c6f679 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,6 +27,10 @@ SET(WTDBOPOSTGRES_SOVERSION 23)
+ #
+ # Various things that must be configured by the user or packager ...
+ #
++option(BUILD_EXAMPLES "Build examples" OFF)
++option(INSTALL_RESOURCES "Install resources directory" ON)
++option(ENABLE_GM "Enable GraphicsMagick, for supporting painting to raster images (PNG, GIF, ...) (WRasterImage)" ON)
++option(ENABLE_HARU "Enable Haru Free PDF Library, which is used to provide support for painting to PDF (WPdfImage)" ON)
+
+ IF(NOT SHARED_LIBS)
+ IF(WIN32)
+@@ -296,11 +300,11 @@ IF (DOXYGEN_FOUND)
+ ADD_DEPENDENCIES(doc doxygen-examples)
+ ENDIF (DOXYGEN_FOUND)
+
+-IF(WIN32)
+- SUBDIRS(src examples)
+-ELSE(WIN32)
+- SUBDIRS(src EXCLUDE_FROM_ALL examples)
+-ENDIF(WIN32)
++SUBDIRS(src)
++
++IF(BUILD_EXAMPLES)
++ SUBDIRS(examples)
++ENDIF(BUILD_EXAMPLES)
+
+ IF(BUILD_TESTS)
+ SUBDIRS(test)
+@@ -313,20 +317,24 @@ ENDIF( NOT DEFINED WT_CMAKE_FINDER_INSTALL_DIR)
+ INSTALL(FILES ${PROJECT_SOURCE_DIR}/cmake/FindWt.cmake DESTINATION
+ ${CMAKE_INSTALL_PREFIX}/${WT_CMAKE_FINDER_INSTALL_DIR} )
+
++IF(INSTALL_RESOURCES)
+ INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/resources DESTINATION
+ ${CMAKE_INSTALL_PREFIX}/share/Wt/)
++ENDIF(INSTALL_RESOURCES)
+
+-IF(NOT EXISTS ${CONFIGDIR}/wt_config.xml)
++IF(NOT EXISTS ${DESTDIR}${CONFIGDIR}/wt_config.xml)
+ INSTALL(FILES ${WT_BINARY_DIR}/wt_config.xml DESTINATION ${CONFIGDIR})
+-ENDIF (NOT EXISTS ${CONFIGDIR}/wt_config.xml)
++ENDIF (NOT EXISTS ${DESTDIR}${CONFIGDIR}/wt_config.xml)
+
+-IF(HARU_FOUND)
++IF(ENABLE_HARU AND HARU_FOUND)
++ SET(HAVE_HARU ON)
+ SET(WT_HAS_WPDFIMAGE true)
+-ENDIF(HARU_FOUND)
++ENDIF(ENABLE_HARU AND HARU_FOUND)
+
+-IF(GM_FOUND)
++IF(ENABLE_GM AND GM_FOUND)
++ SET(HAVE_GM ON)
+ SET(WT_HAS_WRASTERIMAGE true)
+-ENDIF(GM_FOUND)
++ENDIF(ENABLE_GM AND GM_FOUND)
+
+ # Compile time constants & make sure our build finds it
+ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Wt)
+diff --git a/examples/mandelbrot/CMakeLists.txt b/examples/mandelbrot/CMakeLists.txt
+index 176cab6..64b8ff7 100644
+--- a/examples/mandelbrot/CMakeLists.txt
++++ b/examples/mandelbrot/CMakeLists.txt
+@@ -1,6 +1,6 @@
+-IF(NOT GM_FOUND)
++IF(NOT HAVE_GM)
+ MESSAGE(STATUS "** Not building mandelbrot example: requires Wt::WRasterImage.")
+-ELSE(NOT GM_FOUND)
++ELSE(NOT HAVE_GM)
+
+ WT_ADD_EXAMPLE(mandelbrot.wt MandelbrotImage.C MandelbrotExample.C)
+
+@@ -11,5 +11,5 @@ ELSE(NOT GM_FOUND)
+
+ ADD_DEPENDENCIES(mandelbrot.wt wt ${EXAMPLES_CONNECTOR})
+
+-ENDIF(NOT GM_FOUND)
++ENDIF(NOT HAVE_GM)
+
+diff --git a/examples/style/CMakeLists.txt b/examples/style/CMakeLists.txt
+index 6443035..04a71f7 100644
+--- a/examples/style/CMakeLists.txt
++++ b/examples/style/CMakeLists.txt
+@@ -1,8 +1,8 @@
+-IF(NOT GM_FOUND)
++IF(NOT HAVE_GM)
+
+ MESSAGE(STATUS "** Not building style example: requires WRasterImage.")
+
+-ELSE(NOT GM_FOUND)
++ELSE(NOT HAVE_GM)
+
+ WT_ADD_EXAMPLE(styleexample.wt CornerImage.C RoundedWidget.C StyleExample.C)
+
+@@ -12,5 +12,5 @@ ELSE(NOT GM_FOUND)
+
+ ADD_DEPENDENCIES(styleexample.wt wt ${EXAMPLES_CONNECTOR})
+
+-ENDIF(NOT GM_FOUND)
++ENDIF(NOT HAVE_GM)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7d11b67..4523540 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -238,33 +238,37 @@ IF (MULTI_THREADED_BUILD)
+ SET(libsources ${libsources} web/SocketNotifier.C)
+ ENDIF(MULTI_THREADED_BUILD)
+
+-IF(HARU_FOUND)
++IF(HAVE_HARU)
+ SET(libsources ${libsources} Wt/WPdfImage.C)
+-ENDIF(HARU_FOUND)
++ENDIF(HAVE_HARU)
+
+-IF(GM_FOUND)
++IF(HAVE_GM)
+ SET(libsources ${libsources} Wt/WRasterImage.C)
+-ENDIF(GM_FOUND)
++ENDIF(HAVE_GM)
+
+ ADD_LIBRARY(wt ${libsources})
+ TARGET_LINK_LIBRARIES(wt ${BOOST_WT_LIBRARIES})
+
+-IF(HARU_FOUND)
++IF(HAVE_HARU)
+ TARGET_LINK_LIBRARIES(wt ${HARU_LIBRARIES})
+ INCLUDE_DIRECTORIES(${HARU_INCLUDE_DIRS})
+-ELSE(HARU_FOUND)
++ELSE(HAVE_HARU)
+ MESSAGE("** Disabling PDF support (WPdfImage): requires libharu.")
+- MESSAGE(" Indicate the location of your haru library using -DHARU_PREFIX=...")
+-ENDIF(HARU_FOUND)
++ IF(ENABLE_HARU)
++ MESSAGE(" Indicate the location of your haru library using -DHARU_PREFIX=...")
++ ENDIF(ENABLE_HARU)
++ENDIF(HAVE_HARU)
+
+-IF(GM_FOUND)
++IF(HAVE_GM)
+ TARGET_LINK_LIBRARIES(wt ${GM_LIBRARIES})
+ INCLUDE_DIRECTORIES(${GM_INCLUDE_DIRS})
+ ADD_DEFINITIONS(-DHAVE_RASTER_IMAGE)
+-ELSE(GM_FOUND)
++ELSE(HAVE_GM)
+ MESSAGE("** Disabling raster image support (WRasterImage): requires graphicsmagick.")
+- MESSAGE(" Indicate the location of your graphicsmagick library using -DGM_PREFIX=...")
+-ENDIF(GM_FOUND)
++ IF(ENABLE_GM)
++ MESSAGE(" Indicate the location of your graphicsmagick library using -DGM_PREFIX=...")
++ ENDIF(ENABLE_GM)
++ENDIF(HAVE_GM)
+
+ IF(MULTI_THREADED_BUILD)
+ TARGET_LINK_LIBRARIES(wt ${CMAKE_THREAD_LIBS_INIT})
+diff --git a/src/Wt/CMakeLists.txt b/src/Wt/CMakeLists.txt
+index d5a3c58..67faae8 100644
+--- a/src/Wt/CMakeLists.txt
++++ b/src/Wt/CMakeLists.txt
+@@ -1,4 +1,14 @@
+-SUBDIRS(Dbo Ext Chart Http Test)
++SUBDIRS(Chart Http Test)
++
++# FIXME we should use (HAVE_SQLITE OR HAVE_POSTGRES)
++IF(ENABLE_SQLITE OR ENABLE_POSTGRES)
++ SUBDIRS(Dbo)
++ENDIF(ENABLE_SQLITE OR ENABLE_POSTGRES)
++
++option(ENABLE_EXT "Build Wt Ext library with JavaScript-only widgets (http://extjs.com/)" ON)
++IF(ENABLE_EXT)
++ SUBDIRS(Ext)
++ENDIF(ENABLE_EXT)
+
+ INSTALL_FILES(/include/Wt "^W.*[^C~]$")
+ #INSTALL(
+diff --git a/src/Wt/Dbo/backend/CMakeLists.txt b/src/Wt/Dbo/backend/CMakeLists.txt
+index 653a830..7668b90 100644
+--- a/src/Wt/Dbo/backend/CMakeLists.txt
++++ b/src/Wt/Dbo/backend/CMakeLists.txt
+@@ -1,3 +1,8 @@
++OPTION(ENABLE_SQLITE "Build SQLite3 backend for Wt::Dbo" ON)
++OPTION(ENABLE_POSTGRES "Build PostgreSQL backend for Wt::Dbo" OFF)
++
++IF(ENABLE_SQLITE)
++
+ OPTION( USE_SYSTEM_SQLITE3 "Use system-wide Sqlite3 instead of Wt's version" OFF)
+
+ IF(USE_SYSTEM_SQLITE3)
+@@ -41,7 +46,9 @@ PROPERTIES
+ INSTALL_FILES(/include/Wt/Dbo/backend "^Sqlite3$")
+ INSTALL_FILES(/include/Wt/Dbo/backend "^.*Sqlite3.*h$")
+
+-IF(POSTGRES_FOUND)
++ENDIF(ENABLE_SQLITE)
++
++IF(ENABLE_POSTGRES AND POSTGRES_FOUND)
+ MESSAGE("** Wt::Dbo: building Postgres backend.")
+ ADD_LIBRARY(wtdbopostgres
+ Postgres.C
+@@ -65,8 +72,10 @@ IF(POSTGRES_FOUND)
+
+ INSTALL_FILES(/include/Wt/Dbo/backend "^Postgres$")
+ INSTALL_FILES(/include/Wt/Dbo/backend "^.*Postgres.*h$")
+-ELSE(POSTGRES_FOUND)
++ELSE(ENABLE_POSTGRES AND POSTGRES_FOUND)
+ MESSAGE("** Wt::Dbo: not building Postgres backend.")
+- MESSAGE(" Indicate the location of your postgres installation using -DPOSTGRES_PREFIX=...")
+-ENDIF(POSTGRES_FOUND)
++ IF(ENABLE_POSTGRES)
++ MESSAGE(" Indicate the location of your postgres installation using -DPOSTGRES_PREFIX=...")
++ ENDIF(ENABLE_POSTGRES)
++ENDIF(ENABLE_POSTGRES AND POSTGRES_FOUND)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index d18ca2e..2a928ae 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,20 +1,27 @@
+-ADD_EXECUTABLE(test
+- test.C
+- chart/WChartTest.C
+- dbo/DboTest.C
+- dbo/DboTest2.C
+- models/WBatchEditProxyModelTest.C
+- utf8/Utf8Test.C
+- wdatetime/WDateTimeTest.C
+-)
++# Tests need sqlite
++IF(ENABLE_SQLITE)
+
+-# SQLITE3 test
+-TARGET_LINK_LIBRARIES(test wt wtdbo wtdbosqlite3)
+-ADD_DEFINITIONS(-DSQLITE3)
++ ADD_EXECUTABLE(test
++ test.C
++ chart/WChartTest.C
++ dbo/DboTest.C
++ dbo/DboTest2.C
++ models/WBatchEditProxyModelTest.C
++ utf8/Utf8Test.C
++ wdatetime/WDateTimeTest.C
++ )
+
+-# POSTGRES test
+-#TARGET_LINK_LIBRARIES(test wt wtdbo wtdbopostgres)
+-#ADD_DEFINITIONS(-DPOSTGRES)
++ # SQLITE3 test
++ TARGET_LINK_LIBRARIES(test wt wtdbo wtdbosqlite3)
++ ADD_DEFINITIONS(-DSQLITE3)
++
++ENDIF(ENABLE_SQLITE)
++
++## # POSTGRES test
++## IF(ENABLE_POSTGRES AND POSTGRES_FOUND)
++## TARGET_LINK_LIBRARIES(test wt wtdbo wtdbopostgres)
++## ADD_DEFINITIONS(-DPOSTGRES)
++## ENDIF(ENABLE_POSTGRES AND POSTGRES_FOUND)
+
+ INCLUDE_DIRECTORIES(${WT_SOURCE_DIR}/src)
+
+--
+1.7.2.2
+
diff --git a/net-libs/wt/metadata.xml b/net-libs/wt/metadata.xml
new file mode 100644
index 000000000000..33e101fa4624
--- /dev/null
+++ b/net-libs/wt/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>mattm@gentoo.org</email>
+ <name>Matthew Marlowe</name>
+ </maintainer>
+ <use>
+ <flag name="extjs">Build Wt Ext library with JavaScript-only widgets (http://extjs.com/)</flag>
+ <flag name="fcgi">Compile in FCGI connector</flag>
+ <flag name="graphicsmagick">Enable GraphicsMagick, for supporting painting to raster images (PNG, GIF, ...) (WRasterImage)</flag>
+ <flag name="resources">Install resources directory</flag>
+ <flag name="server">Compile in stand-alone httpd connector</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">witty</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-libs/wt/wt-3.2.2_p1-r1.ebuild b/net-libs/wt/wt-3.2.2_p1-r1.ebuild
new file mode 100644
index 000000000000..034b74031e80
--- /dev/null
+++ b/net-libs/wt/wt-3.2.2_p1-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit cmake-utils versionator eutils user
+
+DESCRIPTION="C++ library for developing interactive web applications"
+MY_P=${P/_/-}
+HOMEPAGE="http://webtoolkit.eu/"
+SRC_URI="mirror://sourceforge/witty/wt/3.2.2/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc +extjs fcgi graphicsmagick pdf postgres resources +server ssl +sqlite test zlib"
+
+RDEPEND="
+ >=dev-libs/boost-1.36
+ graphicsmagick? ( media-gfx/graphicsmagick )
+ pdf? ( media-libs/libharu )
+ postgres? ( dev-db/postgresql )
+ sqlite? ( dev-db/sqlite:3 )
+ fcgi? (
+ dev-libs/fcgi
+ virtual/httpd-fastcgi
+ )
+ server? (
+ ssl? ( dev-libs/openssl )
+ zlib? ( sys-libs/zlib )
+ )
+"
+DEPEND="${RDEPEND}"
+
+DOCS="Changelog INSTALL"
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if use !server && use !fcgi; then
+ ewarn "You have to select at least built-in server support or fcgi support."
+ ewarn "Invalid use flag combination, enable at least one of: server, fcgi"
+ fi
+
+ if use test && use !sqlite; then
+ ewarn "Tests need sqlite, disabling."
+ fi
+
+ enewgroup wt
+ enewuser wt -1 -1 /var/lib/wt/home wt
+}
+
+src_prepare() {
+ epatch "$FILESDIR/cmakelist.patch"
+
+ # just to be sure
+ rm -rf Wt/Dbo/backend/amalgamation
+
+ # fix png linking
+ if use pdf; then
+ sed -e 's/-lpng12/-lpng/' \
+ -i cmake/WtFindHaru.txt || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ BOOST_PKG="$(best_version ">=dev-libs/boost-1.36.0")"
+ BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+ BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+ BOOST_INC="/usr/include/boost-${BOOST_VER}"
+
+ local mycmakeargs=(
+ -DDESTDIR="${D}"
+ -DLIB_INSTALL_DIR=$(get_libdir)
+ $(cmake-utils_use test BUILD_TESTS)
+ -DSHARED_LIBS=ON
+ -DMULTI_THREADED=ON
+ -DUSE_SYSTEM_SQLITE3=ON
+ -DWEBUSER=wt
+ -DWEBGROUP=wt
+ $(cmake-utils_use extjs ENABLE_EXT)
+ $(cmake-utils_use graphicsmagick ENABLE_GM)
+ $(cmake-utils_use pdf ENABLE_HARU)
+ $(cmake-utils_use postgres ENABLE_POSTGRES)
+ $(cmake-utils_use sqlite ENABLE_SQLITE)
+ $(cmake-utils_use fcgi CONNECTOR_FCGI)
+ $(cmake-utils_use server CONNECTOR_HTTP)
+ $(cmake-utils_use ssl WT_WITH_SSL)
+ $(cmake-utils_use zlib HTTP_WITH_ZLIB)
+ -DBUILD_EXAMPLES=OFF
+ $(cmake-utils_use resources INSTALL_RESOURCES)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ # Tests need sqlite
+ if use sqlite; then
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null
+ ./test/test || die
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+
+ dodir \
+ /var/lib/wt \
+ /var/lib/wt/home
+
+ cmake-utils_src_install
+
+ use doc && dohtml -A pdf,xhtml -r doc/*
+
+}
+
+pkg_postinst() {
+ if use fcgi; then
+ elog "You selected fcgi support. Please make sure that the web-server"
+ elog "has fcgi support and access to the fcgi socket."
+ elog "You can use spawn-fcgi to spawn the witty-processes and run them"
+ elog "in a chroot environment."
+ fi
+
+ chown -R wt:wt \
+ "${ROOT}"/var/lib/wt
+
+ chmod 0750 \
+ "${ROOT}"/var/lib/wt \
+ "${ROOT}"/var/lib/wt/home
+
+}
diff --git a/net-libs/wt/wt-3.3.1.ebuild b/net-libs/wt/wt-3.3.1.ebuild
new file mode 100644
index 000000000000..ff19f996db4c
--- /dev/null
+++ b/net-libs/wt/wt-3.3.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit cmake-utils versionator eutils user
+
+DESCRIPTION="C++ library for developing interactive web applications"
+MY_P=${P/_/-}
+HOMEPAGE="http://webtoolkit.eu/"
+SRC_URI="mirror://sourceforge/witty/wt/3.3.0/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +extjs fcgi graphicsmagick mysql pdf postgres resources +server ssl +sqlite test zlib"
+
+RDEPEND="
+ >=dev-libs/boost-1.41
+ graphicsmagick? ( media-gfx/graphicsmagick )
+ pdf? (
+ media-libs/libharu
+ x11-libs/pango
+ )
+ postgres? ( dev-db/postgresql )
+ mysql? ( virtual/mysql )
+ sqlite? ( dev-db/sqlite:3 )
+ fcgi? (
+ dev-libs/fcgi
+ virtual/httpd-fastcgi
+ )
+ server? (
+ ssl? ( dev-libs/openssl )
+ zlib? ( sys-libs/zlib )
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-util/cmake-2.6
+"
+
+DOCS="Changelog INSTALL"
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if use !server && use !fcgi; then
+ ewarn "You have to select at least built-in server support or fcgi support."
+ ewarn "Invalid use flag combination, enable at least one of: server, fcgi"
+ fi
+
+ if use test && use !sqlite; then
+ ewarn "Tests need sqlite, disabling."
+ fi
+
+ enewgroup wt
+ enewuser wt -1 -1 /var/lib/wt/home wt
+}
+
+src_prepare() {
+ # just to be sure
+ rm -rf Wt/Dbo/backend/amalgamation
+
+ # fix png linking
+ if use pdf; then
+ sed -e 's/-lpng12/-lpng/' \
+ -i cmake/WtFindHaru.txt || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ BOOST_PKG="$(best_version ">=dev-libs/boost-1.41.0")"
+ BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+ BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+ BOOST_INC="/usr/include/boost-${BOOST_VER}"
+
+ local mycmakeargs=(
+ -DDESTDIR="${D}"
+ -DLIB_INSTALL_DIR=$(get_libdir)
+ $(cmake-utils_use test BUILD_TESTS)
+ -DSHARED_LIBS=ON
+ -DMULTI_THREADED=ON
+ -DUSE_SYSTEM_SQLITE3=ON
+ -DWEBUSER=wt
+ -DWEBGROUP=wt
+ $(cmake-utils_use extjs ENABLE_EXT)
+ $(cmake-utils_use graphicsmagick ENABLE_GM)
+ $(cmake-utils_use pdf ENABLE_HARU)
+ $(cmake-utils_use postgres ENABLE_POSTGRES)
+ $(cmake-utils_use sqlite ENABLE_SQLITE)
+ $(cmake-utils_use mysql ENABLE_MYSQL)
+ $(cmake-utils_use fcgi CONNECTOR_FCGI)
+ $(cmake-utils_use server CONNECTOR_HTTP)
+ $(cmake-utils_use ssl WT_WITH_SSL)
+ $(cmake-utils_use zlib HTTP_WITH_ZLIB)
+ -DBUILD_EXAMPLES=OFF
+ $(cmake-utils_use resources INSTALL_RESOURCES)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ # Tests need sqlite
+ if use sqlite; then
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null
+ ./test/test || die
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+
+ dodir \
+ /var/lib/wt \
+ /var/lib/wt/home
+
+ cmake-utils_src_install
+
+ use doc && dohtml -A pdf,xhtml -r doc/*
+
+}
+
+pkg_postinst() {
+ if use fcgi; then
+ elog "You selected fcgi support. Please make sure that the web-server"
+ elog "has fcgi support and access to the fcgi socket."
+ elog "You can use spawn-fcgi to spawn the witty-processes and run them"
+ elog "in a chroot environment."
+ fi
+
+ chown -R wt:wt \
+ "${ROOT}"/var/lib/wt
+
+ chmod 0750 \
+ "${ROOT}"/var/lib/wt \
+ "${ROOT}"/var/lib/wt/home
+
+}
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
new file mode 100644
index 000000000000..3da826a19a69
--- /dev/null
+++ b/net-libs/wvstreams/Manifest
@@ -0,0 +1 @@
+DIST wvstreams-4.6.1.tar.gz 1118456 SHA256 8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a WHIRLPOOL 4d5a8e39332d00c1614d81e3d980d2458aebdf745b6630c8875adfff89b2c0baf08d39e5f7cc47bb4dbe37bc573c7e019e31163837df6d6d13741eeccc1c8e7a
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch
new file mode 100644
index 000000000000..b284da8f3e79
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch
@@ -0,0 +1,50 @@
+http://bugs.gentoo.org/419563
+http://bugs.gentoo.org/419971
+
+See -gcc47-patch and -magic.patch in Fedora git:
+
+http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree
+
+--- include/wvtask.h
++++ include/wvtask.h
+@@ -45,7 +45,8 @@
+ typedef void TaskFunc(void *userdata);
+
+ static int taskcount, numtasks, numrunning;
+- int magic_number, *stack_magic;
++ int volatile magic_number;
++ int *stack_magic;
+ WvString name;
+ int tid;
+
+@@ -84,7 +85,7 @@
+ static WvTaskMan *singleton;
+ static int links;
+
+- static int magic_number;
++ static int volatile magic_number;
+ static WvTaskList all_tasks, free_tasks;
+
+ static void get_stack(WvTask &task, size_t size);
+--- include/wvuid.h
++++ include/wvuid.h
+@@ -7,6 +7,7 @@
+ #ifndef __WVUID_H
+ #define __WVUID_H
+
++#include <unistd.h>
+ #include "wvstring.h"
+
+ #if WIN32
+--- utils/wvtask.cc
++++ utils/wvtask.cc
+@@ -58,7 +58,8 @@
+ int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning;
+
+ WvTaskMan *WvTaskMan::singleton;
+-int WvTaskMan::links, WvTaskMan::magic_number;
++int WvTaskMan::links;
++int volatile WvTaskMan::magic_number;
+ WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks;
+ ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return,
+ WvTaskMan::toplevel;
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
new file mode 100644
index 000000000000..473d3e832933
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/333301
+
+--- ipstreams/wvunixdgsocket.cc
++++ ipstreams/wvunixdgsocket.cc
+@@ -1,5 +1,5 @@
+ #include "wvunixdgsocket.h"
+-#ifdef MACOS
++#if defined(MACOS) || defined(__GNUC__)
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #endif
+--- streams/wvatomicfile.cc
++++ streams/wvatomicfile.cc
+@@ -11,7 +11,8 @@
+ #include "wvfileutils.h"
+ #include "wvstrutils.h"
+
+-#ifdef MACOS
++#if defined(MACOS) || defined(__GNUC__)
++#include <sys/types.h>
+ #include <sys/stat.h>
+ #endif
+
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch
new file mode 100644
index 000000000000..c27e7233627f
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/304283
+
+--- crypto/wvx509.cc
++++ crypto/wvx509.cc
+@@ -1157,7 +1157,11 @@
+
+ if (ext)
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++ const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
++#else
+ X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
++#endif
+ if (!method)
+ {
+ WvDynBuf buf;
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch
new file mode 100644
index 000000000000..d6f7d6e76174
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch
@@ -0,0 +1,56 @@
+--- Makefile
++++ Makefile
+@@ -131,12 +131,19 @@
+ # libwvstreams: stream/event handling library
+ #
+ TARGETS += libwvstreams.so
+-TARGETS += crypto/tests/ssltest ipstreams/tests/unixtest
++TARGETS += crypto/tests/ssltest
++crypto/tests/ssltest: $(LIBWVSTREAMS)
++
++TARGETS += ipstreams/tests/unixtest
++ipstreams/tests/unixtest: $(LIBWVSTREAMS)
++
+ TARGETS += crypto/tests/printcert
++crypto/tests/printcert: $(LIBWVSTREAMS)
+
+ ifndef _MACOS
+ ifneq ("$(with_readline)", "no")
+ TARGETS += ipstreams/tests/wsd
++ ipstreams/tests/wsd: $(LIBWVSTREAMS)
+ ipstreams/tests/wsd-LIBS += -lreadline
+ else
+ TEST_SKIP_OBJS += ipstreams/tests/wsd
+@@ -179,7 +186,11 @@
+ #
+ ifneq ("$(with_dbus)", "no")
+ TARGETS += libwvdbus.so
+- TARGETS += dbus/tests/wvdbus dbus/tests/wvdbusd
++ TARGETS += dbus/tests/wvdbus
++ dbus/tests/wvdbus: $(LIBWVDBUS)
++
++ TARGETS += dbus/tests/wvdbusd
++ dbus/tests/wvdbusd: $(LIBWVDBUS)
+ TESTS += $(call tests_cc,dbus/tests)
+ libwvdbus_OBJS += $(call objects,dbus)
+ libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS)
+--- wvrules-posix.mk
++++ wvrules-posix.mk
+@@ -85,12 +85,15 @@
+ $(AR) s $1
+ endef
+
+-CC: FORCE
++CC:
+ @CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ $(WVSTREAMS)/gen-cc CC c
+
+-CXX: FORCE
++CXX:
+ @CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ $(WVSTREAMS)/gen-cc CXX cc
+
++#All files must depend on the above two rules. This is a godawful hack.
++$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX
++
+ wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS)
diff --git a/net-libs/wvstreams/metadata.xml b/net-libs/wvstreams/metadata.xml
new file mode 100644
index 000000000000..4fd26ae6812a
--- /dev/null
+++ b/net-libs/wvstreams/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-dialup</herd>
+ <upstream>
+ <remote-id type="google-code">wvstreams</remote-id>
+ </upstream>
+ <use>
+ <flag name="boost">
+ Use <pkg>dev-libs/boost</pkg> to provide TR1-compatible
+ functional interface. This USE flag is only needed with GCC
+ earlier than version 4.1, or with other compilares not providing
+ said interface.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild
new file mode 100644
index 000000000000..a462106b74a1
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils flag-o-matic toolchain-funcs versionator
+
+DESCRIPTION="A network programming library in C++"
+HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
+SRC_URI="http://wvstreams.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
+IUSE="pam doc +ssl +dbus debug"
+
+#Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
+RESTRICT="test"
+
+#QA Fail: xplc is compiled as a part of wvstreams.
+#It'll take a larger patching effort to get it extracted, since upstream integrated it
+#more tightly this time. Probably for the better since upstream xplc seems dead.
+
+RDEPEND="sys-libs/readline
+ sys-libs/zlib
+ dbus? ( >=sys-apps/dbus-1.4.20 )
+ dev-libs/openssl:0
+ pam? ( sys-libs/pam )"
+DEPEND="${RDEPEND}
+ || ( >=sys-devel/gcc-4.1 >=dev-libs/boost-1.34.0 )
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+DOCS="ChangeLog README*"
+
+pkg_setup() {
+ if has_version '>=sys-devel/gcc-4.1' && ! has_version '>=dev-libs/boost-1.34.1'
+ then
+ if ! version_is_at_least 4.1 "$(gcc-fullversion)"
+ then
+ eerror "This package requires the active gcc to be at least version 4.1"
+ eerror "or >=dev-libs/boost-1.34.1 must be installed."
+ die "Please activate >=sys-devel/gcc-4.1 with gcc-config."
+ fi
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-parallel-make.patch \
+ "${FILESDIR}"/${P}-openssl-1.0.0.patch \
+ "${FILESDIR}"/${P}-glibc212.patch \
+ "${FILESDIR}"/${P}-gcc47.patch
+
+ sed -i \
+ -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+ -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+ configure.ac argp/configure.ac || die
+
+ eautoreconf
+ pushd argp >/dev/null
+ eautoreconf
+ popd >/dev/null
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ append-flags -fno-tree-dce -fno-optimize-sibling-calls #421375
+
+ tc-export CXX
+
+ econf \
+ --localstatedir=/var \
+ $(use_enable debug) \
+ --disable-optimization \
+ $(use_with dbus) \
+ --with-openssl \
+ $(use_with pam) \
+ --without-tcl \
+ --without-qt \
+ --with-zlib \
+ --without-valgrind
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ doxygen || die
+ fi
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ default
+
+ if use doc; then
+ #the list of files is too big for dohtml -r Docs/doxy-html/*
+ cd Docs/doxy-html
+ dohtml -r *
+ fi
+}
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
new file mode 100644
index 000000000000..0b2b9a966d28
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic toolchain-funcs versionator
+
+DESCRIPTION="A network programming library in C++"
+HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
+SRC_URI="http://wvstreams.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
+IUSE="pam doc +ssl +dbus debug boost"
+
+#Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
+RESTRICT="test"
+
+#QA Fail: xplc is compiled as a part of wvstreams.
+#It'll take a larger patching effort to get it extracted, since upstream integrated it
+#more tightly this time. Probably for the better since upstream xplc seems dead.
+
+RDEPEND="sys-libs/readline
+ sys-libs/zlib
+ dbus? ( >=sys-apps/dbus-1.4.20 )
+ dev-libs/openssl:0
+ pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ boost? ( >=dev-libs/boost-1.34.1:= )"
+
+DOCS="ChangeLog README*"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} == "binary" ]] && return
+
+ if ! use boost && ! version_is_at_least 4.1 "$(gcc-fullversion)"; then
+ eerror "This package requires the active gcc to be at least version 4.1"
+ eerror "or USE=boost must be installed."
+ die "Please activate >=sys-devel/gcc-4.1 with gcc-config."
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-parallel-make.patch \
+ "${FILESDIR}"/${P}-openssl-1.0.0.patch \
+ "${FILESDIR}"/${P}-glibc212.patch \
+ "${FILESDIR}"/${P}-gcc47.patch
+
+ sed -i \
+ -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+ -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+ configure.ac argp/configure.ac || die
+
+ eautoreconf
+ pushd argp >/dev/null
+ eautoreconf
+ popd >/dev/null
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ append-flags -fno-tree-dce -fno-optimize-sibling-calls #421375
+
+ tc-export AR CXX
+
+ use boost && export ac_cv_header_tr1_functional=no
+
+ econf \
+ --localstatedir=/var \
+ $(use_enable debug) \
+ --disable-optimization \
+ $(use_with dbus) \
+ --with-openssl \
+ $(use_with pam) \
+ --without-tcl \
+ --without-qt \
+ --with-zlib \
+ --without-valgrind
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ doxygen || die
+ fi
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ default
+
+ if use doc; then
+ #the list of files is too big for dohtml -r Docs/doxy-html/*
+ cd Docs/doxy-html
+ dohtml -r *
+ fi
+}
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
new file mode 100644
index 000000000000..47a8625575a2
--- /dev/null
+++ b/net-libs/xrootd/Manifest
@@ -0,0 +1,2 @@
+DIST xrootd-3.3.6.tar.gz 1836866 SHA256 06656d919f5296bcf49953e97b1f3d1cf601c9a1d676945529032fa0046d7217 SHA512 87682fbc49ac13e0c98ee72f506c7c23902f983cfdb672f52a041bcd8de3f723d0ce26638d366a74cffbb3e251e69335454da4b9f8dd8e00ae80bb3bfc432572 WHIRLPOOL 9da9140743b3679ac49f6ae42e9ae4fd430ababd1bf3a021331b804fbe6c56140c6b36fe7d10113a0efc14283ab934240e3d7dac6b4e94c794e8dc47c9896559
+DIST xrootd-4.1.1.tar.gz 1957303 SHA256 3e472ec8068adc76f10df8a1bb1c795bb37a0a9936d4a255cc62073eb86c70c4 SHA512 ad5793b622ef967f69bf4be16b23fd00c9db183c3d0664e1913b82697d663c885499db780acd0d968148af6c33e9dad18fe798093e3fec72b20eba0717f3cc7e WHIRLPOOL 4de2ac56599af17188fe608f95cc10434c22d87d72b534b80865a79f648e20b98908b8703c18259d96ea43fb34a683cb45c19656efcae6b32cb13f58bbc37d2e
diff --git a/net-libs/xrootd/files/cmsd.confd b/net-libs/xrootd/files/cmsd.confd
new file mode 100644
index 000000000000..ab5aa8c614f0
--- /dev/null
+++ b/net-libs/xrootd/files/cmsd.confd
@@ -0,0 +1,9 @@
+# conf.d file for cmsd daemon
+
+# User to run as (default is root)
+CMSD_USER="root"
+
+#
+# Please refer to the cmsd(1) man(1) page for more
+# information on command line parameters.
+CMSD_OPTS=""
diff --git a/net-libs/xrootd/files/cmsd.initd b/net-libs/xrootd/files/cmsd.initd
new file mode 100644
index 000000000000..eb8b4470b345
--- /dev/null
+++ b/net-libs/xrootd/files/cmsd.initd
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+. /etc/conf.d/xrootd
+
+depend() {
+ need net
+ use logger dns
+ provide root-file-server
+}
+
+start_pre() {
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/spool
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/xrootd
+}
+
+start() {
+ ebegin "Starting Cluster Management Service daemon"
+ start-stop-daemon --start --quiet --user ${XROOTD_USER} \
+ --make-pidfile --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME} --background -- \
+ -c ${XROOTD_CONF} -l ${XROOTD_LOGDIR}/${RC_SVCNAME}.log \
+ ${CMSD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Cluster Management Service daemon"
+ start-stop-daemon --stop --quiet \
+ --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME}
+ eend $?
+}
diff --git a/net-libs/xrootd/files/frm_purged.initd b/net-libs/xrootd/files/frm_purged.initd
new file mode 100644
index 000000000000..9b7db734adb5
--- /dev/null
+++ b/net-libs/xrootd/files/frm_purged.initd
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+. /etc/conf.d/xrootd
+
+depend() {
+ need net
+ use logger dns
+ provide root-file-server
+}
+
+start_pre() {
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/spool
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/xrootd
+}
+
+start() {
+ ebegin "Starting File Residency Manager purge daemon"
+ start-stop-daemon --start --quiet --user ${XROOTD_USER} \
+ --make-pidfile --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME} --background -- \
+ -c ${XROOTD_CONF} -l ${XROOTD_LOGDIR}/${RC_SVCNAME}.log \
+ ${FRM_PURGED_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping File Residency Manager purge daemon"
+ start-stop-daemon --stop --quiet \
+ --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME}
+ eend $?
+}
diff --git a/net-libs/xrootd/files/frm_xfrd.initd b/net-libs/xrootd/files/frm_xfrd.initd
new file mode 100644
index 000000000000..b33f3f9b0322
--- /dev/null
+++ b/net-libs/xrootd/files/frm_xfrd.initd
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+. /etc/conf.d/xrootd
+
+depend() {
+ need net
+ use logger dns
+ provide root-file-server
+}
+
+start_pre() {
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/spool
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/xrootd
+}
+
+start() {
+ ebegin "Starting File Residency Manager transfer daemon"
+ start-stop-daemon --start --quiet --user ${XROOTD_USER} \
+ --make-pidfile --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME} --background -- \
+ -c ${XROOTD_CONF} -l ${XROOTD_LOGDIR}/${RC_SVCNAME}.log \
+ ${FRM_XFRD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping File Residency Manager transfer daemon"
+ start-stop-daemon --stop --quiet \
+ --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME}
+ eend $?
+}
diff --git a/net-libs/xrootd/files/xrootd-no-werror.patch b/net-libs/xrootd/files/xrootd-no-werror.patch
new file mode 100644
index 000000000000..d9f3b1c52f7b
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-no-werror.patch
@@ -0,0 +1,11 @@
+--- cmake/XRootDOSDefs.cmake.orig 2014-06-04 20:31:15.000000000 +0400
++++ cmake/XRootDOSDefs.cmake 2014-08-21 12:12:55.397368485 +0400
+@@ -15,7 +15,7 @@
+ # GCC
+ #-------------------------------------------------------------------------------
+ if( CMAKE_COMPILER_IS_GNUCXX )
+- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror" )
++ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra" )
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter" )
+ # gcc 4.1 is retarded
+ execute_process( COMMAND ${CMAKE_C_COMPILER} -dumpversion
diff --git a/net-libs/xrootd/files/xrootd.confd b/net-libs/xrootd/files/xrootd.confd
new file mode 100644
index 000000000000..0e847e53e69c
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd.confd
@@ -0,0 +1,21 @@
+# conf.d file for xroot, cmsd, frm_purged, frm_xfrd daemons
+
+# User to run as, please note that:
+# 1) daemons will refuse to run as root;
+# 2) several dirs must be created with an appropriate permissions
+# and ownership, so be careful when changing default 'xrootd' user.
+XROOTD_USER="xrootd"
+
+# Configuration file MUST be the same for all four daemons.
+# See /etc/xrootd for available simple defaults.
+XROOTD_CONF="/etc/xrootd/xrootd-clustered.cfg"
+
+# Logdir for all daemons
+XROOTD_LOGDIR="/var/log/xrootd"
+
+# Additional options for each daemon, please refer to their
+# documentation for details
+XROOTD_OPTS=""
+CMSD_OPTS=""
+FRM_PURGED=""
+FRM_XFRD=""
diff --git a/net-libs/xrootd/files/xrootd.initd b/net-libs/xrootd/files/xrootd.initd
new file mode 100644
index 000000000000..ffffa6c4470e
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd.initd
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need net
+ use logger dns
+ provide root-file-server
+}
+
+start_pre() {
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/spool
+ checkpath -q -d -m 0755 -o xrootd:xrootd /var/run/xrootd
+}
+
+start() {
+ ebegin "Starting extended ROOTD file server"
+ start-stop-daemon --start --quiet --user ${XROOTD_USER} \
+ --make-pidfile --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME} --background -- \
+ -c ${XROOTD_CONF} -l ${XROOTD_LOGDIR}/${RC_SVCNAME}.log \
+ ${XROOTD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping extended ROOTD file server"
+ start-stop-daemon --stop --quiet \
+ --pidfile /var/run/${RC_SVCNAME}.pid \
+ --exec /usr/bin/${RC_SVCNAME}
+ eend $?
+}
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
new file mode 100644
index 000000000000..4d4eef0ef40d
--- /dev/null
+++ b/net-libs/xrootd/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-physics</herd>
+ <longdescription lang="en">
+ XROOTD software framework is a fully generic suite for fast, low latency
+ and scalable data access, which can serve natively any kind of data,
+ organized as a hierarchical filesystem-like namespace, based on the
+ concept of directory.
+ It is usually used with <pkg>sci-physics/root</pkg> and its PROOF
+ facilities for cluster computing in high energy physics.
+</longdescription>
+ <use>
+ <flag name="fuse">Enable the <pkg>sys-fs/fuse</pkg> filesystem driver</flag>
+ <flag name="http">Enable http protocol support</flag>
+ <flag name="libevent">Use <pkg>dev-libs/libevent</pkg> for event handling</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/xrootd/xrootd-3.3.6.ebuild b/net-libs/xrootd/xrootd-3.3.6.ebuild
new file mode 100644
index 000000000000..5ca003f361bf
--- /dev/null
+++ b/net-libs/xrootd/xrootd-3.3.6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils eutils user multilib
+
+DURI="http://xrootd.slac.stanford.edu/doc/prod"
+
+DESCRIPTION="Extended ROOT remote file server"
+HOMEPAGE="http://xrootd.org/"
+SRC_URI="${HOMEPAGE}/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc fuse kerberos perl readline ssl test"
+
+RDEPEND="
+ !<sci-physics/root-5.32[xrootd]
+ sys-libs/zlib:0=
+ fuse? ( sys-fs/fuse )
+ kerberos? ( virtual/krb5 )
+ perl? (
+ dev-lang/perl
+ readline? ( dev-perl/Term-ReadLine-Perl )
+ )
+ readline? ( sys-libs/readline:0= )
+ ssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[dot] )
+ perl? ( dev-lang/swig )
+ test? ( dev-util/cppunit )"
+
+pkg_setup() {
+ enewgroup xrootd
+ enewuser xrootd -1 -1 "${EPREFIX}"/var/spool/xrootd xrootd
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable fuse)
+ $(cmake-utils_use_enable kerberos KRB5)
+ $(cmake-utils_use_enable perl)
+ $(cmake-utils_use_enable readline)
+ $(cmake-utils_use_enable ssl CRYPTO)
+ $(cmake-utils_use_enable test TESTS)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && doxygen Doxyfile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # base configs
+ insinto /etc/xrootd
+ doins packaging/common/*.cfg
+
+ fowners root:xrootd /etc/xrootd
+ keepdir /var/log/xrootd
+ fowners xrootd:xrootd /var/log/xrootd
+
+ local i
+ for i in cmsd frm_purged frm_xfrd xrootd; do
+ newinitd "${FILESDIR}"/${i}.initd ${i}
+ done
+ # all daemons MUST use single master config file
+ newconfd "${FILESDIR}"/xrootd.confd xrootd
+
+ dodoc docs/ReleaseNotes.txt
+ use doc && dohtml -r doxydoc/html/*
+}
diff --git a/net-libs/xrootd/xrootd-4.1.1.ebuild b/net-libs/xrootd/xrootd-4.1.1.ebuild
new file mode 100644
index 000000000000..920673938c8e
--- /dev/null
+++ b/net-libs/xrootd/xrootd-4.1.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils eutils user multilib
+
+DURI="http://xrootd.slac.stanford.edu/doc/prod"
+
+DESCRIPTION="Extended ROOT remote file server"
+HOMEPAGE="http://xrootd.org/"
+SRC_URI="${HOMEPAGE}/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fuse http kerberos libevent perl readline ssl test"
+
+RDEPEND="
+ !<sci-physics/root-5.32[xrootd]
+ sys-libs/zlib:0=
+ fuse? ( sys-fs/fuse:0= )
+ kerberos? ( virtual/krb5 )
+ libevent? ( dev-libs/libevent[threads] )
+ perl? (
+ dev-lang/perl
+ readline? ( dev-perl/Term-ReadLine-Perl )
+ )
+ readline? ( sys-libs/readline:0= )
+ ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[dot] )
+ perl? ( dev-lang/swig )
+ test? ( dev-util/cppunit )"
+
+REQUIRED_USE="
+ http? ( kerberos ssl )"
+
+PATCHES=( "${FILESDIR}"/${PN}-no-werror.patch )
+
+pkg_setup() {
+ enewgroup xrootd
+ enewuser xrootd -1 -1 "${EPREFIX}"/var/spool/xrootd xrootd
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable fuse)
+ $(cmake-utils_use_enable http)
+ $(cmake-utils_use_enable kerberos KRB5)
+ $(cmake-utils_use_enable libevent)
+ $(cmake-utils_use_enable perl)
+ $(cmake-utils_use_enable readline)
+ $(cmake-utils_use_enable ssl CRYPTO)
+ $(cmake-utils_use_enable test TESTS)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && doxygen Doxyfile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # base configs
+ insinto /etc/xrootd
+ doins packaging/common/*.cfg
+
+ fowners root:xrootd /etc/xrootd
+ keepdir /var/log/xrootd
+ fowners xrootd:xrootd /var/log/xrootd
+
+ local i
+ for i in cmsd frm_purged frm_xfrd xrootd; do
+ newinitd "${FILESDIR}"/${i}.initd ${i}
+ done
+ # all daemons MUST use single master config file
+ newconfd "${FILESDIR}"/xrootd.confd xrootd
+
+ dodoc docs/ReleaseNotes.txt
+ use doc && dohtml -r doxydoc/html/*
+}
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
new file mode 100644
index 000000000000..406edfd3016f
--- /dev/null
+++ b/net-libs/zeromq/Manifest
@@ -0,0 +1,5 @@
+DIST zeromq-2.2.0.tar.gz 1899104 SHA256 6e2f4183e5259eeb67025b00116d900491fb71581e8e085373b51c3bc9571ae1 SHA512 fb3cf421b2dc48c31956b3e3ee4ab6ebc743deec3bf626c2238a1996c8c51be87260bd6aa662793a1f0c34dcda9b3146763777bb162dfad6fec4ca7acc403b2e WHIRLPOOL b35a6f0cdcff34ec188c989354fb53ee44f22ebb8d830f904447b4fa32ddd17de157998c2733a42ff0a6c1355f0ab2e0639e7666c7e983839e1dbde2188dcef5
+DIST zeromq-3.2.3.tar.gz 2072758 SHA256 e134c1aaf829dd77bca9dc0fa199ba31095a581bd0d3dda5fc59523b9f401238 SHA512 34ffb6aa645f62bd1158a8f2888bf92929ccf90917a6c50ed51ed1240732f498522e164d1536f26480c87ad5457fe614a93bf0e15f2f89b0b168e64a30de68ca WHIRLPOOL 14ba025abe6db59d6e8d1dd9df23f88e0171721bb046b9e2cf0cd7a5a6e9034980808d346fe10e755e367302cfbb670912576071345233148711815237fa176e
+DIST zeromq-3.2.5.tar.gz 2082960 SHA256 09653e56a466683edb2f87ee025c4de55b8740df69481b9d7da98748f0c92124 SHA512 3682204e5a47824d149968e62fbf9768134370e4f7debbbf8f2bfa24bdd0a781e50c4a9b4231af8a0c4bab61839169100525a91472448ef180a9672342e10a3f WHIRLPOOL a8afa70760fa1fa9382f4694beabfe50f5c8098b1f81d5c62c926cd3073fd25946f6b8d1236e903e6644a9fff783116e131f1f87a5b92d16a6e91e05bd7f6e75
+DIST zeromq-4.1.1.tar.gz 1383196 SHA256 43d61e5706b43946aad4a661400627bcde9c63cc25816d4749c67b64c3dab8db SHA512 6f626c89e573900d3b094ea6058693dee290eb9e4039a8a03d61d41b1d8976ed5596027ca76a43f371dbf86820edfbd56a84ecfab6864adfeee73035df7b5353 WHIRLPOOL b72f9118a0422bb2a6cc99e490085715739e7438fe88fb556b85e6da70a995c92ad0cdde296e02e31c02979458ad4bb6962ff0acd4f5642273659c29b43892e9
+DIST zeromq-4.1.2.tar.gz 1367275 SHA256 f9162ead6d68521e5154d871bac304f88857308bb02366b81bb588497a345927 SHA512 69f8992dabd1d2ae90b0f8fadf39d89eac054f6593e175432e35f0f8edd224bc588b015280ee2e9dd34c55269dd9daf4a4f275e547535b2a24ea0cb9617b2e80 WHIRLPOOL 59885d9b9d2267e26a2ff07be71bd360a64b649a6e6fa5243f7e99fcf88a9d4d0df562541d0dbabba25f07bb381c1f62c8371c4a16c911809e8295503e54ea01
diff --git a/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch b/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch
new file mode 100644
index 000000000000..9fb86fa7d5c2
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-3.2.3-unused-variable.patch
@@ -0,0 +1,105 @@
+Fix building with -Wall.
+
+Description from upstream repo:
+ Author: Pieter Hintjens <ph@imatix.com>
+ Date: Wed Jan 30 23:53:23 2013 +0100
+
+ Various cleanups to test programs
+
+ - Patch applied using git am from libzmq commit 5f009e52
+ - tests/test_raw_sock.cpp doesn't exist in zeromq3-x, so that
+ file was manually removed from the patch before 'git am'
+
+ Signed-off-by: AJ Lewis <aj.lewis@quantum.com>
+X-GENTOO-BUG: 483318
+X-GENTOO-BUG-URL: https://bugs.gentoo.org/show_bug.cgi?id=483318
+X-UPSTREAM-URL: https://github.com/zeromq/zeromq3-x/commit/bdd72826c96fa7cb6a8d2e5cf688c973a8e8d42f
+
+--- a/tests/test_connect_delay.cpp
++++ b/tests/test_connect_delay.cpp
+@@ -61,12 +61,12 @@ int main (void)
+ assert(from);
+
+ val = 0;
+- zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof(val));
++ zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof (val));
+ // This pipe will not connect
+ rc = zmq_connect (from, "tcp://localhost:5556");
+ assert (rc == 0);
+ // This pipe will
+- rc = zmq_connect (from, "tcp://localhost:5555");
++ rc = zmq_connect (from, "tcp://localhost:6555");
+ assert (rc == 0);
+
+ // We send 10 messages, 5 should just get stuck in the queue
+@@ -112,7 +112,6 @@ int main (void)
+ // cause the pipe attachment to be delayed until the connection
+ // succeeds.
+ context = zmq_ctx_new();
+- fprintf (stderr, " Rerunning with DELAY_ATTACH_ON_CONNECT\n");
+
+ // Bind the valid socket
+ to = zmq_socket (context, ZMQ_PULL);
+@@ -182,7 +181,6 @@ int main (void)
+ // block. Then we reconnect and verify messages flow again.
+ context = zmq_ctx_new();
+ void *context2 = zmq_ctx_new();
+- fprintf (stderr, " Running DELAY_ATTACH_ON_CONNECT with disconnect\n");
+
+ to = zmq_socket (context2, ZMQ_PULL);
+ assert (to);
+diff --git a/tests/test_disconnect_inproc.cpp b/tests/test_disconnect_inproc.cpp
+index 7875083..d6b68c6 100644
+--- a/tests/test_disconnect_inproc.cpp
++++ b/tests/test_disconnect_inproc.cpp
+@@ -40,16 +40,14 @@ int main(int argc, char** argv) {
+ zmq_msg_t msg;
+ zmq_msg_init (&msg);
+ zmq_msg_recv (&msg, pubSocket, 0);
+- int msgSize = zmq_msg_size(&msg);
+ char* buffer = (char*)zmq_msg_data(&msg);
+
+ if (buffer[0] == 0) {
+ assert(isSubscribed);
+- printf("unsubscribing from '%s'\n", strndup(buffer + 1, msgSize - 1));
+ isSubscribed = false;
+- } else {
++ }
++ else {
+ assert(!isSubscribed);
+- printf("subscribing on '%s'\n", strndup(buffer + 1, msgSize - 1));
+ isSubscribed = true;
+ }
+
+@@ -66,11 +64,6 @@ int main(int argc, char** argv) {
+ zmq_msg_t msg;
+ zmq_msg_init (&msg);
+ zmq_msg_recv (&msg, subSocket, 0);
+- int msgSize = zmq_msg_size(&msg);
+- char* buffer = (char*)zmq_msg_data(&msg);
+-
+- printf("received on subscriber '%s'\n", strndup(buffer, msgSize));
+-
+ zmq_getsockopt (subSocket, ZMQ_RCVMORE, &more, &more_size);
+ zmq_msg_close (&msg);
+
+diff --git a/tests/test_last_endpoint.cpp b/tests/test_last_endpoint.cpp
+index 5f121c4..ef3230b 100644
+--- a/tests/test_last_endpoint.cpp
++++ b/tests/test_last_endpoint.cpp
+@@ -29,11 +29,10 @@ static void do_bind_and_verify (void *s, const char *endpoint)
+ {
+ int rc = zmq_bind (s, endpoint);
+ assert (rc == 0);
+-
+- char test [255];
+- size_t siz = 255;
+- rc = zmq_getsockopt (s, ZMQ_LAST_ENDPOINT, test, &siz);
+- assert (rc == 0 && strcmp (test, endpoint) == 0);
++ char reported [255];
++ size_t size = 255;
++ rc = zmq_getsockopt (s, ZMQ_LAST_ENDPOINT, reported, &size);
++ assert (rc == 0 && strcmp (reported, endpoint) == 0);
+ }
+
+ int main (void)
diff --git a/net-libs/zeromq/metadata.xml b/net-libs/zeromq/metadata.xml
new file mode 100644
index 000000000000..833cfe98b466
--- /dev/null
+++ b/net-libs/zeromq/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>qnikst@gentoo.org</email>
+ <name>Alexander Vershilov</name>
+ </maintainer>
+ <upstream>
+ <maintainer>
+ <email>sustrik@fastmq.com</email>
+ <name>Martin Sustrik</name>
+ <description>iMatrix Corporation</description>
+ </maintainer>
+ <doc>http://zguide.zeromq.org/chapter:1</doc>
+ <bugs-to>http://github.com/zeromq/zeromq2/issues</bugs-to>
+ <!-- remote-id type="github">zeromq/zeromq2</remote-id-->
+ </upstream>
+ <longdescription lang="en">
+ The 0MQ lightweight messaging kernel is a library which
+ extends the standard socket interfaces with features
+ traditionally provided by specialised messaging middleware
+ products. 0MQ sockets provide an abstraction of asynchronous
+ message queues, multiple messaging patterns, message filtering
+ (subscriptions), seamless access to multiple transport protocols
+ and more.
+ </longdescription>
+ <use>
+ <flag name="pgm">
+Build PGM (Pragmatic General Multicast)extention, a protocol for reliable
+multicast transport of data over IP networks.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/net-libs/zeromq/zeromq-2.2.0.ebuild b/net-libs/zeromq/zeromq-2.2.0.ebuild
new file mode 100644
index 000000000000..6e4e87b0e474
--- /dev/null
+++ b/net-libs/zeromq/zeromq-2.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# NOTES:
+# 1- use flag 'pgm' (OpenPGM support) must be masked by profiles for ARM archs;
+
+EAPI=4
+WANT_AUTOCONF="2.5"
+inherit autotools
+
+DESCRIPTION="ZeroMQ is a brokerless messaging kernel with extremely high performance"
+HOMEPAGE="http://www.zeromq.org"
+SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="pgm test static-libs"
+
+RDEPEND="!net-libs/cppzmq"
+DEPEND="pgm? (
+ virtual/pkgconfig
+ =net-libs/openpgm-5.1.118
+ )
+ || ( sys-apps/util-linux sys-freebsd/freebsd-lib )"
+
+src_prepare() {
+ einfo "Removing bundled OpenPGM library"
+ rm -r "${S}"/foreign/openpgm/libpgm* || die
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ use pgm && myconf="--with-system-pgm" || myconf="--without-pgm"
+ econf \
+ $(use_enable static-libs static) \
+ $myconf
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc NEWS README AUTHORS ChangeLog || die "dodoc failed"
+ doman doc/*.[1-9] || die "doman failed"
+
+ # remove useless .la files
+ find "${D}" -name '*.la' -delete
+
+ # remove useless .a (only for non static compilation)
+ use static-libs || find "${D}" -name '*.a' -delete
+}
diff --git a/net-libs/zeromq/zeromq-3.2.3.ebuild b/net-libs/zeromq/zeromq-3.2.3.ebuild
new file mode 100644
index 000000000000..2a0122b2571d
--- /dev/null
+++ b/net-libs/zeromq/zeromq-3.2.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="ZeroMQ is a brokerless kernel"
+HOMEPAGE="http://www.zeromq.org/"
+SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="pgm test static-libs elibc_glibc"
+
+DEPEND="
+ || ( sys-devel/gcc sys-devel/gcc-apple )
+ pgm? (
+ virtual/pkgconfig
+ =net-libs/openpgm-5.1.118
+ )
+ elibc_glibc? ( sys-apps/util-linux )"
+RDEPEND=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-unused-variable.patch
+ einfo "Removing bundled OpenPGM library"
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
+ rm -r "${S}"/foreign/openpgm/libpgm* || die
+ # apply effective bit of below commit to fix compilation on Darwin
+ # https://github.com/zeromq/zeromq3-x/commit/400cbc208a768c4df5039f401dd2688eede6e1ca
+ sed -i -e '/strndup/d' tests/test_disconnect_inproc.cpp || die
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ use pgm && myconf="--with-system-pgm" || myconf="--without-pgm"
+ econf \
+ $(use_enable static-libs static) \
+ ${myconf}
+}
+
+src_test() {
+ emake -j1 check
+}
+
+src_install() {
+ default
+ doman doc/*.[1-9]
+
+ # remove useless .la files
+ find "${ED}" -name '*.la' -delete || die
+
+ # remove useless .a (only for non static compilation)
+ if ! use static-libs; then
+ find "${ED}" -name '*.a' -delete || die
+ fi
+}
diff --git a/net-libs/zeromq/zeromq-3.2.5.ebuild b/net-libs/zeromq/zeromq-3.2.5.ebuild
new file mode 100644
index 000000000000..5bf377533927
--- /dev/null
+++ b/net-libs/zeromq/zeromq-3.2.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="ZeroMQ is a brokerless kernel"
+HOMEPAGE="http://www.zeromq.org/"
+SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="pgm test static-libs elibc_glibc"
+
+DEPEND="
+ || ( sys-devel/gcc sys-devel/gcc-apple )
+ pgm? (
+ virtual/pkgconfig
+ >=net-libs/openpgm-5.2
+ )
+ elibc_glibc? ( sys-apps/util-linux )"
+RDEPEND=""
+
+src_prepare() {
+ einfo "Removing bundled OpenPGM library"
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
+ rm -r "${S}"/foreign/openpgm/libpgm* || die
+ # apply effective bit of below commit to fix compilation on Darwin
+ # https://github.com/zeromq/zeromq3-x/commit/400cbc208a768c4df5039f401dd2688eede6e1ca
+ sed -i -e '/strndup/d' tests/test_disconnect_inproc.cpp || die
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ use pgm && myconf="--with-system-pgm" || myconf="--without-pgm"
+ econf \
+ $(use_enable static-libs static) \
+ ${myconf}
+}
+
+src_test() {
+ emake -j1 check
+}
+
+src_install() {
+ default
+ doman doc/*.[1-9]
+
+ # remove useless .la files
+ find "${ED}" -name '*.la' -delete || die
+
+ # remove useless .a (only for non static compilation)
+ if ! use static-libs; then
+ find "${ED}" -name '*.a' -delete || die
+ fi
+}
diff --git a/net-libs/zeromq/zeromq-4.1.1.ebuild b/net-libs/zeromq/zeromq-4.1.1.ebuild
new file mode 100644
index 000000000000..8a6780ef0849
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="A brokerless kernel"
+HOMEPAGE="http://www.zeromq.org/"
+SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/4"
+KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="pgm static-libs test"
+
+RDEPEND="
+ dev-libs/libsodium:=
+ pgm? ( =net-libs/openpgm-5.2.122 )"
+DEPEND="${RDEPEND}
+ sys-apps/util-linux
+ pgm? ( virtual/pkgconfig )"
+
+src_prepare() {
+ einfo "Removing bundled OpenPGM library"
+ rm -fr "${S}"/foreign/openpgm/libpgm* || die
+ sed \
+ -e '/libzmq_werror=/s:yes:no:g' \
+ -i configure.ac || die
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=()
+ use pgm && myeconfargs+=( --with-system-pgm ) || myeconfargs+=( --without-pgm )
+ autotools-utils_src_configure
+}
+
+src_test() {
+ autotools-utils_src_test -j1
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ doman doc/*.[1-9]
+}
diff --git a/net-libs/zeromq/zeromq-4.1.2.ebuild b/net-libs/zeromq/zeromq-4.1.2.ebuild
new file mode 100644
index 000000000000..eb52ba2e1cb6
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="A brokerless kernel"
+HOMEPAGE="http://www.zeromq.org/"
+SRC_URI="http://download.zeromq.org/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="pgm static-libs test"
+
+RDEPEND="
+ dev-libs/libsodium:=
+ pgm? ( =net-libs/openpgm-5.2.122 )"
+DEPEND="${RDEPEND}
+ sys-apps/util-linux
+ pgm? ( virtual/pkgconfig )"
+
+src_prepare() {
+ einfo "Removing bundled OpenPGM library"
+ rm -fr "${S}"/foreign/openpgm/libpgm* || die
+ sed \
+ -e '/libzmq_werror=/s:yes:no:g' \
+ -i configure.ac || die
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=()
+ use pgm && myeconfargs+=( --with-system-pgm ) || myeconfargs+=( --without-pgm )
+ autotools-utils_src_configure
+}
+
+src_test() {
+ autotools-utils_src_test -j1
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ doman doc/*.[1-9]
+}