summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
Diffstat (limited to 'net-im')
-rw-r--r--net-im/ayttm/Manifest1
-rw-r--r--net-im/ayttm/ayttm-0.6.3.ebuild67
-rw-r--r--net-im/ayttm/files/ayttm-0.6.3-opt-webcam.patch28
-rw-r--r--net-im/ayttm/files/ayttm-0.6.3-opt-xscreensaver.patch16
-rw-r--r--net-im/ayttm/metadata.xml19
-rw-r--r--net-im/birdie/Manifest1
-rw-r--r--net-im/birdie/birdie-1.1-r1.ebuild79
-rw-r--r--net-im/birdie/metadata.xml10
-rw-r--r--net-im/bitlbee/Manifest1
-rw-r--r--net-im/bitlbee/bitlbee-3.2.2.ebuild182
-rw-r--r--net-im/bitlbee/files/bitlbee-3.2.1-configure.patch17
-rw-r--r--net-im/bitlbee/files/bitlbee.confd2
-rw-r--r--net-im/bitlbee/files/bitlbee.confd-r18
-rw-r--r--net-im/bitlbee/files/bitlbee.initd28
-rw-r--r--net-im/bitlbee/files/bitlbee.initd-r131
-rw-r--r--net-im/bitlbee/metadata.xml26
-rw-r--r--net-im/centerim/Manifest3
-rw-r--r--net-im/centerim/centerim-4.22.10.ebuild113
-rw-r--r--net-im/centerim/centerim-5.0.0_beta1.ebuild39
-rw-r--r--net-im/centerim/centerim-5.0.0_beta2.ebuild39
-rw-r--r--net-im/centerim/files/centerim-4.22.10-gcc46.patch12
-rw-r--r--net-im/centerim/metadata.xml14
-rw-r--r--net-im/choqok/Manifest1
-rw-r--r--net-im/choqok/choqok-1.5.ebuild48
-rw-r--r--net-im/choqok/metadata.xml11
-rw-r--r--net-im/climm/Manifest1
-rw-r--r--net-im/climm/climm-0.7.1.ebuild64
-rw-r--r--net-im/climm/metadata.xml8
-rw-r--r--net-im/coccinella/Manifest1
-rw-r--r--net-im/coccinella/coccinella-0.96.20.ebuild70
-rw-r--r--net-im/coccinella/metadata.xml18
-rw-r--r--net-im/corebird/Manifest2
-rw-r--r--net-im/corebird/corebird-0.8.ebuild48
-rw-r--r--net-im/corebird/corebird-1.0.ebuild50
-rw-r--r--net-im/corebird/metadata.xml22
-rw-r--r--net-im/cpop/Manifest1
-rw-r--r--net-im/cpop/cpop-0.0.4-r1.ebuild28
-rw-r--r--net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch38
-rw-r--r--net-im/cpop/metadata.xml5
-rw-r--r--net-im/dianara/Manifest1
-rw-r--r--net-im/dianara/dianara-1.2.4.ebuild57
-rw-r--r--net-im/dianara/metadata.xml11
-rw-r--r--net-im/ejabberd/Manifest3
-rw-r--r--net-im/ejabberd/ejabberd-15.03-r1.ebuild150
-rw-r--r--net-im/ejabberd/ejabberd-2.1.13-r1.ebuild222
-rw-r--r--net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch49
-rw-r--r--net-im/ejabberd/files/ejabberd-3.confd5
-rw-r--r--net-im/ejabberd/files/ejabberd-3.initd47
-rw-r--r--net-im/ejabberd/files/ejabberd.logrotate13
-rw-r--r--net-im/ejabberd/files/ejabberd.service17
-rw-r--r--net-im/ejabberd/files/ejabberd.tmpfiles.conf1
-rw-r--r--net-im/ejabberd/metadata.xml26
-rw-r--r--net-im/ekg2/Manifest1
-rw-r--r--net-im/ekg2/ekg2-0.3.1-r2.ebuild112
-rw-r--r--net-im/ekg2/ekg2-9999.ebuild109
-rw-r--r--net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch25
-rw-r--r--net-im/ekg2/metadata.xml33
-rw-r--r--net-im/empathy/Manifest3
-rw-r--r--net-im/empathy/empathy-3.12.10.ebuild127
-rw-r--r--net-im/empathy/empathy-3.12.7.ebuild127
-rw-r--r--net-im/empathy/empathy-3.12.9.ebuild127
-rw-r--r--net-im/empathy/files/empathy-3.12.7-Fix-parallel-build-in-extensions.patch65
-rw-r--r--net-im/empathy/metadata.xml22
-rw-r--r--net-im/err/Manifest1
-rw-r--r--net-im/err/err-1.7.1.ebuild90
-rw-r--r--net-im/err/files/errd.confd9
-rw-r--r--net-im/err/files/errd.initd27
-rw-r--r--net-im/err/metadata.xml20
-rw-r--r--net-im/gajim/Manifest2
-rw-r--r--net-im/gajim/files/gajim-0.16-desktop.patch16
-rw-r--r--net-im/gajim/gajim-0.16.3.ebuild127
-rw-r--r--net-im/gajim/gajim-0.16.ebuild124
-rw-r--r--net-im/gajim/metadata.xml16
-rw-r--r--net-im/gg-transport/Manifest1
-rw-r--r--net-im/gg-transport/files/jggtrans-2.2.2-r120
-rw-r--r--net-im/gg-transport/files/jggtrans-2.2.420
-rw-r--r--net-im/gg-transport/gg-transport-2.2.4.ebuild46
-rw-r--r--net-im/gg-transport/metadata.xml12
-rw-r--r--net-im/indicator-messages/Manifest1
-rw-r--r--net-im/indicator-messages/indicator-messages-0.6.0-r1.ebuild49
-rw-r--r--net-im/indicator-messages/metadata.xml11
-rw-r--r--net-im/jabber-base/jabber-base-0.01.ebuild50
-rw-r--r--net-im/jabber-base/metadata.xml10
-rw-r--r--net-im/jabberd2/Manifest2
-rw-r--r--net-im/jabberd2/files/jabberd2-2.3.1.init82
-rw-r--r--net-im/jabberd2/files/jabberd2-2.3.1.logrotate10
-rw-r--r--net-im/jabberd2/files/jabberd2-2.3.1.pamd6
-rw-r--r--net-im/jabberd2/files/jabberd2-2.3.2.init97
-rw-r--r--net-im/jabberd2/files/jabberd2-2.3.2.logrotate8
-rw-r--r--net-im/jabberd2/jabberd2-2.3.1-r1.ebuild156
-rw-r--r--net-im/jabberd2/jabberd2-2.3.2-r1.ebuild157
-rw-r--r--net-im/jabberd2/jabberd2-2.3.2.ebuild157
-rw-r--r--net-im/jabberd2/metadata.xml15
-rw-r--r--net-im/kadu/Manifest2
-rw-r--r--net-im/kadu/files/kadu-2.1-qt5-compilation.patch11
-rw-r--r--net-im/kadu/kadu-0.12.3.ebuild98
-rw-r--r--net-im/kadu/kadu-2.1.ebuild145
-rw-r--r--net-im/kadu/metadata.xml17
-rw-r--r--net-im/kde-telepathy-meta/kde-telepathy-meta-0.9.0.ebuild43
-rw-r--r--net-im/kde-telepathy-meta/metadata.xml5
-rw-r--r--net-im/kouchat/Manifest2
-rw-r--r--net-im/kouchat/files/build.xml52
-rw-r--r--net-im/kouchat/kouchat-1.1.0.ebuild30
-rw-r--r--net-im/kouchat/metadata.xml8
-rw-r--r--net-im/ktp-accounts-kcm/Manifest1
-rw-r--r--net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.9.0.ebuild40
-rw-r--r--net-im/ktp-accounts-kcm/metadata.xml8
-rw-r--r--net-im/ktp-approver/Manifest1
-rw-r--r--net-im/ktp-approver/ktp-approver-0.9.0.ebuild30
-rw-r--r--net-im/ktp-approver/metadata.xml5
-rw-r--r--net-im/ktp-auth-handler/Manifest1
-rw-r--r--net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild33
-rw-r--r--net-im/ktp-auth-handler/metadata.xml5
-rw-r--r--net-im/ktp-call-ui/Manifest1
-rw-r--r--net-im/ktp-call-ui/ktp-call-ui-0.9.0.ebuild39
-rw-r--r--net-im/ktp-call-ui/metadata.xml5
-rw-r--r--net-im/ktp-common-internals/Manifest1
-rw-r--r--net-im/ktp-common-internals/ktp-common-internals-0.9.0.ebuild48
-rw-r--r--net-im/ktp-common-internals/metadata.xml8
-rw-r--r--net-im/ktp-contact-list/Manifest1
-rw-r--r--net-im/ktp-contact-list/ktp-contact-list-0.9.0.ebuild39
-rw-r--r--net-im/ktp-contact-list/metadata.xml5
-rw-r--r--net-im/ktp-contact-runner/Manifest1
-rw-r--r--net-im/ktp-contact-runner/ktp-contact-runner-0.9.0.ebuild29
-rw-r--r--net-im/ktp-contact-runner/metadata.xml5
-rw-r--r--net-im/ktp-desktop-applets/Manifest1
-rw-r--r--net-im/ktp-desktop-applets/ktp-desktop-applets-0.9.0.ebuild31
-rw-r--r--net-im/ktp-desktop-applets/metadata.xml5
-rw-r--r--net-im/ktp-filetransfer-handler/Manifest1
-rw-r--r--net-im/ktp-filetransfer-handler/ktp-filetransfer-handler-0.9.0.ebuild29
-rw-r--r--net-im/ktp-filetransfer-handler/metadata.xml5
-rw-r--r--net-im/ktp-kded-module/Manifest1
-rw-r--r--net-im/ktp-kded-module/ktp-kded-module-0.9.0.ebuild32
-rw-r--r--net-im/ktp-kded-module/metadata.xml5
-rw-r--r--net-im/ktp-send-file/Manifest1
-rw-r--r--net-im/ktp-send-file/ktp-send-file-0.9.0.ebuild32
-rw-r--r--net-im/ktp-send-file/metadata.xml5
-rw-r--r--net-im/ktp-text-ui/Manifest1
-rw-r--r--net-im/ktp-text-ui/ktp-text-ui-0.9.0.ebuild44
-rw-r--r--net-im/ktp-text-ui/metadata.xml5
-rw-r--r--net-im/librvp/Manifest2
-rw-r--r--net-im/librvp/librvp-0.9.6.ebuild30
-rw-r--r--net-im/librvp/librvp-0.9.7.ebuild30
-rw-r--r--net-im/librvp/metadata.xml12
-rw-r--r--net-im/licq/Manifest1
-rw-r--r--net-im/licq/files/licq-1.3.8-hebrew.patch95
-rw-r--r--net-im/licq/files/licq-1.3.8-memory_leak.patch9
-rw-r--r--net-im/licq/licq-1.8.2.ebuild76
-rw-r--r--net-im/licq/metadata.xml16
-rw-r--r--net-im/mcabber/Manifest3
-rw-r--r--net-im/mcabber/files/mcabber-0.10.2_p20131025-vim-ftdetect.patch12
-rw-r--r--net-im/mcabber/files/mcabber-0.10.3-vim-ftdetect.patch12
-rw-r--r--net-im/mcabber/mcabber-0.10.2_p20131025-r1.ebuild118
-rw-r--r--net-im/mcabber/mcabber-0.10.2_p20131025.ebuild115
-rw-r--r--net-im/mcabber/mcabber-0.10.3.ebuild119
-rw-r--r--net-im/mcabber/mcabber-1.0.0.ebuild119
-rw-r--r--net-im/mcabber/metadata.xml22
-rw-r--r--net-im/metadata.xml35
-rw-r--r--net-im/minbif/Manifest1
-rw-r--r--net-im/minbif/files/minbif-1.0.5-gcc47.patch76
-rw-r--r--net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch26
-rw-r--r--net-im/minbif/files/minbif.initd24
-rw-r--r--net-im/minbif/metadata.xml8
-rw-r--r--net-im/minbif/minbif-1.0.5-r1.ebuild84
-rw-r--r--net-im/mu-conference/Manifest3
-rw-r--r--net-im/mu-conference/files/README.Gentoo40
-rw-r--r--net-im/mu-conference/files/mu-conference-0.7.init25
-rw-r--r--net-im/mu-conference/files/mu-conference-conf.d9
-rw-r--r--net-im/mu-conference/files/mu-conference-makefile.patch11
-rw-r--r--net-im/mu-conference/files/muc-transport.init26
-rw-r--r--net-im/mu-conference/files/muc-transport.init-r233
-rw-r--r--net-im/mu-conference/files/muctrans.xml37
-rw-r--r--net-im/mu-conference/metadata.xml6
-rw-r--r--net-im/mu-conference/mu-conference-0.7.ebuild86
-rw-r--r--net-im/mu-conference/mu-conference-0.8-r1.ebuild88
-rw-r--r--net-im/mu-conference/mu-conference-0.8.81.ebuild86
-rw-r--r--net-im/openfire/Manifest3
-rw-r--r--net-im/openfire/files/openfire-confd11
-rw-r--r--net-im/openfire/files/openfire-initd29
-rw-r--r--net-im/openfire/files/openfire.service13
-rw-r--r--net-im/openfire/metadata.xml14
-rw-r--r--net-im/openfire/openfire-3.10.0.ebuild108
-rw-r--r--net-im/openfire/openfire-3.10.1.ebuild108
-rw-r--r--net-im/openfire/openfire-3.10.2.ebuild108
-rw-r--r--net-im/pidgin/Manifest3
-rw-r--r--net-im/pidgin/files/pidgin-2.10.0-gold.patch30
-rw-r--r--net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch23
-rw-r--r--net-im/pidgin/files/pidgin-2.10.11-tinfo.patch24
-rw-r--r--net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch10
-rw-r--r--net-im/pidgin/metadata.xml29
-rw-r--r--net-im/pidgin/pidgin-2.10.10.ebuild244
-rw-r--r--net-im/pidgin/pidgin-2.10.11.ebuild248
-rw-r--r--net-im/pork/Manifest1
-rw-r--r--net-im/pork/files/pork-0.99.8.1-tinfo.patch11
-rw-r--r--net-im/pork/metadata.xml13
-rw-r--r--net-im/pork/pork-0.99.8.1.ebuild40
-rw-r--r--net-im/prosody/Manifest2
-rw-r--r--net-im/prosody/files/prosody-0.9.2-cfg.lua.patch52
-rw-r--r--net-im/prosody/files/prosody.initd-r247
-rw-r--r--net-im/prosody/files/prosody.service12
-rw-r--r--net-im/prosody/files/prosody.tmpfilesd1
-rw-r--r--net-im/prosody/metadata.xml18
-rw-r--r--net-im/prosody/prosody-0.9.7.ebuild83
-rw-r--r--net-im/prosody/prosody-0.9.8.ebuild84
-rw-r--r--net-im/psi/Manifest18
-rw-r--r--net-im/psi/files/psi-0.14-drop-debug-cflags.patch35
-rw-r--r--net-im/psi/files/psi-0.14-input-validation.patch257
-rw-r--r--net-im/psi/files/psi-0.14-minizip-detection.patch284
-rw-r--r--net-im/psi/files/psi-0.14-qt-compat.patch40
-rw-r--r--net-im/psi/metadata.xml21
-rw-r--r--net-im/psi/psi-0.14-r4.ebuild171
-rw-r--r--net-im/psi/psi-0.15.ebuild129
-rw-r--r--net-im/psi/psi-9999.ebuild215
-rw-r--r--net-im/psimedia/Manifest1
-rw-r--r--net-im/psimedia/files/psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch51
-rw-r--r--net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch52
-rw-r--r--net-im/psimedia/files/psimedia-1.0.3-linux-headers-2.6.38.patch86
-rw-r--r--net-im/psimedia/metadata.xml13
-rw-r--r--net-im/psimedia/psimedia-1.0.3-r3.ebuild77
-rw-r--r--net-im/purple-events/Manifest1
-rw-r--r--net-im/purple-events/metadata.xml15
-rw-r--r--net-im/purple-events/purple-events-0.2.ebuild24
-rw-r--r--net-im/pyaim-t/Manifest1
-rw-r--r--net-im/pyaim-t/files/pyaim-t-0.8-initd-r124
-rw-r--r--net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch36
-rw-r--r--net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch118
-rw-r--r--net-im/pyaim-t/metadata.xml19
-rw-r--r--net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild51
-rw-r--r--net-im/pyicq-t/Manifest1
-rw-r--r--net-im/pyicq-t/files/pyicq-t-0.8-initd-r124
-rw-r--r--net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch36
-rw-r--r--net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff118
-rw-r--r--net-im/pyicq-t/files/pyicq-t.service10
-rw-r--r--net-im/pyicq-t/metadata.xml13
-rw-r--r--net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild54
-rw-r--r--net-im/qtwitter/Manifest1
-rw-r--r--net-im/qtwitter/files/qtwitter-0.10.0-gold.patch12
-rw-r--r--net-im/qtwitter/metadata.xml6
-rw-r--r--net-im/qtwitter/qtwitter-0.10.0-r1.ebuild54
-rw-r--r--net-im/qutim/Manifest1
-rw-r--r--net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-kde-build.patch25
-rw-r--r--net-im/qutim/files/qutim-0.3.2-astral-migrate-qt-telepaphy.patch151
-rw-r--r--net-im/qutim/metadata.xml40
-rw-r--r--net-im/qutim/qutim-0.3.2.ebuild187
-rw-r--r--net-im/qwit/Manifest1
-rw-r--r--net-im/qwit/metadata.xml14
-rw-r--r--net-im/qwit/qwit-1.1_pre2.ebuild30
-rw-r--r--net-im/reaim/Manifest1
-rw-r--r--net-im/reaim/files/reaim22
-rw-r--r--net-im/reaim/metadata.xml8
-rw-r--r--net-im/reaim/reaim-0.8-r1.ebuild36
-rw-r--r--net-im/sendxmpp/Manifest2
-rw-r--r--net-im/sendxmpp/metadata.xml8
-rw-r--r--net-im/sendxmpp/sendxmpp-1.23.ebuild22
-rw-r--r--net-im/sendxmpp/sendxmpp-1.24.ebuild20
-rw-r--r--net-im/silc-server/Manifest1
-rw-r--r--net-im/silc-server/files/silcd.initd-r125
-rw-r--r--net-im/silc-server/metadata.xml5
-rw-r--r--net-im/silc-server/silc-server-1.1.18.ebuild82
-rw-r--r--net-im/silc-toolkit/Manifest1
-rw-r--r--net-im/silc-toolkit/metadata.xml5
-rw-r--r--net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild40
-rw-r--r--net-im/simpserver-bin/Manifest1
-rw-r--r--net-im/simpserver-bin/files/simpserver.rc21
-rw-r--r--net-im/simpserver-bin/metadata.xml14
-rw-r--r--net-im/simpserver-bin/simpserver-bin-2.1.0.ebuild38
-rw-r--r--net-im/skype/Manifest1
-rw-r--r--net-im/skype/files/skype2
-rw-r--r--net-im/skype/files/skype-4.3.0.37-desktop.patch15
-rw-r--r--net-im/skype/metadata.xml16
-rw-r--r--net-im/skype/skype-4.3.0.37-r5.ebuild120
-rw-r--r--net-im/skypetab-ng/Manifest1
-rw-r--r--net-im/skypetab-ng/metadata.xml12
-rw-r--r--net-im/skypetab-ng/skypetab-ng-0.5.2.ebuild38
-rw-r--r--net-im/skypetab-ng/skypetab-ng-9999.ebuild38
-rw-r--r--net-im/telepathy-connection-managers/metadata.xml16
-rw-r--r--net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild41
-rw-r--r--net-im/telepathy-logger/Manifest2
-rw-r--r--net-im/telepathy-logger/metadata.xml5
-rw-r--r--net-im/telepathy-logger/telepathy-logger-0.8.1.ebuild50
-rw-r--r--net-im/telepathy-logger/telepathy-logger-0.8.2.ebuild50
-rw-r--r--net-im/telepathy-mission-control/Manifest2
-rw-r--r--net-im/telepathy-mission-control/metadata.xml14
-rw-r--r--net-im/telepathy-mission-control/telepathy-mission-control-5.16.2.ebuild50
-rw-r--r--net-im/telepathy-mission-control/telepathy-mission-control-5.16.3.ebuild50
-rw-r--r--net-im/tkabber/Manifest2
-rw-r--r--net-im/tkabber/metadata.xml9
-rw-r--r--net-im/tkabber/tkabber-0.11.1-r1.ebuild49
-rw-r--r--net-im/turses/Manifest2
-rw-r--r--net-im/turses/files/turses-0.2.11-tests.patch28
-rw-r--r--net-im/turses/metadata.xml10
-rw-r--r--net-im/turses/turses-0.2.13-r1.ebuild38
-rw-r--r--net-im/turses/turses-0.2.23.ebuild48
-rw-r--r--net-im/vacuum/Manifest1
-rw-r--r--net-im/vacuum/metadata.xml61
-rw-r--r--net-im/vacuum/vacuum-1.2.4.ebuild80
-rw-r--r--net-im/vacuum/vacuum-9999.ebuild105
-rw-r--r--net-im/ysm/Manifest1
-rw-r--r--net-im/ysm/metadata.xml8
-rw-r--r--net-im/ysm/ysm-2.9.9.1.ebuild26
300 files changed, 11488 insertions, 0 deletions
diff --git a/net-im/ayttm/Manifest b/net-im/ayttm/Manifest
new file mode 100644
index 000000000000..f8e608210834
--- /dev/null
+++ b/net-im/ayttm/Manifest
@@ -0,0 +1 @@
+DIST ayttm-0.6.3.tar.bz2 1377010 SHA256 2c48d3b8183139e7657c03dab9d17c997077624fd97a177d932f80ee6c596157
diff --git a/net-im/ayttm/ayttm-0.6.3.ebuild b/net-im/ayttm/ayttm-0.6.3.ebuild
new file mode 100644
index 000000000000..079efe16e8ac
--- /dev/null
+++ b/net-im/ayttm/ayttm-0.6.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils multilib
+
+DESCRIPTION="A multi-protocol instant messaging client"
+HOMEPAGE="http://ayttm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ayttm/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt icq irc xmpp lj msn nls oscar smtp webcam xscreensaver yahoo"
+
+CDEPEND="app-text/enchant
+ dev-libs/glib:2
+ dev-libs/openssl
+ virtual/libiconv
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/libXpm
+ x11-libs/pango
+ crypt? ( app-crypt/gpgme )
+ webcam? ( media-libs/jasper )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ yahoo? ( net-libs/libyahoo2 )"
+RDEPEND="${CDEPEND}
+ webcam? ( media-tv/xawtv )"
+DEPEND="${CDEPEND}
+ sys-devel/bison
+ sys-devel/flex
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-opt-xscreensaver.patch \
+ "${FILESDIR}"/${P}-opt-webcam.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable crypt aycryption) \
+ --disable-esd \
+ $(use_enable icq) \
+ $(use_enable irc) \
+ $(use_enable xmpp jabber) \
+ $(use_enable lj) \
+ $(use_enable msn) \
+ $(use_enable nls) \
+ $(use_enable oscar) \
+ $(use_enable smtp) \
+ $(use_enable webcam) \
+ $(use_enable xscreensaver) \
+ $(use_enable yahoo) \
+ --disable-arts \
+ --enable-posix-dlopen \
+ --disable-static
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog README README.LINUX TODO
+ rm -f "${D}"/usr/$(get_libdir)/${PN}/*.la
+}
diff --git a/net-im/ayttm/files/ayttm-0.6.3-opt-webcam.patch b/net-im/ayttm/files/ayttm-0.6.3-opt-webcam.patch
new file mode 100644
index 000000000000..e805d90746d6
--- /dev/null
+++ b/net-im/ayttm/files/ayttm-0.6.3-opt-webcam.patch
@@ -0,0 +1,28 @@
+Make the building of the webcam-related plugins optional.
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- configure.ac
++++ configure.ac
+@@ -436,6 +439,10 @@
+ AC_MSG_WARN(You need gpgme to compile the aycryption module))
+ fi
+
++if test "$enable_webcam" != no; then
++ OPTIONAL_PLUG_DIR="$OPTIONAL_PLUG_DIR image_filter"
++fi
++
+ ###########################################################################
+ # End Optional Modules
+ ###########################################################################
+--- modules/Makefile.am
++++ modules/Makefile.am
+@@ -1,7 +1,7 @@
+ DIST_SUBDIRS = aim-oscar irc jabber msn2 yahoo2 smtp importers \
+ livejournal utility aycryption smileys image_filter
+
+-SUBDIRS = @OPTIONAL_PLUG_DIR@ importers utility smileys image_filter
++SUBDIRS = @OPTIONAL_PLUG_DIR@ importers utility smileys
+
+ # Gets rid of the datarootdir warning
+ datarootdir=@datarootdir@
diff --git a/net-im/ayttm/files/ayttm-0.6.3-opt-xscreensaver.patch b/net-im/ayttm/files/ayttm-0.6.3-opt-xscreensaver.patch
new file mode 100644
index 000000000000..7c6f09f5117e
--- /dev/null
+++ b/net-im/ayttm/files/ayttm-0.6.3-opt-xscreensaver.patch
@@ -0,0 +1,16 @@
+Add --enable-xscreensaver to configure for USE flag support
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- configure.ac
++++ configure.ac
+@@ -316,6 +316,9 @@
+ #endif
+ ])
+
++AC_ARG_ENABLE(xscreensaver, AC_HELP_STRING([--enable-xscreensaver],
++ [compile with X Screensaver]), [have_xss=$enableval], [have_xss=no] )
++
+ if test "$have_xss" = yes; then
+ # Let's figure out what library it's in...
+
diff --git a/net-im/ayttm/metadata.xml b/net-im/ayttm/metadata.xml
new file mode 100644
index 000000000000..06a0a876dacd
--- /dev/null
+++ b/net-im/ayttm/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-im</herd>
+ <longdescription lang="en">
+ Ayttm is a multi-protocol instant messaging client with some novel features
+ such as the ability to connect to livejournal.com and the ability to send
+ short messages via RFC2821 SMTP.
+ </longdescription>
+ <use>
+ <flag name="irc">Enable Internet Relay Chat support</flag>
+ <flag name="lj">Enable livejournal.com support</flag>
+ <flag name="smtp">Adds support for sending messages via RFC2821 SMTP</flag>
+ <flag name="webcam">Adds webcam support for Yahoo Messenger</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">ayttm</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/birdie/Manifest b/net-im/birdie/Manifest
new file mode 100644
index 000000000000..b1e9c43b5205
--- /dev/null
+++ b/net-im/birdie/Manifest
@@ -0,0 +1 @@
+DIST birdie-1.1.tar.gz 218970 SHA256 c9b652b157f09241197c859d2c77f14becaf1b1031b1d2140dcc052a6227a338 SHA512 dc9fabebe580648227f0decc8bd441db4049559086db828957147f99cce0dc16a7b063f84092c8c7d712463e16f448cf6c3691e090cdb56dd5eed9c854bdaeae WHIRLPOOL 2cdbc9c2a536d81446484ede0b29c7849d42407755ac44cec60293b959ec79e2e6be6967fa3c6e871796a923553399d383e2465bf44fb592205e57c09a14a9f0
diff --git a/net-im/birdie/birdie-1.1-r1.ebuild b/net-im/birdie/birdie-1.1-r1.ebuild
new file mode 100644
index 000000000000..ad75635ab48a
--- /dev/null
+++ b/net-im/birdie/birdie-1.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.22
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+inherit cmake-utils fdo-mime gnome2 vala
+
+DESCRIPTION="Twitter client for Linux"
+HOMEPAGE="http://birdieapp.github.io/"
+SRC_URI="https://github.com/birdieapp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ dev-db/sqlite:3
+ >=dev-libs/granite-0.2.1
+ dev-libs/json-glib
+ dev-libs/libdbusmenu
+ dev-libs/libgee:0
+ net-libs/libsoup:2.4
+ net-libs/rest:0.7
+ media-libs/libcanberra
+ net-im/pidgin
+ net-libs/webkit-gtk:3
+ >=x11-libs/gtk+-3.10:3
+ x11-libs/gtksourceview:3.0
+ x11-libs/libnotify
+ x11-libs/libXtst
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+"
+
+src_prepare() {
+ sed \
+ -e '/ggdb/d' \
+ -e 's:gtk-update-icon-cache:true:g' \
+ -e 's:update-desktop-database:true:g' \
+ -i icons/CMakeLists.txt data/CMakeLists.txt CMakeLists.txt || die
+ vala_src_prepare
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DVALA_EXECUTABLE="${VALAC}"
+ -DGSETTINGS_COMPILE=OFF
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_pkg_postrm
+}
diff --git a/net-im/birdie/metadata.xml b/net-im/birdie/metadata.xml
new file mode 100644
index 000000000000..d2c94161ca63
--- /dev/null
+++ b/net-im/birdie/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>jlec@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">birdieapp/birdie</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
new file mode 100644
index 000000000000..452cb35ef074
--- /dev/null
+++ b/net-im/bitlbee/Manifest
@@ -0,0 +1 @@
+DIST bitlbee-3.2.2.tar.gz 661757 SHA256 ba38939281f23e8a0e71022c7be0cb68f6544248404362c5e20245fa7a67558e SHA512 5826a9d64e2de42c5560d85c3e7c96a72930afae005143323b6a301b588328b156b50cde571c7f396ca00952d950d22db1ea11cc42256935d3d72ec90215e7d2 WHIRLPOOL cbc3552289949e5e10281d65f617f38075016c813bf2cbb13e09af913ea8545c46a69225bf4f523e1a73f955d7309b8c7b94e23affdedf5dce2760eee55203ae
diff --git a/net-im/bitlbee/bitlbee-3.2.2.ebuild b/net-im/bitlbee/bitlbee-3.2.2.ebuild
new file mode 100644
index 000000000000..a67a1334c123
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-3.2.2.ebuild
@@ -0,0 +1,182 @@
+# 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 user python-single-r1 systemd
+
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
+HOMEPAGE="http://www.bitlbee.org/"
+SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
+IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux
+skype ssl test twitter +yahoo xinetd"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.14
+ purple? ( net-im/pidgin )
+ libevent? ( dev-libs/libevent )
+ otr? ( >=net-libs/libotr-4 )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? (
+ nss? ( dev-libs/nss )
+ !nss? ( ssl? ( dev-libs/openssl ) )
+ )
+ "
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ selinux? ( sec-policy/selinux-bitlbee )
+ skype? ( app-text/asciidoc )
+ test? ( dev-libs/check )"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/logger
+ skype? (
+ dev-python/skype4py[${PYTHON_USEDEP}]
+ net-im/skype
+ )
+ xinetd? ( sys-apps/xinetd )"
+
+REQUIRED_USE="|| ( purple xmpp msn oscar yahoo )
+ msn? ( || ( gnutls nss ssl ) )
+ xmpp? ( !nss )"
+
+pkg_setup() {
+ if use xmpp && ! use gnutls && ! use ssl ; then
+ einfo
+ elog "You have enabled support for Jabber but do not have SSL"
+ elog "support enabled. This *will* prevent bitlbee from being"
+ elog "able to connect to SSL enabled Jabber servers. If you need to"
+ elog "connect to Jabber over SSL, enable ONE of the following use"
+ elog "flags: gnutls or ssl"
+ einfo
+ fi
+
+ use skype && python-single-r1_pkg_setup
+
+ enewgroup bitlbee
+ enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
+}
+
+src_prepare() {
+ sed -i \
+ -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \
+ -e "s/nobody/bitlbee/" \
+ -e "s/}/ disable = yes\n}/" \
+ doc/bitlbee.xinetd || die "sed failed in xinetd"
+
+ sed -i \
+ -e "s@mozilla-nss@nss@g" \
+ configure || die "sed failed in configure"
+
+ use skype && python_fix_shebang protocols/skype/skyped.py
+
+ epatch "${FILESDIR}"/${PN}-3.2.1-configure.patch
+}
+
+src_configure() {
+ # setup plugins, protocol, ipv6 and debug
+ use xmpp && myconf="${myconf} --jabber=1"
+ for flag in debug ipv6 msn oscar plugins purple skype twitter yahoo ; do
+ if use ${flag} ; then
+ myconf="${myconf} --${flag}=1"
+ else
+ myconf="${myconf} --${flag}=0"
+ fi
+ done
+
+ # set otr
+ if use otr && use plugins ; then
+ myconf="${myconf} --otr=plugin"
+ else
+ if use otr ; then
+ ewarn "OTR support has been disabled automatically because it"
+ ewarn "requires the plugins USE flag."
+ fi
+ myconf="${myconf} --otr=0"
+ fi
+
+ # setup ssl use flags
+ if use gnutls ; then
+ myconf="${myconf} --ssl=gnutls"
+ einfo "Using gnutls for SSL support"
+ elif use ssl ; then
+ myconf="${myconf} --ssl=openssl"
+ einfo "Using openssl for SSL support"
+ elif use nss ; then
+ myconf="${myconf} --ssl=nss"
+ einfo "Using nss for SSL support"
+ else
+ myconf="${myconf} --ssl=bogus"
+ einfo "You will not have any encryption support enabled."
+ fi
+
+ # set event handler
+ if use libevent ; then
+ myconf="${myconf} --events=libevent"
+ else
+ myconf="${myconf} --events=glib"
+ fi
+
+ # NOTE: bitlbee's configure script is not an autotool creation,
+ # so that is why we don't use econf.
+ ./configure --prefix=/usr --datadir=/usr/share/bitlbee \
+ --etcdir=/etc/bitlbee --plugindir=/usr/$(get_libdir)/bitlbee \
+ --systemdsystemunitdir=$(systemd_get_unitdir) \
+ --strip=0 ${myconf} || die "econf failed"
+
+ sed -i \
+ -e "/^EFLAGS/s:=:&${LDFLAGS} :" \
+ Makefile.settings || die "sed failed"
+}
+
+src_install() {
+ emake install install-etc install-doc install-dev install-systemd DESTDIR="${D}"
+
+ keepdir /var/lib/bitlbee
+ fperms 700 /var/lib/bitlbee
+ fowners bitlbee:bitlbee /var/lib/bitlbee
+
+ dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
+ dodoc doc/user-guide/user-guide.txt
+ dohtml doc/user-guide/*.html
+
+ if use skype ; then
+ newdoc protocols/skype/NEWS NEWS-skype
+ newdoc protocols/skype/README README-skype
+ fi
+
+ doman doc/bitlbee.8 doc/bitlbee.conf.5
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins doc/bitlbee.xinetd bitlbee
+ fi
+
+ newinitd "${FILESDIR}"/bitlbee.initd-r1 bitlbee
+ newconfd "${FILESDIR}"/bitlbee.confd-r1 bitlbee
+
+ exeinto /usr/share/bitlbee
+ cd utils
+ doexe convert_purple.py bitlbee-ctl.pl
+}
+
+pkg_postinst() {
+ chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
+ [[ -d "${ROOT}"/var/run/bitlbee ]] &&
+ chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee
+
+ einfo
+ elog "The bitlbee init script will now attempt to stop all processes owned by the"
+ elog "bitlbee user, including per-client forks."
+ elog
+ elog "Tell the init script not to touch anything besides the main bitlbee process"
+ elog "by changing the BITLBEE_STOP_ALL variable in"
+ elog " /etc/conf.d/bitlbee"
+ einfo
+}
diff --git a/net-im/bitlbee/files/bitlbee-3.2.1-configure.patch b/net-im/bitlbee/files/bitlbee-3.2.1-configure.patch
new file mode 100644
index 000000000000..5bde108af32c
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.2.1-configure.patch
@@ -0,0 +1,17 @@
+--- bitlbee-3.0.6/configure
++++ bitlbee-3.0.6/configure
+@@ -612,14 +612,6 @@
+ fi
+ fi
+
+-case "$CC" in
+-*gcc* )
+- echo CFLAGS+=-MMD -MF .depend/\$@.d >> Makefile.settings
+- for i in . lib tests protocols protocols/*/; do
+- mkdir -p $i/.depend
+- done
+-esac
+-
+ if [ "$msn" = 0 ]; then
+ echo '#undef WITH_MSN' >> config.h
+ else
diff --git a/net-im/bitlbee/files/bitlbee.confd b/net-im/bitlbee/files/bitlbee.confd
new file mode 100644
index 000000000000..c4003ce43515
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee.confd
@@ -0,0 +1,2 @@
+#Bitlbee options (see /usr/sbin/bitlbee -h)
+BITLBEE_OPTS="-F"
diff --git a/net-im/bitlbee/files/bitlbee.confd-r1 b/net-im/bitlbee/files/bitlbee.confd-r1
new file mode 100644
index 000000000000..d581222f9fb9
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee.confd-r1
@@ -0,0 +1,8 @@
+# Bitlbee options (see /usr/sbin/bitlbee -h)
+BITLBEE_OPTS="-F"
+
+# By default, the bitlbee init script will attempt to stop
+# all bitlbee-owned processes, including per-client forks.
+# Setting this to "no" tells the init script to only
+# stop the main bitlbee process.
+BITLBEE_STOP_ALL="yes"
diff --git a/net-im/bitlbee/files/bitlbee.initd b/net-im/bitlbee/files/bitlbee.initd
new file mode 100644
index 000000000000..3f4147799d6e
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee.initd
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or
+# later
+# $Id$
+
+DAEMON=/usr/sbin/bitlbee
+PIDFILE=/var/run/bitlbee/bitlbee.pid
+
+depend() {
+ need logger net
+}
+
+start () {
+ ebegin "Starting bitlbee"
+ checkpath -d -m 0755 -o bitlbee:bitlbee `dirname ${PIDFILE}`
+ start-stop-daemon --start --quiet \
+ -u bitlbee:bitlbee --exec ${DAEMON} -- -P ${PIDFILE} \
+ ${BITLBEE_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping bitlbee"
+ start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+ eend $?
+}
+
diff --git a/net-im/bitlbee/files/bitlbee.initd-r1 b/net-im/bitlbee/files/bitlbee.initd-r1
new file mode 100644
index 000000000000..f2c79841fde9
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee.initd-r1
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or
+# later
+# $Id$
+
+DAEMON=/usr/sbin/bitlbee
+PIDFILE=/var/run/bitlbee/bitlbee.pid
+
+depend() {
+ need logger net
+}
+
+start () {
+ ebegin "Starting bitlbee"
+ checkpath -d -m 0755 -o bitlbee:bitlbee $(dirname ${PIDFILE})
+ start-stop-daemon --start --quiet \
+ -u bitlbee:bitlbee --exec ${DAEMON} --pidfile ${PIDFILE} \
+ -- -P ${PIDFILE} ${BITLBEE_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping bitlbee"
+ local pidfile=
+ yesno ${BITLBEE_STOP_ALL:-YES} ||
+ pidfile="--pidfile ${PIDFILE}"
+ start-stop-daemon --stop --quiet ${pidfile} -u bitlbee:bitlbee
+ eend $?
+}
+
diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml
new file mode 100644
index 000000000000..e8e57b501a8c
--- /dev/null
+++ b/net-im/bitlbee/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>wired@gentoo.org</email>
+ <name>Alex Alexander</name>
+ </maintainer>
+ <maintainer>
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+ <use>
+ <flag name='libevent'>Use libevent for event handling</flag>
+ <flag name='nss'>Use NSS for SSL support in MSN and Jabber</flag>
+ <flag name='otr'>Enable support for encrypted conversations</flag>
+ <flag name='plugins'>Enable support for plugins</flag>
+ <flag name='purple'>Use libpurple instead of the built-in IM protocol support</flag>
+ <flag name='skype'>Enable Skype support</flag>
+ <flag name='twitter'>Enable Twitter protocol support</flag>
+ </use>
+ <longdescription>
+ Bitlbee as an IRC to IM gateway. It provides an irc server that allows
+ you to log on and then connect to various instant messaging protocols
+ (AIM, MSN, Yahoo, Jabber, etc).
+ </longdescription>
+</pkgmetadata>
diff --git a/net-im/centerim/Manifest b/net-im/centerim/Manifest
new file mode 100644
index 000000000000..a9ab1d42b91c
--- /dev/null
+++ b/net-im/centerim/Manifest
@@ -0,0 +1,3 @@
+DIST centerim-4.22.10.tar.gz 2287832 SHA256 93ce15eb9c834a4939b5aa0846d5c6023ec2953214daf8dc26c85ceaa4413f6e SHA512 1cabb6d455e2c1d2bb70a4330f78a34b54dabbc9a7d77d93ef7a08cfae73958670e86dee06b1fb7cb393c248d9682a491edb19a81cb43e7b0f44513c24759116 WHIRLPOOL 58a615cb171221b916c1cea61388659fe2dd6b09ebfe4bf8442109289e1ed89c47ee5e9cd093a05a276d08f33e6f4e7cb951153a6cdf6eed439a9c20b8d3ff78
+DIST centerim5-5.0.0beta1.tar.gz 640277 SHA256 d8dd989a0e6a29247dd56b11ad444ebcc4f0b07fa95879f0f86f8a7ab69ead7c SHA512 581acff42ba768ee564b5c1e817e1287e9889c3e837474de9a3342b10b6035ffa3430de62299c334376c5a61136dbf3eb776a35d7f5f7bb4dd2571296b3441ac WHIRLPOOL 178ff8814aaf204c557e6274a65eeea98e72956969a408eb02e02cebcc89f9c36462298e7fc5235f910299e1be51358eaac6c3bec24b23e6ba144727ba4e305f
+DIST centerim5-5.0.0beta2.tar.gz 689578 SHA256 5f4ad8d4ad8ec785f928ad06b42a184a9785a2cce31da5d908963643b0c522c7 SHA512 5057186ddb354c76740ea38d10678a18a716085566630e3338911f2d3931d60925406fe78c25de8ffe9bdbb7a307e7a230d0da6863c2d81ebb63ba2f6b962d0c WHIRLPOOL 089b5cf1e773712379154df9f74a006763d93472103f6a1f18f767701fa8248e76e0b309d7731dfb3d8e072905ddfe05212bfb69cd4a10215ced3553281c59f9
diff --git a/net-im/centerim/centerim-4.22.10.ebuild b/net-im/centerim/centerim-4.22.10.ebuild
new file mode 100644
index 000000000000..556665ccd6ae
--- /dev/null
+++ b/net-im/centerim/centerim-4.22.10.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils
+
+PROTOCOL_IUSE="+aim gadu +icq +irc +xmpp lj +msn rss +yahoo"
+IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
+
+DESCRIPTION="CenterIM is a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
+if [[ ${PV} = *_p* ]] # is this a snaphot?
+then
+ SRC_URI="http://www.centerim.org/download/snapshots/${PN}-${PV/*_p/}.tar.gz"
+elif [[ ${PV} = *.*.*.* ]] # is this a mobshot?
+then
+ SRC_URI="http://www.centerim.org/download/mobshots/${P}.tar.gz"
+else
+ SRC_URI="http://www.centerim.org/download/releases/${P}.tar.gz"
+fi
+HOMEPAGE="http://www.centerim.org/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+
+DEPEND=">=sys-libs/ncurses-5.2
+ bidi? ( dev-libs/fribidi )
+ ssl? ( >=dev-libs/openssl-0.9.6g )
+ jpeg? ( virtual/jpeg )
+ xmpp? (
+ otr? ( <net-libs/libotr-4 )
+ crypt? ( >=app-crypt/gpgme-1.0.2 )
+ )
+ msn? ( >=net-misc/curl-7.25.0-r1[ssl] )
+ yahoo? ( >=net-misc/curl-7.25.0-r1[ssl] )"
+
+RDEPEND="${DEPEND}
+ nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}"/${P/_p*}
+
+check_protocol_iuse() {
+ local flag
+
+ for flag in ${PROTOCOL_IUSE}
+ do
+ use ${flag#+} && return 0
+ done
+
+ return 1
+}
+
+pkg_setup() {
+ if ! check_protocol_iuse
+ then
+ eerror
+ eerror "Please activate at least one of the following protocol USE flags:"
+ eerror "${PROTOCOL_IUSE//+}"
+ eerror
+ die "Please activate at least one protocol USE flag!"
+ fi
+
+ if use otr && ! use xmpp
+ then
+ ewarn
+ ewarn "Support for OTR is only supported with Jabber!"
+ ewarn
+ fi
+
+ if use gadu && ! use jpeg
+ then
+ ewarn
+ ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!"
+ ewarn
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc46.patch
+
+ # Don't execute git commands, bug #228151
+ cat >"${S}"/misc/git-version-gen <<-EOF
+ #!/bin/sh
+ echo -n "${PVR}"
+ EOF
+}
+
+src_configure() {
+ econf \
+ $(use_with ssl) \
+ $(use_enable aim) \
+ $(use_with bidi fribidi) \
+ $(use_with jpeg libjpeg) \
+ $(use_with otr libotr) \
+ $(use_enable gadu gg) \
+ $(use_enable icq) \
+ $(use_enable irc) \
+ $(use_enable xmpp jabber) \
+ $(use_enable lj) \
+ $(use_enable msn) \
+ $(use_enable nls locales-fix) \
+ $(use_enable nls) \
+ $(use_enable rss) \
+ $(use_enable yahoo) \
+ || die "econf failed"
+}
+
+src_install () {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc AUTHORS ChangeLog FAQ README THANKS TODO
+}
diff --git a/net-im/centerim/centerim-5.0.0_beta1.ebuild b/net-im/centerim/centerim-5.0.0_beta1.ebuild
new file mode 100644
index 000000000000..c327469fb026
--- /dev/null
+++ b/net-im/centerim/centerim-5.0.0_beta1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+MY_P="${PN}5-${PV/_}"
+
+DESCRIPTION="CenterIM is a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
+SRC_URI="http://www.centerim.org/download/cim5/${MY_P}.tar.gz"
+HOMEPAGE="http://www.centerim.org/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="debug nls"
+
+DEPEND=">=sys-libs/ncurses-5.2
+ >=net-im/pidgin-2.7.0
+ >=dev-libs/glib-2.16.0
+ >=dev-libs/libsigc++-2.2.0"
+RDEPEND="${DEPEND}
+ nls? ( sys-devel/gettext )"
+DEPEND="${DEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+ econf \
+ $(use_enable debug) \
+ $(use_enable nls)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ rm -f "${D}"/usr/lib*/libcppconsui.{a,la}
+
+ dodoc AUTHORS HACKING NEWS README TODO
+}
diff --git a/net-im/centerim/centerim-5.0.0_beta2.ebuild b/net-im/centerim/centerim-5.0.0_beta2.ebuild
new file mode 100644
index 000000000000..eafd6aed3ff6
--- /dev/null
+++ b/net-im/centerim/centerim-5.0.0_beta2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="${PN}5-${PV/_}"
+
+DESCRIPTION="CenterIM is a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
+SRC_URI="http://www.centerim.org/download/cim5/${MY_P}.tar.gz"
+HOMEPAGE="http://www.centerim.org/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="debug nls"
+
+DEPEND=">=sys-libs/ncurses-5.2
+ >=net-im/pidgin-2.7.0
+ >=dev-libs/glib-2.16.0
+ >=dev-libs/libsigc++-2.2.0"
+RDEPEND="${DEPEND}
+ nls? ( sys-devel/gettext )"
+DEPEND="${DEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+ econf \
+ $(use_enable debug) \
+ $(use_enable nls)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ rm -f "${D}"/usr/lib*/libcppconsui.{a,la}
+
+ dodoc AUTHORS HACKING NEWS README TODO
+}
diff --git a/net-im/centerim/files/centerim-4.22.10-gcc46.patch b/net-im/centerim/files/centerim-4.22.10-gcc46.patch
new file mode 100644
index 000000000000..a03e9eabd13f
--- /dev/null
+++ b/net-im/centerim/files/centerim-4.22.10-gcc46.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/show_bug.cgi?id=363017
+
+--- a/libicq2000/libicq2000/sigslot.h
++++ b/libicq2000/libicq2000/sigslot.h
+@@ -82,6 +82,7 @@
+ #ifndef SIGSLOT_H__
+ #define SIGSLOT_H__
+
++#include <cstddef>
+ #include <set>
+ #include <list>
+
diff --git a/net-im/centerim/metadata.xml b/net-im/centerim/metadata.xml
new file mode 100644
index 000000000000..2efcddf1f657
--- /dev/null
+++ b/net-im/centerim/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>swegener@gentoo.org</email>
+ <description>Primary Maintainer</description>
+</maintainer>
+<use>
+ <flag name='gadu'>Enable support for the Gadu-Gadu protocol</flag>
+ <flag name='irc'>Enable support for the IRC protocol</flag>
+ <flag name='lj'>Enable support for the LiveJournal weblog system</flag>
+ <flag name='otr'>Enable encrypted conversations</flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
new file mode 100644
index 000000000000..de6e26fd8e2a
--- /dev/null
+++ b/net-im/choqok/Manifest
@@ -0,0 +1 @@
+DIST choqok-1.5.tar.xz 1068516 SHA256 5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4 SHA512 fbb31abedd07ea1c674a7d59b4a18808ca03812ac37c60ea67d2d641668be4a9137e9f4573eda1e19425123601e9536971170e3948c1e5098b220991571a2cf3 WHIRLPOOL c4f869bab6a23a2ffa2e8e071414a6c7170816269e6e9f77df4269b94b627248fd259eb3c24217a2a838f74162ba6c198ff5549371b61f516fb142b8690cdce0
diff --git a/net-im/choqok/choqok-1.5.ebuild b/net-im/choqok/choqok-1.5.ebuild
new file mode 100644
index 000000000000..e26f35e3cde9
--- /dev/null
+++ b/net-im/choqok/choqok-1.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fa fi fr ga gl
+hr hu is it ja km lt mr ms nb nds nl pa pl pt pt_BR ro ru sk sl sq sv tr ug
+uk zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Free/Open Source micro-blogging client for KDE"
+HOMEPAGE="http://choqok.gnufolks.org/"
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+ KEYWORDS="amd64 ~ppc x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2+"
+SLOT="4"
+IUSE="ayatana debug telepathy"
+
+RDEPEND="
+ dev-libs/libattica
+ dev-libs/qjson
+ >=dev-libs/qoauth-1.0.1
+ ayatana? ( dev-libs/libindicate-qt )
+ telepathy? ( net-libs/telepathy-qt[qt4] )
+"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ sys-devel/gettext
+"
+
+DOCS=( AUTHORS README TODO changelog )
+
+src_prepare(){
+ local mycmakeargs=(
+ $(cmake-utils_use !ayatana QTINDICATE_DISABLE)
+ $(cmake-utils_use_find_package telepathy TelepathyQt4)
+ )
+
+ kde4-base_src_prepare
+}
diff --git a/net-im/choqok/metadata.xml b/net-im/choqok/metadata.xml
new file mode 100644
index 000000000000..4ccecd71210f
--- /dev/null
+++ b/net-im/choqok/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>kde</herd>
+ <use>
+ <flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">choqok</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/climm/Manifest b/net-im/climm/Manifest
new file mode 100644
index 000000000000..5bfadcd03868
--- /dev/null
+++ b/net-im/climm/Manifest
@@ -0,0 +1 @@
+DIST climm-0.7.1.tgz 1296303 SHA256 6212ada46947f0572fb6734b920a2cfd91b6a632cbd044d87476791a318af052 SHA512 8ee8b716229b4181a3b2f7ff3323b4587e80200ca753347f670616da9f25e8fd7cae4da597435d6f71b3a104ad89f3cfe4fd3f9524e259feef220255b6f7d138 WHIRLPOOL 4ca9f3af34512ac5af3f22413b170017a1cba11a42762211fcfd64c948a1c20263f2b9db339e63b829805f45212b5a0feb07c8e04044def07c0001c65dd7e27a
diff --git a/net-im/climm/climm-0.7.1.ebuild b/net-im/climm/climm-0.7.1.ebuild
new file mode 100644
index 000000000000..18afc161ab50
--- /dev/null
+++ b/net-im/climm/climm-0.7.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="ICQ text-mode client with many features"
+HOMEPAGE="http://www.climm.org/"
+SRC_URI="http://www.climm.org/source/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="xmpp gnutls otr tcl ssl"
+
+# In case user don't need xmpp there is a choice gnutls/openssl. Since xmpp
+# requires gnutls then without explicit request to use gnutls (USE=gnutls)
+# for ssl we fall back on gnutls instead of openssl.
+REQUIRED_USE="xmpp? ( ssl gnutls )"
+
+RDEPEND="
+ xmpp? (
+ || (
+ >=dev-libs/iksemel-1.4[ssl]
+ >=dev-libs/iksemel-1.3[gnutls]
+ )
+ )
+ ssl? (
+ gnutls? (
+ >=net-libs/gnutls-0.8.10
+ dev-libs/libgcrypt:0
+ )
+ !gnutls? ( dev-libs/openssl )
+ )
+ tcl? ( dev-lang/tcl:0 )
+ otr? ( <net-libs/libotr-4 )"
+DEPEND="${RDEPEND}
+ ssl? ( gnutls? ( virtual/pkgconfig ) )"
+
+src_configure() {
+ local myconf
+ if use ssl; then
+ if use gnutls; then
+ einfo "Using gnutls"
+ myconf="--enable-ssl=gnutls"
+ else
+ einfo "Using openSSL"
+ myconf="--enable-ssl=openssl"
+ fi
+ else
+ myconf="--disable-ssl"
+ fi
+
+ econf \
+ $(use_enable xmpp) \
+ $(use_enable otr) \
+ $(use_enable tcl) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog FAQ NEWS README TODO
+}
diff --git a/net-im/climm/metadata.xml b/net-im/climm/metadata.xml
new file mode 100644
index 000000000000..923f5d919afc
--- /dev/null
+++ b/net-im/climm/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>
+<use>
+ <flag name='otr'>Enable encrypted conversations</flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/coccinella/Manifest b/net-im/coccinella/Manifest
new file mode 100644
index 000000000000..583a899e9224
--- /dev/null
+++ b/net-im/coccinella/Manifest
@@ -0,0 +1 @@
+DIST Coccinella-0.96.20Src.tar.gz 9297799 SHA256 b4feecfc5934305cbae6bfb9ab9c8b99245c40b28bbdcd682c9f1534f82bd866
diff --git a/net-im/coccinella/coccinella-0.96.20.ebuild b/net-im/coccinella/coccinella-0.96.20.ebuild
new file mode 100644
index 000000000000..c3c50472c5f5
--- /dev/null
+++ b/net-im/coccinella/coccinella-0.96.20.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 fdo-mime
+
+NAME=Coccinella
+DESCRIPTION="Jabber Client With a Built-in Whiteboard and VoIP (jingle)"
+HOMEPAGE="http://www.thecoccinella.org/"
+SRC_URI="mirror://sourceforge/coccinella/${NAME}-${PV}Src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+DEPEND=">=dev-lang/tk-8.5
+ >=dev-tcltk/tkpng-0.9
+ >=dev-tcltk/tktreectrl-2.2.9
+ >=dev-tcltk/tktray-1.1
+ >=dev-tcltk/snack-2.2
+ ssl? ( >=dev-tcltk/tls-1.4 )
+ >=dev-tcltk/tkimg-1.3"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${NAME}-${PV}Src"
+
+#src_compile() {
+# einfo "Nothing to compile for ${P}."
+#}
+
+src_install () {
+ rm -R "${S}"/bin/unix/Linux/i686/ || die
+ rm -R "${S}"/bin/macosx || die
+ rm -R "${S}"/bin/windows || die
+ rm -R "${S}"/bin/unix/NetBSD || die
+
+ dodir /opt/coccinella
+ cp -R "${S}"/* "${D}"/opt/coccinella/
+ fperms 0755 /opt/coccinella/Coccinella.tcl
+ dosym /opt/coccinella/Coccinella.tcl /opt/bin/coccinella
+ dodoc README.txt READMEs/*
+
+ for x in 128 64 32 16 ; do
+ src=/opt/coccinella/themes/Oxygen/icons/${x}x${x}/coccinella.png
+ src2=/opt/coccinella/themes/Oxygen/icons/${x}x${x}/coccinella.png
+ src2shadow=/opt/coccinella/themes/Oxygen/icons/${x}x${x}/coccinella2-shadow.png
+ dir=/usr/share/icons/hicolor/${x}x${x}/apps
+ dodir ${dir}
+ dosym ${src} ${dir}/coccinella.png
+ dosym ${src2} ${dir}/coccinella2.png
+ dosym ${src2shadow} ${dir}/coccinella2-shadow.png
+ unset src
+ unset src2
+ unset src2shadow
+ unset dir
+ done
+
+ make_desktop_entry "coccinella" "Coccinella IM Client" "coccinella2-shadow"
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/net-im/coccinella/metadata.xml b/net-im/coccinella/metadata.xml
new file mode 100644
index 000000000000..df957ab4996e
--- /dev/null
+++ b/net-im/coccinella/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>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+Coccinella is a Jabber client with a whiteboard. The whiteboard is a shared
+desktop which supports text, drawings, images, and multimedia in a number of
+formats, such as MP3 and video. It runs in two main modes, a peer-to-peer
+configuration and a mode compatible with the Jabber Instant Messaging system. A
+flexible plugin architecture may be used to support additional formats. It
+should run on any machine that runs Tcl/Tk.
+</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">coccinella</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/corebird/Manifest b/net-im/corebird/Manifest
new file mode 100644
index 000000000000..f4ffd33643b3
--- /dev/null
+++ b/net-im/corebird/Manifest
@@ -0,0 +1,2 @@
+DIST corebird-0.8.tar.gz 1655839 SHA256 4e68e174edc40b49d70a11c1b0a1b196ca9517daa8eae6ce2da3e8004acda611 SHA512 308bc0ade8ddda0b0be0949e5199bf6ac1b3658bf6e181821a205a602b2a22a97e77583cd5ca63ba272926810095104ae4117e54ccda10234d143c3377b9384d WHIRLPOOL 2e014590c0d9222a6a53d78d855ff9017fa9b3c68c2c354bc2acad1b028bd6253fa9510fbc5ce391bc65319829e14c5447b4be4cbcc8427faace790767e6d98c
+DIST corebird-1.0.tar.gz 1697452 SHA256 0ca4ca20b0281b2901382810ef8bd1682bb896c3915ad3bea3f2a41461118001 SHA512 098dd764a3aecaeda90ad5b0e24a4bf172025ce1a4105b713a1a73385d1de9cca028d7a34a39e9682ad4e2b2b22d4bf2889668c587e363cdfa6053136b1f4c39 WHIRLPOOL e033988b94632ad6b8d4e8c79a6125311466e81d746dd434801451f71e4590558b1797e8690ff033c1c04aeb4a299191993421a64e9d3a925409cda663478ab8
diff --git a/net-im/corebird/corebird-0.8.ebuild b/net-im/corebird/corebird-0.8.ebuild
new file mode 100644
index 000000000000..1bc2a1426145
--- /dev/null
+++ b/net-im/corebird/corebird-0.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.24
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit eutils autotools-utils gnome2 vala
+
+DESCRIPTION="Native GTK+3 Twitter client"
+HOMEPAGE="http://corebird.baedert.org/"
+SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug glade gstreamer"
+
+RDEPEND="dev-db/sqlite:3
+ >=dev-libs/glib-2.40:2
+ dev-libs/json-glib
+ dev-libs/libgee:0.8
+ gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] )
+ >=net-libs/libsoup-2.42.3.1
+ >=net-libs/rest-0.7.91:0.7
+ >=x11-libs/gtk+-3.12:3"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ sys-apps/sed
+ virtual/pkgconfig"
+
+src_prepare() {
+ sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
+ autotools-utils_src_prepare
+ gnome2_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable glade catalog)
+ $(usex gstreamer "" --disable-video)
+ )
+ gnome2_src_configure "${myeconfargs[@]}"
+}
diff --git a/net-im/corebird/corebird-1.0.ebuild b/net-im/corebird/corebird-1.0.ebuild
new file mode 100644
index 000000000000..bbd83bf58908
--- /dev/null
+++ b/net-im/corebird/corebird-1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+VALA_MIN_API_VERSION=0.26
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils gnome2 vala
+
+DESCRIPTION="Native GTK+3 Twitter client"
+HOMEPAGE="http://corebird.baedert.org/"
+SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gstreamer"
+
+RDEPEND="
+ dev-db/sqlite:3
+ >=dev-libs/glib-2.40:2
+ dev-libs/json-glib
+ dev-libs/libgee:0.8
+ gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] )
+ >=net-libs/libsoup-2.42.3.1
+ >=net-libs/rest-0.7.91:0.7
+ >=x11-libs/gtk+-3.14:3
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ >=dev-util/intltool-0.40
+ sys-apps/sed
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
+ autotools-utils_src_prepare
+ gnome2_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(usex gstreamer "" --disable-video)
+ )
+ gnome2_src_configure "${myeconfargs[@]}"
+}
diff --git a/net-im/corebird/metadata.xml b/net-im/corebird/metadata.xml
new file mode 100644
index 000000000000..14d619e0d0f4
--- /dev/null
+++ b/net-im/corebird/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-im</herd>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>thatslyude@gmail.com</email>
+ <name>Chandler Paul</name>
+ <description>Maintainer, Assign bugs</description>
+ </maintainer>
+ <maintainer>
+ <email>markpariente@gmail.com</email>
+ <name>Mark R. Pariente</name>
+ <description>Maintainer, Assign bugs</description>
+ </maintainer>
+ <use>
+ <flag name="glade">Install glade catalogs for corebird</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">baedert/corebird</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/cpop/Manifest b/net-im/cpop/Manifest
new file mode 100644
index 000000000000..54df7ecf2161
--- /dev/null
+++ b/net-im/cpop/Manifest
@@ -0,0 +1 @@
+DIST cpop-0.0.4.tar.gz 68544 SHA256 68855387c20ce2adaf5a51464b68fc756acfe197ab9b53dbde910757526f45a8 SHA512 c7f4dbff7f8702a8a32447c09457fa6f0810768a41450c43ae71aa67c6fb2d40af634713d1a703dd7f1a9a97ac534f2dab11f8f3f88a79c549224e8b375d721a WHIRLPOOL 20bd2fc1b9d4e4e4d794a917861fc66dd90ebadf01fb8ab1531715beb05ce3504a381aa6623955fde1dc0fda1ef5a8026823124720b1d6b144e93a9e0f33c674
diff --git a/net-im/cpop/cpop-0.0.4-r1.ebuild b/net-im/cpop/cpop-0.0.4-r1.ebuild
new file mode 100644
index 000000000000..5511135a08e0
--- /dev/null
+++ b/net-im/cpop/cpop-0.0.4-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
+inherit eutils
+
+DESCRIPTION="GTK+ network popup message client. Compatible with the jpop protocol"
+HOMEPAGE="http://www.draxil.uklinux.net/hip/index.pl?page=cpop"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+ x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-implicit-exit_memset_strlen.patch
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc README
+}
diff --git a/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch b/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch
new file mode 100644
index 000000000000..3ce224c2910a
--- /dev/null
+++ b/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch
@@ -0,0 +1,38 @@
+pop_common.c:5:3: warning: incompatible implicit declaration of built-in function ‘exit’
+pop_common.c:10:3: warning: incompatible implicit declaration of built-in function ‘exit’
+pop_client.c:61:3: warning: incompatible implicit declaration of built-in function ‘exit’
+pop_gui_client.c:58:4: warning: incompatible implicit declaration of built-in function ‘memset’
+pop_gui_client.c:72:27: warning: incompatible implicit declaration of built-in function ‘strlen’
+pop_gui_client.c:128:3: warning: incompatible implicit declaration of built-in function ‘exit’
+
+--- pop_client.c
++++ pop_client.c
+@@ -1,11 +1,11 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <errno.h>
+ #include <glib.h>
+-#include <stdio.h>
+ #include <netdb.h>
+ #include "pop_common.h"
+ #include "pop_client.h"
+--- pop_common.c
++++ pop_common.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ void errquit(char *message)
+ {
+ perror(message);
+--- pop_gui_client.c
++++ pop_gui_client.c
+@@ -1,3 +1,5 @@
++#include <stdlib.h>
++#include <string.h>
+ #include <netdb.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
diff --git a/net-im/cpop/metadata.xml b/net-im/cpop/metadata.xml
new file mode 100644
index 000000000000..3e2b4181f5be
--- /dev/null
+++ b/net-im/cpop/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-im/dianara/Manifest b/net-im/dianara/Manifest
new file mode 100644
index 000000000000..36583f19c8c5
--- /dev/null
+++ b/net-im/dianara/Manifest
@@ -0,0 +1 @@
+DIST dianara-v1.2.4.tar.gz 540237 SHA256 8e58042e551646a09bd3c47838a1fb6d65c90501547ce4ed85944814d6e609d2 SHA512 78bacd0a02f5070b54d0a0aa74282592ab60aa734143c50f00f97f0dc09308f0571205608e0150fd4eb5cdca0083a5a2b0acaa2f90a00f84cd9cc6737dee30c7 WHIRLPOOL 940a6c2a0a1e15accaee24b40b96a87c0f8d947d65bfa7e7d3155ccdf90ca73b0ae6a8a7bc5f3281736f298f1748a352638d772153479fa5d4f1d1119febf636
diff --git a/net-im/dianara/dianara-1.2.4.ebuild b/net-im/dianara/dianara-1.2.4.ebuild
new file mode 100644
index 000000000000..24182a722b2c
--- /dev/null
+++ b/net-im/dianara/dianara-1.2.4.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 gnome2-utils qmake-utils
+
+MY_P=${PN}-v${PV/_beta/beta}
+DESCRIPTION="Qt-based client for the pump.io distributed social network"
+HOMEPAGE="http://dianara.nongnu.org/"
+SRC_URI="mirror://nongnu/dianara/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+ app-crypt/qca:2[qt4(+)]
+ dev-libs/qjson
+ dev-libs/qoauth
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ dev-qt/qtgui:4
+ sys-apps/file"
+RDEPEND="${DEPEND}
+ app-crypt/qca:2[openssl]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ eqmake4
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ doman manual/*
+ dodoc README TODO CHANGELOG BUGS
+ doicon -s 32 icon/32x32/${PN}.png
+ doicon -s 64 icon/64x64/${PN}.png
+ domenu ${PN}.desktop
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/net-im/dianara/metadata.xml b/net-im/dianara/metadata.xml
new file mode 100644
index 000000000000..9a53b08c0ed6
--- /dev/null
+++ b/net-im/dianara/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>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://savannah.nongnu.org/bugs/?group=dianara</bugs-to>
+ <remote-id type="gitorious">dianara</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
new file mode 100644
index 000000000000..b3e9e0895883
--- /dev/null
+++ b/net-im/ejabberd/Manifest
@@ -0,0 +1,3 @@
+DIST ejabberd-15.03.tar.xz 6274856 SHA256 3a6fd6e94d6f24575dcaff1aa7ca319944eb76970a9d3b6bf5f30819824143fc SHA512 b292b596094aeab576d9d4aadea47042eeda130881de5dd523985dc60cd0644726dae8d525364ec72992c0c45ba9e0673b7a6ffc2bc20613ba0092e2b285e16f WHIRLPOOL 630feba542f5d4bac1e4c17f453b2298a500c0d18159e8f09a4f11e9d372f7ffbf6e2e600c0ee849c689868872644404c03ebfb375d4852f3bbbd966417d951e
+DIST ejabberd-2.1.13.tgz 1999853 SHA256 a80d1c72e435da31758261cb0c04fe750ac71fc3e33a3b606123efd3b3abc86d SHA512 9348271f0cf1d9a7e6c53204121568e77820afc50fff1271e7b7ef66c5c5d7d067034c46472250423c4e9052046b18c1c8178f09eda0b0bfe25a1eac465fd07b WHIRLPOOL 2c366d2f7c4371db56f47f5492ef27028a589186eeddb7a6b4e8aac0537b1b80ee31a9760f0551063ce2c2a658b9b5eafb7ed25294e00eb69480231a599a7b10
+DIST ejabberd-mod_statsdx-1118.patch.gz 13989 SHA256 5e5d975e44248cf2b0d6dd0ecf4c477e8479b2b4d0bd531e80f4623fd787320e SHA512 99399323150990cda15e707385f0f26fa790d4ba188a97ac46daaaab9c25e72a7ec72a875573136f17a18648017074d76e4e267b544dc4c95a5101ed9ad6815d WHIRLPOOL 05997f03bb70136ee5e829ea9c55e3aeb0704150f1ed54f11c6cce382a82106129fc1a6ef35a62780837cd2b59fbb384fa10f3bb49813acaee8c5edc22ae3702
diff --git a/net-im/ejabberd/ejabberd-15.03-r1.ebuild b/net-im/ejabberd/ejabberd-15.03-r1.ebuild
new file mode 100644
index 000000000000..3154b9755ddc
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-15.03-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib pam ssl-cert systemd
+
+DESCRIPTION="The Erlang Jabber Daemon"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
+# upstream tarball missing bundled erlang libs that are fetched via git
+#SRC_URI="https://www.process-one.net/downloads/downloads-action.php?file=/${PN}/${PV}/${P}.tgz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+EJABBERD_MODULES="mod_bosh mod_irc mod_muc mod_proxy65 mod_pubsub"
+IUSE="captcha debug elixir ldap mysql nls odbc pam postgres riak redis tools zlib ${EJABBERD_MODULES}"
+
+DEPEND=">=net-im/jabber-base-0.01
+ >=dev-libs/expat-1.95
+ >=dev-libs/libyaml-0.1.4
+ >=dev-lang/erlang-15.2[ssl]
+ odbc? ( dev-db/unixODBC )
+ ldap? ( =net-nds/openldap-2* )
+ >=dev-libs/openssl-0.9.8e
+ captcha? ( media-gfx/imagemagick[truetype,png] )
+ zlib? ( >=sys-libs/zlib-1.2.3 )"
+RDEPEND="${DEPEND}
+ >=sys-apps/shadow-4.1.4.2-r3
+ pam? ( virtual/pam )"
+
+# paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+#JABBER_RUN="/var/run/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-ejabberdctl.patch
+
+ # don't install release notes (we'll do this manually)
+ sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
+ # Set correct paths
+ sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \
+ -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+ -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+ -e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+ -i Makefile.in || die
+ sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \
+ -e "s|\(ETC_DIR=\){{sysconfdir}}.*|\1${JABBER_ETC}|" \
+ -e "s|\(LOGS_DIR=\){{localstatedir}}.*|\1${JABBER_LOG}|" \
+ -e "s|\(SPOOL_DIR=\){{localstatedir}}.*|\1${JABBER_SPOOL}|" \
+ -i ejabberdctl.template || die
+
+ # fix up the ssl cert paths in ejabberd.yml to use our cert and
+ # also use the correct pam service name
+ sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
+ -e "s:pamservicename:xmpp:" \
+ -i ejabberd.yml.example || die
+
+ # correct path to captcha script in default ejabberd.yml
+ sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \
+ -i ejabberd.yml.example || die
+
+ # disable mod_irc in ejabberd.yml
+ if ! use mod_irc; then
+ sed -e "s/{mod_irc,/%{mod_irc,/" \
+ -i ejabberd.yml.example || die
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \
+ $(use_enable tools) \
+ $(use_enable odbc) \
+ $(use_enable mysql) \
+ $(use_enable postgres pgsql) \
+ $(use_enable pam) \
+ $(use_enable zlib) \
+ $(use_enable riak) \
+ $(use_enable redis) \
+ $(use_enable mod_bosh json) \
+ $(use_enable nls iconv) \
+ $(use_enable elixir) \
+ $(use_enable debug) \
+ --enable-lager \
+ --enable-user=jabber
+
+ # run configure scripts for all prefetched deps
+ ./rebar get-deps || die
+}
+
+src_compile() {
+ emake $(use debug && echo debug=true ejabberd_debug=true)
+}
+
+src_install() {
+ default
+
+ # Pam helper module permissions
+ # https://www.process-one.net/docs/ejabberd/guide_en.html#pam
+ if use pam; then
+ pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
+ fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
+ fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
+ fi
+
+ newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}-3.confd ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "For configuration instructions, please see"
+ elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
+ elog "http://www.process-one.net/en/ejabberd/docs/guide_en/"
+ else
+ elog "Ejabberd now defaults to using a YAML format for its config file."
+ elog "The old ejabberd.cfg file can be converted using the following instructions:"
+ echo
+ elog "1. Make sure all processes related to the previous version of ejabberd aren't running."
+ elog " Usually this just means the ejabberd daemon and possibly the pam-related processes"
+ elog " (epmd and epam) if pam support is enabled."
+ elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can fail to"
+ elog " start ejabberd properly for various reasons. Check ejabberd's main log file"
+ elog " at /var/log/jabber/ejabberd.log to confirm it started successfully."
+ elog "3. Run \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`"
+ elog " with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to"
+ elog " /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config file."
+ echo
+ fi
+
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}"
+ install_cert /etc/ssl/ejabberd/server
+ # Fix ssl cert permissions bug #369809
+ chown root:jabber "${EROOT}/etc/ssl/ejabberd/server.pem"
+ chmod 0440 "${EROOT}/etc/ssl/ejabberd/server.pem"
+}
diff --git a/net-im/ejabberd/ejabberd-2.1.13-r1.ebuild b/net-im/ejabberd/ejabberd-2.1.13-r1.ebuild
new file mode 100644
index 000000000000..74019181e8fd
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-2.1.13-r1.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib pam ssl-cert systemd
+
+DESCRIPTION="The Erlang Jabber Daemon"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+ mod_statsdx? ( http://dev.gentoo.org/~radhermit/dist/${PN}-mod_statsdx-1118.patch.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
+EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx"
+IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}"
+
+DEPEND=">=net-im/jabber-base-0.01
+ >=dev-libs/expat-1.95
+ >=dev-lang/erlang-12.2.5[ssl]
+ <dev-lang/erlang-16
+ odbc? ( dev-db/unixODBC )
+ ldap? ( =net-nds/openldap-2* )
+ >=dev-libs/openssl-0.9.8e
+ captcha? ( media-gfx/imagemagick[truetype,png] )
+ zlib? ( sys-libs/zlib )"
+#>=sys-apps/shadow-4.1.4.2-r3 - fixes bug in su that made ejabberdctl unworkable.
+RDEPEND="${DEPEND}
+ >=sys-apps/shadow-4.1.4.2-r3
+ pam? ( virtual/pam )"
+
+S=${WORKDIR}/${P}/src
+
+# paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+#JABBER_RUN="/var/run/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}"
+
+src_prepare() {
+ if use mod_statsdx; then
+ ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module"
+ ewarn "taken from here: http://www.ejabberd.im/mod_stats2file"
+ EPATCH_OPTS="-p2" epatch "${WORKDIR}"/${PN}-mod_statsdx-1118.patch
+ fi
+
+ # don't install release notes (we'll do this manually)
+ sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
+ # Set correct paths
+ sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \
+ -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+ -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+ -e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+ -i Makefile.in || die
+ sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \
+ -e "s|\(ETCDIR=\)@SYSCONFDIR@.*|\1${JABBER_ETC}|" \
+ -e "s|\(LOGS_DIR=\)@LOCALSTATEDIR@.*|\1${JABBER_LOG}|" \
+ -e "s|\(SPOOLDIR=\)@LOCALSTATEDIR@.*|\1${JABBER_SPOOL}|" \
+ -i ejabberdctl.template || die
+
+ # Set shell, so it'll work even in case jabber user have no shell
+ # This is gentoo specific I guess since other distributions may have
+ # ejabberd user with reall shell, while we share this user among different
+ # jabberd implementations.
+ sed '/^HOME/aSHELL=/bin/sh' -i ejabberdctl.template || die
+ sed '/^export HOME/aexport SHELL' -i ejabberdctl.template || die
+
+ #sed -e "s:/share/doc/ejabberd/:${JABBER_DOC}:" -i web/ejabberd_web_admin.erl
+
+ # fix up the ssl cert paths in ejabberd.cfg to use our cert
+ sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
+ -i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
+
+ # correct path to captcha script in default ejabberd.cfg
+ sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \
+ -i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
+
+ # disable mod_irc in ejabberd.cfg
+ if ! use mod_irc; then
+ sed -i -e "s/{mod_irc,/%{mod_irc,/" \
+ -i ejabberd.cfg.example || die "Failed to disable mod_irc"
+ fi
+
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \
+ $(use_enable mod_irc) \
+ $(use_enable ldap eldap) \
+ $(use_enable mod_muc) \
+ $(use_enable mod_proxy65) \
+ $(use_enable mod_pubsub) \
+ $(use_enable web) \
+ $(use_enable odbc) \
+ $(use_enable zlib ejabberd_zlib) \
+ $(use_enable pam) \
+ --enable-user=jabber
+}
+
+src_compile() {
+ emake $(use debug && echo debug=true ejabberd_debug=true)
+}
+
+src_install() {
+ default
+
+ # Pam helper module permissions
+ # http://www.process-one.net/docs/ejabberd/guide_en.html
+ if use pam; then
+ pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
+ fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
+ fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
+ fi
+
+ cd "${WORKDIR}"/${P}/doc
+ dodoc release_notes_${PV%%_rc*}.txt
+
+ newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}-3.confd ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "For configuration instructions, please see"
+ elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
+ elog "http://www.process-one.net/en/ejabberd/docs/guide_en/"
+
+ if ! use web ; then
+ ewarn
+ ewarn "The web USE flag is off, this has disabled the web admin interface."
+ ewarn
+ fi
+
+ elog
+ elog '===================================================================='
+ elog 'Quick Start Guide:'
+ elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 91'
+ elog ' {hosts, ["localhost", "thehost"]}.'
+ elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 360'
+ elog ' {acl, admin, {user, "theadmin", "thehost"}}.'
+ elog '3) Start the server'
+ elog ' # /etc/init.d/ejabberd start (for openRC)'
+ elog ' # systemctl start ejabberd (for Systemd)'
+ elog '4) Register the admin user'
+ elog ' # /usr/sbin/ejabberdctl register theadmin thehost thepassword'
+ elog '5) Log in with your favourite jabber client or using the web admin'
+ fi
+
+ # Upgrading from ejabberd-2.0.x:
+ if grep -E '^[^#]*EJABBERD_NODE=' "${EROOT}/etc/conf.d/ejabberd" >/dev/null 2>&1; then
+ source "${EROOT}/etc/conf.d/ejabberd"
+ ewarn
+ ewarn "!!! WARNING !!! WARNING !!! WARNING !!! WARNING !!!"
+ ewarn "Starting with 2.1.x some paths and configuration files were"
+ ewarn "changed to reflect upstream intentions better. Notable changes are:"
+ ewarn
+ ewarn "1. Everything (even init scripts) is now handled with ejabberdctl script."
+ ewarn "Thus main configuration file became /etc/jabberd/ejabberdctl.cfg"
+ ewarn "You must update ERLANG_NODE there with the value of EJABBERD_NODE"
+ ewarn "from /etc/conf.d/ejebberd or ejabberd will refuse to start."
+ ewarn
+ ewarn "2. SSL certificate is now generated with ssl-cert eclass and resides"
+ ewarn "at standard location: /etc/ssl/ejabberd/server.pem."
+ ewarn
+ ewarn "3. Cookie now resides at /var/spool/jabber/.erlang.cookie"
+ ewarn
+ ewarn "4. /var/log/jabber/sasl.log is now /var/log/jabber/erlang.log"
+ ewarn
+ ewarn "5. Crash dumps (if any) will be located at /var/log/jabber"
+
+ local i ctlcfg new_ctlcfg
+ i=0
+ ctlcfg=${EROOT}/etc/jabber/ejabberdctl.cfg
+ while :; do
+ new_ctlcfg=$(printf "${EROOT}/etc/jabber/._cfg%04d_ejabberdctl.cfg" ${i})
+ [[ ! -e ${new_ctlcfg} ]] && break
+ ctlcfg=${new_ctlcfg}
+ ((i++))
+ done
+
+ ewarn
+ ewarn "Updating ${ctlcfg} (debug: ${new_ctlcfg})"
+ sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die
+
+ if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then
+ ewarn "Moving .erlang.cookie..."
+ if [[ -e ${EROOT}/var/spool/jabber/.erlang.cookie ]]; then
+ mv -v "${EROOT}"/var/spool/jabber/.erlang.cookie{,bak}
+ fi
+ mv -v "${EROOT}"/var/{run/jabber,spool/jabber}/.erlang.cookie
+ fi
+ ewarn
+ ewarn "We'll try to handle upgrade automagically but, please, do your"
+ ewarn "own checks and do not forget to run 'etc-update'!"
+ ewarn "PLEASE! Run 'etc-update' now!"
+ fi
+
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}"
+ install_cert /etc/ssl/ejabberd/server
+ # Fix ssl cert permissions bug #369809
+ chown root:jabber "${EROOT}/etc/ssl/ejabberd/server.pem"
+ chmod 0440 "${EROOT}/etc/ssl/ejabberd/server.pem"
+ if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then
+ ewarn
+ ewarn "The location of SSL certificates has changed. If you are"
+ ewarn "upgrading from ${CATEGORY}/${PN}-2.0.5* or earlier you might"
+ ewarn "want to move your old certificates from /etc/jabber into"
+ ewarn "/etc/ssl/ejabberd/, update config files and"
+ ewarn "rm /etc/jabber/ssl.pem to avoid this message."
+ ewarn
+ fi
+}
diff --git a/net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch
new file mode 100644
index 000000000000..0d2ccf32485f
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-15.03-ejabberdctl.patch
@@ -0,0 +1,49 @@
+Set SHELL since the generic jabber user used on Gentoo for jabber servers
+doesn't have a valid shell set by default and fix EXEC_CMD otherwise it fails
+with "This account is currently not available" again due to jabber not having
+a valid shell.
+
+Also, workaround the assumption that jabber's $HOME is a directory when instead
+it defaults to /dev/null on Gentoo.
+
+--- ejabberd-15.03/ejabberdctl.template
++++ ejabberd-15.03/ejabberdctl.template
+@@ -15,6 +15,7 @@
+ IEX={{bindir}}/iex
+ EPMD={{bindir}}/epmd
+ INSTALLUSER={{installuser}}
++SHELL=/bin/sh
+
+ # Compatibility in ZSH
+ #setopt shwordsplit 2>/dev/null
+@@ -25,11 +26,11 @@
+ for GID in `id -G`; do
+ if [ $GID -eq 0 ] ; then
+ INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6)
+- if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then
++ if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then
+ mkdir -p "$INSTALLUSER_HOME"
+ chown "$INSTALLUSER" "$INSTALLUSER_HOME"
+ fi
+- EXEC_CMD="su $INSTALLUSER -c"
++ EXEC_CMD="su $INSTALLUSER -p -c"
+ fi
+ done
+ if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
+@@ -111,6 +112,7 @@
+ DATETIME=`date "+%Y%m%d-%H%M%S"`
+ ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
+ ERL_INETRC=$ETC_DIR/inetrc
++HOME=$SPOOL_DIR
+
+ # define erl parameters
+ ERL_OPTIONS=$(echo $ERL_OPTIONS | sed 's/ /\\ /g')
+@@ -167,6 +169,8 @@
+ export ERL_INETRC
+ export ERL_MAX_PORTS
+ export ERL_MAX_ETS_TABLES
++export HOME
++export SHELL
+
+ # start server
+ start()
diff --git a/net-im/ejabberd/files/ejabberd-3.confd b/net-im/ejabberd/files/ejabberd-3.confd
new file mode 100644
index 000000000000..b1e984e4d7ab
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-3.confd
@@ -0,0 +1,5 @@
+# Please configure everything at /etc/jabber/ejabberdctl.cfg
+# Put here only command line arguments for ejabberdctl (if any are required)
+
+#EJABBERDCTL_OPTS=""
+
diff --git a/net-im/ejabberd/files/ejabberd-3.initd b/net-im/ejabberd/files/ejabberd-3.initd
new file mode 100644
index 000000000000..29a30da3610d
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-3.initd
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ use dns
+ need net
+ provide jabber-server
+}
+
+start() {
+ if ejabberdctl status >/dev/null 2>&1; then
+ ewarn "ejabberd is already started (manually?)."
+ return 0
+ fi
+ ebegin "Starting ejabberd"
+ /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} start
+ eend $?
+}
+
+stop() {
+ ejabberdctl status >/dev/null 2>&1
+ if test $? = 3; then
+ ewarn "ejabberd is already stopped (manually?)."
+ return 0
+ fi
+ ebegin "Stopping ejabberd"
+ if /usr/sbin/ejabberdctl stop >/dev/null 2>&1; then
+ cnt=0
+ sleep 1
+ while ejabberdctl status >/dev/null 2>&1 || test $? = 1; do
+ echo -n .
+ cnt=`expr $cnt + 1`
+ if [ $cnt -ge 60 ] ; then
+ eend 1
+ break
+ fi
+ sleep 1
+ done
+ eend 0
+ else
+ eend 1
+ einfo "Please, run '/usr/sbin/ejabberdctl stop' to see what's going on."
+ fi
+ eend 0
+}
diff --git a/net-im/ejabberd/files/ejabberd.logrotate b/net-im/ejabberd/files/ejabberd.logrotate
new file mode 100644
index 000000000000..4f324729dba8
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd.logrotate
@@ -0,0 +1,13 @@
+/var/log/jabber/*.log {
+ su jabber jabber
+ weekly
+ rotate 4
+ missingok
+ nocreate
+ sharedscripts
+ notifempty
+ compress
+ postrotate
+ /usr/sbin/ejabberdctl reopen-log > /dev/null 2>&1 || true
+ endscript
+}
diff --git a/net-im/ejabberd/files/ejabberd.service b/net-im/ejabberd/files/ejabberd.service
new file mode 100644
index 000000000000..0b792565b75e
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=A distributed, fault-tolerant Jabber/XMPP server
+After=network.target
+
+[Service]
+Type=oneshot
+User=jabber
+LimitNOFILE=16000
+RestartSec=5
+ExecStart=/usr/sbin/ejabberdctl \
+ --config /etc/jabber/ejabberd.cfg --ctl-config /etc/jabber/ejabberdctl.cfg \
+ --logs "/var/log/jabber" --spool "/var/spool/jabber" start
+ExecStop=/usr/sbin/ejabberdctl stop
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/ejabberd/files/ejabberd.tmpfiles.conf b/net-im/ejabberd/files/ejabberd.tmpfiles.conf
new file mode 100644
index 000000000000..cf17b73b43a3
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd.tmpfiles.conf
@@ -0,0 +1 @@
+d /var/lock/ejabberdctl 0750 jabber jabber
diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
new file mode 100644
index 000000000000..2b661cf5a454
--- /dev/null
+++ b/net-im/ejabberd/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-im</herd>
+ <longdescription>
+ Free and Open Source distributed fault-tolerant Jabber server. It's
+ mostly written in Erlang, and works on many platforms.
+ </longdescription>
+ <use>
+ <flag name="captcha">Support for CAPTCHA Forms (XEP-158)</flag>
+ <flag name="mod_proxy65">Support for SOCKS5 Bytestreams (XEP-0065)</flag>
+ <flag name="mod_statsdx">Measures several statistics, and provides a new section in ejabberd Web Admin to view them.</flag>
+ <flag name="elixir">Enable Elixir language support (http://elixir-lang.org/)</flag>
+ <flag name="mod_bosh">Enable support for XMPP over BOSH (XEP-0206)</flag>
+ <flag name="mod_irc">Build irc gateway</flag>
+ <flag name="mod_muc">Build Multi User Chat module</flag>
+ <flag name="mod_pubsub">Build Pubsub module</flag>
+ <flag name="redis">Enable Redis support</flag>
+ <flag name="riak">Enable Riak support</flag>
+ <flag name="tools">Build development tools</flag>
+ <flag name="web">Enable web admin interface</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">processone/ejabberd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
new file mode 100644
index 000000000000..e399e9902885
--- /dev/null
+++ b/net-im/ekg2/Manifest
@@ -0,0 +1 @@
+DIST ekg2-0.3.1.tar.gz 1704772 SHA256 6ad360f8ca788d4f5baff226200f56922031ceda1ce0814e650fa4d877099c63 SHA512 dc107005f434f9e3011ff2be720b750b09c72fee1f9e1b47dfbf8af8eac1e27b24e028505a0d4928aedd1375a3245e93757410c742ff112ff5dac1e1a4f5a21c WHIRLPOOL 520f2eeb03e3edf3f3a622fcdcd3ca2952c69ac2503c1c5d76af5abdd7bdb12aa216d3ea22539bec2d996f5147bbf0e8198c9cc201677c8a1d2a65cecca0c1a7
diff --git a/net-im/ekg2/ekg2-0.3.1-r2.ebuild b/net-im/ekg2/ekg2-0.3.1-r2.ebuild
new file mode 100644
index 000000000000..53629f3953f6
--- /dev/null
+++ b/net-im/ekg2/ekg2-0.3.1-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit autotools-utils eutils python-single-r1 versionator
+
+DESCRIPTION="Text-based, multi-protocol instant messenger"
+HOMEPAGE="http://www.ekg2.org"
+SRC_URI="http://pl.ekg2.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gadu gif gnutls gpg gpm gsm gtk idn jpeg ncurses nls
+ oracle perl python readline rss spell sqlite ssl threads unicode
+ xmpp xosd zlib"
+
+RDEPEND="
+ gpg? ( app-crypt/gpgme:= )
+ gsm? ( media-sound/gsm:= )
+ gtk? ( x11-libs/gtk+:2= )
+ idn? ( net-dns/libidn:= )
+ nls? ( virtual/libintl:= )
+ oracle? ( dev-db/oracle-instantclient-basic:= )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS} )
+ readline? ( sys-libs/readline:0= )
+ ssl? ( dev-libs/openssl:0= )
+ xosd? ( x11-libs/xosd:= )
+ zlib? ( sys-libs/zlib:= )
+
+ gadu? ( <net-libs/libgadu-1.12:=
+ gif? ( media-libs/giflib:= )
+ jpeg? ( virtual/jpeg:0= ) )
+ ncurses? ( sys-libs/ncurses:=[unicode?]
+ gpm? ( sys-libs/gpm:= )
+ spell? ( app-text/aspell:= ) )
+ rss? ( dev-libs/expat:= )
+ sqlite? ( dev-db/sqlite:3= )
+ xmpp? ( dev-libs/expat:=
+ gnutls? ( net-libs/gnutls:= ) )"
+
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
+)
+DOCS=(
+ AUTHORS docs/README docs/TODO
+ docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
+ docs/themes.txt docs/themes-en.txt
+ docs/ui-ncurses.txt docs/ui-ncurses-en.txt
+)
+
+# Due to MakeMaker being used to build Perl modules.
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+pkg_pretend() {
+ if ! use gtk && ! use ncurses && ! use readline; then
+ ewarn 'ekg2 is being compiled without any frontend, you should consider'
+ ewarn 'enabling at least one of following USEflags:'
+ ewarn ' gtk, ncurses, readline.'
+ fi
+
+ if use gnutls && ! use ssl; then
+ ewarn 'You have enabled USE=gnutls without USE=ssl. The SSL support'
+ ewarn 'in ekg2 will be limited to the plugins supporting GnuTLS.'
+ fi
+}
+
+src_configure() {
+ myeconfargs=(
+ $(use_with gadu libgadu)
+ $(use_with gif)
+ # gnutls is jabber-specific
+ $(use xmpp && use_with gnutls libgnutls || echo '--without-libgnutls')
+ $(use_with gpg)
+ $(use_with gpm gpm-mouse)
+ $(use_with gsm libgsm)
+ $(use_with gtk)
+ $(use_with idn libidn)
+ $(use xmpp && echo '--with-expat' || use_with rss expat)
+ $(use_with jpeg libjpeg)
+ $(use_with ncurses)
+ $(use_with oracle logsoracle)
+ $(use_with perl)
+ $(use_with python)
+ $(use_with readline)
+ $(use_with spell aspell)
+ $(use_with sqlite sqlite3)
+ $(use_with ssl openssl)
+ $(use_with threads pthread)
+ $(use_with xosd libxosd)
+ $(use_with zlib)
+ $(use_enable nls)
+ $(use_enable unicode)
+ --with-inotify
+ --without-ioctld
+ --without-sqlite
+ --disable-remote
+ --enable-skip-relative-plugins-dir
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+ prune_libtool_files --modules
+}
diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild
new file mode 100644
index 000000000000..58ac4ed65f8d
--- /dev/null
+++ b/net-im/ekg2/ekg2-9999.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="git://github.com/leafnode/${PN}.git
+ http://github.com/leafnode/${PN}.git"
+
+inherit git-r3
+#endif
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools-utils python-single-r1
+
+DESCRIPTION="Text-based, multi-protocol instant messenger"
+HOMEPAGE="http://www.ekg2.org"
+SRC_URI="http://pl.ekg2.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
+ perl python readline rss spell sqlite ssl xmpp unicode zlib"
+
+RDEPEND="dev-libs/glib:2=
+ gadu? ( <net-libs/libgadu-1.12:0= )
+ gpg? ( app-crypt/gpgme:1= )
+ gtk? ( x11-libs/gtk+:2= )
+ nls? ( virtual/libintl:0= )
+ openssl? ( dev-libs/openssl:0= )
+ perl? ( dev-lang/perl:0= )
+ python? ( ${PYTHON_DEPS} )
+ readline? ( sys-libs/readline:0= )
+ rss? ( dev-libs/expat:0= )
+ ssl? ( net-libs/gnutls:0= )
+ xmpp? ( dev-libs/expat:0= )
+ zlib? ( sys-libs/zlib:0= )
+
+ ncurses? ( sys-libs/ncurses:5=[unicode=]
+ gpm? ( sys-libs/gpm:0= )
+ spell? ( app-text/aspell:0= ) )
+ sqlite? ( dev-db/sqlite:3= )"
+
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+DOCS=(
+ AUTHORS README.md docs/README docs/TODO
+ docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
+ docs/themes.txt docs/themes-en.txt
+ docs/ui-ncurses.txt docs/ui-ncurses-en.txt
+)
+
+#if LIVE
+KEYWORDS=
+SRC_URI=
+#endif
+
+pkg_pretend() {
+ if ! use gtk && ! use ncurses && ! use readline; then
+ ewarn 'ekg2 is being compiled without any frontend. You should consider'
+ ewarn 'enabling at least one of following USEflags:'
+ ewarn ' gtk, ncurses, readline.'
+ fi
+}
+
+src_configure() {
+ myeconfargs=(
+ # direct plugin references
+ $(use_enable gadu gg)
+ $(use_enable gpg)
+ $(use_enable gtk)
+ $(use_enable ncurses)
+ $(use_enable nntp)
+ $(use_enable openssl sim)
+ $(use_enable perl)
+ $(use_enable python)
+ $(use_enable readline)
+ $(use_enable rss)
+ $(use_enable sqlite logsqlite)
+ $(use_enable xmpp jabber)
+
+ $(use_enable !minimal autoresponder)
+ $(use_enable !minimal jogger)
+ $(use_enable !minimal mail)
+ $(use_enable !minimal polchat)
+ $(use_enable !minimal rivchat)
+ $(use_enable !minimal sms)
+
+ # sqlite switch
+ --with-sqlite3
+
+ # optional deps
+ $(use_with gpm)
+ # do not pass --with-inotify as it will fail if check fails
+ $(use_with spell aspell)
+ $(use_with ssl gnutls)
+ $(use_with zlib)
+
+ # other magic
+ $(use_enable nls)
+ --with-perl-module-build-flags='INSTALLDIRS=vendor'
+ --enable-fast-configure
+ )
+ autotools-utils_src_configure
+}
diff --git a/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch b/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
new file mode 100644
index 000000000000..010b22fc976c
--- /dev/null
+++ b/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
@@ -0,0 +1,25 @@
+From 804370c1ad2f94937ac9184dbbb40354885ea6be Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 6 Apr 2011 16:19:46 +0200
+Subject: [PATCH] [Gentoo] use vendor dirs for perl modules.
+
+---
+ plugins/perl/Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/perl/Makefile.in b/plugins/perl/Makefile.in
+index 84d378b..309e2e2 100644
+--- a/plugins/perl/Makefile.in
++++ b/plugins/perl/Makefile.in
+@@ -594,7 +594,7 @@ all-local:
+ set -e; for dir in $(perl_dirs); do \
+ cd $$dir && \
+ if [ ! -f Makefile ]; then \
+- $(PERL) Makefile.PL; \
++ $(PERL) Makefile.PL INSTALLDIRS=vendor; \
+ fi && \
+ $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(AM_CFLAGS) $(CFLAGS)" && \
+ cd ..; \
+--
+1.7.4.1
+
diff --git a/net-im/ekg2/metadata.xml b/net-im/ekg2/metadata.xml
new file mode 100644
index 000000000000..9235b334061f
--- /dev/null
+++ b/net-im/ekg2/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>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+
+ <use>
+ <!-- 0.3* flags -->
+ <flag name='gif' restrict='=net-im/ekg2-0.3*'>
+ GIF token support for Gadu-Gadu protocol.</flag>
+ <flag name='gnutls'>Enable SSL/TLS support through GnuTLS
+ for the plugins supporting it. If 'ssl' is enabled too, GnuTLS will
+ be preferred where possible (and OpenSSL will be used
+ elsewhere).</flag>
+ <flag name='jpeg'>JPEG token support for Gadu-Gadu protocol.</flag>
+ <flag name='ssl' restrict='=net-im/ekg2-0.3*'>
+ Enable the complete SSL/TLS support through OpenSSL.
+ This also enables the 'sim' plugin which relies on OpenSSL.</flag>
+ <flag name='oracle'>Support logging messages into Oracle database.</flag>
+
+ <!-- common and modern flags -->
+ <flag name='gadu'>Enable Gadu-Gadu protocol support (requires
+ <pkg>net-libs/libgadu</pkg>).</flag>
+ <flag name='gpg'>Enable jabber message encryption through
+ <pkg>app-crypt/gpgme</pkg>.</flag>
+ <flag name='minimal'>Disable building extra plugins with no additional
+ deps.</flag>
+ <flag name='openssl'>Support encryption in sim plugin, using OpenSSL.</flag>
+ <flag name='sqlite'>Support logging messages into SQLite3 database.</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
new file mode 100644
index 000000000000..00abc94d2de8
--- /dev/null
+++ b/net-im/empathy/Manifest
@@ -0,0 +1,3 @@
+DIST empathy-3.12.10.tar.xz 5064384 SHA256 794140c3743aa83739ef7efa9eff1950e2f718fde9dc29064fa9d616478e97cb SHA512 59d48316d4708e04cddb395626ac1e8fc55aa215e1bbb79e6976c58c857f08e8a758ccc670a35bd966b95676a2cdd6bc70dd12e3aac85d01e02e995bb6fd6fe2 WHIRLPOOL 1391448c99876746471273dcabc47e8c1119be98d415e0e7ee7b31391c3dbc029ef952176b567d59fd9c0300ab5be3102302237b488bd4c9ecef214831db0c96
+DIST empathy-3.12.7.tar.xz 5047116 SHA256 abcc6e325474d158ba21dfc864183617cf832c3570ccefe9e32f275b94452794 SHA512 4c0c6ba19fbf200c6171ccf1935ffb862d1a22ccfd705dff7bac7230ff22330d5244e8330e9a84f8aadaae726384f37b8ebc594d015cab07fdb3bc6386acbc47 WHIRLPOOL 833962c303c1518a6aa2d5327877ea5a9e99be7d26814c4692c78b978c090802765ab27a697b689757f17dd7a2fa062270fdc44f2488ce4919bdd87db2427a01
+DIST empathy-3.12.9.tar.xz 5060040 SHA256 743d3f1826afb6f1f6751983a780443da315635e1f05345370564c8cd541c422 SHA512 5aa01a6be70a708d8d7f6d7950d5f71110386a3e5633e169f6ac29ee036d73bcb3237ce80e424915decec5cfd79235cf76c067dc9f810f34dd2443cf733d9c6c WHIRLPOOL 3089843d8e8049d79b414dca43c350d568125e01ec0d468564e6d4735fbd4e50d7d59bdf7c3be51b18a0f4b356a6cd2ae7a4c7f956e297a88b26478c994f5cf3
diff --git a/net-im/empathy/empathy-3.12.10.ebuild b/net-im/empathy/empathy-3.12.10.ebuild
new file mode 100644
index 000000000000..c589840621bc
--- /dev/null
+++ b/net-im/empathy/empathy-3.12.10.ebuild
@@ -0,0 +1,127 @@
+# 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 python3_{3,4} )
+
+inherit gnome2 autotools python-any-r1 virtualx
+
+DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Empathy"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
+SLOT="0"
+
+IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gdk-pixbuf and pango extensively used in libempathy-gtk
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.6:2
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.9.4:3
+ x11-libs/pango
+ >=dev-libs/dbus-glib-0.51
+ >=dev-libs/folks-0.9.5:=[telepathy]
+ dev-libs/libgee:0.8=
+ >=app-crypt/libsecret-0.5
+ >=media-libs/libcanberra-0.25[gtk3]
+ >=net-libs/gnutls-2.8.5:=
+ >=net-libs/webkit-gtk-1.9.1:3
+ >=x11-libs/libnotify-0.7:=
+
+ media-libs/gstreamer:1.0
+ >=media-libs/clutter-1.10.0:1.0
+ >=media-libs/clutter-gtk-1.1.2:1.0
+ media-libs/clutter-gst:2.0
+ >=media-libs/cogl-1.14:1.0=
+
+ net-libs/farstream:0.2=
+ >=net-libs/telepathy-farstream-0.6.0:=
+ >=net-libs/telepathy-glib-0.23.2
+ >=net-im/telepathy-logger-0.8.0:=
+
+ app-crypt/gcr
+ dev-libs/libxml2:2
+ gnome-base/gsettings-desktop-schemas
+ media-sound/pulseaudio[glib]
+ net-libs/libsoup:2.4
+ x11-libs/libX11
+
+ geoloc? (
+ >=app-misc/geoclue-2.1:2.0
+ >=sci-geosciences/geocode-glib-3.10 )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
+ map? (
+ >=media-libs/clutter-1.7.14:1.0
+ >=media-libs/clutter-gtk-0.90.3:1.0
+ >=media-libs/libchamplain-0.12.1:0.12[gtk] )
+ spell? (
+ >=app-text/enchant-1.2
+ >=app-text/iso-codes-0.35 )
+ v4l? (
+ media-plugins/gst-plugins-v4l2:1.0
+ >=media-video/cheese-3.4:=
+ virtual/libgudev:= )
+"
+
+# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
+RDEPEND="${COMMON_DEPEND}
+ media-libs/gst-plugins-base:1.0
+ net-im/telepathy-connection-managers
+ !<net-voip/telepathy-rakia-0.7
+ x11-themes/gnome-icon-theme-symbolic
+ gnome? ( gnome-extra/gnome-contacts )
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=dev-util/intltool-0.50.0
+ virtual/pkgconfig
+ test? (
+ sys-apps/grep
+ >=dev-libs/check-0.9.4 )
+"
+PDEPEND=">=net-im/telepathy-mission-control-5.14"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ export PYTHONIOENCODING=UTF-8 # See bug 489774
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.12.7-Fix-parallel-build-in-extensions.patch"
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
+ gnome2_src_configure \
+ --disable-Werror \
+ --disable-coding-style-checks \
+ --disable-static \
+ --disable-ubuntu-online-accounts \
+ --enable-gst-1.0 \
+ $(use_enable debug) \
+ $(use_enable geoloc geocode) \
+ $(use_enable geoloc location) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable map) \
+ $(use_enable spell) \
+ $(use_enable v4l gudev) \
+ $(use_with v4l cheese) \
+ ITSTOOL=$(type -P true)
+}
+
+src_test() {
+ dbus-launch Xemake check #504516
+}
diff --git a/net-im/empathy/empathy-3.12.7.ebuild b/net-im/empathy/empathy-3.12.7.ebuild
new file mode 100644
index 000000000000..62d960d7d9e2
--- /dev/null
+++ b/net-im/empathy/empathy-3.12.7.ebuild
@@ -0,0 +1,127 @@
+# 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 python3_{3,4} )
+
+inherit gnome2 autotools python-any-r1 virtualx
+
+DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Empathy"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
+SLOT="0"
+
+IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gdk-pixbuf and pango extensively used in libempathy-gtk
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.6:2
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.9.4:3
+ x11-libs/pango
+ >=dev-libs/dbus-glib-0.51
+ >=dev-libs/folks-0.9.5:=[telepathy]
+ dev-libs/libgee:0.8=
+ >=app-crypt/libsecret-0.5
+ >=media-libs/libcanberra-0.25[gtk3]
+ >=net-libs/gnutls-2.8.5:=
+ >=net-libs/webkit-gtk-1.9.1:3
+ >=x11-libs/libnotify-0.7:=
+
+ media-libs/gstreamer:1.0
+ >=media-libs/clutter-1.10.0:1.0
+ >=media-libs/clutter-gtk-1.1.2:1.0
+ media-libs/clutter-gst:2.0
+ >=media-libs/cogl-1.14:1.0=
+
+ net-libs/farstream:0.2=
+ >=net-libs/telepathy-farstream-0.6.0:=
+ >=net-libs/telepathy-glib-0.23.2
+ >=net-im/telepathy-logger-0.8.0:=
+
+ app-crypt/gcr
+ dev-libs/libxml2:2
+ gnome-base/gsettings-desktop-schemas
+ media-sound/pulseaudio[glib]
+ net-libs/libsoup:2.4
+ x11-libs/libX11
+
+ geoloc? (
+ >=app-misc/geoclue-1.99.3:2.0
+ >=sci-geosciences/geocode-glib-3.10 )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
+ map? (
+ >=media-libs/clutter-1.7.14:1.0
+ >=media-libs/clutter-gtk-0.90.3:1.0
+ >=media-libs/libchamplain-0.12.1:0.12[gtk] )
+ spell? (
+ >=app-text/enchant-1.2
+ >=app-text/iso-codes-0.35 )
+ v4l? (
+ media-plugins/gst-plugins-v4l2:1.0
+ >=media-video/cheese-3.4:=
+ virtual/libgudev:= )
+"
+
+# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
+RDEPEND="${COMMON_DEPEND}
+ media-libs/gst-plugins-base:1.0
+ net-im/telepathy-connection-managers
+ !<net-voip/telepathy-rakia-0.7
+ x11-themes/gnome-icon-theme-symbolic
+ gnome? ( gnome-extra/gnome-contacts )
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=dev-util/intltool-0.50.0
+ virtual/pkgconfig
+ test? (
+ sys-apps/grep
+ >=dev-libs/check-0.9.4 )
+"
+PDEPEND=">=net-im/telepathy-mission-control-5.14"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ export PYTHONIOENCODING=UTF-8 # See bug 489774
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.12.7-Fix-parallel-build-in-extensions.patch"
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
+ gnome2_src_configure \
+ --disable-Werror \
+ --disable-coding-style-checks \
+ --disable-static \
+ --disable-ubuntu-online-accounts \
+ --enable-gst-1.0 \
+ $(use_enable debug) \
+ $(use_enable geoloc geocode) \
+ $(use_enable geoloc location) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable map) \
+ $(use_enable spell) \
+ $(use_enable v4l gudev) \
+ $(use_with v4l cheese) \
+ ITSTOOL=$(type -P true)
+}
+
+src_test() {
+ dbus-launch Xemake check #504516
+}
diff --git a/net-im/empathy/empathy-3.12.9.ebuild b/net-im/empathy/empathy-3.12.9.ebuild
new file mode 100644
index 000000000000..9fc57eb07e26
--- /dev/null
+++ b/net-im/empathy/empathy-3.12.9.ebuild
@@ -0,0 +1,127 @@
+# 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 python3_{3,4} )
+
+inherit gnome2 autotools python-any-r1 virtualx
+
+DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Empathy"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
+SLOT="0"
+
+IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gdk-pixbuf and pango extensively used in libempathy-gtk
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.6:2
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.9.4:3
+ x11-libs/pango
+ >=dev-libs/dbus-glib-0.51
+ >=dev-libs/folks-0.9.5:=[telepathy]
+ dev-libs/libgee:0.8=
+ >=app-crypt/libsecret-0.5
+ >=media-libs/libcanberra-0.25[gtk3]
+ >=net-libs/gnutls-2.8.5:=
+ >=net-libs/webkit-gtk-1.9.1:3
+ >=x11-libs/libnotify-0.7:=
+
+ media-libs/gstreamer:1.0
+ >=media-libs/clutter-1.10.0:1.0
+ >=media-libs/clutter-gtk-1.1.2:1.0
+ media-libs/clutter-gst:2.0
+ >=media-libs/cogl-1.14:1.0=
+
+ net-libs/farstream:0.2=
+ >=net-libs/telepathy-farstream-0.6.0:=
+ >=net-libs/telepathy-glib-0.23.2
+ >=net-im/telepathy-logger-0.8.0:=
+
+ app-crypt/gcr
+ dev-libs/libxml2:2
+ gnome-base/gsettings-desktop-schemas
+ media-sound/pulseaudio[glib]
+ net-libs/libsoup:2.4
+ x11-libs/libX11
+
+ geoloc? (
+ >=app-misc/geoclue-2.1:2.0
+ >=sci-geosciences/geocode-glib-3.10 )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 )
+ map? (
+ >=media-libs/clutter-1.7.14:1.0
+ >=media-libs/clutter-gtk-0.90.3:1.0
+ >=media-libs/libchamplain-0.12.1:0.12[gtk] )
+ spell? (
+ >=app-text/enchant-1.2
+ >=app-text/iso-codes-0.35 )
+ v4l? (
+ media-plugins/gst-plugins-v4l2:1.0
+ >=media-video/cheese-3.4:=
+ virtual/libgudev:= )
+"
+
+# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
+RDEPEND="${COMMON_DEPEND}
+ media-libs/gst-plugins-base:1.0
+ net-im/telepathy-connection-managers
+ !<net-voip/telepathy-rakia-0.7
+ x11-themes/gnome-icon-theme-symbolic
+ gnome? ( gnome-extra/gnome-contacts )
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=dev-util/intltool-0.50.0
+ virtual/pkgconfig
+ test? (
+ sys-apps/grep
+ >=dev-libs/check-0.9.4 )
+"
+PDEPEND=">=net-im/telepathy-mission-control-5.14"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ export PYTHONIOENCODING=UTF-8 # See bug 489774
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.12.7-Fix-parallel-build-in-extensions.patch"
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
+ gnome2_src_configure \
+ --disable-Werror \
+ --disable-coding-style-checks \
+ --disable-static \
+ --disable-ubuntu-online-accounts \
+ --enable-gst-1.0 \
+ $(use_enable debug) \
+ $(use_enable geoloc geocode) \
+ $(use_enable geoloc location) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable map) \
+ $(use_enable spell) \
+ $(use_enable v4l gudev) \
+ $(use_with v4l cheese) \
+ ITSTOOL=$(type -P true)
+}
+
+src_test() {
+ dbus-launch Xemake check #504516
+}
diff --git a/net-im/empathy/files/empathy-3.12.7-Fix-parallel-build-in-extensions.patch b/net-im/empathy/files/empathy-3.12.7-Fix-parallel-build-in-extensions.patch
new file mode 100644
index 000000000000..28eef07fbb3c
--- /dev/null
+++ b/net-im/empathy/files/empathy-3.12.7-Fix-parallel-build-in-extensions.patch
@@ -0,0 +1,65 @@
+From 7af14d9ca148e4d1ec2eb70d7b655bb2fc5a052f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Sun, 30 Nov 2014 22:10:59 +0100
+Subject: [PATCH] Fix parallel build in extensions/
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GNU Make manual says:
+
+ A rule with multiple targets is equivalent to writing many rules,
+ each with one target, and all identical aside from that.
+
+In other words, make may very well call glib-gtypes-generator.py twice
+(once for each generated header). And hell breaks loose because the
+python code assumes it will run once (it should be using the tempfile
+module, but that's another bug). On a fast multi-core machine, make -j4
+will easily reproduce this bug.
+
+The solution is hidden in the same manual [1] :
+
+ %.tab.c %.tab.h: %.y
+ bison -d $<
+
+ This tells make that the recipe ‘bison -d x.y’ will make both
+ x.tab.c and x.tab.h.
+
+So by using '%' to replace the 'y' in the targets, I'm telling make that
+running the recipe once will generate both files.
+
+[1] http://www.gnu.org/software/make/manual/make.html#Pattern-Examples
+
+https://bugs.gentoo.org/show_bug.cgi?id=515894
+https://bugzilla.gnome.org/show_bug.cgi?id=685837
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ extensions/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/extensions/Makefile.am b/extensions/Makefile.am
+index 79622d4..9082496 100644
+--- a/extensions/Makefile.am
++++ b/extensions/Makefile.am
+@@ -66,7 +66,7 @@ extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
+ $(tools_dir)/doc-generator.xsl \
+ $< > $@
+
+-_gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \
++_gen/gt%pes.h _gen/gt%pes-body.h: _gen/all.xml \
+ $(top_srcdir)/tools/glib-gtypes-generator.py
+ $(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \
+ $< _gen/gtypes Emp
+@@ -82,7 +82,7 @@ _gen/enums.h: _gen/all.xml \
+ Emp \
+ $< _gen/enums
+
+-_gen/interfaces-body.h _gen/interfaces.h: _gen/all.xml \
++_gen/int%rfaces-body.h _gen/int%rfaces.h: _gen/all.xml \
+ $(tools_dir)/glib-interfaces-gen.py
+ $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
+ Emp _gen/interfaces-body.h _gen/interfaces.h $<
+--
+2.3.6
+
diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
new file mode 100644
index 000000000000..0968098fd22f
--- /dev/null
+++ b/net-im/empathy/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+ <use>
+ <flag name="geoloc">Enable geolocation support through
+ <pkg>app-misc/geoclue</pkg></flag>
+ <flag name="gnome-online-accounts">Enable using
+ <pkg>net-libs/gnome-online-accounts</pkg> for authorization (e.g.
+ for Google Talk)</flag>
+ <flag name="map">Enable world map support through
+ <pkg>media-libs/libchamplain</pkg></flag>
+ </use>
+ <longdescription>
+ Empathy consists of a rich set of reusable instant messaging widgets,
+ and a GNOME client using those widgets. It uses Telepathy and Nokia's
+ Mission Control. The main goal is to permit desktop integration by
+ providing libempathy and libempathy-gtk libraries. libempathy-gtk is a
+ set of powerful widgets that can be embeded into any GNOME application.
+ A client application is provided.
+ </longdescription>
+</pkgmetadata>
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
new file mode 100644
index 000000000000..9ce6f86dd19f
--- /dev/null
+++ b/net-im/err/Manifest
@@ -0,0 +1 @@
+DIST err-1.7.1.tar.gz 100716 SHA256 a116df7fb4489274b0074c960eebfd7bb938cc777dfc43c773f828aaf9cb5406 SHA512 5be7f6ede6694877e73226de4da58bc47e1230032bc9be8dd3e8fd1448afd1e3ae4c02ecbdb30343b98466bb0d3a8fbfbcb6609c5c50768a9be70b9d22f675a4 WHIRLPOOL a79fd02db047ccfdf25201ade924ed3382d8b729b69bcdebf911d806c167751ec011e62728d9342a4f7c0d8cc6e4b07a40bd5f275ed042ff2451fc17066800e8
diff --git a/net-im/err/err-1.7.1.ebuild b/net-im/err/err-1.7.1.ebuild
new file mode 100644
index 000000000000..68c779f5902d
--- /dev/null
+++ b/net-im/err/err-1.7.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 eutils user
+
+DESCRIPTION="Plugin based XMPP chatbot designed to be easily deployable, extensible and maintainable"
+HOMEPAGE="http://gbin.github.com/err/"
+
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="irc qt4 +plugins"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/dnspython[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyfire[${PYTHON_USEDEP}]
+ dev-python/python-daemon[${PYTHON_USEDEP}]
+ dev-python/xmpppy
+ dev-python/yapsy[${PYTHON_USEDEP}]
+ irc? (
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/twisted-core[${PYTHON_USEDEP}]
+ dev-python/twisted-words[${PYTHON_USEDEP}]
+ )
+ qt4? ( dev-python/pyside[${PYTHON_USEDEP},X,webkit] )
+ plugins? ( dev-vcs/git )"
+
+# Testsuite is broken since 1.6.3
+RESTRICT="test"
+
+# NOTES:
+# 1. It has bundled libs - for example exrex(see 'errbot/bundled' subfolder)
+# 2. Need to add PYTHON_USEDEP to remaining dev-python/ deps
+# 3. Support for BOT_SENTRY option is missing, cause
+# we do not have apropriate packages in portage yet
+# 4. Internal web server is broken(dunno why :-()
+
+pkg_setup() {
+ ebegin "Creating err group and user"
+ enewgroup 'err'
+ enewuser 'err' -1 -1 -1 'err'
+ eend ${?}
+}
+
+python_prepare_all() {
+ # Remove configparser and config from requirements as they are NOT needed
+ sed -i \
+ -e "/install_requires/s/'configparser', //" \
+ -e "/install_requires/s/, 'config'//" \
+ setup.py || die
+
+ # Tests are broken and should not be installed
+ rm -r tests || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newinitd "${FILESDIR}"/errd.initd errd
+ newconfd "${FILESDIR}"/errd.confd errd
+
+ dodir /etc/${PN}
+ dodir /var/lib/${PN}
+ keepdir /var/log/${PN}
+ fowners -R err:err /var/lib/${PN}
+ fowners -R err:err /var/log/${PN}
+
+ insinto /etc/${PN}
+ newins errbot/config-template.py config.py
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ # Upstream requires images to be in site-packages directory,
+ # but does not install them at all!
+ if use qt4; then
+ local python_moduleroot=errbot
+ python_domodule errbot/*.svg
+ fi
+}
diff --git a/net-im/err/files/errd.confd b/net-im/err/files/errd.confd
new file mode 100644
index 000000000000..cc70d90b4b43
--- /dev/null
+++ b/net-im/err/files/errd.confd
@@ -0,0 +1,9 @@
+# Path to config directory
+ERR_CONFIG_PATH=/etc/err
+
+# Path to pid file
+ERR_PID_FILE=/var/run/err/err.pid
+
+# User and group to run bot with
+ERR_USER=err
+ERR_GROUP=err
diff --git a/net-im/err/files/errd.initd b/net-im/err/files/errd.initd
new file mode 100644
index 000000000000..053f92fd16ed
--- /dev/null
+++ b/net-im/err/files/errd.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+}
+
+start() {
+ # create piddir if necessary, bug #448498
+ local piddir=$(dirname ${ERR_PID_FILE})
+ checkpath -q -d -o err:err -m 0770 "${piddir}" || {
+ eend 1
+ return 1
+ }
+
+ ebegin "Starting errd"
+ start-stop-daemon --start --make-pidfile --pidfile ${ERR_PID_FILE} --background --quiet -u ${ERR_USER}:${ERR_GROUP} \
+ --exec /usr/bin/python2 -- /usr/bin/err.py -c ${ERR_CONFIG_PATH}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping errd"
+ start-stop-daemon --stop --pidfile ${ERR_PID_FILE}
+ eend $?
+}
diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
new file mode 100644
index 000000000000..2530b60c19c3
--- /dev/null
+++ b/net-im/err/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+ <use>
+ <flag name="irc">Pull optional dependencies, needed for IRC backend</flag>
+ <flag name="plugins">Enable support for installing plugins with <pkg>dev-vcs/git</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="github">gbin/err</remote-id>
+ <maintainer status="active">
+ <email>gbin@gootz.net</email>
+ <name>Guillaume BINET</name>
+ </maintainer>
+ <remote-id type="pypi">err</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
new file mode 100644
index 000000000000..7f81a86208f8
--- /dev/null
+++ b/net-im/gajim/Manifest
@@ -0,0 +1,2 @@
+DIST gajim-0.16.3.tar.bz2 4596437 SHA256 a1c85879cb43f80a5a4ece91c5571012bb08c3878b28105db246599e1c4c4515 SHA512 815275c0abbc18ff7309a4142186952f4d46acedeb29c14ab90ab4e60935d427248eedcf6392cf6f197b24928763a58c0a52ccdfb112f28e9c9c727c3f3e45c9 WHIRLPOOL f6f7098ae5098d7f3ade834773002aa62a53d6e43a2c52d07cc1bad29e9b83741a616f1e50953063c060881f1d5a3e8cef87ea2ac0b0f667ee9b330bd995f827
+DIST gajim-0.16.tar.bz2 4575445 SHA256 7abd8dfb22522d3a2f0345da2a86b99fb9917bfd97310124df8601fab82ca193 SHA512 af2fd6b750e3ffa5770913a93ac5e61e6dab5688a28a26484ba4a097d73cc38b820797b1fedc60a67bf94e9a641cc80264210d0c4cf997047068c6dcb056ca75 WHIRLPOOL 6d5374bcc574bf851f6dde184f52ef8ca517869b96a85a9598b4c37953c2bc7849ccfdb106d975da80a394555f7ed7486cf356dad06dc11f545d375745e983be
diff --git a/net-im/gajim/files/gajim-0.16-desktop.patch b/net-im/gajim/files/gajim-0.16-desktop.patch
new file mode 100644
index 000000000000..142c98972808
--- /dev/null
+++ b/net-im/gajim/files/gajim-0.16-desktop.patch
@@ -0,0 +1,16 @@
+ data/gajim.desktop.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/gajim.desktop.in.in b/data/gajim.desktop.in.in
+index 8a93ee8..ea0b1da 100644
+--- a/data/gajim.desktop.in.in
++++ b/data/gajim.desktop.in.in
+@@ -3,7 +3,7 @@ Categories=Network;InstantMessaging;GTK;GNOME;
+ _Name=Gajim
+ _GenericName=Jabber IM Client
+ _Comment=A GTK+ Jabber client
+-_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip
++_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip;
+ Version=1.0
+ Exec=gajim
+ Icon=gajim
diff --git a/net-im/gajim/gajim-0.16.3.ebuild b/net-im/gajim/gajim-0.16.3.ebuild
new file mode 100644
index 000000000000..d3b47b52c63f
--- /dev/null
+++ b/net-im/gajim/gajim-0.16.3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils python-r1 versionator
+
+MY_PV=${PV/_/-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI="
+ http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+# test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ libnotify? ( dbus )
+ avahi? ( dbus )
+ gnome? ( gnome-keyring )"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.40.1
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+ >=dev-python/python-nbxmpp-0.5.3[${PYTHON_USEDEP}]
+ crypt? (
+ app-crypt/gnupg
+ dev-python/pycrypto[${PYTHON_USEDEP}]
+ )
+ dbus? (
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-libs/dbus-glib
+ libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+ avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
+ )
+ gnome? (
+ dev-python/libgnome-python[${PYTHON_USEDEP}]
+ dev-python/egg-python[${PYTHON_USEDEP}]
+ )
+ gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
+ idle? ( x11-libs/libXScrnSaver )
+ jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
+ kde? ( kde-apps/kwalletmanager )
+ networkmanager? (
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ net-misc/networkmanager
+ )
+ spell? ( app-text/gtkspell:2 )
+ srv? (
+ || (
+ dev-python/libasyncns-python[${PYTHON_USEDEP}]
+ net-dns/bind-tools
+ )
+ )
+ xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.16-desktop.patch
+ )
+
+src_prepare() {
+ autotools-utils_src_prepare
+ python_copy_sources
+}
+
+src_configure() {
+ configuration() {
+ local myeconfargs=(
+ $(use_enable nls)
+ $(use_with X x)
+ --docdir="/usr/share/doc/${PF}"
+ --libdir="$(python_get_sitedir)"
+ --enable-site-packages
+ )
+ run_in_build_dir autotools-utils_src_configure
+ }
+ python_foreach_impl configuration
+}
+
+src_compile() {
+ compilation() {
+ run_in_build_dir autotools-utils_src_compile
+ }
+ python_foreach_impl compilation
+}
+
+src_test() {
+ testing() {
+ run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
+ }
+ python_foreach_impl testing
+}
+
+src_install() {
+ installation() {
+ run_in_build_dir autotools-utils_src_install
+ python_optimize
+ }
+ python_foreach_impl installation
+
+ rm "${ED}/usr/share/doc/${PF}/README.html" || die
+ dohtml README.html
+}
diff --git a/net-im/gajim/gajim-0.16.ebuild b/net-im/gajim/gajim-0.16.ebuild
new file mode 100644
index 000000000000..b88d727c88aa
--- /dev/null
+++ b/net-im/gajim/gajim-0.16.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils python-r1 versionator
+
+MY_PV=${PV/_/-}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI="
+ http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+# test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
+IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ libnotify? ( dbus )
+ avahi? ( dbus )
+ gnome? ( gnome-keyring )"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.40.1
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+ >=dev-python/python-nbxmpp-0.5.1[${PYTHON_USEDEP}]
+ crypt? (
+ app-crypt/gnupg
+ dev-python/pycrypto[${PYTHON_USEDEP}]
+ )
+ dbus? (
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-libs/dbus-glib
+ libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+ avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
+ )
+ gnome? (
+ dev-python/libgnome-python[${PYTHON_USEDEP}]
+ dev-python/egg-python[${PYTHON_USEDEP}]
+ )
+ gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
+ idle? ( x11-libs/libXScrnSaver )
+ jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
+ kde? ( kde-apps/kwalletmanager )
+ networkmanager? (
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ net-misc/networkmanager
+ )
+ spell? ( app-text/gtkspell:2 )
+ srv? (
+ || (
+ dev-python/libasyncns-python[${PYTHON_USEDEP}]
+ net-dns/bind-tools )
+ )
+ xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-desktop.patch )
+
+src_prepare() {
+ autotools-utils_src_prepare
+ python_copy_sources
+}
+
+src_configure() {
+ configuration() {
+ local myeconfargs=(
+ $(use_enable nls)
+ $(use_with X x)
+ --docdir="/usr/share/doc/${PF}"
+ --libdir="$(python_get_sitedir)"
+ --enable-site-packages
+ )
+ run_in_build_dir autotools-utils_src_configure
+ }
+ python_foreach_impl configuration
+}
+
+src_compile() {
+ compilation() {
+ run_in_build_dir autotools-utils_src_compile
+ }
+ python_foreach_impl compilation
+}
+
+src_test() {
+ testing() {
+ run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
+ }
+ python_foreach_impl testing
+}
+
+src_install() {
+ installation() {
+ run_in_build_dir autotools-utils_src_install
+ python_optimize
+ }
+ python_foreach_impl installation
+
+ rm "${ED}/usr/share/doc/${PF}/README.html" || die
+ dohtml README.html
+}
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
new file mode 100644
index 000000000000..ea54566d67ff
--- /dev/null
+++ b/net-im/gajim/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-im</herd>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ A fully featured and easy to use GTK+ Jabber client written in PyGTK.
+ </longdescription>
+ <use>
+ <flag name="idle">Enable idle module</flag>
+ <flag name="srv">SRV capabilities</flag>
+ <flag name="xhtml">Enable XHTML support</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-im/gg-transport/Manifest b/net-im/gg-transport/Manifest
new file mode 100644
index 000000000000..3df74610adcb
--- /dev/null
+++ b/net-im/gg-transport/Manifest
@@ -0,0 +1 @@
+DIST jggtrans-2.2.4.tar.gz 796625 SHA256 678db2bef8e867889715663188f6ac785c7bf6e1bd0840a000f0a76b28892830
diff --git a/net-im/gg-transport/files/jggtrans-2.2.2-r1 b/net-im/gg-transport/files/jggtrans-2.2.2-r1
new file mode 100644
index 000000000000..7e38a40b2231
--- /dev/null
+++ b/net-im/gg-transport/files/jggtrans-2.2.2-r1
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ after net jabber-server
+}
+
+start() {
+ ebegin "Starting Jabber GG Transport"
+ start-stop-daemon --start --user jabber --group jabber --exec /usr/sbin/jggtrans -- -u jabber -g jabber /etc/jabber/jggtrans.xml
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Jabber GG Transport"
+ start-stop-daemon --stop --pidfile /var/run/jabber/jggtrans.pid
+ eend $?
+}
diff --git a/net-im/gg-transport/files/jggtrans-2.2.4 b/net-im/gg-transport/files/jggtrans-2.2.4
new file mode 100644
index 000000000000..7e38a40b2231
--- /dev/null
+++ b/net-im/gg-transport/files/jggtrans-2.2.4
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ after net jabber-server
+}
+
+start() {
+ ebegin "Starting Jabber GG Transport"
+ start-stop-daemon --start --user jabber --group jabber --exec /usr/sbin/jggtrans -- -u jabber -g jabber /etc/jabber/jggtrans.xml
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Jabber GG Transport"
+ start-stop-daemon --stop --pidfile /var/run/jabber/jggtrans.pid
+ eend $?
+}
diff --git a/net-im/gg-transport/gg-transport-2.2.4.ebuild b/net-im/gg-transport/gg-transport-2.2.4.ebuild
new file mode 100644
index 000000000000..b29c5438b0f6
--- /dev/null
+++ b/net-im/gg-transport/gg-transport-2.2.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Gadu-Gadu transport for Jabber"
+HOMEPAGE="https://github.com/Jajcus/jggtrans"
+SRC_URI="mirror://github/Jajcus/jggtrans/jggtrans-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=net-im/jabber-base-0.01
+ >=dev-libs/glib-2.6.4
+ net-dns/libidn
+ >=net-libs/libgadu-1.9.0_rc3
+ dev-libs/expat"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}/jggtrans-${PV}"
+
+src_install() {
+ emake DESTDIR="${D}" install || die "install failed"
+
+ keepdir /var/spool/jabber/gg
+ keepdir /var/run/jabber
+ keepdir /var/log/jabber
+ fowners jabber:jabber /var/spool/jabber/gg
+ fowners jabber:jabber /var/run/jabber
+ fowners jabber:jabber /var/log/jabber
+
+ newinitd "${FILESDIR}/jggtrans-${PVR}" jggtrans
+
+ insinto /etc/jabber
+ doins jggtrans.xml
+
+ sed -i \
+ -e 's,/var/lib/jabber/spool/gg.localhost/,/var/spool/jabber/gg/,' \
+ -e 's,/var/lib/jabber/ggtrans.pid,/var/run/jabber/jggtrans.pid,' \
+ -e 's,/tmp/ggtrans.log,/var/log/jabber/jggtrans.log,' \
+ "${D}/etc/jabber/jggtrans.xml" || die "sed failed"
+
+ dodoc AUTHORS ChangeLog README README.Pl NEWS
+}
diff --git a/net-im/gg-transport/metadata.xml b/net-im/gg-transport/metadata.xml
new file mode 100644
index 000000000000..e30841e388bf
--- /dev/null
+++ b/net-im/gg-transport/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>
+ <longdescription>
+ Gadu-Gadu is a IM network vary famous in Poland, this package will
+ enable your jabber server to talk to that network.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">Jajcus/jggtrans</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/indicator-messages/Manifest b/net-im/indicator-messages/Manifest
new file mode 100644
index 000000000000..bbca14f4713d
--- /dev/null
+++ b/net-im/indicator-messages/Manifest
@@ -0,0 +1 @@
+DIST indicator-messages-0.6.0.tar.gz 538527 SHA256 3a905ceee3778d5dbd05a96aa05470d79bd4be4bdd9d97196dffca125828b466 SHA512 d46ee85d5ceffd794af2917f6246febb538e73b7f23ff70e6198daca9c9a200c85a385d546b2a1e8b5e51f86ac3e58d2aa17378c5077c4b30ae2f3c1a902fafe WHIRLPOOL 3a58183433edc3c925b870a88fd80449a24cc13a26be43b1c92e3528c5098fca1c286f65a3f262ec9e18a4093cb02bf7861ba5f1ab86c608d5d64cb7fe748ea6
diff --git a/net-im/indicator-messages/indicator-messages-0.6.0-r1.ebuild b/net-im/indicator-messages/indicator-messages-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..0e1665a889a4
--- /dev/null
+++ b/net-im/indicator-messages/indicator-messages-0.6.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils gnome2-utils
+
+DESCRIPTION="A place on the user's desktop that collects messages that need a response"
+HOMEPAGE="http://launchpad.net/indicator-messages"
+SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libdbusmenu-0.6.2[gtk3]
+ >=dev-libs/glib-2.22
+ >=dev-libs/libindicate-12.10.0:3
+ >=dev-libs/libindicator-12.10.0:3
+ net-libs/telepathy-glib
+ >=x11-libs/gtk+-3.2:3"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ --disable-silent-rules \
+ --with-gtk=3
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog
+ prune_libtool_files --all
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/net-im/indicator-messages/metadata.xml b/net-im/indicator-messages/metadata.xml
new file mode 100644
index 000000000000..86195656b0c5
--- /dev/null
+++ b/net-im/indicator-messages/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>ayatana</herd>
+ <maintainer>
+ <email>ayatana-bugs@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="launchpad">indicator-messages</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/jabber-base/jabber-base-0.01.ebuild b/net-im/jabber-base/jabber-base-0.01.ebuild
new file mode 100644
index 000000000000..7719cfe054a6
--- /dev/null
+++ b/net-im/jabber-base/jabber-base-0.01.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils user
+
+DESCRIPTION="Jabber servers and transports layout package"
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+S="${WORKDIR}"
+
+#Info for people working in jabber related packages
+
+#/etc/jabber/ for configuration files
+#/var/run/jabber/ for the pid files
+#/var/spool/jabber/ for the flat files databases (actually there must be a ewarn
+#at end of ebuild telling user to creat /var/spool/jabber/JID, as some transports fail to start if
+#the directory is not there, even if they have permissions to creat it)
+#/var/log/jabber/ for the log files
+
+#for the python based transports with no install script:
+#they must inherit python and be installed in:
+#$(python_get_sitedir)/$package-name
+
+#the user should be the one created here username=group=jabber
+
+src_install() {
+ keepdir /etc/jabber
+ keepdir /var/run/jabber
+ keepdir /var/spool/jabber
+ keepdir /var/log/jabber
+}
+
+pkg_postinst() {
+ # Users should not be created in src_install see bug #124680
+ # Add our default jabber group and user
+ enewgroup jabber
+ enewuser jabber -1 -1 -1 jabber
+ # We can't use fowners & fperms convenience wrappers as we are outside the sandbox
+ chown jabber:jabber /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
+ chmod 770 /etc/jabber /var/log/jabber /var/spool/jabber /var/run/jabber
+}
diff --git a/net-im/jabber-base/metadata.xml b/net-im/jabber-base/metadata.xml
new file mode 100644
index 000000000000..3c4008ea7825
--- /dev/null
+++ b/net-im/jabber-base/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>net-im</herd>
+<maintainer>
+ <email>chainsaw@gentoo.org</email>
+</maintainer>
+ <longdescription>Package that creats the users and directory's for jabber
+ related packages. See ebuild for more info </longdescription>
+</pkgmetadata>
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
new file mode 100644
index 000000000000..9e461eda2d33
--- /dev/null
+++ b/net-im/jabberd2/Manifest
@@ -0,0 +1,2 @@
+DIST jabberd-2.3.1.tar.xz 1460088 SHA256 feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0 SHA512 93a594ac4a39643c66e330ef4912ecee8071fdc3e3f460514d0bff60b2031caa2ef5eaad00dede59e4a4d6f7b8e5b52d56daa3959f3b341082933d175cb49b2c WHIRLPOOL 667c576cf7915dc80b2b044e0e0483ef9ef5268daec069542013accf7089acf1428310521f4b1dd144b2a3ebde7a5ec2d70b50a065c76588c8e7de7d9da50136
+DIST jabberd-2.3.2.tar.xz 1473436 SHA256 ceb1f427fde5bf3d1acf2275a2ea3c8c680470ee1aa2be2dda66092d60cd3d50 SHA512 10b00dc4409b59dd30ab85a3c42e4b7b10d1d733d0e73eac5984c6b0bb1edbbca29e3a5e56f86d9a0b94acd3f582ab0575db9387abd345edb154fe5ac7765e03 WHIRLPOOL 42a88b8a53dd8fb22b3157103f307c2d2635953b530536777e35a2e1a46a03351e54c93e192b793f276a98fc6b1699628ca2f8a1284a2f2f4d9db3210f579183
diff --git a/net-im/jabberd2/files/jabberd2-2.3.1.init b/net-im/jabberd2/files/jabberd2-2.3.1.init
new file mode 100644
index 000000000000..696a94489836
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.1.init
@@ -0,0 +1,82 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need net
+ use mysql postgresql slapd
+ provide jabber-server
+}
+
+stopJabberServices() {
+
+ eindent
+ for pidfile in /var/run/jabber/*.pid; do
+ if [ -f "${pidfile}" ]; then
+ service=$(basename ${pidfile} .pid)
+ ebegin "Stopping ${service}"
+ start-stop-daemon \
+ --stop \
+ --pidfile ${pidfile}
+ eend $?
+ fi
+ done
+ eoutdent
+
+}
+
+start_pre() {
+ checkpath -d -o jabber /var/run/jabber
+}
+
+start() {
+
+ einfo "Starting Jabber Server ..."
+ local services executable cfgfile pidfile
+ services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
+ eindent
+ for service in ${services}; do
+
+ cfgfile=$(echo ${service} | cut -d ':' -f 2)
+ service=$(echo ${service} | cut -d ':' -f 1)
+ if [ ! -f "${cfgfile}" ]; then
+ if [ -f "/etc/jabber/${service}.xml" ]; then
+ cfgfile="/etc/jabber/${service}.xml"
+ else
+ eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
+ stopJabberServices
+ return 1
+ fi
+ fi
+
+ executable=/usr/bin/${service}
+
+ if [ ! -f "${executable}" ]; then
+ eerror "Can't find executable: ${executable}"
+ stopJabberServices
+ return 1
+ fi
+
+ ebegin "Starting ${service} (${cfgfile})"
+ pidfile="$(grep -v ^# ${cfgfile} | grep '<pidfile>' | sed 's#<.\?pidfile>##g')"
+ start-stop-daemon \
+ --background \
+ --start \
+ --user jabber:jabber \
+ --exec /usr/bin/${service} \
+ --pid ${pidfile} \
+ -- -c ${cfgfile}
+ eend $?
+
+ done
+ eoutdent
+
+}
+
+stop() {
+
+ einfo "Stopping Jabber Server"
+ stopJabberServices
+
+}
diff --git a/net-im/jabberd2/files/jabberd2-2.3.1.logrotate b/net-im/jabberd2/files/jabberd2-2.3.1.logrotate
new file mode 100644
index 000000000000..0ce109263fbe
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.1.logrotate
@@ -0,0 +1,10 @@
+/var/log/jabber/c2s.log /var/log/jabber/s2s.log /var/log/jabber/sm.log /var/log/jabber/router.log {
+ su jabber jabber
+ sharedscripts
+ postrotate
+ kill -HUP $(cat /var/run/jabberd/c2s.pid)
+ kill -HUP $(cat /var/run/jabberd/s2s.pid)
+ kill -HUP $(cat /var/run/jabberd/sm.pid)
+ kill -HUP $(cat /var/run/jabberd/router.pid)
+ endscript
+}
diff --git a/net-im/jabberd2/files/jabberd2-2.3.1.pamd b/net-im/jabberd2/files/jabberd2-2.3.1.pamd
new file mode 100644
index 000000000000..2c5a5347ad6a
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.1.pamd
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth required pam_nologin.so
+auth include system-auth
+account include system-auth
+session include system-auth
diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.init b/net-im/jabberd2/files/jabberd2-2.3.2.init
new file mode 100644
index 000000000000..108923fa71c0
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.2.init
@@ -0,0 +1,97 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_commands="reload"
+
+depend() {
+ need net
+ use mysql postgresql slapd
+ provide jabber-server
+}
+
+stopJabberServices() {
+
+ eindent
+ for pidfile in /var/run/jabber/*.pid; do
+ if [ -f "${pidfile}" ]; then
+ service=$(basename ${pidfile} .pid)
+ ebegin "Stopping ${service}"
+ start-stop-daemon \
+ --stop \
+ --pidfile ${pidfile}
+ eend $?
+ fi
+ done
+ eoutdent
+
+}
+
+start_pre() {
+ checkpath -d -o jabber /var/run/jabber
+}
+
+start() {
+
+ einfo "Starting Jabber Server ..."
+ local services executable cfgfile pidfile
+ services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
+ eindent
+ for service in ${services}; do
+
+ cfgfile=$(echo ${service} | cut -d ':' -f 2)
+ service=$(echo ${service} | cut -d ':' -f 1)
+ if [ ! -f "${cfgfile}" ]; then
+ if [ -f "/etc/jabber/${service}.xml" ]; then
+ cfgfile="/etc/jabber/${service}.xml"
+ else
+ eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
+ stopJabberServices
+ return 1
+ fi
+ fi
+
+ executable=/usr/bin/${service}
+
+ if [ ! -f "${executable}" ]; then
+ eerror "Can't find executable: ${executable}"
+ stopJabberServices
+ return 1
+ fi
+
+ ebegin "Starting ${service} (${cfgfile})"
+ pidfile="$(grep -v ^# ${cfgfile} | grep '<pidfile>' | sed 's#<.\?pidfile>##g')"
+ start-stop-daemon \
+ --background \
+ --start \
+ --user jabber:jabber \
+ --exec /usr/bin/${service} \
+ --pid ${pidfile} \
+ -- -c ${cfgfile}
+ eend $?
+
+ done
+ eoutdent
+
+}
+
+reload() {
+ eindent
+ for pidfile in /var/run/jabber/*.pid; do
+ if [ -f "${pidfile}" ]; then
+ service=$(basename ${pidfile} .pid)
+ ebegin "Reloading ${service}"
+ kill -HUP $(cat ${pidfile})
+ eend $?
+ fi
+ done
+ eoutdent
+}
+
+stop() {
+
+ einfo "Stopping Jabber Server"
+ stopJabberServices
+
+}
diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.logrotate b/net-im/jabberd2/files/jabberd2-2.3.2.logrotate
new file mode 100644
index 000000000000..fcec0f7a1d59
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.2.logrotate
@@ -0,0 +1,8 @@
+/var/log/jabber/c2s.log /var/log/jabber/s2s.log /var/log/jabber/sm.log /var/log/jabber/router.log {
+ su jabber jabber
+ sharedscripts
+ missingok
+ postrotate
+ /etc/init.d/jabberd reload
+ endscript
+}
diff --git a/net-im/jabberd2/jabberd2-2.3.1-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..67b1f04854e8
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.1-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+IUSE="berkdb debug ldap memdebug mysql pam postgres sqlite ssl test zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+ net-libs/udns
+ net-dns/libidn
+ virtual/gsasl
+ berkdb? ( >=sys-libs/db-4.1.25 )
+ ldap? ( net-nds/openldap )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql )
+ ssl? ( >=dev-libs/openssl-1.0.1:0 )
+ sqlite? ( dev-db/sqlite:3 )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+ >=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+S=${WORKDIR}/jabberd-${PV}
+
+src_prepare() {
+ # Fix some default directory locations
+ sed -i \
+ -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+ -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+ -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+ -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+ -e 's,@localstatedir@,/var/spool,g' \
+ -e 's,@package@,jabber,g' \
+ etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+ # If the package wasn't merged with sqlite then default to use berkdb
+ use sqlite ||
+ sed -i \
+ -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+ etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+ # avoid file collision with x11-misc/screen-message wrt #453994
+ sed -i \
+ -e 's/@jabberd_router_bin@/jabberd2-router/' \
+ -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+ -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+ -e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+ etc/jabberd*.in || die "fixing file collisions failed!"
+
+ # rename pid files wrt #241472
+ sed -i \
+ -e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \
+ -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
+ -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
+ -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
+ etc/*.xml.dist.in || die "renaming pid files failed!"
+}
+
+src_configure() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+ # https://github.com/jabberd2/jabberd2/issues/34
+ replace-flags -O[3s] -O2
+
+ # --enable-pool-debug is currently broken
+ econf \
+ --sysconfdir=/etc/jabber \
+ $(usex debug "--enable-debug" "") \
+ $(usex memdebug "--enable-nad-debug" "") \
+ $(use_enable ssl) \
+ $(use_enable mysql) \
+ $(use_enable postgres pgsql) \
+ $(use_enable sqlite) \
+ $(use_enable berkdb db) \
+ $(use_enable ldap) \
+ $(use_enable pam) \
+ --enable-pipe \
+ --enable-anon \
+ --enable-fs \
+ $(use_enable test tests) \
+ $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
+ $(use_with zlib)
+}
+
+src_install() {
+ local i
+
+ default
+ prune_libtool_files --modules
+
+ keepdir /var/spool/jabber/{fs,db}
+ fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+ /var/spool/jabber/{fs,db}
+ fperms 770 /var/spool/jabber/{fs,db}
+ fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+ # avoid file collision with x11-misc/screen-message wrt #453994
+ for i in router sm c2s s2s ; do
+ einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+ mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+ done
+
+ newinitd "${FILESDIR}/${P}.init" jabberd
+ newpamd "${FILESDIR}/${P}.pamd" jabberd
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${P}.logrotate" jabberd
+
+ docompress -x /usr/share/doc/${PF}/tools
+ docinto tools
+ dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+ tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+ # remove useless upstart files wrt #498900
+ rm -rf "${ED%/}"/usr/etc
+}
+
+pkg_postinst() {
+ if use pam; then
+ echo
+ ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
+ ewarn 'be in the form of "contactname@jabberdomain". This behavior'
+ ewarn 'is likely to change in future versions of jabberd-2. It may'
+ ewarn 'be advisable to avoid PAM authentication for the time being.'
+ echo
+ fi
+
+ if use sqlite || use mysql || use postgres; then
+ echo
+ einfo "You will need to setup or update your database using the"
+ einfo "scripts in /usr/share/doc/${PF}/tools/"
+ echo
+ fi
+
+ ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+ ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+ ewarn 'the binaries have been renamed to avoid file collisions!'
+}
diff --git a/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..aecb34c0a813
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
+IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+ net-libs/udns
+ net-dns/libidn
+ virtual/gsasl
+ berkdb? ( >=sys-libs/db-4.1.25 )
+ ldap? ( net-nds/openldap )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql )
+ ssl? ( >=dev-libs/openssl-1.0.1:0 )
+ sqlite? ( dev-db/sqlite:3 )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+ >=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+S=${WORKDIR}/jabberd-${PV}
+
+src_prepare() {
+ # Fix some default directory locations
+ sed -i \
+ -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+ -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+ -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+ -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+ -e 's,@localstatedir@,/var/spool,g' \
+ -e 's,@package@,jabber,g' \
+ etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+ # If the package wasn't merged with sqlite then default to use berkdb
+ use sqlite ||
+ sed -i \
+ -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+ etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+ # avoid file collision with x11-misc/screen-message wrt #453994
+ sed -i \
+ -e 's/@jabberd_router_bin@/jabberd2-router/' \
+ -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+ -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+ -e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+ etc/jabberd*.in || die "fixing file collisions failed!"
+
+ # rename pid files wrt #241472
+ sed -i \
+ -e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \
+ -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
+ -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
+ -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
+ etc/*.xml.dist.in || die "renaming pid files failed!"
+}
+
+src_configure() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+ # https://github.com/jabberd2/jabberd2/issues/34
+ replace-flags -O[3s] -O2
+
+ # --enable-pool-debug is currently broken
+ econf \
+ --sysconfdir=/etc/jabber \
+ $(usex debug "--enable-debug" "") \
+ $(usex memdebug "--enable-nad-debug" "") \
+ $(use_enable ssl) \
+ $(use_enable mysql) \
+ $(use_enable postgres pgsql) \
+ $(use_enable sqlite) \
+ $(use_enable berkdb db) \
+ $(use_enable ldap) \
+ $(use_enable pam) \
+ --enable-pipe \
+ --enable-anon \
+ --enable-fs \
+ $(use_enable experimental) \
+ $(use_enable test tests) \
+ $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
+ $(use_with zlib)
+}
+
+src_install() {
+ local i
+
+ default
+ prune_libtool_files --modules
+
+ keepdir /var/spool/jabber/{fs,db}
+ fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+ /var/spool/jabber/{fs,db}
+ fperms 770 /var/spool/jabber/{fs,db}
+ fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+ # avoid file collision with x11-misc/screen-message wrt #453994
+ for i in router sm c2s s2s ; do
+ einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+ mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+ done
+
+ newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd
+ newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd
+
+ docompress -x /usr/share/doc/${PF}/tools
+ docinto tools
+ dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+ tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+ # remove useless upstart files wrt #498900
+ rm -rf "${ED%/}"/usr/etc
+}
+
+pkg_postinst() {
+ if use pam; then
+ echo
+ ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
+ ewarn 'be in the form of "contactname@jabberdomain". This behavior'
+ ewarn 'is likely to change in future versions of jabberd-2. It may'
+ ewarn 'be advisable to avoid PAM authentication for the time being.'
+ echo
+ fi
+
+ if use sqlite || use mysql || use postgres; then
+ echo
+ einfo "You will need to setup or update your database using the"
+ einfo "scripts in /usr/share/doc/${PF}/tools/"
+ echo
+ fi
+
+ ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+ ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+ ewarn 'the binaries have been renamed to avoid file collisions!'
+}
diff --git a/net-im/jabberd2/jabberd2-2.3.2.ebuild b/net-im/jabberd2/jabberd2-2.3.2.ebuild
new file mode 100644
index 000000000000..31e378486ea6
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+ net-libs/udns
+ net-dns/libidn
+ virtual/gsasl
+ berkdb? ( >=sys-libs/db-4.1.25 )
+ ldap? ( net-nds/openldap )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql )
+ ssl? ( >=dev-libs/openssl-1.0.1:0 )
+ sqlite? ( dev-db/sqlite:3 )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+ >=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+S=${WORKDIR}/jabberd-${PV}
+
+src_prepare() {
+ # Fix some default directory locations
+ sed -i \
+ -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+ -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+ -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+ -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+ -e 's,@localstatedir@,/var/spool,g' \
+ -e 's,@package@,jabber,g' \
+ etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+ # If the package wasn't merged with sqlite then default to use berkdb
+ use sqlite ||
+ sed -i \
+ -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+ etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+ # avoid file collision with x11-misc/screen-message wrt #453994
+ sed -i \
+ -e 's/@jabberd_router_bin@/jabberd2-router/' \
+ -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+ -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+ -e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+ etc/jabberd*.in || die "fixing file collisions failed!"
+
+ # rename pid files wrt #241472
+ sed -i \
+ -e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \
+ -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
+ -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
+ -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
+ etc/*.xml.dist.in || die "renaming pid files failed!"
+}
+
+src_configure() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+ # https://github.com/jabberd2/jabberd2/issues/34
+ replace-flags -O[3s] -O2
+
+ # --enable-pool-debug is currently broken
+ econf \
+ --sysconfdir=/etc/jabber \
+ $(usex debug "--enable-debug" "") \
+ $(usex memdebug "--enable-nad-debug" "") \
+ $(use_enable ssl) \
+ $(use_enable mysql) \
+ $(use_enable postgres pgsql) \
+ $(use_enable sqlite) \
+ $(use_enable berkdb db) \
+ $(use_enable ldap) \
+ $(use_enable pam) \
+ --enable-pipe \
+ --enable-anon \
+ --enable-fs \
+ $(use_enable experimental) \
+ $(use_enable test tests) \
+ $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
+ $(use_with zlib)
+}
+
+src_install() {
+ local i
+
+ default
+ prune_libtool_files --modules
+
+ keepdir /var/spool/jabber/{fs,db}
+ fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+ /var/spool/jabber/{fs,db}
+ fperms 770 /var/spool/jabber/{fs,db}
+ fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+ # avoid file collision with x11-misc/screen-message wrt #453994
+ for i in router sm c2s s2s ; do
+ einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+ mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+ done
+
+ newinitd "${FILESDIR}/${PN}-2.3.1.init" jabberd
+ newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}-2.3.1.logrotate" jabberd
+
+ docompress -x /usr/share/doc/${PF}/tools
+ docinto tools
+ dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+ tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+ # remove useless upstart files wrt #498900
+ rm -rf "${ED%/}"/usr/etc
+}
+
+pkg_postinst() {
+ if use pam; then
+ echo
+ ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
+ ewarn 'be in the form of "contactname@jabberdomain". This behavior'
+ ewarn 'is likely to change in future versions of jabberd-2. It may'
+ ewarn 'be advisable to avoid PAM authentication for the time being.'
+ echo
+ fi
+
+ if use sqlite || use mysql || use postgres; then
+ echo
+ einfo "You will need to setup or update your database using the"
+ einfo "scripts in /usr/share/doc/${PF}/tools/"
+ echo
+ fi
+
+ ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+ ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+ ewarn 'the binaries have been renamed to avoid file collisions!'
+}
diff --git a/net-im/jabberd2/metadata.xml b/net-im/jabberd2/metadata.xml
new file mode 100644
index 000000000000..8da71244c21f
--- /dev/null
+++ b/net-im/jabberd2/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>net-im</herd>
+ <use>
+ <flag name='experimental'>Enable experimental features such
+ as TLS Everywhere.</flag>
+ <flag name='memdebug'>Enable nad and pool debug.
+ Requires USE="debug" to be set.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type='github'>jabberd2/jabberd2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
new file mode 100644
index 000000000000..a50a33da2f97
--- /dev/null
+++ b/net-im/kadu/Manifest
@@ -0,0 +1,2 @@
+DIST kadu-0.12.3.tar.bz2 5106482 SHA256 d607bbd0d00b01bfb70dd15f15c8be4076896a935041651e67a3887ad12ab8a8 SHA512 0aeaec9ac3ce5a1860571721e307a8d5e6657a30780125e21d153901ce5f2870ba3ea6ebc272bbb6f35a56ed9a24127abfc8f25b9eb88d01ecf9c931fa5c851c WHIRLPOOL 0a2b1b9684577d95027b9107fc51e8a8f290b7ed38a18bf282f9589eb3dd5ca7a9fa61b088e2fb2be8d4d16e6d4e72d766476e36f7d65cc55a2d5efae53bb8ca
+DIST kadu-2.1.tar.bz2 6013519 SHA256 9f8092756d4a870c1ecb016c0cba2c833e1697b3eb7e9bf51813b1f0a541ffb8 SHA512 3f0e38aefbaf15f357ae8232b1364deb5954a2464895fafa0a324ad99c7d14c6ba7495bed51d628e04c30bbaaf8e49412c70bbbbf01a40f360406c1afba2384a WHIRLPOOL 10b214ca8d1964054918dc0e1b85bf1157d2496e3ad340958302083a0374ac4fb7b6ac96741637f3847ac06dd9c322b0e529f9c204b9ebc6658157f7b7c2b8a2
diff --git a/net-im/kadu/files/kadu-2.1-qt5-compilation.patch b/net-im/kadu/files/kadu-2.1-qt5-compilation.patch
new file mode 100644
index 000000000000..68120a4ede0e
--- /dev/null
+++ b/net-im/kadu/files/kadu-2.1-qt5-compilation.patch
@@ -0,0 +1,11 @@
+diff -ruN kadu-2.1/kadu-core/os/single-application/single-application.cpp my/kadu-core/os/single-application/single-application.cpp
+--- kadu-2.1/kadu-core/os/single-application/single-application.cpp 2015-03-24 22:13:18.000000000 +0100
++++ my/kadu-core/os/single-application/single-application.cpp 2015-07-05 21:08:09.044685214 +0200
+@@ -26,6 +26,7 @@
+ #include "long-lived-lock-file.h"
+
+ #include <QtCore/QCoreApplication>
++#include <QtCore/QDataStream>
+ #include <QtCore/QDir>
+ #include <QtCore/QRegExp>
+ #include <QtNetwork/QLocalServer>
diff --git a/net-im/kadu/kadu-0.12.3.ebuild b/net-im/kadu/kadu-0.12.3.ebuild
new file mode 100644
index 000000000000..5eb83a8ef69b
--- /dev/null
+++ b/net-im/kadu/kadu-0.12.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit base cmake-utils flag-o-matic
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client"
+HOMEPAGE="http://www.kadu.net"
+SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+SLOT="0"
+IUSE="ayatana +gadu mpd phonon sdk speech spell xmpp"
+REQUIRED_USE="
+ || (
+ gadu
+ xmpp
+ )
+"
+COMMON_DEPEND="
+ app-crypt/qca:2[qt4(+)]
+ x11-libs/libX11
+ x11-libs/libXfixes
+ x11-libs/libXScrnSaver
+ >=dev-qt/qtdbus-4.7.0:4
+ >=dev-qt/qtgui-4.7.0:4
+ >=dev-qt/qtscript-4.7.0:4
+ >=dev-qt/qtsql-4.7.0:4[sqlite]
+ >=dev-qt/qtwebkit-4.7.0:4
+ ayatana? ( dev-libs/libindicate-qt )
+ gadu? (
+ >=net-libs/libgadu-1.11.1[threads]
+ >=dev-qt/qtxmlpatterns-4.7.0:4
+ )
+ mpd? ( media-libs/libmpdclient )
+ phonon? (
+ || (
+ media-libs/phonon[qt4]
+ >=dev-qt/qtphonon-4.7.0:4
+ )
+ )
+ spell? ( app-text/enchant )
+ xmpp? (
+ net-dns/libidn
+ sys-libs/zlib
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ x11-proto/fixesproto
+ x11-proto/scrnsaverproto
+ x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+ app-crypt/qca:2[openssl]
+ >=dev-qt/qtsvg-4.7.0:4
+ speech? ( app-accessibility/powiedz )
+"
+
+PLUGINS='amarok1_mediaplayer antistring auto_hide autoaway autoresponder autostatus cenzor chat_notify config_wizard desktop_docking docking encryption_ng encryption_ng_simlite exec_notify ext_sound falf_mediaplayer filedesc firewall freedesktop_notify hints history idle imagelink last_seen mediaplayer mprisplayer_mediaplayer pcspeaker qt4_docking qt4_docking_notify screenshot simpleview single_window sms sound sql_history tabs word_fix'
+
+src_configure() {
+ # Filter out dangerous flags
+ filter-flags -fno-rtti
+ strip-unsupported-flags
+
+ # Ensure -DQT_NO_DEBUG is added
+ append-cppflags -DQT_NO_DEBUG
+
+ # Plugin selection
+ if use gadu; then
+ PLUGINS+=' gadu_protocol history_migration profiles_import'
+ fi
+
+ use mpd && PLUGINS+=' mpd_mediaplayer'
+ use xmpp && PLUGINS+=' jabber_protocol'
+ use phonon && PLUGINS+=' phonon_sound'
+ use speech && PLUGINS+=' speech'
+ use spell && PLUGINS+=' spellchecker'
+
+ # Configure package
+ local mycmakeargs=(
+ -DBUILD_DESCRIPTION='Gentoo Linux'
+ -DCOMPILE_PLUGINS="${PLUGINS}"
+ -DNETWORK_IMPLEMENTATION="Qt"
+ -DSIG_HANDLING_ENABLED=TRUE
+ $(cmake-utils_use sdk INSTALL_SDK)
+ $(cmake-utils_use_with ayatana INDICATE_QT)
+ $(cmake-utils_use_with spell ENCHANT)
+ )
+ unset PLUGINS
+
+ cmake-utils_src_configure
+}
diff --git a/net-im/kadu/kadu-2.1.ebuild b/net-im/kadu/kadu-2.1.ebuild
new file mode 100644
index 000000000000..c743349bc1e7
--- /dev/null
+++ b/net-im/kadu/kadu-2.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit base cmake-utils flag-o-matic
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client"
+HOMEPAGE="http://www.kadu.net"
+SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+gadu mpd otr phonon sdk speech spell xmpp"
+REQUIRED_USE="
+ || (
+ gadu
+ xmpp
+ )
+"
+COMMON_DEPEND="
+ app-crypt/qca:2[openssl,qt5]
+ >=dev-libs/injeqt-1.0.0
+ >=dev-qt/qtcore-5.2.0:5
+ >=dev-qt/qtdbus-5.2.0:5
+ >=dev-qt/qtgui-5.2.0:5
+ >=dev-qt/qtmultimedia-5.2.0:5
+ >=dev-qt/qtnetwork-5.2.0:5
+ >=dev-qt/qtquick1-5.2.0:5
+ >=dev-qt/qtscript-5.2.0:5
+ >=dev-qt/qtsql-5.2.0:5
+ >=dev-qt/qtsvg-5.2.0:5
+ >=dev-qt/qtwebkit-5.2.0:5
+ >=dev-qt/qtwidgets-5.2.0:5
+ >=dev-qt/qtx11extras-5.2.0:5
+ >=dev-qt/qtxml-5.2.0:5
+ >=dev-qt/qtxmlpatterns-5.2.0:5
+ >=app-arch/libarchive-2.6[lzma]
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXScrnSaver
+ gadu? ( >=net-libs/libgadu-1.11.1[threads] )
+ mpd? ( media-libs/libmpdclient )
+ otr? (
+ >=dev-libs/libgcrypt-1.2.2:0
+ >=net-libs/libotr-4.1.0
+ )
+ phonon? (
+ || (
+ media-libs/phonon[qt5]
+ >=dev-qt/qtphonon-4.7.0:4
+ )
+ )
+ spell? ( app-text/enchant )
+ xmpp? (
+ net-dns/libidn
+ sys-libs/zlib
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/linguist-tools-5.2.0:5
+ x11-proto/scrnsaverproto
+ x11-proto/xextproto
+ x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+ speech? ( app-accessibility/powiedz )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-qt5-compilation.patch"
+)
+
+PLUGINS='
+antistring
+auto_hide
+autoaway
+autoresponder
+autostatus
+cenzor
+chat_notify
+config_wizard
+desktop_docking
+docking
+emoticons
+encryption_ng
+encryption_ng_simlite
+exec_notify
+ext_sound
+falf_mediaplayer
+filedesc
+firewall
+freedesktop_notify
+hints
+history
+idle
+imagelink
+last_seen
+mediaplayer
+mprisplayer_mediaplayer
+pcspeaker
+qt4_docking
+qt4_docking_notify
+screenshot simpleview
+single_window
+sms
+sound
+sql_history
+tabs
+word_fix
+'
+
+src_configure() {
+ # Filter out dangerous flags
+ filter-flags -fno-rtti
+ strip-unsupported-flags
+
+ # Ensure -DQT_NO_DEBUG is added
+ append-cppflags -DQT_NO_DEBUG
+
+ # Plugin selection
+ use gadu && PLUGINS+=' gadu_protocol history_migration profiles_import'
+ use mpd && PLUGINS+=' mpd_mediaplayer'
+ use otr && PLUGINS+=' encryption_otr'
+ use phonon && PLUGINS+=' phonon_sound'
+ use speech && PLUGINS+=' speech'
+ use spell && PLUGINS+=' spellchecker'
+ use xmpp && PLUGINS+=' jabber_protocol'
+
+ # Configure package
+ local mycmakeargs=(
+ -DBUILD_DESCRIPTION='Gentoo Linux'
+ -DCOMPILE_PLUGINS="${PLUGINS}"
+ -DNETWORK_IMPLEMENTATION="Qt"
+ $(cmake-utils_use sdk INSTALL_SDK)
+ $(cmake-utils_use_with spell ENCHANT)
+ )
+ unset PLUGINS
+
+ cmake-utils_src_configure
+}
diff --git a/net-im/kadu/metadata.xml b/net-im/kadu/metadata.xml
new file mode 100644
index 000000000000..d54eca9f9ee3
--- /dev/null
+++ b/net-im/kadu/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-im</herd>
+ <maintainer>
+ <email>reavertm@gentoo.org</email>
+ <name>Maciej Mrozowski</name>
+ </maintainer>
+ <use>
+ <flag name="gadu">Enables Gadu communication protocol</flag>
+ <flag name="mpd">Enables Music Player Daemon support</flag>
+ <flag name="otr">Enable char encryption via OTR library</flag>
+ <flag name="phonon">Enables phonon audio plugin</flag>
+ <flag name="sdk">Install Kadu SDK (cmake module, API headers)</flag>
+ <flag name="speech">Enables speech module</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-im/kde-telepathy-meta/kde-telepathy-meta-0.9.0.ebuild b/net-im/kde-telepathy-meta/kde-telepathy-meta-0.9.0.ebuild
new file mode 100644
index 000000000000..fe6fde08a1c7
--- /dev/null
+++ b/net-im/kde-telepathy-meta/kde-telepathy-meta-0.9.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
+
+DESCRIPTION="KDE Telepathy client - merge this to pull in all net-im/ktp-*
+kde packages"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+if [[ ${PV} != *9999* ]]; then
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 LGPL-2.1 )"
+SLOT="4"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ >=net-im/ktp-accounts-kcm-${PV}
+ >=net-im/ktp-approver-${PV}
+ >=net-im/ktp-auth-handler-${PV}
+ >=net-im/ktp-call-ui-${PV}
+ >=net-im/ktp-common-internals-${PV}
+ >=net-im/ktp-contact-list-${PV}
+ >=net-im/ktp-contact-runner-${PV}
+ >=net-im/ktp-desktop-applets-${PV}
+ >=net-im/ktp-filetransfer-handler-${PV}
+ >=net-im/ktp-kded-module-${PV}
+ >=net-im/ktp-send-file-${PV}
+ >=net-im/ktp-text-ui-${PV}
+ net-im/telepathy-connection-managers
+"
+
+pkg_postinst() {
+ echo
+ elog "You can configure the accounts in the KDE System Settings"
+ elog "and then add the Instant Messaging plasma applet to access the contact list."
+ echo
+}
diff --git a/net-im/kde-telepathy-meta/metadata.xml b/net-im/kde-telepathy-meta/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/net-im/kde-telepathy-meta/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-im/kouchat/Manifest b/net-im/kouchat/Manifest
new file mode 100644
index 000000000000..e858993b9ee2
--- /dev/null
+++ b/net-im/kouchat/Manifest
@@ -0,0 +1,2 @@
+DIST kouchat-1.1.0-buildfiles.tar.gz 2793 SHA256 80251607b13eb094b73e8556f825c56520adf7c7792b8bd93004feaf8eebd543 SHA512 daae5a4f3374ab588214321793725f4b9add063f4c7b98f64f6db0ab71cc2d07f2ae9f27fb0ed12c7704604fd97781b0cfa9bdb0a188782c4f5bd0172e167c89 WHIRLPOOL db0114019e89907608837c7c4bc6ebb8011d1bacc8035c77bdc314069d8e473a8b227122920fa65fa3dc9f09c335155078cbebbab241a09633627a6de316a921
+DIST kouchat-1.1.0-src.tar.gz 363491 SHA256 be7eb437afc8710405ae0c678e7d0383f416ef34b9401897ef1590149b417f4a SHA512 838d2afac858d698a543ad9ca6e249fa6439cd6f31bf67d20bc44961c9dcbed843fefb51430202666c74c02ec71b8bd30edbd5dcfe5a15d2c364426e99350c27 WHIRLPOOL 08dc58961afc2be4db404674e72fe5c03ba5dbeae523afee73061530919e5655c47ac3cf569551e23158d3a7bfff9f7c1a9b8807f17265d16cf7f6d5685aa6a5
diff --git a/net-im/kouchat/files/build.xml b/net-im/kouchat/files/build.xml
new file mode 100644
index 000000000000..a413586b648a
--- /dev/null
+++ b/net-im/kouchat/files/build.xml
@@ -0,0 +1,52 @@
+<project name="kouchat" default="jar">
+ <property name="dest.jar" value="kouchat.jar"/>
+ <property name="build.app" value="build/app"/>
+ <property name="build.test" value="build/test"/>
+ <target name="compile">
+ <mkdir dir="${build.app}"/>
+ <javac srcdir="src" destdir="${build.app}"/>
+ <copy todir="${build.app}/icons">
+ <fileset dir="resources/icons"/>
+ </copy>
+ <copy todir="${build.app}/sounds">
+ <fileset dir="resources/sounds"/>
+ </copy>
+ <copy file="kou_shortcut.ico" todir="${build.app}"/>
+ <copy file="kou_shortcut.png" todir="${build.app}"/>
+ <copy file="CHANGES" todir="${build.app}"/>
+ <copy file="COPYING" todir="${build.app}"/>
+ <copy file="FAQ" todir="${build.app}"/>
+ <copy file="README" todir="${build.app}"/>
+ </target>
+
+ <target name="jar" depends="compile">
+ <jar destfile="${dest.jar}">
+ <fileset dir="${build.app}"/>
+ </jar>
+ </target>
+
+ <target name="test">
+ <mkdir dir="${build.test}"/>
+ <javac srcdir="test" destdir="${build.test}">
+ <classpath>
+ <pathelement location="${dest.jar}"/>
+ <pathelement path="${junit4.jar}"/>
+ </classpath>
+ </javac>
+ <junit printsummary="yes" haltonfailure="yes">
+ <classpath>
+ <pathelement path="${build.test}"/>
+ <pathelement path="${build.app}"/>
+ </classpath>
+ <test name="net.usikkert.kouchat.net.MessageParserTest"/>
+ <test name="net.usikkert.kouchat.net.UDPReceiverTest"/>
+ <test name="net.usikkert.kouchat.net.UDPSenderTest"/>
+ </junit>
+ </target>
+
+ <target name="javadoc" depends="compile">
+ <mkdir dir="docs"/>
+ <javadoc sourcepath="src" destdir="docs"/>
+ </target>
+
+</project>
diff --git a/net-im/kouchat/kouchat-1.1.0.ebuild b/net-im/kouchat/kouchat-1.1.0.ebuild
new file mode 100644
index 000000000000..b403d810b15a
--- /dev/null
+++ b/net-im/kouchat/kouchat-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE=""
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="KouChat is a simple serverless chat client for local area networks"
+HOMEPAGE="http://kouchat.googlecode.com/"
+SRC_URI="http://kouchat.googlecode.com/files/${P}-src.tar.gz
+ http://dev.gentoo.org/~serkan/distfiles/${P}-buildfiles.tar.gz"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S=${WORKDIR}/${P}-src
+
+src_install() {
+ java-pkg_newjar target/${P}.jar ${PN}.jar
+ java-pkg_dolauncher ${PN} --main net.usikkert.kouchat.KouChat
+ java-pkg_dolauncher ${PN}-console --main net.usikkert.kouchat.KouChat --pkg_args "--console"
+ newicon kou_shortcut.png ${PN}.png
+ make_desktop_entry ${PN} "KouChat"
+}
diff --git a/net-im/kouchat/metadata.xml b/net-im/kouchat/metadata.xml
new file mode 100644
index 000000000000..01c7bbf2f461
--- /dev/null
+++ b/net-im/kouchat/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>java</herd>
+ <upstream>
+ <remote-id type="google-code">kouchat</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/ktp-accounts-kcm/Manifest b/net-im/ktp-accounts-kcm/Manifest
new file mode 100644
index 000000000000..2d22eca55913
--- /dev/null
+++ b/net-im/ktp-accounts-kcm/Manifest
@@ -0,0 +1 @@
+DIST ktp-accounts-kcm-0.9.0.tar.bz2 264892 SHA256 b9d7cf3b2a8f99e50ba60fec039b107f3049df41e44787683dbc346d08c37de7 SHA512 fadc424be1a462d3f84e1845e02467880214345a6f47b79036cce48ac60454abf3c449026e4b830628848d8e7744d628e61877817dfe7ac9f1f80b6913823bc8 WHIRLPOOL d6945ed15d9a0b4df5819a8de35f09cb650d70ce74622bbdcb774984e295e645128a2af0ccd2ce6dda077f198b748508f1f52d1781696878d54dbdc8795f4fc8
diff --git a/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.9.0.ebuild b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.9.0.ebuild
new file mode 100644
index 000000000000..8f893c9d103f
--- /dev/null
+++ b/net-im/ktp-accounts-kcm/ktp-accounts-kcm-0.9.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu ia it
+ja kk km ko lt mai mr nb nds nl pa pl pt pt_BR ro ru sk sl sr sr@ijekavian
+sr@ijekavianlatin sr@latin sv tr ug uk vi wa zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy account management kcm"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="4"
+IUSE="debug modemmanager"
+
+DEPEND="
+ >=net-im/ktp-common-internals-${PV}
+ net-im/telepathy-mission-control
+ net-libs/telepathy-glib
+ >=net-libs/telepathy-qt-0.9.5[qt4]
+ modemmanager? ( net-libs/libmm-qt )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_build modemmanager pintxo)
+ )
+
+ kde4-base_src_configure
+}
diff --git a/net-im/ktp-accounts-kcm/metadata.xml b/net-im/ktp-accounts-kcm/metadata.xml
new file mode 100644
index 000000000000..c5ae96e2c633
--- /dev/null
+++ b/net-im/ktp-accounts-kcm/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-im/ktp-approver/Manifest b/net-im/ktp-approver/Manifest
new file mode 100644
index 000000000000..7ea9e049d97e
--- /dev/null
+++ b/net-im/ktp-approver/Manifest
@@ -0,0 +1 @@
+DIST ktp-approver-0.9.0.tar.bz2 36866 SHA256 3ac663cdfa51f564bb7f9898974acb630ab9112a5d76a73657d10f53c42b82e7 SHA512 9b00d9ad2d962190f9c2e234976abccd275256356faea4c37768aeb1682694bc299cc057e25fd523f32a592611280f51003ec0e6a5a795a197cd9d8df2b6c58f WHIRLPOOL 9b7d07c336db3b120a877a0b3c6d3b6c0d88f5fd9c45ef08b3788592480a90a433163b174d7840a3c561ee121501002c1a3a6d55298ee0f1ef7d6a664f2eaff2
diff --git a/net-im/ktp-approver/ktp-approver-0.9.0.ebuild b/net-im/ktp-approver/ktp-approver-0.9.0.ebuild
new file mode 100644
index 000000000000..954dc18cc665
--- /dev/null
+++ b/net-im/ktp-approver/ktp-approver-0.9.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia cs da de el es et fi fr ga gl hu ia it ja kk km
+ko lt mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian sr@ijekavianlatin
+sr@latin sv tr uk zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy notification handler"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+ >=net-libs/telepathy-qt-0.9.5[qt4]
+"
+RDEPEND="${DEPEND}
+ >=net-im/ktp-contact-list-${PV}
+"
diff --git a/net-im/ktp-approver/metadata.xml b/net-im/ktp-approver/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/net-im/ktp-approver/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-im/ktp-auth-handler/Manifest b/net-im/ktp-auth-handler/Manifest
new file mode 100644
index 000000000000..06404aac4ebb
--- /dev/null
+++ b/net-im/ktp-auth-handler/Manifest
@@ -0,0 +1 @@
+DIST ktp-auth-handler-0.9.0.tar.bz2 49212 SHA256 6eb07a75200bd18154f42fbe1ff64a9fb0799b709899c3cb31474523b418478e SHA512 915790f317d82a34b2daaf81eae47af0d68e6602de57902801d7904f3b64165556554a12a076bb40037ccdc6e74c39328dfdaefd2e30dd1018952ec3e4fae675 WHIRLPOOL ed97c5c475650fd6f20e55afe2deae9266531aa024874294110266d990018a93f9be51ab2ea982f25474375ee63e8c20dd7fbcad8b3b04ebe3aac66d467c016d
diff --git a/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild b/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild
new file mode 100644
index 000000000000..f4506037559f
--- /dev/null
+++ b/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia cs da de el es et fi fr ga gl hu ia it ja kk km
+ko lt mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian sr@ijekavianlatin
+sr@latin sv uk vi zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy authentication handler"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+ app-crypt/qca:2[qt4(+)]
+ >=dev-libs/qjson-0.8
+ >=net-im/ktp-common-internals-${PV}
+ >=net-libs/telepathy-qt-0.9.5[qt4]
+"
+RDEPEND="${DEPEND}
+ app-crypt/qca:2[openssl]
+"
diff --git a/net-im/ktp-auth-handler/metadata.xml b/net-im/ktp-auth-handler/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/net-im/ktp-auth-handler/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-im/ktp-call-ui/Manifest b/net-im/ktp-call-ui/Manifest
new file mode 100644
index 000000000000..b0152b120271
--- /dev/null
+++ b/net-im/ktp-call-ui/Manifest
@@ -0,0 +1 @@
+DIST ktp-call-ui-0.9.0.tar.bz2 98669 SHA256 64b7506da66b4cd2023a2691c2d4f03bdcf8f2d697aac50305bc15b0aa265a79 SHA512 d91b770b7d13c732d7f3c4e29c851f07e7aaf50d4fe5685df94fb33e4337278bddecbc00fdc31c7e786ba9c055c59d83e110f841fc087cd0657d9ad6e5560b5d WHIRLPOOL 0cbea63350644e85564ad22c8c66a6e22f0c12de45ce40d99bcc13e3060f5a267e0444fb0147f729feeb27f56c07416acab60c98434bb846a79f459ac36a4ca1
diff --git a/net-im/ktp-call-ui/ktp-call-ui-0.9.0.ebuild b/net-im/ktp-call-ui/ktp-call-ui-0.9.0.ebuild
new file mode 100644
index 000000000000..0ade92035ede
--- /dev/null
+++ b/net-im/ktp-call-ui/ktp-call-ui-0.9.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu ia
+it ja kk km ko lt mai mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian
+sr@ijekavianlatin sr@latin sv th tr ug uk zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy audio/video conferencing ui"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="4"
+IUSE="debug v4l"
+
+DEPEND="
+ >=media-libs/qt-gstreamer-1.2.0[qt4(+)]
+ >=net-im/ktp-common-internals-${PV}
+ net-libs/farstream:0.2
+ >=net-libs/telepathy-farstream-0.6.0
+ >=net-libs/telepathy-qt-0.9.5[farstream,qt4]
+"
+RDEPEND="${DEPEND}
+ || (
+ >=net-im/ktp-contact-list-${PV}
+ >=net-im/ktp-desktop-applets-${PV}
+ >=net-im/ktp-text-ui-${PV}
+ )
+ v4l? ( media-plugins/gst-plugins-v4l2:0.10 )
+"
diff --git a/net-im/ktp-call-ui/metadata.xml b/net-im/ktp-call-ui/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/net-im/ktp-call-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>kde</herd>
+</pkgmetadata>
diff --git a/net-im/ktp-common-internals/Manifest b/net-im/ktp-common-internals/Manifest
new file mode 100644
index 000000000000..7cce6df25aa6
--- /dev/null
+++ b/net-im/ktp-common-internals/Manifest
@@ -0,0 +1 @@
+DIST ktp-common-internals-0.9.0.tar.bz2 439404 SHA256 b358d134345225dacddffb2e61177a4819093c55f2ca15c4c3481e1a6e9f9443 SHA512 65ee4330d05ff91183935767069927978ff973152428ccaa88fd1a77cdef8ad1d6cb939276061b63fcfbecc9b051e83a603f07c327248dc2c28dbfa674fb226b WHIRLPOOL 8f5d22eff2a3c01d5b84f29d5392751574499b5f47d5bc6c81d5d22d2bb63f0b56d7ba135b34db9517465574a046b15da38887559e9d1147391b239c0a0ec3f1
diff --git a/net-im/ktp-common-internals/ktp-common-internals-0.9.0.ebuild b/net-im/ktp-common-internals/ktp-common-internals-0.9.0.ebuild
new file mode 100644
index 000000000000..afa5cb821687
--- /dev/null
+++ b/net-im/ktp-common-internals/ktp-common-internals-0.9.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
+
+KDE_LINGUAS="bs ca ca@valencia cs da de el es et fi fr ga gl hu ia it ja kk ko
+lt mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian sr@ijekavianlatin
+sr@latin sv uk zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy common library"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="4"
+IUSE="debug otr semantic-desktop"
+
+DEPEND="
+ >=net-libs/telepathy-qt-0.9.5[qt4]
+ >=net-libs/telepathy-logger-qt-0.5.80:0
+ otr? (
+ dev-libs/libgcrypt:=
+ >=net-libs/libotr-4.0.0
+ )
+ semantic-desktop? (
+ $(add_kdebase_dep kdepimlibs)
+ >=net-libs/libkpeople-0.3.0:=
+ )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package otr Libgcrypt)
+ $(cmake-utils_use_find_package otr LibOTR)
+ $(cmake-utils_use_find_package semantic-desktop KPeople)
+ $(cmake-utils_use_find_package semantic-desktop KdepimLibs)
+ )
+
+ kde4-base_src_configure
+}
diff --git a/net-im/ktp-common-internals/metadata.xml b/net-im/ktp-common-internals/metadata.xml
new file mode 100644
index 000000000000..0defe784bf07
--- /dev/null
+++ b/net-im/ktp-common-internals/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="otr">Enable support for encrypted conversations using Off-The-Records messaging</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-im/ktp-contact-list/Manifest b/net-im/ktp-contact-list/Manifest
new file mode 100644
index 000000000000..ffcc8923524b
--- /dev/null
+++ b/net-im/ktp-contact-list/Manifest
@@ -0,0 +1 @@
+DIST ktp-contact-list-0.9.0.tar.bz2 140159 SHA256 7d78b9369825fd5bbf227feccd533a282791725ad4875e85c62b53f443c5e49b SHA512 32f61f01d36a8e3d18a4696c6f8f520287f61a2161f4e5323870194c97867a4e73b77c8cf90cb47fc86de238c0bad8c45e1851a198d5e84ccfc7750d5c5f7e46 WHIRLPOOL 18d4464294db87d3413ad10b7eb97856ffcca176c023828c66e71f4a0b49dea90adcb9dd641aeedbaac1f5a06833a2eeda9313d05cecd32ee00dc9b6163d36a7
diff --git a/net-im/ktp-contact-list/ktp-contact-list-0.9.0.ebuild b/net-im/ktp-contact-list/ktp-contact-list-0.9.0.ebuild
new file mode 100644
index 000000000000..21052aeb7788
--- /dev/null
+++ b/net-im/ktp-contact-list/ktp-contact-list-0.9.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
+
+KDE_LINGUAS="bs ca ca@valencia cs da de el es et fi fr ga gl hu ia it ja kk km
+ko lt mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian sr@ijekavianlatin
+sr@latin sv tr ug uk vi zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy contact list"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="debug semantic-desktop"
+
+DEPEND="
+ >=net-im/ktp-accounts-kcm-${PV}
+ >=net-im/ktp-common-internals-${PV}[semantic-desktop?]
+ >=net-libs/telepathy-qt-0.9.5[qt4]
+ semantic-desktop? ( >=net-libs/libkpeople-0.3.0:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package semantic-desktop KPeople)
+ )
+
+ kde4-base_src_configure
+}
diff --git a/net-im/ktp-contact-list/metadata.xml b/net-im/ktp-contact-list/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/net-im/ktp-contact-list/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-im/ktp-contact-runner/Manifest b/net-im/ktp-contact-runner/Manifest
new file mode 100644
index 000000000000..aca44beb739c
--- /dev/null
+++ b/net-im/ktp-contact-runner/Manifest
@@ -0,0 +1 @@
+DIST ktp-contact-runner-0.9.0.tar.bz2 42207 SHA256 20c68896ee848e3b16d6dd8002eb0a286513ae18054801f45d3d893898cf9b70 SHA512 af6582780d4f195ef011b4674b98b00892d9306a5b6a20bd6be721f455ee52478931e3b1a70fc99dae6e395b3f5b28d0e8d91b24c840a23cd06c0341ca53d5de WHIRLPOOL edc21ba3e4ecf0660d0732cf9e03b00ff1849324ee9b42a60bb3383b1b6ca9f4c26a6883515ca70a62fb3c7ea870911c2164f66ccf81d913c1ce5f038b93f393
diff --git a/net-im/ktp-contact-runner/ktp-contact-runner-0.9.0.ebuild b/net-im/ktp-contact-runner/ktp-contact-runner-0.9.0.ebuild
new file mode 100644
index 000000000000..c4841a1c3d72
--- /dev/null
+++ b/net-im/ktp-contact-runner/ktp-contact-runner-0.9.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia cs da de el es et fi fr ga gl hu ia it kk km ko
+lt mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian sr@ijekavianlatin
+sr@latin sv tr uk vi zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy krunner plugin"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+ >=net-im/ktp-common-internals-${PV}
+ >=net-libs/telepathy-qt-0.9.5[qt4]
+"
+RDEPEND="${DEPEND}"
diff --git a/net-im/ktp-contact-runner/metadata.xml b/net-im/ktp-contact-runner/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/net-im/ktp-contact-runner/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-im/ktp-desktop-applets/Manifest b/net-im/ktp-desktop-applets/Manifest
new file mode 100644
index 000000000000..7c17c15a8f7e
--- /dev/null
+++ b/net-im/ktp-desktop-applets/Manifest
@@ -0,0 +1 @@
+DIST ktp-desktop-applets-0.9.0.tar.bz2 64913 SHA256 fe6254b5c2178b22e2d53ced5dc72a3cb96e667294b4a34936d37b434c8dc88d SHA512 45e8e61b975bc64187352a4133e66c7c0b061873619017c4faf96dc05da8362748fb1f8193e495d998a0ffa03631f91887d4ddd0e2d50b57a3971b6cc8a8fc7b WHIRLPOOL 1fd574e480fbb1eb29de8d7c674331fd480263b4336830f6ec002c83aac3bb364bc7216947706eded60b95e2d06cc5d5d945f56cd37d435537d7a634aaabdf30
diff --git a/net-im/ktp-desktop-applets/ktp-desktop-applets-0.9.0.ebuild b/net-im/ktp-desktop-applets/ktp-desktop-applets-0.9.0.ebuild
new file mode 100644
index 000000000000..c255afd439d9
--- /dev/null
+++ b/net-im/ktp-desktop-applets/ktp-desktop-applets-0.9.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia cs da de el es et fi fr ga gl hu ia it ja kk km
+ko lt mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian sr@ijekavianlatin
+sr@latin sv tr uk vi wa zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+ >=net-im/ktp-common-internals-${PV}
+ >=net-libs/telepathy-qt-0.9.5[qt4]
+"
+RDEPEND="${DEPEND}
+ >=net-im/ktp-contact-list-${PV}
+"
diff --git a/net-im/ktp-desktop-applets/metadata.xml b/net-im/ktp-desktop-applets/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/net-im/ktp-desktop-applets/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-im/ktp-filetransfer-handler/Manifest b/net-im/ktp-filetransfer-handler/Manifest
new file mode 100644
index 000000000000..d988e986fe51
--- /dev/null
+++ b/net-im/ktp-filetransfer-handler/Manifest
@@ -0,0 +1 @@
+DIST ktp-filetransfer-handler-0.9.0.tar.bz2 48041 SHA256 e6270427415071bf7f07cc35261f5e82bb7cb64f6c264e0b54ca46a3b313ebc0 SHA512 6051225eda7c1f95f862837f4c75e695bf7b3d38a21e9427cb403e7ca0c547baeba549869815a1471509a5eddb686d5d8d7270a73adeba2b2b31b3f4f3050cac WHIRLPOOL 82dcc6e9f4ec90967dcb9f9912916c73d820a59f22d0a1ae697be13e9a495d8ec1a4173fbbfd4143b4fc13fb109301775783d595ce8695e3cbbad2b3977dcd41
diff --git a/net-im/ktp-filetransfer-handler/ktp-filetransfer-handler-0.9.0.ebuild b/net-im/ktp-filetransfer-handler/ktp-filetransfer-handler-0.9.0.ebuild
new file mode 100644
index 000000000000..c19308b876ae
--- /dev/null
+++ b/net-im/ktp-filetransfer-handler/ktp-filetransfer-handler-0.9.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia cs da de el es et fi fr ga gl hu ia it ja kk ko
+lt mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian sr@ijekavianlatin
+sr@latin sv uk zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy file transfer handler"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+ >=net-im/ktp-common-internals-${PV}
+ >=net-libs/telepathy-qt-0.9.5[qt4]
+"
+RDEPEND="${DEPEND}"
diff --git a/net-im/ktp-filetransfer-handler/metadata.xml b/net-im/ktp-filetransfer-handler/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/net-im/ktp-filetransfer-handler/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-im/ktp-kded-module/Manifest b/net-im/ktp-kded-module/Manifest
new file mode 100644
index 000000000000..fb7ced3386ef
--- /dev/null
+++ b/net-im/ktp-kded-module/Manifest
@@ -0,0 +1 @@
+DIST ktp-kded-integration-module-0.9.0.tar.bz2 79387 SHA256 e7fb9cd8770b9c2560f8325ed17c334726c082b932fb17820cc881d49b11419d SHA512 eb597de2691ea4df29e85f720d4ead4d8ec03c86570eca19953b9410b9fc45a578ce87bbc1ae52f5d4c0601ca66dc5ca2cad65beb648dd9c93297b70f227cebe WHIRLPOOL c56aec68cb59883fd6841b1574c086d4c212a5acbda3127e1aa5fa312dcfc285881b85870882ed3d8038142d22fce8654ad8109f3429acf5a9eb25cb1a5789a5
diff --git a/net-im/ktp-kded-module/ktp-kded-module-0.9.0.ebuild b/net-im/ktp-kded-module/ktp-kded-module-0.9.0.ebuild
new file mode 100644
index 000000000000..801f8e72cdf0
--- /dev/null
+++ b/net-im/ktp-kded-module/ktp-kded-module-0.9.0.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_LINGUAS="bs ca ca@valencia cs da de el es et fi fr ga gl hu ia it ja kk km
+ko lt mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian sr@ijekavianlatin
+sr@latin sv uk zh_CN zh_TW"
+MY_P=${PN/kded/kded-integration}-${PV}
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy workspace integration"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${MY_P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+ >=net-im/ktp-common-internals-${PV}
+ >=net-libs/telepathy-qt-0.9.5[qt4]
+"
+RDEPEND="${DEPEND}"
+
+[[ ${PV} == *9999* ]] || S=${WORKDIR}/${MY_P}
diff --git a/net-im/ktp-kded-module/metadata.xml b/net-im/ktp-kded-module/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/net-im/ktp-kded-module/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-im/ktp-send-file/Manifest b/net-im/ktp-send-file/Manifest
new file mode 100644
index 000000000000..84774bc89ab2
--- /dev/null
+++ b/net-im/ktp-send-file/Manifest
@@ -0,0 +1 @@
+DIST ktp-send-file-0.9.0.tar.bz2 29739 SHA256 a453ae5ca8d18242c9050d961be4fa5d7e8f230f0397fd0206f84a3635106864 SHA512 ff6cad1831a4851c00f11a27e1302bf051d2cc72f6e8bc90bd838329a681202e213fb4f3f9accb56522601f9623c061b29e14bb380d66764237d15eef3eece04 WHIRLPOOL eeed7cbb8afc26a6a5396eef3f57578245c752cbbc594d61a4cc5655cf3636743587e06ef5df4638f72de32c17c72191975888313ff089b17bab294cead7fcf9
diff --git a/net-im/ktp-send-file/ktp-send-file-0.9.0.ebuild b/net-im/ktp-send-file/ktp-send-file-0.9.0.ebuild
new file mode 100644
index 000000000000..1899c97ac8c5
--- /dev/null
+++ b/net-im/ktp-send-file/ktp-send-file-0.9.0.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_LINGUAS="bs ca ca@valencia cs da de el es et fi fr ga gl hu ia it ja kk km
+ko lt mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian sr@ijekavianlatin
+sr@latin sv tr uk vi zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+ >=net-im/ktp-common-internals-${PV}
+ >=net-libs/telepathy-qt-0.9.5[qt4]
+"
+RDEPEND="${DEPEND}
+ >=net-im/ktp-contact-list-${PV}
+ >=net-im/ktp-filetransfer-handler-${PV}
+"
diff --git a/net-im/ktp-send-file/metadata.xml b/net-im/ktp-send-file/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/net-im/ktp-send-file/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-im/ktp-text-ui/Manifest b/net-im/ktp-text-ui/Manifest
new file mode 100644
index 000000000000..21844b7f2aca
--- /dev/null
+++ b/net-im/ktp-text-ui/Manifest
@@ -0,0 +1 @@
+DIST ktp-text-ui-0.9.0.tar.bz2 471280 SHA256 54e7247c25fbd5fee431471d179f56cd4a9851822e997ab99492e644118723b2 SHA512 8ff0cd400cf7bafc228f8769a9688b17a60d10b5f012e4718130d7dc98f77e2f08bad1cce2ee089096de0da1d55c57b7c7cbeff163decf60e564c381d56b10bd WHIRLPOOL ec4cc32a8d8ac8e7f9abceec2e552a70a6565ea2b0bb9846e230b11a6a6b1f85dd20a705b1e6eb644bcf63b193fa55acda32864803740715c1f6f09728cd321f
diff --git a/net-im/ktp-text-ui/ktp-text-ui-0.9.0.ebuild b/net-im/ktp-text-ui/ktp-text-ui-0.9.0.ebuild
new file mode 100644
index 000000000000..e6ecb0df745a
--- /dev/null
+++ b/net-im/ktp-text-ui/ktp-text-ui-0.9.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
+
+KDE_LINGUAS="bs ca ca@valencia cs da de el es et fi fr ga gl hu ia it ja kk km
+ko lt mr nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian sr@ijekavianlatin
+sr@latin sv tr ug uk vi wa zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy text chat window"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="mirror://kde/stable/kde-telepathy/${PV}/src/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="debug semantic-desktop"
+
+DEPEND="
+ dev-libs/qjson[qt4(+)]
+ >=net-libs/telepathy-qt-0.9.5[qt4]
+ >=net-libs/telepathy-logger-qt-0.8:0
+ semantic-desktop? (
+ $(add_kdebase_dep kdepimlibs)
+ >=net-libs/libkpeople-0.3.0:=
+ )
+"
+RDEPEND="${DEPEND}
+ >=net-im/ktp-contact-list-${PV}
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package semantic-desktop KPeople)
+ )
+
+ kde4-base_src_configure
+}
diff --git a/net-im/ktp-text-ui/metadata.xml b/net-im/ktp-text-ui/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/net-im/ktp-text-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>kde</herd>
+</pkgmetadata>
diff --git a/net-im/librvp/Manifest b/net-im/librvp/Manifest
new file mode 100644
index 000000000000..a79a0e724582
--- /dev/null
+++ b/net-im/librvp/Manifest
@@ -0,0 +1,2 @@
+DIST librvp-0.9.6.tar.gz 464935 SHA256 c57747cd3c3628ff189ce1f30c3a027ad2a0f222cc7615a259124e646fb488e0
+DIST librvp-0.9.7.tar.gz 478014 SHA256 c674ad76a4c4b91088b2012b197964cec549edd74a88a53490bd7eda735ffd46
diff --git a/net-im/librvp/librvp-0.9.6.ebuild b/net-im/librvp/librvp-0.9.6.ebuild
new file mode 100644
index 000000000000..f8d737ca350e
--- /dev/null
+++ b/net-im/librvp/librvp-0.9.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit multilib
+
+DESCRIPTION="An RVP (Microsoft Exchange Instant Messaging) plugin for Pidgin"
+HOMEPAGE="http://www.waider.ie/hacks/workshop/c/rvp/"
+SRC_URI="http://www.waider.ie/hacks/workshop/c/rvp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin[gtk]"
+DEPEND="virtual/pkgconfig
+ ${RDEPEND}"
+
+src_configure() {
+ econf --with-gaim-plugin-dir=/usr/$(get_libdir)/pidgin \
+ --with-gaim-data-dir=/usr/share/pixmaps/pidgin
+}
+
+src_install() {
+ make install DESTDIR="${D}" || die "install failure"
+ dodoc AUTHORS ChangeLog INSTALL NEWS README
+}
diff --git a/net-im/librvp/librvp-0.9.7.ebuild b/net-im/librvp/librvp-0.9.7.ebuild
new file mode 100644
index 000000000000..30ba9f896541
--- /dev/null
+++ b/net-im/librvp/librvp-0.9.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit multilib
+
+DESCRIPTION="An RVP (Microsoft Exchange Instant Messaging) plugin for Pidgin"
+HOMEPAGE="http://www.waider.ie/hacks/workshop/c/rvp/"
+SRC_URI="http://www.waider.ie/hacks/workshop/c/rvp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin[gtk]"
+DEPEND="virtual/pkgconfig
+ ${RDEPEND}"
+
+src_configure() {
+ econf --with-gaim-plugin-dir=/usr/$(get_libdir)/pidgin \
+ --with-gaim-data-dir=/usr/share/pixmaps/pidgin
+}
+
+src_install() {
+ make install DESTDIR="${D}" || die "install failure"
+ dodoc AUTHORS ChangeLog INSTALL NEWS README
+}
diff --git a/net-im/librvp/metadata.xml b/net-im/librvp/metadata.xml
new file mode 100644
index 000000000000..282b3407ee83
--- /dev/null
+++ b/net-im/librvp/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>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ This is an RVP (Microsoft Exchange Instant Messaging) plugin for
+ Gaim 1.x and Pidgin. It's based on some work done at Lucent and
+ available through http://www.bell-labs.com/project/wwexptools/
+ </longdescription>
+</pkgmetadata>
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
new file mode 100644
index 000000000000..1338c964cfc3
--- /dev/null
+++ b/net-im/licq/Manifest
@@ -0,0 +1 @@
+DIST licq-1.8.2.tar.bz2 2260717 SHA256 16aa514888379a12f538becbaeb81f77017d05c94c15f3b2a5e0ffb60315180f SHA512 2535d1ec3abf91825041ce17ccbe525291b10d9df9af16f5c4bbfab27b5dcef2fc39444f6de839d126cb36014330fc75a3143cbc50b7926123782988105bdf1f WHIRLPOOL 25f4881b8e8abe1187f1bda374d3513dfb52b77742611c41c080d151e4c3d1e369dce11c9f7dc43b6e199c5117ca65e2273fab6355548ed57ceefc4bf74d53ed
diff --git a/net-im/licq/files/licq-1.3.8-hebrew.patch b/net-im/licq/files/licq-1.3.8-hebrew.patch
new file mode 100644
index 000000000000..a0fdb936bdb2
--- /dev/null
+++ b/net-im/licq/files/licq-1.3.8-hebrew.patch
@@ -0,0 +1,95 @@
+--- configure
++++ configure
+@@ -3283,7 +3283,7 @@
+
+ # Check whether --enable-hebrew was given.
+ if test "${enable_hebrew+set}" = set; then :
+- enableval=$enable_hebrew; USE_HEBREW=yes
++ enableval=$enable_hebrew; USE_HEBREW=$enableval
+ else
+ USE_HEBREW=no
+ fi
+--- src/hebrev.c
++++ src/hebrev.c
+@@ -48,6 +48,7 @@
+ short int mode = 0, imode;
+ const char *hmark = NULL, *lmark, *nmark, *nlmark;
+ char ch;
++ const char* srcstart = src;
+
+ if (src == NULL)
+ return NULL;
+@@ -69,7 +70,7 @@
+ if (*src == 0 || iseng(*src))
+ {
+ lmark = src-1;
+- while ((!isheb(*lmark)) && (!ispunct(*lmark))) lmark--;
++ while (lmark > srcstart && !isheb(*lmark) && !ispunct(*lmark)) lmark--;
+ src = lmark;
+ imode = 0;
+ nmark = NULL;
+@@ -114,6 +115,7 @@
+ hmark = NULL;
+ mode = 0;
+ }
++ if (*src == '\0') *dest = '\0';
+ }
+ if (!*src++)
+ break;
+@@ -141,15 +143,16 @@
+ char *temp=NULL, *tmp=NULL;
+ char *arg=NULL, *arg2=NULL;
+ int i=0;
++ char* saveptr = NULL;
+
+ temp = (char*) malloc(strlen(input)+1);
+ tmp = temp;
+
+ strcpy(temp, input);
+
+- arg = strtok(temp, "\n");
++ arg = strtok_r(temp, "\n", &saveptr);
+ for(i = 0; (i < index) && (arg!=NULL); i++)
+- arg = strtok(NULL, "\n");
++ arg = strtok_r(NULL, "\n", &saveptr);
+
+ if(arg != NULL)
+ {
+@@ -164,6 +167,7 @@
+ {
+ char* temp_str = NULL;
+ char* temp = NULL;
++ char* arg = NULL;
+ int i=0;
+ int size = 0;
+ if(src == NULL)
+@@ -172,21 +176,23 @@
+ if((temp_str = (char*)malloc(strlen(src)+1))== NULL)
+ return NULL;
+
+- temp = GetArg(src, i);
+- while(temp != NULL)
++ arg = GetArg(src, i);
++ while(arg != NULL)
+ {
+ i++;
+- temp = hebrew(temp);
++ temp = hebrew(arg);
++ free(arg);
+ memcpy(temp_str + size , temp, strlen(temp));
+ size += strlen(temp) ;
+ temp_str[size++] = '\n';
+
+ free(temp);
+ temp = NULL;
+- temp = GetArg(src, i);
++ arg = GetArg(src, i);
+ }
+- free(temp);
+- temp_str[size]= '\0';
++ // Above loop adds a line break after last line that wasn't there in src
++ // replace it with the null terminator
++ temp_str[--size]= '\0';
+ return temp_str;
+ }
+
diff --git a/net-im/licq/files/licq-1.3.8-memory_leak.patch b/net-im/licq/files/licq-1.3.8-memory_leak.patch
new file mode 100644
index 000000000000..38ea9e0da5bb
--- /dev/null
+++ b/net-im/licq/files/licq-1.3.8-memory_leak.patch
@@ -0,0 +1,9 @@
+--- src/user.cpp
++++ src/user.cpp
+@@ -3631,6 +3631,7 @@
+ {
+ gLog.Error("%sUnable to open picture file (%s):\n%s%s.\n", L_ERRORxSTR,
+ szFilename, L_BLANKxSTR, strerror(errno));
++ close(source);
+ return;
+ }
diff --git a/net-im/licq/licq-1.8.2.ebuild b/net-im/licq/licq-1.8.2.ebuild
new file mode 100644
index 000000000000..a75d8a32eba1
--- /dev/null
+++ b/net-im/licq/licq-1.8.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 cmake-utils eutils flag-o-matic
+
+DESCRIPTION="ICQ Client with v8 support"
+HOMEPAGE="http://www.licq.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE="debug doc linguas_he nls socks5 ssl xosd aosd xmpp qt4 msn"
+
+RDEPEND=">=app-crypt/gpgme-1
+ xmpp? ( net-libs/gloox )
+ qt4? ( dev-qt/qtgui:4 )
+ socks5? ( net-proxy/dante )
+ ssl? ( >=dev-libs/openssl-0.9.5a )
+ xosd? ( x11-libs/xosd )
+ aosd? ( x11-libs/libaosd )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[dot] )
+ nls? ( sys-devel/gettext )
+ dev-libs/boost"
+
+src_prepare() {
+ local licq_plugins="auto-reply icq rms"
+ use msn && licq_plugins+=" msn"
+ use xosd && licq_plugins+=" osd"
+ use aosd && licq_plugins+=" aosd"
+ use xmpp && licq_plugins+=" jabber"
+ use qt4 && licq_plugins+=" qt4-gui"
+
+ local plugins="" x
+ for x in ${licq_plugins}; do
+ plugins+=" ${x}\/CMakeLists.txt"
+ done
+
+ sed -i -e "s/file(GLOB cmake_plugins.*$/set(cmake_plugins ${plugins})/" plugins/CMakeLists.txt
+}
+
+pkg_setup() {
+ # crutch
+ append-flags -pthread
+}
+
+src_configure() {
+ local myopts="-DCMAKE_BUILD_TYPE=$(use debug && echo 'Debug' || echo 'Release')"
+ mycmakeargs="$myopts
+ $(cmake-utils_use doc USE_DOXYGEN)
+ $(cmake-utils_use linguas_he USE_HEBREW)
+ $(cmake-utils_use nls ENABLE_NLS)
+ $(cmake-utils_use socks5 USE_SOCKS5)
+ $(cmake-utils_use ssl USE_OPENSSL)
+ -DUSE_FIFO=ON
+ -DBUILD_PLUGINS=ON"
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ dodoc README
+
+ docinto doc
+ dodoc doc/*
+
+ use ssl && dodoc README.OPENSSL
+
+ exeinto /usr/share/${PN}/upgrade
+ doexe upgrade/*.pl
+}
diff --git a/net-im/licq/metadata.xml b/net-im/licq/metadata.xml
new file mode 100644
index 000000000000..ffc90125c10d
--- /dev/null
+++ b/net-im/licq/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-im</herd>
+ <maintainer>
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <longdescription>Licq is an ICQ clone with an extensive plugin system.</longdescription>
+ <use>
+ <flag name="aosd">Build the advanced on screen display plugin.</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">licq</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
new file mode 100644
index 000000000000..4de926d868b0
--- /dev/null
+++ b/net-im/mcabber/Manifest
@@ -0,0 +1,3 @@
+DIST mcabber-0.10.2_p20131025.tar.gz 399025 SHA256 90f4e583a7ea929abcd243dc970d64db53f1f577a4a76dc55432eaa86b5ce007 SHA512 4910acfb3d0f6341e0926bff740186d3039a47f15fd075409ecd940b6388b9bb3bf35cb88eb675e6063eaefba6f4421ca7c07e18cb307a1c7b3206c077feeeb1 WHIRLPOOL 12b9ea8d5dd2e70afeeaab18f8361bd57a5c9850bfc70e953800efe5319d632881163c48d904efc07aadb9cb1a33c09d9b034537e4fe3102793da084bd246e97
+DIST mcabber-0.10.3.tar.bz2 612153 SHA256 77466138496cc26db125145cc28dc4fc0df79827143b922dfb9f02eb0dc7fa6d SHA512 3f4c83dbe99f1e1981a89d2a9cdfbaf96b265aaabe133e41d562491557e0acc2d780ae88aa3e45eca9088318ef7d7b284f1df445d2b5afb139d5a247e111bc10 WHIRLPOOL 7139d7b44837026276b269f5d911486bc898ef4c72d0cec2ada066636f284c00205b207241024d4311a82f7eb6a83590dbf402167dec4441e477f6166a7595b5
+DIST mcabber-1.0.0.tar.bz2 602173 SHA256 5476bcba395e0b9527823f5a9bce725151756f685ce2dcf6fad3dbe50a157032 SHA512 bad8af15ed984ac0a568ea497464a3fa9b3ba3dea51cdd4042361be10783bba3578859ced532cd2c1cf19588fc42bdd561486b9fce6ed2da86a509e29c26c497 WHIRLPOOL f9eba52f2686f0571947e006ce825378be7f00db8192988e5a071a86160c48b113609fe4f539d61191378348333763c24e013f5bc69863f4b41a54264313e3f8
diff --git a/net-im/mcabber/files/mcabber-0.10.2_p20131025-vim-ftdetect.patch b/net-im/mcabber/files/mcabber-0.10.2_p20131025-vim-ftdetect.patch
new file mode 100644
index 000000000000..015d3693ee97
--- /dev/null
+++ b/net-im/mcabber/files/mcabber-0.10.2_p20131025-vim-ftdetect.patch
@@ -0,0 +1,12 @@
+diff -urN mcabber-a18e1b488f1c.orig/mcabber/contrib/vim/mcabber_log-ftdetect.vim mcabber-a18e1b488f1c/mcabber/contrib/vim/mcabber_log-ftdetect.vim
+--- mcabber-a18e1b488f1c.orig/mcabber/contrib/vim/mcabber_log-ftdetect.vim 2013-10-25 22:20:23.000000000 +0200
++++ mcabber-a18e1b488f1c/mcabber/contrib/vim/mcabber_log-ftdetect.vim 2014-03-30 14:41:31.975129825 +0200
+@@ -1,7 +1,7 @@
+ "
+ " Save this file in your ~/.vim/ftdetect/ folder
+
+-function MCabber_log_ftdetect()
++function! MCabber_log_ftdetect()
+ if getline(1) =~ '^\u. \d\{8}T\d\d:\d\d:\d\dZ \d\{3} '
+ setlocal filetype=mcabber_log
+ endif
diff --git a/net-im/mcabber/files/mcabber-0.10.3-vim-ftdetect.patch b/net-im/mcabber/files/mcabber-0.10.3-vim-ftdetect.patch
new file mode 100644
index 000000000000..015d3693ee97
--- /dev/null
+++ b/net-im/mcabber/files/mcabber-0.10.3-vim-ftdetect.patch
@@ -0,0 +1,12 @@
+diff -urN mcabber-a18e1b488f1c.orig/mcabber/contrib/vim/mcabber_log-ftdetect.vim mcabber-a18e1b488f1c/mcabber/contrib/vim/mcabber_log-ftdetect.vim
+--- mcabber-a18e1b488f1c.orig/mcabber/contrib/vim/mcabber_log-ftdetect.vim 2013-10-25 22:20:23.000000000 +0200
++++ mcabber-a18e1b488f1c/mcabber/contrib/vim/mcabber_log-ftdetect.vim 2014-03-30 14:41:31.975129825 +0200
+@@ -1,7 +1,7 @@
+ "
+ " Save this file in your ~/.vim/ftdetect/ folder
+
+-function MCabber_log_ftdetect()
++function! MCabber_log_ftdetect()
+ if getline(1) =~ '^\u. \d\{8}T\d\d:\d\d:\d\dZ \d\{3} '
+ setlocal filetype=mcabber_log
+ endif
diff --git a/net-im/mcabber/mcabber-0.10.2_p20131025-r1.ebuild b/net-im/mcabber/mcabber-0.10.2_p20131025-r1.ebuild
new file mode 100644
index 000000000000..d35f969c5703
--- /dev/null
+++ b/net-im/mcabber/mcabber-0.10.2_p20131025-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic autotools-utils
+
+DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
+HOMEPAGE="http://mcabber.com/"
+REV="a18e1b488f1c"
+SRC_URI="http://mcabber.com/hg/index.cgi/archive/${REV}.tar.gz -> ${P}.tar.gz"
+
+S=${WORKDIR}/${PN}-${REV}/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
+
+LANGS="cs de fr it nl pl ru uk"
+# localized help versions are installed only, when LINGUAS var is set
+for i in ${LANGS}; do
+ IUSE="${IUSE} linguas_${i}"
+done;
+
+RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
+ otr? ( >=net-libs/libotr-3.1.0 )
+ aspell? ( app-text/aspell )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+ idn? ( net-dns/libidn )
+ spell? ( app-text/enchant )
+ dev-libs/glib:2
+ sys-libs/ncurses
+ >=net-libs/loudmouth-1.4.3-r1[ssl?]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+## autotools-utils.eclass settings
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
+PATCHES=(
+ "${FILESDIR}/${P}-vim-ftdetect.patch"
+)
+
+pkg_setup() {
+ if use aspell && use spell; then
+ ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable crypt gpgme) \
+ $(use_enable otr) \
+ $(use_enable aspell) \
+ $(use_enable spell enchant) \
+ $(use_enable modules) \
+ $(use_with idn libidn)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ # clean unneeded language documentation
+ for i in ${LANGS}; do
+ use linguas_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
+ done
+
+ # contrib themes
+ insinto /usr/share/${PN}/themes
+ doins "${S}"/contrib/themes/*
+
+ # contrib generic scripts
+ exeinto /usr/share/${PN}/scripts
+ doexe "${S}"/contrib/*.{pl,py}
+
+ # contrib event scripts
+ exeinto /usr/share/${PN}/scripts/events
+ doexe "${S}"/contrib/events/*
+
+ if use vim-syntax; then
+ cd contrib/vim/ || die
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins mcabber_log-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins mcabber_log-ftdetect.vim
+ fi
+}
+
+pkg_postinst() {
+ elog
+ elog "MCabber requires you to create a subdirectory .mcabber in your home"
+ elog "directory and to place a configuration file there."
+ elog "An example mcabberrc was installed as part of the documentation."
+ elog "To create a new mcabberrc based on the example mcabberrc, execute the"
+ elog "following commands:"
+ elog
+ elog " mkdir -p ~/.mcabber"
+ elog " bzcat ${EROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
+ elog
+ elog "Then edit ~/.mcabber/mcabberrc with your favorite editor."
+ elog
+ elog "See the CONFIGURATION FILE and FILES sections of the mcabber"
+ elog "manual page (section 1) for more information."
+ elog
+ elog "From version 0.9.0 on, MCabber supports PGP encryption of messages."
+ elog "See README_PGP.txt for details."
+ echo
+ einfo "Check out ${EROOT}usr/share/${PN} for contributed themes and event scripts."
+ echo
+}
diff --git a/net-im/mcabber/mcabber-0.10.2_p20131025.ebuild b/net-im/mcabber/mcabber-0.10.2_p20131025.ebuild
new file mode 100644
index 000000000000..e6fa9eb281d2
--- /dev/null
+++ b/net-im/mcabber/mcabber-0.10.2_p20131025.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic autotools
+
+DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
+HOMEPAGE="http://mcabber.com/"
+REV="a18e1b488f1c"
+SRC_URI="http://mcabber.com/hg/index.cgi/archive/${REV}.tar.gz -> ${P}.tar.gz"
+
+S=${WORKDIR}/${PN}-${REV}/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
+
+LANGS="cs de fr it nl pl ru uk"
+# localized help versions are installed only, when LINGUAS var is set
+for i in ${LANGS}; do
+ IUSE="${IUSE} linguas_${i}"
+done;
+
+RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
+ otr? ( >=net-libs/libotr-3.1.0 )
+ aspell? ( app-text/aspell )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+ idn? ( net-dns/libidn )
+ spell? ( app-text/enchant )
+ dev-libs/glib:2
+ sys-libs/ncurses
+ >=net-libs/loudmouth-1.4.3-r1[ssl?]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+pkg_setup() {
+ if use aspell && use spell; then
+ ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."
+ fi
+}
+
+src_prepare() {
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable crypt gpgme) \
+ $(use_enable otr) \
+ $(use_enable aspell) \
+ $(use_enable spell enchant) \
+ $(use_enable modules) \
+ $(use_with idn libidn)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # clean unneeded language documentation
+ for i in ${LANGS}; do
+ use linguas_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
+ done
+
+ dodoc AUTHORS ChangeLog NEWS README TODO mcabberrc.example
+ dodoc doc/README_PGP.txt
+
+ # contrib themes
+ insinto /usr/share/${PN}/themes
+ doins "${S}"/contrib/themes/*
+
+ # contrib generic scripts
+ exeinto /usr/share/${PN}/scripts
+ doexe "${S}"/contrib/*.{pl,py}
+
+ # contrib event scripts
+ exeinto /usr/share/${PN}/scripts/events
+ doexe "${S}"/contrib/events/*
+
+ if use vim-syntax; then
+ cd contrib/vim/ || die
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins mcabber_log-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins mcabber_log-ftdetect.vim
+ fi
+}
+
+pkg_postinst() {
+ elog
+ elog "MCabber requires you to create a subdirectory .mcabber in your home"
+ elog "directory and to place a configuration file there."
+ elog "An example mcabberrc was installed as part of the documentation."
+ elog "To create a new mcabberrc based on the example mcabberrc, execute the"
+ elog "following commands:"
+ elog
+ elog " mkdir -p ~/.mcabber"
+ elog " bzcat ${EROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
+ elog
+ elog "Then edit ~/.mcabber/mcabberrc with your favorite editor."
+ elog
+ elog "See the CONFIGURATION FILE and FILES sections of the mcabber"
+ elog "manual page (section 1) for more information."
+ elog
+ elog "From version 0.9.0 on, MCabber supports PGP encryption of messages."
+ elog "See README_PGP.txt for details."
+ echo
+ einfo "Check out ${EROOT}usr/share/${PN} for contributed themes and event scripts."
+ echo
+}
diff --git a/net-im/mcabber/mcabber-0.10.3.ebuild b/net-im/mcabber/mcabber-0.10.3.ebuild
new file mode 100644
index 000000000000..8dcbeb77359e
--- /dev/null
+++ b/net-im/mcabber/mcabber-0.10.3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic autotools-utils
+
+DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
+HOMEPAGE="http://mcabber.com/"
+#REV="a18e1b488f1c"
+#SRC_URI="http://mcabber.com/hg/index.cgi/archive/${REV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
+
+#S=${WORKDIR}/${PN}-${REV}/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
+
+LANGS="cs de fr it nl pl ru uk"
+# localized help versions are installed only, when LINGUAS var is set
+for i in ${LANGS}; do
+ IUSE="${IUSE} linguas_${i}"
+done;
+
+RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
+ otr? ( >=net-libs/libotr-3.1.0 )
+ aspell? ( app-text/aspell )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+ idn? ( net-dns/libidn )
+ spell? ( app-text/enchant )
+ dev-libs/glib:2
+ sys-libs/ncurses
+ >=net-libs/loudmouth-1.4.3-r1[ssl?]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+## autotools-utils.eclass settings
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
+PATCHES=(
+ "${FILESDIR}/${P}-vim-ftdetect.patch"
+)
+
+pkg_setup() {
+ if use aspell && use spell; then
+ ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable crypt gpgme) \
+ $(use_enable otr) \
+ $(use_enable aspell) \
+ $(use_enable spell enchant) \
+ $(use_enable modules) \
+ $(use_with idn libidn)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ # clean unneeded language documentation
+ for i in ${LANGS}; do
+ use linguas_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
+ done
+
+ # contrib themes
+ insinto /usr/share/${PN}/themes
+ doins "${S}"/contrib/themes/*
+
+ # contrib generic scripts
+ exeinto /usr/share/${PN}/scripts
+ doexe "${S}"/contrib/*.{pl,py}
+
+ # contrib event scripts
+ exeinto /usr/share/${PN}/scripts/events
+ doexe "${S}"/contrib/events/*
+
+ if use vim-syntax; then
+ cd contrib/vim/ || die
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins mcabber_log-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins mcabber_log-ftdetect.vim
+ fi
+}
+
+pkg_postinst() {
+ elog
+ elog "MCabber requires you to create a subdirectory .mcabber in your home"
+ elog "directory and to place a configuration file there."
+ elog "An example mcabberrc was installed as part of the documentation."
+ elog "To create a new mcabberrc based on the example mcabberrc, execute the"
+ elog "following commands:"
+ elog
+ elog " mkdir -p ~/.mcabber"
+ elog " bzcat ${EROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
+ elog
+ elog "Then edit ~/.mcabber/mcabberrc with your favorite editor."
+ elog
+ elog "See the CONFIGURATION FILE and FILES sections of the mcabber"
+ elog "manual page (section 1) for more information."
+ elog
+ elog "From version 0.9.0 on, MCabber supports PGP encryption of messages."
+ elog "See README_PGP.txt for details."
+ echo
+ einfo "Check out ${EROOT}usr/share/${PN} for contributed themes and event scripts."
+ echo
+}
diff --git a/net-im/mcabber/mcabber-1.0.0.ebuild b/net-im/mcabber/mcabber-1.0.0.ebuild
new file mode 100644
index 000000000000..bff79876f43d
--- /dev/null
+++ b/net-im/mcabber/mcabber-1.0.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic autotools-utils
+
+DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
+HOMEPAGE="http://mcabber.com/"
+#REV="a18e1b488f1c"
+#SRC_URI="http://mcabber.com/hg/index.cgi/archive/${REV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
+
+#S=${WORKDIR}/${PN}-${REV}/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
+
+LANGS="cs de fr it nl pl ru uk"
+# localized help versions are installed only, when LINGUAS var is set
+for i in ${LANGS}; do
+ IUSE="${IUSE} linguas_${i}"
+done;
+
+RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
+ otr? ( >=net-libs/libotr-3.1.0 )
+ aspell? ( app-text/aspell )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+ idn? ( net-dns/libidn )
+ spell? ( app-text/enchant )
+ dev-libs/glib:2
+ sys-libs/ncurses
+ >=net-libs/loudmouth-1.4.3-r1[ssl?]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+## autotools-utils.eclass settings
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt )
+PATCHES=(
+ "${FILESDIR}/${PN}-0.10.3-vim-ftdetect.patch"
+)
+
+pkg_setup() {
+ if use aspell && use spell; then
+ ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable crypt gpgme) \
+ $(use_enable otr) \
+ $(use_enable aspell) \
+ $(use_enable spell enchant) \
+ $(use_enable modules) \
+ $(use_with idn libidn)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ # clean unneeded language documentation
+ for i in ${LANGS}; do
+ use linguas_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
+ done
+
+ # contrib themes
+ insinto /usr/share/${PN}/themes
+ doins "${S}"/contrib/themes/*
+
+ # contrib generic scripts
+ exeinto /usr/share/${PN}/scripts
+ doexe "${S}"/contrib/*.{pl,py}
+
+ # contrib event scripts
+ exeinto /usr/share/${PN}/scripts/events
+ doexe "${S}"/contrib/events/*
+
+ if use vim-syntax; then
+ cd contrib/vim/ || die
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins mcabber_log-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins mcabber_log-ftdetect.vim
+ fi
+}
+
+pkg_postinst() {
+ elog
+ elog "MCabber requires you to create a subdirectory .mcabber in your home"
+ elog "directory and to place a configuration file there."
+ elog "An example mcabberrc was installed as part of the documentation."
+ elog "To create a new mcabberrc based on the example mcabberrc, execute the"
+ elog "following commands:"
+ elog
+ elog " mkdir -p ~/.mcabber"
+ elog " bzcat ${EROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
+ elog
+ elog "Then edit ~/.mcabber/mcabberrc with your favorite editor."
+ elog
+ elog "See the CONFIGURATION FILE and FILES sections of the mcabber"
+ elog "manual page (section 1) for more information."
+ elog
+ elog "From version 0.9.0 on, MCabber supports PGP encryption of messages."
+ elog "See README_PGP.txt for details."
+ echo
+ einfo "Check out ${EROOT}usr/share/${PN} for contributed themes and event scripts."
+ echo
+}
diff --git a/net-im/mcabber/metadata.xml b/net-im/mcabber/metadata.xml
new file mode 100644
index 000000000000..ce8c1aca6ffc
--- /dev/null
+++ b/net-im/mcabber/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-im</herd>
+ <maintainer>
+ <email>wschlich@gentoo.org</email>
+ <name>Wolfram Schlich</name>
+ <description>Secondary maintainer</description>
+ </maintainer>
+ <longdescription lang="en">
+ MCabber is a small Jabber console client that features
+ such as GPG encryption, SSL support, MUC (Multi-User Chat) support,
+ history logging, commands completion, and external actions triggers.
+ </longdescription>
+ <use>
+ <flag name="aspell">Adds support for app-text/aspell spell
+ checker.</flag>
+ <flag name="otr">Enable encrypted conversations using Off-The-Records
+ messaging
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/net-im/metadata.xml b/net-im/metadata.xml
new file mode 100644
index 000000000000..efaf4c0dda2d
--- /dev/null
+++ b/net-im/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The net-im category contains instant messaging software.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie net-im enthält Instand Messaging Software.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría net-im contiene programas de mensajería instantánea.
+ </longdescription>
+ <longdescription lang="ja">
+ net-imカテゴリーにはインスタント・メッセージのソフトウェアが含まれています。
+ </longdescription>
+ <longdescription lang="nl">
+ De net-im categorie bevat applicaties voor instant messaging.
+ </longdescription>
+ <longdescription lang="sk">
+ Kategória net-im obsahuje aplikácie pre instant messaging.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm net-im chứa các phần mềm nhắn tin.
+ </longdescription>
+ <longdescription lang="it">
+ La categoria net-im contiene programmi per i messaggi istantanei.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria net-im contém programas para mensagens instantâneas.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria net-im zawiera komunikatory internetowe.
+ </longdescription>
+</catmetadata>
+
diff --git a/net-im/minbif/Manifest b/net-im/minbif/Manifest
new file mode 100644
index 000000000000..9fd56fb32d49
--- /dev/null
+++ b/net-im/minbif/Manifest
@@ -0,0 +1 @@
+DIST minbif-1.0.5.tar.gz 176039 SHA256 88271af203a89556165a9ebb4e00e55ea5b649146aea855dd799a79bd9e4befd SHA512 e84c6f38ad35a660f9c319b702ae5743cece167c8e116976a9ca0caf527ad23ea17ea8f518f9bd76536e87283362d2087201a5307128740fc7f05dccabacfbcd WHIRLPOOL 10e51abc809e16c65c86f5887867f9d4b680a60321921a2fdd58345ce100cdea8317d13a007df4efaae786a4ea1b1bdc0231fe186f877f6a5716dbfdc3c32aad
diff --git a/net-im/minbif/files/minbif-1.0.5-gcc47.patch b/net-im/minbif/files/minbif-1.0.5-gcc47.patch
new file mode 100644
index 000000000000..8566406a318f
--- /dev/null
+++ b/net-im/minbif/files/minbif-1.0.5-gcc47.patch
@@ -0,0 +1,76 @@
+commit fe71fd989a4501c77314b2906756f4e9a328ff31
+Author: Romain Bignon <romain@symlink.me>
+Date: Tue May 8 16:46:35 2012 +0200
+
+ fixes for gcc 4.7
+
+--- a/src/im/account.cpp
++++ b/src/im/account.cpp
+@@ -18,6 +18,7 @@
+
+ #include <cassert>
+ #include <cstring>
++#include <unistd.h>
+ #ifdef HAVE_IMLIB
+ #include <Imlib2.h>
+ #endif /* HAVE_IMLIB */
+--- a/src/im/request.cpp
++++ b/src/im/request.cpp
+@@ -18,6 +18,7 @@
+
+ #include <errno.h>
+ #include <string.h>
++#include <unistd.h>
+
+ #include "request.h"
+ #include "buddy.h"
+--- a/src/irc/dcc.cpp
++++ b/src/irc/dcc.cpp
+@@ -23,6 +23,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <netinet/in.h>
++#include <unistd.h>
+
+ #include "dcc.h"
+ #include "nick.h"
+--- a/src/irc/irc.cpp
++++ b/src/irc/irc.cpp
+@@ -246,7 +246,7 @@ Nick* IRC::getNick(string nickname, bool case_sensitive) const
+ Buddy* IRC::getNick(const im::Buddy& buddy) const
+ {
+ map<string, Nick*>::const_iterator it;
+- Buddy* nb;
++ Buddy* nb = NULL;
+ for(it = users.begin();
+ it != users.end() && (!(nb = dynamic_cast<Buddy*>(it->second)) || nb->getBuddy() != buddy);
+ ++it)
+@@ -261,7 +261,7 @@ Buddy* IRC::getNick(const im::Buddy& buddy) const
+ ConvNick* IRC::getNick(const im::Conversation& conv) const
+ {
+ map<string, Nick*>::const_iterator it;
+- ConvNick* n;
++ ConvNick* n = NULL;
+ for(it = users.begin();
+ it != users.end() && (!(n = dynamic_cast<ConvNick*>(it->second)) || n->getConversation() != conv);
+ ++it)
+--- a/src/server_poll/inetd.cpp
++++ b/src/server_poll/inetd.cpp
+@@ -18,6 +18,7 @@
+
+ #include <cassert>
+ #include <glib.h>
++#include <unistd.h>
+
+ #include "inetd.h"
+ #include "irc/irc.h"
+--- a/src/sockwrap/sockwrap.cpp
++++ b/src/sockwrap/sockwrap.cpp
+@@ -22,6 +22,7 @@
+ # include "sockwrap_tls.h"
+ #endif
+ #include "core/util.h"
++#include <unistd.h>
+
+ namespace sock
+ {
diff --git a/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch b/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch
new file mode 100644
index 000000000000..599355eb502c
--- /dev/null
+++ b/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch
@@ -0,0 +1,26 @@
+Index: minbif-1.0.5/src/server_poll/daemon_fork.cpp
+===================================================================
+--- minbif-1.0.5.orig/src/server_poll/daemon_fork.cpp
++++ minbif-1.0.5/src/server_poll/daemon_fork.cpp
+@@ -20,7 +20,7 @@
+ #include <cassert>
+ #include <cstring>
+ #include <cerrno>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+ #include <arpa/inet.h>
+Index: minbif-1.0.5/src/server_poll/inetd.cpp
+===================================================================
+--- minbif-1.0.5.orig/src/server_poll/inetd.cpp
++++ minbif-1.0.5/src/server_poll/inetd.cpp
+@@ -17,7 +17,7 @@
+ */
+
+ #include <cassert>
+-#include <glib/gmain.h>
++#include <glib.h>
+
+ #include "inetd.h"
+ #include "irc/irc.h"
diff --git a/net-im/minbif/files/minbif.initd b/net-im/minbif/files/minbif.initd
new file mode 100644
index 000000000000..a2d5649bfe1f
--- /dev/null
+++ b/net-im/minbif/files/minbif.initd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MINBIF_EXEC="/usr/bin/minbif"
+
+depend() {
+ need logger net
+}
+
+start() {
+ ebegin "Starting minbif"
+ start-stop-daemon --start --startas ${MINBIF_EXEC} \
+ -c minbif:minbif --exec ${MINBIF_EXEC} -- \
+ /etc/minbif/minbif.conf
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping minbif"
+ start-stop-daemon --stop --exec ${MINBIF_EXEC}
+ eend $?
+}
diff --git a/net-im/minbif/metadata.xml b/net-im/minbif/metadata.xml
new file mode 100644
index 000000000000..e96e35b1a37c
--- /dev/null
+++ b/net-im/minbif/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>
+</pkgmetadata>
+
diff --git a/net-im/minbif/minbif-1.0.5-r1.ebuild b/net-im/minbif/minbif-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..1586a3d525be
--- /dev/null
+++ b/net-im/minbif/minbif-1.0.5-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils eutils user
+
+DESCRIPTION="an IRC gateway to IM networks"
+HOMEPAGE="https://symlink.me/projects/minbif/wiki/"
+SRC_URI="https://symlink.me/attachments/download/148/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gnutls +imlib +libcaca pam xinetd"
+REQUIRED_USE="
+ libcaca? ( imlib )
+"
+
+DEPEND="
+ >=net-im/pidgin-2.6
+ libcaca? ( media-libs/libcaca media-libs/imlib2 )
+ imlib? ( media-libs/imlib2 )
+ pam? ( sys-libs/pam )
+ gnutls? ( net-libs/gnutls )
+"
+RDEPEND="${DEPEND}
+ virtual/logger
+ xinetd? ( sys-apps/xinetd )
+"
+
+pkg_setup() {
+ enewgroup minbif
+ enewuser minbif -1 -1 /var/lib/minbif minbif
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.0.5-glib-single-includes.patch"
+ epatch "${FILESDIR}/${PN}-1.0.5-gcc47.patch"
+
+ sed -i "s/-Werror//g" CMakeLists.txt || die "sed failed"
+
+ sed -i "s#share/doc/minbif#share/doc/${P}#" \
+ CMakeLists.txt || die "sed failed"
+
+ if use xinetd; then
+ sed -i "s/type\s=\s[0-9]/type = 0/" \
+ minbif.conf || die "sed failed"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs
+ mycmakeargs="${mycmakeargs}
+ -DCONF_PREFIX=${PREFIX:-/etc/minbif}
+ -DENABLE_VIDEO=OFF
+ $(cmake-utils_use_enable libcaca CACA)
+ $(cmake-utils_use_enable imlib IMLIB)
+ $(cmake-utils_use_enable pam PAM)
+ $(cmake-utils_use_enable gnutls TLS)"
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ keepdir /var/lib/minbif
+ fperms 700 /var/lib/minbif
+ fowners minbif:minbif /var/lib/minbif
+
+ dodoc ChangeLog README
+ doman man/minbif.8
+
+ if use xinetd; then
+ insinto /etc/xinetd.d
+ newins doc/minbif.xinetd minbif
+ fi
+
+ newinitd "${FILESDIR}"/minbif.initd minbif
+
+ dodir /usr/share/minbif
+ insinto /usr/share/minbif
+ doins -r scripts
+}
diff --git a/net-im/mu-conference/Manifest b/net-im/mu-conference/Manifest
new file mode 100644
index 000000000000..2a113bff62cb
--- /dev/null
+++ b/net-im/mu-conference/Manifest
@@ -0,0 +1,3 @@
+DIST mu-conference-0.8.81.tar.gz 247649 SHA256 d3c8f2f0539b06e32b8bcd48dfae008c84961815ada0922ecf095be36b599862 SHA512 96bfafac726ebc8c1a7489f092e5a6d90df0aaff39a183aaa33847e12caf142fe64178d7041fff15115bb5d8116e69b7dce95cb4caf329a4187b5c35ceca28b1 WHIRLPOOL b6da089299d22b3b4e68d79f6451de981e5ccbd7144cf765c2a4073c6b7d58f276c687e4693ab34bbca57275b5b5e48886eded5adc3e5382c61add4d23b9467a
+DIST mu-conference_0.7.tar.gz 112381 SHA256 914d7e5cf45c50e3eaae77d03d895211d332f85469f4a70adaf7209917d27a35 SHA512 55efde6f7605b0d76038c9d67a3e0acb2f0041f896e9a70db0496dec4dbcb28a86539e9efc23df67c4b2eea64c221d1d7d99df2a02f212d46c5172da61d8d6a1 WHIRLPOOL cc9cfe32cff1b21ace94a55d8003038aa28df881b4aaf8759f9e53f53f76a5da4b4dbe7c27985ab2e638deafa4bb7a03cbaa3494c9387b56fb7204b073187f7e
+DIST mu-conference_0.8.tar.gz 110356 SHA256 d9f4399573a83f20c84af55cb56b405c706a943898cb14a5d220d35b89db429b SHA512 e5c410b77091d5fa4cba657a3362704fe1c148b9125984dc1cad832fd48ed343de78e044bafa10c8b8e38160406f4023444009281cb2236c300fbc17d4b85d7f WHIRLPOOL d49fe19bdd09081ba44b16126c9e71e1f9a07a285dea7efe64e487baeb0ac2d3eae04374c245b2451293805f60f935f9243d9e93f1df0f8de9cf98b54e42e53c
diff --git a/net-im/mu-conference/files/README.Gentoo b/net-im/mu-conference/files/README.Gentoo
new file mode 100644
index 000000000000..a478572ffae5
--- /dev/null
+++ b/net-im/mu-conference/files/README.Gentoo
@@ -0,0 +1,40 @@
+This is a small help to get you started with the MSN Jabberd transport in
+Gentoo.
+
+Edit /etc/jabber/muctrans.xml . This is the config file for MU-Conference.
+There change all references to localhost with the FQDN (Fully Qualified Domain
+Name) for your server.
+
+In the msnlinker section enter the IP of your main jabber server (normally
+127.0.0.1) and choose a port and secret (secret is the password the MSN
+transport will use to connect to the main jabber server).
+
+Now back to the multiple.xml to tell your main jabber server to listen to
+connections from the MU transport.
+Search for "<vcard2jud/>" and after that, and before the </jsm> add:
+
+<browse>
+ <item category="conference" type="public" jid="conference.localhost" name="Public Conferencing" version="0.6.0">
+ <ns>http://jabber.org/protocol/muc</ns>
+ </item>
+</browse>
+
+Again here change localhost for your FQDN.
+
+Scrool down to the bottom of the file, and just before the </jabber> add:
+
+<service id="muclinker">
+<host>conference.localhost</host>
+ <accept>
+ <ip>127.0.0.1</ip>
+ <port>31518</port>
+ <secret>mymucsecret</secret>
+ </accept>
+</service>
+(By know you know you have to change localhost for you FQDN).
+One very importante thing: even if it is the same machine the name's for the
+various services must be diferent, that means that there must be valid aliases
+for conference.FQDN .
+
+If you need help with configuration you can try the Jabber Admin Mailling list:
+http://mailman.jabber.org/listinfo/jadmin
diff --git a/net-im/mu-conference/files/mu-conference-0.7.init b/net-im/mu-conference/files/mu-conference-0.7.init
new file mode 100644
index 000000000000..20400acb9a3f
--- /dev/null
+++ b/net-im/mu-conference/files/mu-conference-0.7.init
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+
+depend() {
+ need net
+ use jabber-server
+}
+
+start() {
+ ebegin "Starting MUC Jabber Transport"
+ start-stop-daemon \
+ --background \
+ --start \
+ --user jabber:jabber \
+ --exec /usr/bin/mu-conference \
+ -- -c /etc/jabber/mu-conference.xml
+ eend $?
+}
+
+stop() {
+ ebegin "Stoping MUC Jabber Transport"
+ start-stop-daemon \
+ --stop \
+ --pidfile /var/run/jabber/mu-conference.pid
+ eend $?
+}
diff --git a/net-im/mu-conference/files/mu-conference-conf.d b/net-im/mu-conference/files/mu-conference-conf.d
new file mode 100644
index 000000000000..95e38ab74d37
--- /dev/null
+++ b/net-im/mu-conference/files/mu-conference-conf.d
@@ -0,0 +1,9 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+CONFIG="/etc/jabber/muctrans.xml"
+
+#Need to find a way to fix the "double" expansion
+#PIDFILE= grep pid ${CONFIG} | sed -e 's/<[^>]*>//g' | sed s/' '//g
+PIDFILE="/var/log/jabber/muctrans.pid"
diff --git a/net-im/mu-conference/files/mu-conference-makefile.patch b/net-im/mu-conference/files/mu-conference-makefile.patch
new file mode 100644
index 000000000000..2a009402a0aa
--- /dev/null
+++ b/net-im/mu-conference/files/mu-conference-makefile.patch
@@ -0,0 +1,11 @@
+--- Makefile 2003-11-15 04:19:44.000000000 +0000
++++ Makefile.new 2004-01-10 02:20:28.753368424 +0000
+@@ -1,6 +1,6 @@
+-include ../../platform-settings
++include /usr/lib/jabberd/platform-settings
+
+-CFLAGS:=$(CFLAGS) -I../../jabberd -I../include `pkg-config --cflags glib-2.0`
++CFLAGS:=$(CFLAGS) -I/usr/include/jabberd -I../include `pkg-config --cflags glib-2.0`
+ LIBS:=$(LIBS) `pkg-config --libs glib-2.0`
+
+ # Debug/Experimental
diff --git a/net-im/mu-conference/files/muc-transport.init b/net-im/mu-conference/files/muc-transport.init
new file mode 100644
index 000000000000..39f611579824
--- /dev/null
+++ b/net-im/mu-conference/files/muc-transport.init
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+
+depend() {
+ need net
+ use jabber-server
+}
+
+start() {
+ ebegin "Starting MUC Jabber Transport"
+ jabberd -B -c /etc/jabber/muctrans.xml -H /var/spool/jabber >/dev/null 2>&1
+ eend $?
+}
+
+stop() {
+ ebegin "Stoping MUC Jabber Transport"
+ if [ -f /var/log/jabber/muctrans.pid ]; then
+ kill `cat /var/log/jabber/muctrans.pid`
+ fi
+ sleep 2
+ if [ -f /var/log/jabber/muctrans.pid ]; then
+ kill -9 `cat /var/log/jabber/muctrans.pid`
+ rm -f /var/log/jabber/muctrans.pid
+ fi
+ rm -f /var/log/jabber/muctrans.pid
+ eend $?
+}
diff --git a/net-im/mu-conference/files/muc-transport.init-r2 b/net-im/mu-conference/files/muc-transport.init-r2
new file mode 100644
index 000000000000..03978bdad7bd
--- /dev/null
+++ b/net-im/mu-conference/files/muc-transport.init-r2
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+
+depend() {
+ need net
+ use jabber-server
+}
+
+start() {
+ ebegin "Starting MUC Jabber Transport"
+ if [ -f ${PIDFILE} ]; then
+ if [ -z $(ps ax | grep `cat ${PIDFILE}` | grep -v grep ) ]
+ then
+ rm -f ${PIDFILE}
+ fi
+ fi
+
+ jabberd -B -c ${CONFIG} -H /var/spool/jabber >/dev/null 2>&1
+ eend $?
+}
+
+stop() {
+ ebegin "Stoping MUC Jabber Transport"
+ if [ -f ${PIDFILE} ]; then
+ kill `cat ${PIDFILE}`
+ fi
+ sleep 2
+ if [ -f ${PIDFILE} ]; then
+ kill -9 `cat ${PIDFILE}`
+ rm -f ${PIDFILE}
+ fi
+ rm -f ${PIDFILE}
+ eend $?
+}
diff --git a/net-im/mu-conference/files/muctrans.xml b/net-im/mu-conference/files/muctrans.xml
new file mode 100644
index 000000000000..6fe5b21b7c55
--- /dev/null
+++ b/net-im/mu-conference/files/muctrans.xml
@@ -0,0 +1,37 @@
+<jabber>
+
+ <service id="muclinker">
+ <uplink/>
+ <connect>
+ <ip>127.0.0.1</ip>
+ <port>31518</port>
+ <secret>mymucsecret</secret>
+ </connect>
+ </service>
+
+ <service id="conference.localhost">
+ <load>
+ <conference>/usr/lib/jabberd/mu-conference.so</conference>
+ </load>
+ <conference xmlns="jabber:config:conference">
+ <public/>
+ <vCard>
+ <FN>Public Chatrooms</FN>
+ <DESC>This service is for public chatrooms.</DESC>
+ <URL>http://conference.localhost/logs/</URL>
+ </vCard>
+ <history>20</history>
+ <logdir>/var/log/jabber/conference/</logdir>
+ <sadmin>admin@localhost</sadmin>
+ <notice>
+ <join>has joined this session</join>
+ <leave>has left</leave>
+ <rename>is now known as</rename>
+ </notice>
+ </conference>
+ </service>
+
+ <pidfile>/var/log/jabber/muctrans.pid</pidfile>
+
+</jabber>
+
diff --git a/net-im/mu-conference/metadata.xml b/net-im/mu-conference/metadata.xml
new file mode 100644
index 000000000000..2b8a7eb73128
--- /dev/null
+++ b/net-im/mu-conference/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>net-im</herd>
+ <longdescription>Multi User Conference for Jabber</longdescription>
+</pkgmetadata>
diff --git a/net-im/mu-conference/mu-conference-0.7.ebuild b/net-im/mu-conference/mu-conference-0.7.ebuild
new file mode 100644
index 000000000000..5b3d3501be38
--- /dev/null
+++ b/net-im/mu-conference/mu-conference-0.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Multi-User Chat for jabberd"
+HOMEPAGE="https://gna.org/projects/mu-conference/"
+SRC_URI="http://download.gna.org/mu-conference/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+SLOT="0"
+
+DEPEND="
+ dev-libs/expat
+ >=dev-libs/glib-2
+ net-dns/libidn
+ net-im/jabberd2
+ mysql? ( virtual/mysql )"
+RDEPEND="${DEPEND}"
+IUSE="mysql"
+
+S="${WORKDIR}/${PN}_${PV}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # Fix missing header in src/conference_user.c in order to
+ # make emerge happy and avoid QA notice.
+ sed -i "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
+
+ if use mysql; then
+ sed -i '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' src/Makefile || die
+ else
+ # Makefile is broken. Should not always link against mysql
+ sed -i 's/`mysql_config --libs`//' src/Makefile || die
+ fi
+}
+
+src_compile() {
+ emake || die
+}
+
+src_install() {
+ dobin src/mu-conference
+ fowners jabber:jabber /usr/bin/mu-conference
+ fperms 750 /usr/bin/mu-conference
+
+ newinitd "${FILESDIR}/${P}".init mu-conference
+
+ dodoc ChangeLog FAQ mu-conference.sql README
+ docinto scripts
+ dodoc scripts/*
+
+ for i in log spool; do
+ dodir /var/${i}/jabber/mu-conference
+ keepdir /var/${i}/jabber/mu-conference
+ fowners jabber:jabber /var/${i}/jabber/mu-conference
+ fperms 770 /var/${i}/jabber/mu-conference
+ done
+
+ insinto /etc/jabber
+ newins muc-default.xml mu-conference.xml
+ doins style.css
+
+ cd "${D}/etc/jabber/" || die
+ sed -i \
+ -e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
+ -e 's,./syslogs,/var/log/jabber,g' \
+ -e 's,./logs,/var/log/jabber/mu-conference,g' \
+ -e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
+ -e "s,../style.css,/etc/jabber/style.css,g" \
+ -e "s,7009,5347,g" \
+ mu-conference.xml || die "sed failed"
+}
+
+pkg_postinst() {
+ echo
+ elog "For jabberd-2 connection:"
+ elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
+ elog " match the address of your jabberd router."
+ elog "2. Set a common secret in mu-conference.xml and router.xml"
+ echo
+}
diff --git a/net-im/mu-conference/mu-conference-0.8-r1.ebuild b/net-im/mu-conference/mu-conference-0.8-r1.ebuild
new file mode 100644
index 000000000000..6d2b4f723b04
--- /dev/null
+++ b/net-im/mu-conference/mu-conference-0.8-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
+
+inherit toolchain-funcs
+
+DESCRIPTION="Multi-User Chat for jabberd"
+HOMEPAGE="https://gna.org/projects/mu-conference/"
+SRC_URI="http://download.gna.org/mu-conference/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE="mysql"
+
+RDEPEND="
+ dev-libs/expat
+ >=dev-libs/glib-2:2
+ net-dns/libidn
+ net-im/jabberd2
+ mysql? ( virtual/mysql )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+ # Fix missing header in src/conference_user.c in order to
+ # make emerge happy and avoid QA notice.
+ sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
+
+ if use mysql; then
+ sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \
+ -e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die
+ fi
+ sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\
+ -e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\
+ -e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die
+ sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die
+ sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die
+ sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die
+ sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die
+ tc-export CC AR RANLIB
+}
+
+src_install() {
+ dobin src/mu-conference
+ fowners jabber:jabber /usr/bin/mu-conference
+ fperms 750 /usr/bin/mu-conference
+
+ newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference
+
+ dodoc ChangeLog FAQ mu-conference.sql README README.sql
+ docinto scripts
+ dodoc scripts/*
+
+ local i
+ for i in log spool; do
+ dodir /var/${i}/jabber/mu-conference
+ keepdir /var/${i}/jabber/mu-conference
+ fowners jabber:jabber /var/${i}/jabber/mu-conference
+ fperms 770 /var/${i}/jabber/mu-conference
+ done
+
+ insinto /etc/jabber
+ newins muc-default.xml mu-conference.xml
+ doins style.css
+
+ sed -i \
+ -e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
+ -e 's,./syslogs,/var/log/jabber,g' \
+ -e 's,./logs,/var/log/jabber/mu-conference,g' \
+ -e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
+ -e "s,../style.css,/etc/jabber/style.css,g" \
+ -e "s,7009,5347,g" \
+ "${D}"/etc/jabber/mu-conference.xml || die "sed failed"
+}
+
+pkg_postinst() {
+ echo
+ elog "For jabberd-2 connection:"
+ elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
+ elog " match the address of your jabberd router."
+ elog "2. Set a common secret in mu-conference.xml and router.xml"
+ echo
+}
diff --git a/net-im/mu-conference/mu-conference-0.8.81.ebuild b/net-im/mu-conference/mu-conference-0.8.81.ebuild
new file mode 100644
index 000000000000..4580ec730c0b
--- /dev/null
+++ b/net-im/mu-conference/mu-conference-0.8.81.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Multi-User Chat for jabberd"
+HOMEPAGE="https://gna.org/projects/mu-conference/"
+SRC_URI="http://download.gna.org/mu-conference/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE="mysql"
+
+RDEPEND="
+ dev-libs/expat
+ >=dev-libs/glib-2:2
+ net-dns/libidn
+ net-im/jabberd2
+ mysql? ( virtual/mysql )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ # Fix missing header in src/conference_user.c in order to
+ # make emerge happy and avoid QA notice.
+ sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
+
+ if use mysql; then
+ sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \
+ -e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die
+ fi
+ sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\
+ -e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\
+ -e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die
+ sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die
+ sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die
+ sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die
+ sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die
+ tc-export CC AR RANLIB
+}
+
+src_install() {
+ dobin src/mu-conference
+ fowners jabber:jabber /usr/bin/mu-conference
+ fperms 750 /usr/bin/mu-conference
+
+ newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference
+
+ dodoc ChangeLog FAQ mu-conference.sql README README.sql
+ docinto scripts
+ dodoc scripts/*
+
+ local i
+ for i in log spool; do
+ dodir /var/${i}/jabber/mu-conference
+ keepdir /var/${i}/jabber/mu-conference
+ fowners jabber:jabber /var/${i}/jabber/mu-conference
+ fperms 770 /var/${i}/jabber/mu-conference
+ done
+
+ insinto /etc/jabber
+ newins muc-default.xml mu-conference.xml
+ doins style.css
+
+ sed -i \
+ -e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
+ -e 's,./syslogs,/var/log/jabber,g' \
+ -e 's,./logs,/var/log/jabber/mu-conference,g' \
+ -e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
+ -e "s,../style.css,/etc/jabber/style.css,g" \
+ -e "s,7009,5347,g" \
+ "${D}"/etc/jabber/mu-conference.xml || die "sed failed"
+}
+
+pkg_postinst() {
+ echo
+ elog "For jabberd-2 connection:"
+ elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
+ elog " match the address of your jabberd router."
+ elog "2. Set a common secret in mu-conference.xml and router.xml"
+ echo
+}
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
new file mode 100644
index 000000000000..85af340b72e0
--- /dev/null
+++ b/net-im/openfire/Manifest
@@ -0,0 +1,3 @@
+DIST openfire_src_3_10_0.tar.gz 128475294 SHA256 4911caf5336903e17a752c358c4e506dae76b0f66adfc857537eb6dfe3792f33 SHA512 e3b860711fe9005d58981cd5d037d942cbef2dfb6e59159513916b66dddc5fc4942f1df793e5baf0e71b073e329c1f802884a483a01633c34bfe5143335fb4d7 WHIRLPOOL ad3e6a5f363f6b9bf1fc1c7bcd8c55e514c2ec0fbef3662c2e744cee73ee0d085cda7d96d1a865622e91c96023349fb30e4fe2834eb653b30a169dcdc1b6fea1
+DIST openfire_src_3_10_1.tar.gz 128476328 SHA256 176c53103fe8236be404a3531cf2928c51c8620f1ec75db6e5aa8cccc62c2944 SHA512 24eadd168f31972d19e1fdc2c47ed8515d1407a3741a898264028e1459e37edc08515e9a2a04251f93a423fbce60b07d103d942c42390fbb34720eac9207a6a2 WHIRLPOOL 3f14a2ea1d002222061580283b64bfb503a0d494c5b044998ddfd76244ee0d1f035b9f11a49205508098c038c96392577bbb155f349bd3d8d7b96711af45fb14
+DIST openfire_src_3_10_2.tar.gz 128442398 SHA256 6be2287b27305c19db6daae360b1b898428d289413e8114a35e9ce04c6de3d80 SHA512 8d58c9c1ce03cc5218af91c562d5babc6a9556505f43f2be44996c122ff6c53c1542514143abe4ff34fee48fc5c56238f4999a1f1496ee6e3d13561961adc0d8 WHIRLPOOL 9f313afde26bb5cc6ac9d62d17ef86c2a7661f1f57dd41db1d27139fc3a63349df374c5e135e45790c2c04ee09b6fd934868df863493f380bed0e57cb9850d97
diff --git a/net-im/openfire/files/openfire-confd b/net-im/openfire/files/openfire-confd
new file mode 100644
index 000000000000..35caecef20cc
--- /dev/null
+++ b/net-im/openfire/files/openfire-confd
@@ -0,0 +1,11 @@
+OPENFIRE_HOME=/opt/openfire
+OPENFIRE_LIB="${OPENFIRE_HOME}/lib"
+OPENFIRE_OPTS="-Xmx256m -DopenfireHome=${OPENFIRE_HOME} -Dopenfire.lib.dir=${OPENFIRE_LIB}"
+OPENFIRE_CLASS="-classpath ${OPENFIRE_LIB}/startup.jar"
+OPENFIRE_JAR="-jar ${OPENFIRE_LIB}/startup.jar"
+OPENFIRE_ARGS="-server ${OPENFIRE_OPTS} ${OPENFIRE_CLASS} ${OPENFIRE_JAR}"
+
+
+#JVM used by the openfire server. You can see a list of available vm's in /usr/lib/jvm/
+#But remenber that openfire needs a 1.5 jvm
+GENTOO_VM=sun-jdk-1.5
diff --git a/net-im/openfire/files/openfire-initd b/net-im/openfire/files/openfire-initd
new file mode 100644
index 000000000000..b9af618ba47a
--- /dev/null
+++ b/net-im/openfire/files/openfire-initd
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+
+depend() {
+ need net
+ provide jabber-server
+}
+
+start() {
+ [ -d /var/run/jabber ] || mkdir /var/run/jabber
+ #source /etc/env.d/java/20sun-jdk-1.5.0.06
+ #OPENFIRE_CMD="${JAVA_HOME}/bin/java"
+ OPENFIRE_CMD=`GENTOO_VM=${GENTOO_VM} java-config -J`
+
+ ebegin "Starting Openfire Server"
+ start-stop-daemon \
+ --user jabber \
+ --background \
+ --make-pidfile \
+ --pidfile /var/run/jabber/openfire.pid \
+ --start \
+ --exec ${OPENFIRE_CMD} -- ${OPENFIRE_ARGS} > /var/log/openfire.log 2>&1
+ eend
+}
+
+stop() {
+ ebegin "Stopping Openfire Messenger"
+ start-stop-daemon --pidfile /var/run/jabber/openfire.pid --stop
+ eend
+}
diff --git a/net-im/openfire/files/openfire.service b/net-im/openfire/files/openfire.service
new file mode 100644
index 000000000000..6f2ff26ed497
--- /dev/null
+++ b/net-im/openfire/files/openfire.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Openfire XMPP Server
+After=network.target
+
+[Service]
+User=jabber
+Group=jabber
+PrivateTmp=true
+ExecStart=/usr/bin/java -server -Xmx256m -DopenfireHome=/opt/openfire -Dopenfire.lib.dir=/opt/openfire/lib -classpath /opt/openfire/lib/startup.jar -jar /opt/openfire/lib/startup.jar
+SuccessExitStatus=143 SIGKILL
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/openfire/metadata.xml b/net-im/openfire/metadata.xml
new file mode 100644
index 000000000000..7776b9877bd3
--- /dev/null
+++ b/net-im/openfire/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>net-im</herd>
+ <maintainer>
+ <email>slyfox@gentoo.org</email>
+ <name>Sergei Trofimovich</name>
+ </maintainer>
+ <longdescription>
+ Openfire is a Java implementation of a complete Jabber
+ server. It includes a web based administration interface, conference
+ support and a web/client support system.
+ </longdescription>
+</pkgmetadata>
diff --git a/net-im/openfire/openfire-3.10.0.ebuild b/net-im/openfire/openfire-3.10.0.ebuild
new file mode 100644
index 000000000000..cf4db2476dca
--- /dev/null
+++ b/net-im/openfire/openfire-3.10.0.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 eutils java-pkg-2 java-ant-2 systemd
+
+MY_P=${PN}_src_${PV//./_}
+DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
+HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
+SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND="net-im/jabber-base
+ ~dev-java/ant-contrib-1.0_beta2
+ >=virtual/jdk-1.7"
+
+S=${WORKDIR}/${PN}_src
+
+pkg_setup() {
+ if [[ -f /etc/env.d/98openfire ]]; then
+ einfo "This is an upgrade"
+ ewarn "As the plugin API changed, at least these plugins need to be updated also:"
+ ewarn "User Search, IM Gateway, Fastpath, Monitoring"
+ ewarn "they can be downloaded via Admin Console or at"
+ ewarn " ${HOMEPAGE}"
+ else
+ ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
+ ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
+ ewarn "For more info see bug #139708"
+ sleep 11
+ fi
+ java-pkg-2_pkg_setup
+}
+
+src_compile() {
+ # Jikes doesn't support -source 1.5
+ java-pkg_filter-compiler jikes
+
+ ANT_TASKS="ant-contrib"
+ eant -f build/build.xml openfire plugins $(use_doc)
+
+ # delete nativeAuth prebuilt libs:
+ # uses outdated unmaintained libshaj, does not support amd64
+ rm -rfv target/openfire/resources/nativeAuth || dir
+}
+
+src_install() {
+ dodir /opt/openfire
+
+ newinitd "${FILESDIR}"/openfire-initd openfire
+ newconfd "${FILESDIR}"/openfire-confd openfire
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ dodir /opt/openfire/conf
+ insinto /opt/openfire/conf
+ newins target/openfire/conf/openfire.xml openfire.xml.sample
+ newins target/openfire/conf/security.xml security.xml.sample
+
+ dodir /opt/openfire/logs
+ keepdir /opt/openfire/logs
+
+ dodir /opt/openfire/lib
+ insinto /opt/openfire/lib
+ doins target/openfire/lib/*
+
+ dodir /opt/openfire/plugins
+ insinto /opt/openfire/plugins
+ doins -r target/openfire/plugins/*
+
+ dodir /opt/openfire/resources
+ insinto /opt/openfire/resources
+ doins -r target/openfire/resources/*
+
+ if use doc; then
+ dohtml -r documentation/docs/*
+ fi
+ dodoc documentation/dist/*
+
+ #Protect ssl key on upgrade
+ dodir /etc/env.d/
+ echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
+}
+
+pkg_postinst() {
+ local src
+ local dst
+
+ # http://community.igniterealtime.org/thread/52289
+ for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
+ do
+ src="${dst}".sample
+ if [[ -f "${dst}" ]]; then
+ einfo "Leaving old '${dst}'"
+ else
+ einfo "Created default '${dst}'. Please edit."
+ cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
+ chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
+ fi
+ done
+ chown -R jabber:jabber "${ROOT}"/opt/openfire
+}
diff --git a/net-im/openfire/openfire-3.10.1.ebuild b/net-im/openfire/openfire-3.10.1.ebuild
new file mode 100644
index 000000000000..6ccd462ed388
--- /dev/null
+++ b/net-im/openfire/openfire-3.10.1.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 eutils java-pkg-2 java-ant-2 systemd
+
+MY_P=${PN}_src_${PV//./_}
+DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
+HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
+SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND="net-im/jabber-base
+ ~dev-java/ant-contrib-1.0_beta2
+ >=virtual/jdk-1.7"
+
+S=${WORKDIR}/${PN}_src
+
+pkg_setup() {
+ if [[ -f /etc/env.d/98openfire ]]; then
+ einfo "This is an upgrade"
+ ewarn "As the plugin API changed, at least these plugins need to be updated also:"
+ ewarn "User Search, IM Gateway, Fastpath, Monitoring"
+ ewarn "they can be downloaded via Admin Console or at"
+ ewarn " ${HOMEPAGE}"
+ else
+ ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
+ ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
+ ewarn "For more info see bug #139708"
+ sleep 11
+ fi
+ java-pkg-2_pkg_setup
+}
+
+src_compile() {
+ # Jikes doesn't support -source 1.5
+ java-pkg_filter-compiler jikes
+
+ ANT_TASKS="ant-contrib"
+ eant -f build/build.xml openfire plugins $(use_doc)
+
+ # delete nativeAuth prebuilt libs:
+ # uses outdated unmaintained libshaj, does not support amd64
+ rm -rfv target/openfire/resources/nativeAuth || dir
+}
+
+src_install() {
+ dodir /opt/openfire
+
+ newinitd "${FILESDIR}"/openfire-initd openfire
+ newconfd "${FILESDIR}"/openfire-confd openfire
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ dodir /opt/openfire/conf
+ insinto /opt/openfire/conf
+ newins target/openfire/conf/openfire.xml openfire.xml.sample
+ newins target/openfire/conf/security.xml security.xml.sample
+
+ dodir /opt/openfire/logs
+ keepdir /opt/openfire/logs
+
+ dodir /opt/openfire/lib
+ insinto /opt/openfire/lib
+ doins target/openfire/lib/*
+
+ dodir /opt/openfire/plugins
+ insinto /opt/openfire/plugins
+ doins -r target/openfire/plugins/*
+
+ dodir /opt/openfire/resources
+ insinto /opt/openfire/resources
+ doins -r target/openfire/resources/*
+
+ if use doc; then
+ dohtml -r documentation/docs/*
+ fi
+ dodoc documentation/dist/*
+
+ #Protect ssl key on upgrade
+ dodir /etc/env.d/
+ echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
+}
+
+pkg_postinst() {
+ local src
+ local dst
+
+ # http://community.igniterealtime.org/thread/52289
+ for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
+ do
+ src="${dst}".sample
+ if [[ -f "${dst}" ]]; then
+ einfo "Leaving old '${dst}'"
+ else
+ einfo "Created default '${dst}'. Please edit."
+ cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
+ chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
+ fi
+ done
+ chown -R jabber:jabber "${ROOT}"/opt/openfire
+}
diff --git a/net-im/openfire/openfire-3.10.2.ebuild b/net-im/openfire/openfire-3.10.2.ebuild
new file mode 100644
index 000000000000..6ccd462ed388
--- /dev/null
+++ b/net-im/openfire/openfire-3.10.2.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 eutils java-pkg-2 java-ant-2 systemd
+
+MY_P=${PN}_src_${PV//./_}
+DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
+HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
+SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND="net-im/jabber-base
+ ~dev-java/ant-contrib-1.0_beta2
+ >=virtual/jdk-1.7"
+
+S=${WORKDIR}/${PN}_src
+
+pkg_setup() {
+ if [[ -f /etc/env.d/98openfire ]]; then
+ einfo "This is an upgrade"
+ ewarn "As the plugin API changed, at least these plugins need to be updated also:"
+ ewarn "User Search, IM Gateway, Fastpath, Monitoring"
+ ewarn "they can be downloaded via Admin Console or at"
+ ewarn " ${HOMEPAGE}"
+ else
+ ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
+ ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
+ ewarn "For more info see bug #139708"
+ sleep 11
+ fi
+ java-pkg-2_pkg_setup
+}
+
+src_compile() {
+ # Jikes doesn't support -source 1.5
+ java-pkg_filter-compiler jikes
+
+ ANT_TASKS="ant-contrib"
+ eant -f build/build.xml openfire plugins $(use_doc)
+
+ # delete nativeAuth prebuilt libs:
+ # uses outdated unmaintained libshaj, does not support amd64
+ rm -rfv target/openfire/resources/nativeAuth || dir
+}
+
+src_install() {
+ dodir /opt/openfire
+
+ newinitd "${FILESDIR}"/openfire-initd openfire
+ newconfd "${FILESDIR}"/openfire-confd openfire
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ dodir /opt/openfire/conf
+ insinto /opt/openfire/conf
+ newins target/openfire/conf/openfire.xml openfire.xml.sample
+ newins target/openfire/conf/security.xml security.xml.sample
+
+ dodir /opt/openfire/logs
+ keepdir /opt/openfire/logs
+
+ dodir /opt/openfire/lib
+ insinto /opt/openfire/lib
+ doins target/openfire/lib/*
+
+ dodir /opt/openfire/plugins
+ insinto /opt/openfire/plugins
+ doins -r target/openfire/plugins/*
+
+ dodir /opt/openfire/resources
+ insinto /opt/openfire/resources
+ doins -r target/openfire/resources/*
+
+ if use doc; then
+ dohtml -r documentation/docs/*
+ fi
+ dodoc documentation/dist/*
+
+ #Protect ssl key on upgrade
+ dodir /etc/env.d/
+ echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
+}
+
+pkg_postinst() {
+ local src
+ local dst
+
+ # http://community.igniterealtime.org/thread/52289
+ for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
+ do
+ src="${dst}".sample
+ if [[ -f "${dst}" ]]; then
+ einfo "Leaving old '${dst}'"
+ else
+ einfo "Created default '${dst}'. Please edit."
+ cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
+ chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
+ fi
+ done
+ chown -R jabber:jabber "${ROOT}"/opt/openfire
+}
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
new file mode 100644
index 000000000000..4f9c38f7fb6e
--- /dev/null
+++ b/net-im/pidgin/Manifest
@@ -0,0 +1,3 @@
+DIST pidgin-2.10.10.tar.bz2 9409485 SHA256 dc6b95512eaec75aef170aabce471491fc70584932599dfead20f1f1c45c822d SHA512 79c6e0b382b24b1f9208337afaf5a11de8701b7e4b84be94696df8f7d36d8126eba935144e9b764c50d98a2cc9cdcd7d26891f9d9f93924a8a7065b0540c5d37 WHIRLPOOL 5351bf6cadb3215c246dbabdc75e5f400600516bfa3864a48b647d280ba2736fb29c86717da229ff2a5fe12e57e9154ca60a3be4edda94481cdc98b0c3ec0647
+DIST pidgin-2.10.11.tar.bz2 9458050 SHA256 f2ae211341fc77efb9945d40e9932aa535cdf3a6c8993fe7919fca8cc1c04007 SHA512 774710ab087cb56e349dc1d5e45dbfcbe06b9a8f792abe5d201b0860620d502009f31563cfe5316f4c815345427b6c273b8f9694deb600848957c825fd967029 WHIRLPOOL 24f31ee6ce40e69f644d55f2135644172e8314a64080384eb901ae2b7aba631fbde98cab6cb798f10dd870ecd96374b451cb3ad11d567dc48dcb25f5cf499223
+DIST pidgin-eds-3.6.patch.bz2 2352 SHA256 321185dd5f44e502f671b17e84fa1ca2e08a3f7c79ed211c0bb92710700bcc41 SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 WHIRLPOOL 5c1d3e933bdfa4b1f20f98dbf8b5c1669eb857b9db60dacae488fa04331300618df2f1265e4fb2e58ed31b24229df0edb8c30970d8172fd65ca7fa03bc0e3805
diff --git a/net-im/pidgin/files/pidgin-2.10.0-gold.patch b/net-im/pidgin/files/pidgin-2.10.0-gold.patch
new file mode 100644
index 000000000000..819bfdc5c6bf
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.0-gold.patch
@@ -0,0 +1,30 @@
+ pidgin/Makefile.am | 2 +-
+ pidgin/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
+index b6a5bd4..96d207d 100644
+--- a/pidgin/Makefile.am
++++ b/pidgin/Makefile.am
+@@ -158,7 +158,7 @@ pidgin_LDADD = \
+ $(GTKSPELL_LIBS) \
+ $(LIBXML_LIBS) \
+ $(GTK_LIBS) \
+- $(top_builddir)/libpurple/libpurple.la
++ $(top_builddir)/libpurple/libpurple.la -lm
+
+ if USE_INTERNAL_LIBGADU
+ INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+diff --git a/pidgin/Makefile.in b/pidgin/Makefile.in
+index 615c196..0293e5c 100644
+--- a/pidgin/Makefile.in
++++ b/pidgin/Makefile.in
+@@ -607,7 +607,7 @@ EXTRA_DIST = \
+ @ENABLE_GTK_TRUE@ $(GTKSPELL_LIBS) \
+ @ENABLE_GTK_TRUE@ $(LIBXML_LIBS) \
+ @ENABLE_GTK_TRUE@ $(GTK_LIBS) \
+-@ENABLE_GTK_TRUE@ $(top_builddir)/libpurple/libpurple.la
++@ENABLE_GTK_TRUE@ $(top_builddir)/libpurple/libpurple.la -lm
+
+ @ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+ @ENABLE_GTK_TRUE@AM_CPPFLAGS = \
diff --git a/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch b/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch
new file mode 100644
index 000000000000..555ef8c1ab16
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch
@@ -0,0 +1,23 @@
+diff -urN pidgin-2.10.10.orig/configure.ac pidgin-2.10.10/configure.ac
+--- pidgin-2.10.10.orig/configure.ac 2014-10-17 04:19:33.000000000 +0400
++++ pidgin-2.10.10/configure.ac 2014-10-28 15:56:27.853702740 +0300
+@@ -569,18 +569,10 @@
+ dnl # Check for stuff needed by the Evolution integration plugin.
+ dnl #######################################################################
+ if test "x$enable_gevolution" = "xyes"; then
+- evo_deps="libebook-1.2 libedata-book-1.2 evolution-data-server-1.2 < 3.6"
++ evo_deps="libebook-1.2 libedata-book-1.2 evolution-data-server-1.2 >= 3.6"
+ PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, , [
+ enable_gevolution="no"
+ ])
+- if test "x$enable_gevolution" = "xno"; then
+- evo_deps="libebook-1.0 libedata-book-1.0"
+- PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, [
+- enable_gevolution="yes"
+- ], [
+- enable_gevolution="no"
+- ])
+- fi
+ if test "x$enable_gevolution" = "xyes"; then
+ AC_DEFINE(HAVE_EVOLUTION_ADDRESSBOOK, 1, [Define if we're using evolution addressbook.])
+ AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
diff --git a/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch b/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
new file mode 100644
index 000000000000..370ac62a6e23
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
@@ -0,0 +1,24 @@
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 51471b1..81c57ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,6 +635,8 @@ AC_ARG_WITH(ncurses-headers, [AC_HELP_STRING([--with-ncurses-headers=DIR],
+ [compile finch against the ncurses includes in DIR])],
+ [ac_ncurses_includes="$withval"], [ac_ncurses_includes=""])
+ if test "x$enable_consoleui" = "xyes"; then
++ PKG_CHECK_MODULES([GNT], [ncursesw panelw], [], [
++ PKG_CHECK_MODULES([GNT], [ncurses panel], [], [
+ AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_consoleui=no])
+ AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"],
+ [enable_consoleui=no], [$GNT_LIBS])
+@@ -699,6 +701,7 @@ if test "x$enable_consoleui" = "xyes"; then
+ fi
+ fi
+ fi
++ ])])
+ fi
+
+ if test "x$force_finch" = "xyes" -a "x$enable_consoleui" != "xyes"; then
diff --git a/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch b/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch
new file mode 100644
index 000000000000..4cec32663808
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch
@@ -0,0 +1,10 @@
+--- a/pidgin/Makefile.am 2014-02-02 22:29:20.000000000 +0100
++++ b/pidgin/Makefile.am 2014-02-14 19:35:24.347547795 +0100
+@@ -154,6 +154,7 @@
+ $(GSTREAMER_LIBS) \
+ $(XSS_LIBS) \
+ $(SM_LIBS) \
++ $(X11_LIBS) \
+ $(INTLLIBS) \
+ $(GTKSPELL_LIBS) \
+ $(LIBXML_LIBS) \
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
new file mode 100644
index 000000000000..7a986a0958f0
--- /dev/null
+++ b/net-im/pidgin/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-im</herd>
+ <maintainer>
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <longdescription>
+ Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes. You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SILC, SIMPLE, and Zephyr.
+ </longdescription>
+ <use>
+ <flag name="gadu">Enable Gadu Gadu protocol support</flag>
+ <flag name="groupwise">Enable Novell Groupwise protocol support</flag>
+ <flag name="gstreamer">Enables voice and video sessions</flag>
+ <flag name="gtk">Builds Pidgin, the GTK+ interface</flag>
+ <flag name="meanwhile">Enable meanwhile support for Sametime protocol</flag>
+ <flag name="mxit">Enable mxit protocol support</flag>
+ <flag name="ncurses">Build finch, console interface</flag>
+ <flag name="prediction">Enable Contact Availability Prediction plugin</flag>
+ <flag name="python">Build libgnt (GLib Ncurses Toolkit used by finch) with python scripting support</flag>
+ <flag name="silc">Enable SILC protocol support</flag>
+ <flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag>
+ <flag name="zephyr">Enable Zephyr protocol support</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">pidgin</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/pidgin/pidgin-2.10.10.ebuild b/net-im/pidgin/pidgin-2.10.10.ebuild
new file mode 100644
index 000000000000..3d25bc065288
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.10.10.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 python3_3 )
+inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://pidgin.im/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+ http://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
+IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
+IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+IUSE+=" aqua"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+ >=dev-libs/glib-2.16
+ >=dev-libs/libxml2-2.6.18
+ ncurses? ( sys-libs/ncurses[unicode]
+ dbus? ( ${PYTHON_DEPS} )
+ python? ( ${PYTHON_DEPS} ) )
+ gtk? (
+ >=x11-libs/gtk+-2.10:2[aqua=]
+ x11-libs/libSM
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ spell? ( >=app-text/gtkspell-2.0.2:2 )
+ eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+ prediction? ( >=dev-db/sqlite-3.3:3 ) )
+ gstreamer? ( =media-libs/gstreamer-0.10*
+ =media-libs/gst-plugins-good-0.10*
+ net-libs/farstream:0.1
+ media-plugins/gst-plugins-meta:0.10
+ media-plugins/gst-plugins-gconf:0.10 )
+ zeroconf? ( net-dns/avahi[dbus] )
+ dbus? ( >=dev-libs/dbus-glib-0.71
+ >=sys-apps/dbus-0.90
+ dev-python/dbus-python )
+ perl? ( >=dev-lang/perl-5.16:= )
+ gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls]
+ >=net-libs/libgadu-1.11.0[-ssl] ) )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( >=dev-libs/nss-3.15.4 )
+ meanwhile? ( net-libs/meanwhile )
+ silc? ( >=net-im/silc-toolkit-1.0.1 )
+ tcl? ( dev-lang/tcl:0= )
+ tk? ( dev-lang/tk:0= )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ networkmanager? ( net-misc/networkmanager )
+ idn? ( net-dns/libidn )
+ !<x11-plugins/pidgin-facebookchat-1.69-r1"
+ # Mono support crashes pidgin
+ #mono? ( dev-lang/mono )"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="$RDEPEND
+ dev-lang/perl
+ dev-perl/XML-Parser
+ virtual/pkgconfig
+ gtk? ( x11-proto/scrnsaverproto
+ ${NLS_DEPEND} )
+ dbus? ( ${PYTHON_DEPS} )
+ doc? ( app-doc/doxygen )
+ !gtk? ( nls? ( ${NLS_DEPEND} ) )"
+
+DOCS="AUTHORS HACKING NEWS README ChangeLog"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ dbus? ( ${PYTHON_REQUIRED_USE} )"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
+
+# List of plugins
+# app-accessibility/pidgin-festival
+# net-im/librvp
+# x11-plugins/guifications
+# x11-plugins/msn-pecan
+# x11-plugins/pidgin-encryption
+# x11-plugins/pidgin-extprefs
+# x11-plugins/pidgin-hotkeys
+# x11-plugins/pidgin-latex
+# x11-plugins/pidgintex
+# x11-plugins/pidgin-libnotify
+# x11-plugins/pidgin-mbpurple
+# x11-plugins/pidgin-bot-sentry
+# x11-plugins/pidgin-otr
+# x11-plugins/pidgin-rhythmbox
+# x11-plugins/purple-plugin_pack
+# x11-themes/pidgin-smileys
+# x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+# x11-plugins/pidgin-audacious-remote
+# x11-plugins/pidgin-autoanswer
+# x11-plugins/pidgin-birthday-reminder
+# x11-plugins/pidgin-blinklight
+# x11-plugins/pidgin-convreverse
+# x11-plugins/pidgin-embeddedvideo
+# x11-plugins/pidgin-extended-blist-sort
+# x11-plugins/pidgin-gfire
+# x11-plugins/pidgin-lastfm
+# x11-plugins/pidgin-sendscreenshot
+# x11-plugins/pidgimpd
+
+pkg_setup() {
+ if ! use gtk && ! use ncurses ; then
+ elog "You did not pick the ncurses or gtk use flags, only libpurple"
+ elog "will be built."
+ fi
+ if use python || use dbus ; then
+ python-single-r1_pkg_setup
+ fi
+
+ # dbus is enabled, no way to disable linkage with python => python is enabled
+ #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+ if use gtk && ! use nls; then
+ ewarn "gtk build => nls is enabled!"
+ fi
+ if use dbus && ! use python; then
+ elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
+ "${WORKDIR}/${PN}-eds-3.6.patch" \
+ "${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch" \
+ "${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
+ epatch_user
+
+ eautoreconf
+}
+
+src_configure() {
+ # Stabilize things, for your own good
+ strip-flags
+ replace-flags -O? -O2
+
+ local myconf
+
+ if use gadu; then
+ DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
+ myconf="${myconf} --with-gadu-includes=."
+ myconf="${myconf} --with-gadu-libs=."
+ fi
+
+ use groupwise && DYNAMIC_PRPLS+=",novell"
+ use silc && DYNAMIC_PRPLS+=",silc"
+ use meanwhile && DYNAMIC_PRPLS+=",sametime"
+ use mxit && DYNAMIC_PRPLS+=",mxit"
+ use zephyr && DYNAMIC_PRPLS+=",zephyr"
+ use zeroconf && DYNAMIC_PRPLS+=",bonjour"
+
+ if use gnutls; then
+ einfo "Disabling NSS, using GnuTLS"
+ myconf+=" --enable-nss=no --enable-gnutls=yes"
+ myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
+ myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
+ else
+ einfo "Disabling GnuTLS, using NSS"
+ myconf+=" --enable-gnutls=no --enable-nss=yes"
+ fi
+
+ if use dbus || { use ncurses && use python; }; then
+ myconf+=" --with-python=${PYTHON}"
+ else
+ myconf+=" --without-python"
+ fi
+
+ econf \
+ $(use_enable ncurses consoleui) \
+ $(use_enable gtk gtkui) \
+ $(use_enable gtk sm) \
+ $(use gtk || use_enable nls) \
+ $(use gtk && echo "--enable-nls") \
+ $(use gtk && use_enable xscreensaver screensaver) \
+ $(use gtk && use_enable prediction cap) \
+ $(use gtk && use_enable eds gevolution) \
+ $(use gtk && use_enable spell gtkspell) \
+ $(use_enable perl) \
+ $(use_enable tk) \
+ $(use_enable tcl) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable meanwhile) \
+ $(use_enable gstreamer) \
+ $(use_enable gstreamer farstream) \
+ $(use_enable gstreamer vv) \
+ $(use_enable sasl cyrus-sasl ) \
+ $(use_enable doc doxygen) \
+ $(use_enable networkmanager nm) \
+ $(use_enable zeroconf avahi) \
+ $(use_enable idn) \
+ --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
+ --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
+ --disable-mono \
+ --x-includes="${EPREFIX}"/usr/include/X11 \
+ ${myconf}
+ #$(use_enable mono) \
+}
+
+src_install() {
+ gnome2_src_install
+ if use gtk; then
+ # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
+ # implementations that are not complient with new hicolor theme yet, #323355
+ local pixmapdir
+ for d in 16 22 32 48; do
+ pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+ mkdir "${pixmapdir}" || die
+ pushd "${pixmapdir}" >/dev/null || die
+ for f in ../status/*; do
+ ln -s ${f} || die
+ done
+ popd >/dev/null
+ done
+ fi
+ use perl && perl_delete_localpod
+
+ if use python || use dbus ; then
+ python_fix_shebang "${D}"
+ python_optimize
+ fi
+
+ dodoc finch/plugins/pietray.py
+ docompress -x /usr/share/doc/${PF}/pietray.py
+
+ prune_libtool_files --all
+}
diff --git a/net-im/pidgin/pidgin-2.10.11.ebuild b/net-im/pidgin/pidgin-2.10.11.ebuild
new file mode 100644
index 000000000000..d40123b18007
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.10.11.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://pidgin.im/"
+SRC_URI="
+ mirror://sourceforge/${PN}/${P}.tar.bz2
+ http://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
+IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
+IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+IUSE+=" aqua"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+ >=dev-libs/glib-2.16
+ >=dev-libs/libxml2-2.6.18
+ ncurses? ( sys-libs/ncurses[unicode]
+ dbus? ( ${PYTHON_DEPS} )
+ python? ( ${PYTHON_DEPS} ) )
+ gtk? (
+ >=x11-libs/gtk+-2.10:2[aqua=]
+ x11-libs/libSM
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ spell? ( >=app-text/gtkspell-2.0.2:2 )
+ eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+ prediction? ( >=dev-db/sqlite-3.3:3 ) )
+ gstreamer? ( =media-libs/gstreamer-0.10*
+ =media-libs/gst-plugins-good-0.10*
+ net-libs/farstream:0.1
+ media-plugins/gst-plugins-meta:0.10
+ media-plugins/gst-plugins-gconf:0.10 )
+ zeroconf? ( net-dns/avahi[dbus] )
+ dbus? ( >=dev-libs/dbus-glib-0.71
+ >=sys-apps/dbus-0.90
+ dev-python/dbus-python )
+ perl? ( >=dev-lang/perl-5.16:= )
+ gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls]
+ >=net-libs/libgadu-1.11.0[-ssl] ) )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( >=dev-libs/nss-3.15.4 )
+ meanwhile? ( net-libs/meanwhile )
+ silc? ( >=net-im/silc-toolkit-1.0.1 )
+ tcl? ( dev-lang/tcl:0= )
+ tk? ( dev-lang/tk:0= )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ networkmanager? ( net-misc/networkmanager )
+ idn? ( net-dns/libidn )
+ !<x11-plugins/pidgin-facebookchat-1.69-r1"
+ # Mono support crashes pidgin
+ #mono? ( dev-lang/mono )"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="$RDEPEND
+ dev-lang/perl
+ dev-perl/XML-Parser
+ virtual/pkgconfig
+ gtk? ( x11-proto/scrnsaverproto
+ ${NLS_DEPEND} )
+ dbus? ( ${PYTHON_DEPS} )
+ doc? ( app-doc/doxygen )
+ !gtk? ( nls? ( ${NLS_DEPEND} ) )"
+
+DOCS="AUTHORS HACKING NEWS README ChangeLog"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ dbus? ( ${PYTHON_REQUIRED_USE} )"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
+
+# List of plugins
+# app-accessibility/pidgin-festival
+# net-im/librvp
+# x11-plugins/guifications
+# x11-plugins/msn-pecan
+# x11-plugins/pidgin-encryption
+# x11-plugins/pidgin-extprefs
+# x11-plugins/pidgin-hotkeys
+# x11-plugins/pidgin-latex
+# x11-plugins/pidgintex
+# x11-plugins/pidgin-libnotify
+# x11-plugins/pidgin-mbpurple
+# x11-plugins/pidgin-bot-sentry
+# x11-plugins/pidgin-otr
+# x11-plugins/pidgin-rhythmbox
+# x11-plugins/purple-plugin_pack
+# x11-themes/pidgin-smileys
+# x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+# x11-plugins/pidgin-audacious-remote
+# x11-plugins/pidgin-autoanswer
+# x11-plugins/pidgin-birthday-reminder
+# x11-plugins/pidgin-blinklight
+# x11-plugins/pidgin-convreverse
+# x11-plugins/pidgin-embeddedvideo
+# x11-plugins/pidgin-extended-blist-sort
+# x11-plugins/pidgin-gfire
+# x11-plugins/pidgin-lastfm
+# x11-plugins/pidgin-sendscreenshot
+# x11-plugins/pidgimpd
+
+pkg_setup() {
+ if ! use gtk && ! use ncurses ; then
+ elog "You did not pick the ncurses or gtk use flags, only libpurple"
+ elog "will be built."
+ fi
+ if use python || use dbus ; then
+ python-single-r1_pkg_setup
+ fi
+
+ # dbus is enabled, no way to disable linkage with python => python is enabled
+ #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+ if use gtk && ! use nls; then
+ ewarn "gtk build => nls is enabled!"
+ fi
+ if use dbus && ! use python; then
+ elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-2.10.0-gold.patch \
+ "${WORKDIR}"/${PN}-eds-3.6.patch \
+ "${FILESDIR}"/${PN}-2.10.9-fix-gtkmedia.patch \
+ "${FILESDIR}"/${PN}-2.10.10-eds-3.6-configure.ac.patch \
+ "${FILESDIR}"/${P}-tinfo.patch
+ epatch_user
+
+ eautoreconf
+}
+
+src_configure() {
+ # Stabilize things, for your own good
+ strip-flags
+ replace-flags -O? -O2
+
+ local myconf
+
+ if use gadu; then
+ DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
+ myconf="${myconf} --with-gadu-includes=."
+ myconf="${myconf} --with-gadu-libs=."
+ fi
+
+ use groupwise && DYNAMIC_PRPLS+=",novell"
+ use silc && DYNAMIC_PRPLS+=",silc"
+ use meanwhile && DYNAMIC_PRPLS+=",sametime"
+ use mxit && DYNAMIC_PRPLS+=",mxit"
+ use zephyr && DYNAMIC_PRPLS+=",zephyr"
+ use zeroconf && DYNAMIC_PRPLS+=",bonjour"
+
+ if use gnutls; then
+ einfo "Disabling NSS, using GnuTLS"
+ myconf+=" --enable-nss=no --enable-gnutls=yes"
+ myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
+ myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
+ else
+ einfo "Disabling GnuTLS, using NSS"
+ myconf+=" --enable-gnutls=no --enable-nss=yes"
+ fi
+
+ if use dbus || { use ncurses && use python; }; then
+ myconf+=" --with-python=${PYTHON}"
+ else
+ myconf+=" --without-python"
+ fi
+
+ econf \
+ $(use_enable ncurses consoleui) \
+ $(use_enable gtk gtkui) \
+ $(use_enable gtk sm) \
+ $(use gtk || use_enable nls) \
+ $(use gtk && echo "--enable-nls") \
+ $(use gtk && use_enable xscreensaver screensaver) \
+ $(use gtk && use_enable prediction cap) \
+ $(use gtk && use_enable eds gevolution) \
+ $(use gtk && use_enable spell gtkspell) \
+ $(use_enable perl) \
+ $(use_enable tk) \
+ $(use_enable tcl) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable meanwhile) \
+ $(use_enable gstreamer) \
+ $(use_enable gstreamer farstream) \
+ $(use_enable gstreamer vv) \
+ $(use_enable sasl cyrus-sasl ) \
+ $(use_enable doc doxygen) \
+ $(use_enable networkmanager nm) \
+ $(use_enable zeroconf avahi) \
+ $(use_enable idn) \
+ --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
+ --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
+ --disable-mono \
+ --x-includes="${EPREFIX}"/usr/include/X11 \
+ ${myconf}
+ #$(use_enable mono) \
+}
+
+src_install() {
+ gnome2_src_install
+ if use gtk; then
+ # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
+ # implementations that are not complient with new hicolor theme yet, #323355
+ local pixmapdir
+ for d in 16 22 32 48; do
+ pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+ mkdir "${pixmapdir}" || die
+ pushd "${pixmapdir}" >/dev/null || die
+ for f in ../status/*; do
+ ln -s ${f} || die
+ done
+ popd >/dev/null
+ done
+ fi
+ use perl && perl_delete_localpod
+
+ if use python || use dbus ; then
+ python_fix_shebang "${D}"
+ python_optimize
+ fi
+
+ dodoc finch/plugins/pietray.py
+ docompress -x /usr/share/doc/${PF}/pietray.py
+
+ prune_libtool_files --all
+}
diff --git a/net-im/pork/Manifest b/net-im/pork/Manifest
new file mode 100644
index 000000000000..b3d3d311223d
--- /dev/null
+++ b/net-im/pork/Manifest
@@ -0,0 +1 @@
+DIST pork-0.99.8.1.tar.gz 490425 SHA256 f0d4cad21017fd75b3c200342c54dd56d9ff7bc38d1e9b3c8ba686ba53d585ed SHA512 20efae37c847e4f4552280832c252341f3d541a08f94df21b780d130bb9dc61cf3464f99e119c01a540572a96340d84ed04e81458c0908357693b6af50d6e77f WHIRLPOOL d507920b28046172c607be05b1acbbbcef0889dd2ca1a39d2751e4753939eac868a43076f3281be8f9336eb226528f92fcdb1767c9909b68f0ce482718c108f6
diff --git a/net-im/pork/files/pork-0.99.8.1-tinfo.patch b/net-im/pork/files/pork-0.99.8.1-tinfo.patch
new file mode 100644
index 000000000000..c1f9e6bbb945
--- /dev/null
+++ b/net-im/pork/files/pork-0.99.8.1-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -114,6 +114,8 @@
+
+ AC_CHECK_LIB(ncurses, resizeterm, AC_DEFINE(HAVE_RESIZETERM, 1, [Define to 1 if you have the 'resizeterm' function in -lncurses.]))
+
++AC_SEARCH_LIBS(stdscr, tinfo)
++
+ AC_CHECK_TYPE(u_int32_t, uint32_t)
+ if test "$ac_cv_type_u_int32_t" = "no"; then
+ AC_CHECK_TYPE(uint32_t, unsigned int)
diff --git a/net-im/pork/metadata.xml b/net-im/pork/metadata.xml
new file mode 100644
index 000000000000..759bb26ebbf9
--- /dev/null
+++ b/net-im/pork/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>
+ <longdescription>
+ Pork is an AIM client based on the GAIM libraries with an interface similar to IRCII.
+</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">ojnk</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/pork/pork-0.99.8.1.ebuild b/net-im/pork/pork-0.99.8.1.ebuild
new file mode 100644
index 000000000000..dd222c347f6e
--- /dev/null
+++ b/net-im/pork/pork-0.99.8.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Console based AIM client that looks like ircII"
+HOMEPAGE="http://dev.ojnk.net/"
+SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="perl"
+
+RDEPEND="
+ perl? ( dev-lang/perl )
+ sys-libs/ncurses
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-tinfo.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable perl)
+}
+
+src_install() {
+ default
+
+ doman doc/pork.1
+ insinto /usr/share/pork/examples
+ doins examples/blist.txt
+
+ dodoc AUTHORS ChangeLog INSTALL NEWS README STYLE TODO QUICK_START
+}
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
new file mode 100644
index 000000000000..b6c85f057ff2
--- /dev/null
+++ b/net-im/prosody/Manifest
@@ -0,0 +1,2 @@
+DIST prosody-0.9.7.tar.gz 266638 SHA256 dd4b99b39976442055898c933c013598e558beed11d7795d76ffc0f1a87e2e00 SHA512 fc1f0855e7af2132058af493bb9af20f9f1aa3051e6d8550ba9942264d85dc6840085b17e2a0226d4015745407f445c691455d998c4a43a3a9aa2d036a01ce9e WHIRLPOOL 5de40437be364856acbcaa2553aa54119bd46ed0afda9127211ff65ad9b4acea8b7a447452c7555ecfb9a58266cca319ecc2eb2a4959cb4e2390dc99dcf20b82
+DIST prosody-0.9.8.tar.gz 268716 SHA256 9470415c56e0b847089b45fabd48bc1f8211cd525fba56967409d064f4257871 SHA512 08ca8c8028a947a22d68ddc1d7eb93d3d205894102c900ece9e537ef9dd9332e8509e4b170069383e4f9717b52fd41aec2aa9d959e16ddebf0c3d54fe31aef3c WHIRLPOOL ab0b7a7e4324dd5ea59db4c6470f36cd047aa9da240cd987b9159cfa753e6f28cbf33bb726f8e89762e31ec6a09b7915162beb46e7e429159e52e6cb50dd2728
diff --git a/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch b/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch
new file mode 100644
index 000000000000..15c09a24fd80
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch
@@ -0,0 +1,52 @@
+diff -ru prosody-0.9.2/prosody.cfg.lua.dist prosody-0.9.2-gentoo/prosody.cfg.lua.dist
+--- prosody-0.9.2/prosody.cfg.lua.dist 2013-12-08 19:05:39.000000000 +0100
++++ prosody-0.9.2-gentoo/prosody.cfg.lua.dist 2014-01-27 03:00:44.929196948 +0100
+@@ -1,5 +1,3 @@
+--- Prosody Example Configuration File
+---
+ -- Information on configuring Prosody can be found on our
+ -- website at http://prosody.im/doc/configure
+ --
+@@ -7,9 +5,6 @@
+ -- when you have finished by running: luac -p prosody.cfg.lua
+ -- If there are any errors, it will let you know what and where
+ -- they are, otherwise it will keep quiet.
+---
+--- The only thing left to do is rename this file to remove the .dist ending, and fill in the
+--- blanks. Good luck, and happy Jabbering!
+
+
+ ---------- Server-wide settings ----------
+@@ -63,7 +58,7 @@
+ --"http_files"; -- Serve static files from a directory over HTTP
+
+ -- Other specific functionality
+- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
++ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. (Keep enabled for Gentoo.)
+ --"groups"; -- Shared roster support
+ --"announce"; -- Send announcement to all online users
+ --"welcome"; -- Welcome users who register accounts
+@@ -72,6 +67,12 @@
+ --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+ };
+
++-- Settings for Gentoo init script and net-im/jabber-base permissions system:
++daemonize = true;
++prosody_user = "jabber";
++prosody_group = "jabber";
++pidfile = "/var/run/jabber/prosody.pid";
++
+ -- These modules are auto-loaded, but should you want
+ -- to disable them then uncomment them here:
+ modules_disabled = {
+@@ -139,8 +140,8 @@
+ -- Logging configuration
+ -- For advanced logging see http://prosody.im/doc/logging
+ log = {
+- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
+- error = "prosody.err";
++ info = "/var/log/jabber/prosody.log"; -- Change 'info' to 'debug' for verbose logging
++ error = "/var/log/jabber/prosody.err";
+ -- "*syslog"; -- Uncomment this for logging to syslog
+ -- "*console"; -- Log to the console, useful for debugging with daemonize=false
+ }
diff --git a/net-im/prosody/files/prosody.initd-r2 b/net-im/prosody/files/prosody.initd-r2
new file mode 100644
index 000000000000..d88fd6f92f90
--- /dev/null
+++ b/net-im/prosody/files/prosody.initd-r2
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="Prosody is a server for Jabber/XMPP written in Lua."
+description_reload="Reload configuration and reopen log files."
+extra_started_commands="reload"
+pidfile="/var/run/jabber/prosody.pid"
+
+depend() {
+ use dns
+ need net
+ provide jabber-server
+}
+
+checkconfig() {
+ if [ ! -e /etc/jabber/prosody.cfg.lua ] ; then
+ eerror "You need a /etc/jabber/prosody.cfg.lua file to run prosody"
+ return 1
+ fi
+ luac -p /etc/jabber/prosody.cfg.lua
+ return $?
+}
+
+start() {
+ checkconfig || return 1
+ checkpath -q -d -m 0770 -o jabber:jabber "$(dirname ${pidfile})"
+ checkpath -q -f -m 0770 -o jabber:jabber "${pidfile}"
+ checkpath -q -d -m 0750 -o jabber:jabber /var/log/jabber
+ ebegin "Starting Prosody XMPP Server"
+ prosodyctl start
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Prosody XMPP Server"
+ prosodyctl stop
+ eend $?
+}
+
+reload() {
+ checkconfig || return 1
+ ebegin "Reloading configuration of Prosody XMPP Server"
+ prosodyctl reload
+ eend $?
+}
diff --git a/net-im/prosody/files/prosody.service b/net-im/prosody/files/prosody.service
new file mode 100644
index 000000000000..ec00e5445d51
--- /dev/null
+++ b/net-im/prosody/files/prosody.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Prosody XMPP (Jabber) server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/jabber/prosody.pid
+ExecStart=/usr/bin/prosodyctl start
+ExecStop=/usr/bin/prosodyctl stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/prosody/files/prosody.tmpfilesd b/net-im/prosody/files/prosody.tmpfilesd
new file mode 100644
index 000000000000..924ba434659c
--- /dev/null
+++ b/net-im/prosody/files/prosody.tmpfilesd
@@ -0,0 +1 @@
+d /var/run/jabber 710 jabber jabber
diff --git a/net-im/prosody/metadata.xml b/net-im/prosody/metadata.xml
new file mode 100644
index 000000000000..dbc499ac34ae
--- /dev/null
+++ b/net-im/prosody/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>rafaelmartins@gentoo.org</email>
+ </maintainer>
+ <maintainer>
+ <email>klausman@gentoo.org</email>
+ </maintainer>
+ <maintainer>
+ <email>zx2c4@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="libevent">Use libevent for event handling</flag>
+ <flag name="zlib">Support for compressing XMPP streams with mod_compression</flag>
+ <flag name="jit">Use LuaJIT instead of vanilla Lua</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-im/prosody/prosody-0.9.7.ebuild b/net-im/prosody/prosody-0.9.7.ebuild
new file mode 100644
index 000000000000..630a2db198bf
--- /dev/null
+++ b/net-im/prosody/prosody-0.9.7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic multilib systemd versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
+HOMEPAGE="http://prosody.im/"
+SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit"
+
+DEPEND="net-im/jabber-base
+ !jit? ( >=dev-lang/lua-5.1 )
+ jit? ( dev-lang/luajit )
+ >=net-dns/libidn-1.1
+ >=dev-libs/openssl-0.9.8"
+RDEPEND="${DEPEND}
+ >=dev-lua/luaexpat-1.3.0
+ dev-lua/luafilesystem
+ ipv6? ( >=dev-lua/luasocket-3 )
+ !ipv6? ( dev-lua/luasocket )
+ libevent? ( >=dev-lua/luaevent-0.4.3 )
+ mysql? ( dev-lua/luadbi[mysql] )
+ postgres? ( dev-lua/luadbi[postgres] )
+ sqlite? ( dev-lua/luadbi[sqlite] )
+ ssl? ( dev-lua/luasec )
+ zlib? ( dev-lua/lua-zlib )"
+
+S=${WORKDIR}/${MY_P}
+
+JABBER_ETC="/etc/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-0.9.2-cfg.lua.patch"
+ sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+ -e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+ -e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
+ -e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
+ Makefile || die
+}
+
+src_configure() {
+ # the configure script is handcrafted (and yells at unknown options)
+ # hence do not use 'econf'
+ append-cflags -D_GNU_SOURCE
+ luajit=""
+ if use jit; then
+ luajit="--runwith=luajit"
+ fi
+ ./configure \
+ --ostype=linux $luajit \
+ --prefix="/usr" \
+ --sysconfdir="${JABBER_ETC}" \
+ --datadir="${JABBER_SPOOL}" \
+ --with-lua-include=/usr/include \
+ --with-lua-lib=/usr/$(get_libdir)/lua \
+ --cflags="${CFLAGS} -Wall -fPIC" \
+ --ldflags="${LDFLAGS} -shared" \
+ --c-compiler="$(tc-getCC)" \
+ --linker="$(tc-getCC)" \
+ --require-config || die "configure failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ systemd_dounit "${FILESDIR}/${PN}".service
+ systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+ newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
+}
+
+src_test() {
+ cd tests || die
+ ./run_tests.sh || die
+}
diff --git a/net-im/prosody/prosody-0.9.8.ebuild b/net-im/prosody/prosody-0.9.8.ebuild
new file mode 100644
index 000000000000..5b7fa48b9c7a
--- /dev/null
+++ b/net-im/prosody/prosody-0.9.8.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic multilib systemd versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
+HOMEPAGE="http://prosody.im/"
+SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit"
+
+DEPEND="net-im/jabber-base
+ !jit? ( >=dev-lang/lua-5.1:0 )
+ jit? ( dev-lang/luajit:2 )
+ >=net-dns/libidn-1.1
+ dev-libs/openssl:0"
+RDEPEND="${DEPEND}
+ >=dev-lua/luaexpat-1.3.0
+ dev-lua/luafilesystem
+ ipv6? ( >=dev-lua/luasocket-3 )
+ !ipv6? ( dev-lua/luasocket )
+ libevent? ( >=dev-lua/luaevent-0.4.3 )
+ mysql? ( dev-lua/luadbi[mysql] )
+ postgres? ( dev-lua/luadbi[postgres] )
+ sqlite? ( dev-lua/luadbi[sqlite] )
+ ssl? ( dev-lua/luasec )
+ zlib? ( dev-lua/lua-zlib )"
+
+S=${WORKDIR}/${MY_P}
+
+JABBER_ETC="/etc/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-0.9.2-cfg.lua.patch"
+ sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+ -e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+ -e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
+ -e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
+ Makefile || die
+}
+
+src_configure() {
+ # the configure script is handcrafted (and yells at unknown options)
+ # hence do not use 'econf'
+ append-cflags -D_GNU_SOURCE
+ luajit=""
+ if use jit; then
+ luajit="--runwith=luajit"
+ fi
+ ./configure \
+ --ostype=linux $luajit \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/lib64" \
+ --sysconfdir="${JABBER_ETC}" \
+ --datadir="${JABBER_SPOOL}" \
+ --with-lua-include=/usr/include \
+ --with-lua-lib=/usr/$(get_libdir)/lua \
+ --cflags="${CFLAGS} -Wall -fPIC" \
+ --ldflags="${LDFLAGS} -shared" \
+ --c-compiler="$(tc-getCC)" \
+ --linker="$(tc-getCC)" \
+ --require-config || die "configure failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ systemd_dounit "${FILESDIR}/${PN}".service
+ systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+ newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
+}
+
+src_test() {
+ cd tests || die
+ ./run_tests.sh || die
+}
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
new file mode 100644
index 000000000000..266581a98435
--- /dev/null
+++ b/net-im/psi/Manifest
@@ -0,0 +1,18 @@
+DIST psi-0.14.tar.bz2 2168801 SHA256 aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0 SHA512 c68e5384afa1a40f1eb5622aa73dd9b1a7902d77b49cad26ac65bf495d688aff17376a738a98e3ff48d3d154abb3a20aad170b95e35bebd1d4e360268746ab3d WHIRLPOOL 95c577c295fad5e4cd54717c34ea2269156be82c480931cce1f140853eaa24be9bf9635d7c192b5da62acc85c145bb61980e00433466a42481ce9a0c3ce8d4da
+DIST psi-0.14_langpack_for_packagers_2009-12-02.zip 2553616 SHA256 27e5cec1847454c9ac3726122b204d923e87c11e1e37e8960c49c17fd4d74dc2 SHA512 5700534afc8f32843c5c56a678aff710edb6619ae4c6c92763c70553221e0078b881f25aa47a6752cfa58582fe617e797bdff32db3071b91521a5ce7f70bdbc9 WHIRLPOOL 79703d1e8a053ab9c0dd09088b26d4adee85d50d69436bff66475860b2bccda675ec5924b22b074fcebaee7cd56a58966a94e9a59f8468015f967eb701bb858a
+DIST psi-0.15.tar.bz2 1984777 SHA256 593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6 SHA512 17e972adc8dfc541977e3717c21eb694f4e1268e4719e97432f260682867290d7034b98a345b6efd73026f98a425493e9159fef9c0e0af4c83b02e07d29a704a WHIRLPOOL 6a8953fe22342dca7347af78da3ea80d5a61a14caa6d62d6910b81730b07b76f156d8d5e1331b2a96dabe5a261353da7af565d999bc7246c25d0d88e010fd983
+DIST psi-0.15_be.qm 255759 SHA256 0e9dbd9e4e738c8fcdd098dde4a17042600b35346a26d2176caa85f6253b6eb6 SHA512 90d623abe9f031af83185fc76d35d5ac390cd726490c6722bdf9ea5b1a6e0179aca650c230280a6390cc121d0e18cb9e2bd1bfd75d9e817eb4e8584d844ed3ad WHIRLPOOL f9d531127f861e5a07659f71433a12cd1d8ad6b805efb83e2d94d219c1e718a28f1390d7025122cdc94d563de99f8f245f4c8ab0297f622ad5712cc6eb4b9667
+DIST psi-0.15_cs.qm 242386 SHA256 d579a7059466c11d4264d8197188a9be49b82e2af35405053ea772c0edea6718 SHA512 46eb273794a99045702f52e10aae2122dfd3db5a49bf68b27e36bf8a1443d8dfbdbcdf550dd0ac3e3ff3014e52010682880f7e883f0d1a0d41d8a678d1e16f2f WHIRLPOOL d2ae4a6045ea1072045032a726927439fe57ae8dfad813f718dd230b36a794945e0600ad1a55f0ac74d73a0d0be4ccf9ffecc5ec9e289ccef5d28566535fbe31
+DIST psi-0.15_de.qm 261756 SHA256 a9470932306466bd41bf08975b2b36eba0c56a8f265d998700f0e929ff345bae SHA512 3e81826215a784f1f58e633bd0fb4c0322370aa0f9c24d18ee38ff1b8a8e85e833e26349806922d1435b99433ee3296c4432a99c5fd8effc383308e168866cb0 WHIRLPOOL 77b7bbe300e450e53dff8a3175e21a8bae6f80ec0524c85599c37ed091c344cbbc63f829ea880f2b3e4c04e2cd06e9cf768ab0a674b9fb79e6c85b1a89290550
+DIST psi-0.15_fr.qm 269774 SHA256 733ec88f9bfbb30e6b21358b233e39319d3ea64223b211566ce1a0b8fe370d1c SHA512 109036baa476ad55cffd2c8109d6e99b91894eb6807ef394ea945973418af0c32641b705da172026a762e041c93b0412f61793fe6858a6c7af44bfec9c13dd1f WHIRLPOOL b51228b2ae93671aae676a0ee7519b290b6edb738f0ca8789b48a4d5b92ee8b32f99675c5f64cf5575a2d4cbbd5ea50e0001f3e06081914fc5a3d003f6f082c0
+DIST psi-0.15_it.qm 257779 SHA256 16d17cc5578f0ef6e8b2ac8dc433e7e050255014d41f2a56651f968829d2a991 SHA512 0cff1398248f7a4802f883cb912e46f27782556e675cc742af4c257910d029237849ce2cb49413f6464b7808296ea2079e5be6d5eb98b39d0dccb8e93d8d89a4 WHIRLPOOL 5e02f342f31518197477055293ae6c4e7c51931c5f985b1d46dadf7b6ef3fcb0a9af4ffe1766d7aeadab82e4f3a45b563cd88cabecf8ef49ebef3e5b56d1d3d6
+DIST psi-0.15_ja.qm 195566 SHA256 e77209493428ae06581e91435eb05ff96f442b60481dbd1a0a1d340e7ba5afc9 SHA512 e34abc4a64832cd7b4d5292a9de3d4a6e58742aa4f3fc2c0ebe60ee14e89bd8ab37b2706ea3faab6b6e7108f4bfcf7c220aae018710fa041930f23efc410ae43 WHIRLPOOL df8acef571d5686f8947e5a92ba4b4ad78cf64cae5ec205ad85c3fb926b18738ac779c30ff51dadc67853a20ffbfc827022adceef4ecdb2271955889658378fd
+DIST psi-0.15_pl.qm 258292 SHA256 abb03e2ef132a343991bdc7b437fe38d24ae77a2ad39500202d645408b919f40 SHA512 8f7b5012a9d68ef50f53e4b8e3671f1cd78eb30f9a464d99225f6f5d3abeb5cea1e941255d7f8729f664d016b89cf42ceb9bd18e3a7b0d68bd4d62954abc6cb0 WHIRLPOOL 1e9c8637b6753286c159dc73d80326fc2ecaf70a5e1bf92c569aeb74192bbd63e7e0e35e69f518f11599cd5828168b2e0a6280f770f9189c811fbe8a9480237f
+DIST psi-0.15_pt_BR.qm 254917 SHA256 b85d2355ebe32cd38ff091fce0444e4fc584c8a6e59c215d820dcc57fd99e3d4 SHA512 c138b1506d60bc2934dea8f06a34dc2f81c2d7cf8a5c35d95b3bd28a0a77a58f4d7e74d2bf13c55f49bd824d7c262087d14c8fcb9e341a42a966fd782d34a394 WHIRLPOOL c710deaa983f772233d39c719b6b65c929533f816b03745337ecbaff3bd69599b721d82748d81612c53e08ede1e03bb6984619823d1c0c2b0a08d2d230b52d79
+DIST psi-0.15_ru.qm 241491 SHA256 24fd952eb457ee20778f8fa2d7486521ec00571743aa1df51ad63ceb6f368527 SHA512 876695f2501661554a865873f11ad7a466ce96e4b3f896c7b3c1e049647d9968e88f9ea893d4aace8837d4387a936973b2fd36e1034b6856d45bd73088446176 WHIRLPOOL cb18bd74ed3eec6071531c468cdc972e448ad34f79f092c981a13a24f05f2100ec3660dce59033a439733eb0a35dde6cb14c2506b96c16f9ff78e1c4af3527fc
+DIST psi-0.15_sl.qm 248478 SHA256 5be33716a12b297d609ec7493f9da21a23b3ab89303dc6be62a2240c0992adec SHA512 5aa316f05441524b16803a78f394b7e823c2019fb2828dc83b0cdab1b8eb0d8da2b8f3496aa34381bcea17bb7225a67582ff3f5321011bce4dae499aafdf76d6 WHIRLPOOL e4e8f74ab8538fe12f82bc0951823be94c59b91a494500e0c2f00ebc0bd95900f008664a397acf8e03565b3bfde8d6eefb7234367876372a33e49833f41fa718
+DIST psi-0.15_sv.qm 246214 SHA256 fc5822011ada2b7452c9d15baf74c90e1a58e05536e9a7cc1d81e163f44d3ca2 SHA512 b8dd5e7692512af5ec302b5fee562feb68292988160d1c9e4fac951562bd8b30bc1f67f4d39bbd437eee84b14f6aefd83a8666f0e77d02b539d65e89aee7c1aa WHIRLPOOL 6078437c20881babb731d8915952b40d415e5cc01ab7431be1930fbe887289988abc7ef9a76e09254ad8519146bd94633eba69872bee7cdb504dfc3237f1c1d0
+DIST psi-0.15_ur_PK.qm 244903 SHA256 0101370007c9ce735c50dd9bf6dfd8680c5cd562a3213b960ee507367582b3e6 SHA512 df0786f1b625ecc3144bb9be0ce51558ae45901213405997b5f8ea3c791c64328b049a48a1b88372f7b0cb5bde3b795b306ad16847d91933eedc233f8dea8bc2 WHIRLPOOL 3dc2f807d5e1dce36609854e9360d9521a7fe36d61161a2c0cf195bf58e21a4efa9b8d977a6503f41588d8befb06ca678e6e629168c93f0ab90f0ec42ffe98a5
+DIST psi-0.15_zh_TW.qm 171993 SHA256 a68897a3fe5653b4ea9651a7dc05486aadc9327fcfa96ceae84a6cfbeed4187a SHA512 69b20e18f346af244f7cfd2bc447fcb934786f7ff3d85a16ac471e275c78fb36cfb2008368d81413dbfc6ed5bd4edba3c1ab8185dae72b8aeb9bfa29fde9c871 WHIRLPOOL 2dd1e8e724007248128d69ec9389014d482d38b64df3dbcb1a17c90b94d193d793b17769d78cd36fd15d8409f1eac44eca4a2d7739d885316754df5b557a7344
+DIST psi-extra-iconsets-r1428.tar.bz2 3214991 SHA256 1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c SHA512 b6a74fc9b043800040c519504b14bcb5f44864b9115ea167b235a791bafc17c96986ffaf5b6f9ebe4dd3b467b8e472e7c9bf253893e59581a29ad2342b122bfc WHIRLPOOL a030ca57a5f11f46d17a19d8b2f109d043e6b4eed20fbdf406dd71b647a8bb923ecf24f1ed3f2197cdcaf9637b67fd39d52fd7ef6a174a4fc352cc5008da5759
+DIST psi-extra-patches-r1428.tar.bz2 131700 SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48 SHA512 6fe55bb5c97e672c05eb125defa590cce9575be339a7366d49c2c50aff19fc7d9a5dcf7feece4781e88cd3504c8e959a637c1a4a3e571d52c42e63edc0f60a78 WHIRLPOOL 9e70a07eb8fef72606e28ae2151003aebba724f86b29f9c46f3850a77b1647d9ce5746576c3e41f79b885b162b9889f233f77c2c5766103f5add6d5bc8088b40
diff --git a/net-im/psi/files/psi-0.14-drop-debug-cflags.patch b/net-im/psi/files/psi-0.14-drop-debug-cflags.patch
new file mode 100644
index 000000000000..227265696ae6
--- /dev/null
+++ b/net-im/psi/files/psi-0.14-drop-debug-cflags.patch
@@ -0,0 +1,35 @@
+Drop -g from CFLAGS
+
+--- qcm/buildmodeapp.qcm 2011-10-19 14:38:55.621699641 +0200
++++ qcm/buildmodeapp.qcm 2011-10-19 14:39:11.868700486 +0200
+@@ -130,8 +130,6 @@
+ if(qc_buildmode_separate_debug_info)
+ {
+ opts += "separate_debug_info";
+- other += "*-g++*:QMAKE_CFLAGS += -g\n";
+- other += "*-g++*:QMAKE_CXXFLAGS += -g\n";
+ }
+
+ QString str = QString("CONFIG += ") + opts.join(" ") + '\n';
+--- iris/qcm/extra.qcm.old 2011-10-19 14:39:40.268701738 +0200
++++ iris/qcm/extra.qcm 2011-10-19 14:40:01.904699887 +0200
+@@ -55,8 +55,6 @@
+ if(debug_info)
+ {
+ str += QString("CONFIG += separate_debug_info\n");
+- str += "QMAKE_CFLAGS += -g\n";
+- str += "QMAKE_CXXFLAGS += -g\n";
+ }
+ if(universal)
+ {
+--- iris/qcm/buildmode.qcm.old 2011-10-19 14:40:23.794701147 +0200
++++ iris/qcm/buildmode.qcm 2011-10-19 14:40:42.157701302 +0200
+@@ -186,8 +186,6 @@
+ if(qc_buildmode_separate_debug_info)
+ {
+ opts += "separate_debug_info";
+- other += "QMAKE_CFLAGS += -g\n";
+- other += "QMAKE_CXXFLAGS += -g\n";
+ }
+
+ QString str = QString("CONFIG += ") + opts.join(" ") + '\n';
diff --git a/net-im/psi/files/psi-0.14-input-validation.patch b/net-im/psi/files/psi-0.14-input-validation.patch
new file mode 100644
index 000000000000..7260c80e1ff9
--- /dev/null
+++ b/net-im/psi/files/psi-0.14-input-validation.patch
@@ -0,0 +1,257 @@
+commit c68fdd9926a38b2820bc5df97fd1905355a2640d
+Author: rion <rion4ik@gmail.com>
+Date: Fri Oct 7 22:19:05 2011 +0600
+
+ Fixed QLabel CVE
+
+--- src/Certificates/CertificateDisplay.ui 2011-10-19 08:30:15 +0000
++++ src/Certificates/CertificateDisplay.ui 2011-10-19 08:31:23 +0000
+@@ -1,105 +1,118 @@
+-<ui version="4.0" >
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
+ <class>CertificateDisplay</class>
+- <widget class="QDialog" name="CertificateDisplay" >
+- <property name="geometry" >
++ <widget class="QDialog" name="CertificateDisplay">
++ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>518</width>
++ <width>525</width>
+ <height>369</height>
+ </rect>
+ </property>
+- <property name="windowTitle" >
++ <property name="windowTitle">
+ <string>Certificate Information</string>
+ </property>
+- <layout class="QVBoxLayout" >
+- <property name="margin" >
++ <layout class="QVBoxLayout">
++ <property name="spacing">
++ <number>6</number>
++ </property>
++ <property name="margin">
+ <number>11</number>
+ </property>
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+ <item>
+- <layout class="QHBoxLayout" >
+- <property name="margin" >
++ <layout class="QHBoxLayout">
++ <property name="spacing">
++ <number>6</number>
++ </property>
++ <property name="margin">
+ <number>0</number>
+ </property>
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+ <item>
+- <layout class="QVBoxLayout" >
+- <property name="margin" >
++ <layout class="QVBoxLayout">
++ <property name="spacing">
++ <number>6</number>
++ </property>
++ <property name="margin">
+ <number>0</number>
+ </property>
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+ <item>
+- <widget class="QLabel" name="textLabel4" >
+- <property name="text" >
++ <widget class="QLabel" name="textLabel4">
++ <property name="text">
+ <string>Certificate Validation:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+- <widget class="QLabel" name="lb_valid" >
+- <property name="text" >
++ <widget class="QLabel" name="lb_valid">
++ <property name="text">
+ <string/>
+ </property>
++ <property name="textFormat">
++ <enum>Qt::PlainText</enum>
++ </property>
+ </widget>
+ </item>
+ <item>
+- <widget class="QLabel" name="textLabel2" >
+- <property name="text" >
++ <widget class="QLabel" name="textLabel2">
++ <property name="text">
+ <string>Valid From:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+- <widget class="QLabel" name="lb_notBefore" >
+- <property name="text" >
++ <widget class="QLabel" name="lb_notBefore">
++ <property name="text">
+ <string/>
+ </property>
++ <property name="textFormat">
++ <enum>Qt::PlainText</enum>
++ </property>
+ </widget>
+ </item>
+ <item>
+- <widget class="QLabel" name="textLabel3" >
+- <property name="text" >
++ <widget class="QLabel" name="textLabel3">
++ <property name="text">
+ <string>Valid Until:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+- <widget class="QLabel" name="lb_notAfter" >
+- <property name="text" >
++ <widget class="QLabel" name="lb_notAfter">
++ <property name="text">
+ <string/>
+ </property>
++ <property name="textFormat">
++ <enum>Qt::PlainText</enum>
++ </property>
+ </widget>
+ </item>
+ <item>
+- <widget class="QLabel" name="textLabel1" >
+- <property name="text" >
++ <widget class="QLabel" name="textLabel1">
++ <property name="text">
+ <string>Serial Number:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+- <widget class="QLabel" name="lb_sn" >
+- <property name="text" >
++ <widget class="QLabel" name="lb_sn">
++ <property name="text">
+ <string/>
+ </property>
++ <property name="textFormat">
++ <enum>Qt::PlainText</enum>
++ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+- <property name="orientation" >
++ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+- <property name="sizeType" >
++ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+- <property name="sizeHint" >
++ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>106</height>
+@@ -110,14 +123,14 @@
+ </layout>
+ </item>
+ <item>
+- <widget class="QTextBrowser" name="tb_cert" >
+- <property name="minimumSize" >
++ <widget class="QTextBrowser" name="tb_cert">
++ <property name="minimumSize">
+ <size>
+ <width>350</width>
+ <height>300</height>
+ </size>
+ </property>
+- <property name="horizontalScrollBarPolicy" >
++ <property name="horizontalScrollBarPolicy">
+ <enum>Qt::ScrollBarAlwaysOff</enum>
+ </property>
+ </widget>
+@@ -125,35 +138,35 @@
+ </layout>
+ </item>
+ <item>
+- <widget class="Line" name="line1" >
+- <property name="frameShape" >
++ <widget class="Line" name="line1">
++ <property name="frameShape">
+ <enum>QFrame::HLine</enum>
+ </property>
+- <property name="frameShadow" >
++ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+- <property name="orientation" >
++ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+- <layout class="QHBoxLayout" >
+- <property name="margin" >
++ <layout class="QHBoxLayout">
++ <property name="spacing">
++ <number>6</number>
++ </property>
++ <property name="margin">
+ <number>0</number>
+ </property>
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+ <item>
+ <spacer>
+- <property name="orientation" >
++ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+- <property name="sizeType" >
++ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+- <property name="sizeHint" >
++ <property name="sizeHint" stdset="0">
+ <size>
+ <width>421</width>
+ <height>20</height>
+@@ -162,17 +175,17 @@
+ </spacer>
+ </item>
+ <item>
+- <widget class="QPushButton" native="1" name="pb_close">
+- <property name="text">
+- <string>Close</string>
+- </property>
+- </widget>
++ <widget class="QPushButton" name="pb_close">
++ <property name="text">
++ <string>Close</string>
++ </property>
++ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+- <layoutdefault spacing="6" margin="11" />
++ <layoutdefault spacing="6" margin="11"/>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+ <tabstop>tb_cert</tabstop>
+
diff --git a/net-im/psi/files/psi-0.14-minizip-detection.patch b/net-im/psi/files/psi-0.14-minizip-detection.patch
new file mode 100644
index 000000000000..1eff6dadec4d
--- /dev/null
+++ b/net-im/psi/files/psi-0.14-minizip-detection.patch
@@ -0,0 +1,284 @@
+=== modified file 'conf_windows.pri'
+--- conf_windows.pri 2011-10-25 10:03:42 +0000
++++ conf_windows.pri 2011-10-25 10:04:13 +0000
+@@ -5,7 +5,7 @@
+ #CONFIG += qca-static
+
+ # tell iris to use our internal libz
+-CONFIG += psi-zip
++CONFIG += psi-winzlib
+
+ # OpenSSL
+ qca-static {
+
+=== modified file 'configure'
+--- configure 2011-10-25 10:03:42 +0000
++++ configure 2011-10-25 10:04:13 +0000
+@@ -955,41 +955,68 @@
+ {
+ #ifdef Q_OS_WIN
+ // HACK: on windows, always use psi's bundled zlib
+- conf->addExtra("CONFIG += psi-zip");
++ conf->addExtra("CONFIG += psi-winzlib psi-minizip");
+ return true;
+ #else
+- QString inc, lib;
++ QStringList incs;
++ QString version, libs, other;
+ QString s;
+
+- s = conf->getenv("QC_WITH_ZLIB_INC");
+- if(!s.isEmpty()) {
+- if(!conf->checkHeader(s, "zlib.h"))
+- return false;
+- inc = s;
+- }
+- else {
+- if(!conf->findHeader("zlib.h", QStringList(), &s))
+- return false;
+- inc = s;
+- }
+-
+- s = conf->getenv("QC_WITH_ZLIB_LIB");
+- if(!s.isEmpty()) {
+- if(!conf->checkLibrary(s, "z"))
+- return false;
+- lib = s;
+- }
+- else {
+- if(!conf->findLibrary("z", &s))
+- return false;
+- lib = s;
+- }
+-
+- if(!inc.isEmpty())
++ if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) {
++
++ s = conf->getenv("QC_WITH_ZLIB_INC");
++ if(!s.isEmpty()) {
++ if(!conf->checkHeader(s, "zlib.h"))
++ return false;
++ }
++ else {
++ if(!conf->findHeader("zlib.h", QStringList(), &s))
++ return false;
++ }
++ incs.append(s);
++
++ s = conf->getenv("QC_WITH_ZLIB_LIB");
++ if(!s.isEmpty()) {
++ if(!conf->checkLibrary(s, "z"))
++ return false;
++ }
++ else {
++ if(!conf->findLibrary("z", &s))
++ return false;
++ }
++ libs = QString("-L%1 -lz").arg(s);
++ }
++
++ foreach(const QString &inc, incs) {
+ conf->addIncludePath(inc);
+- if(!lib.isEmpty())
+- conf->addLib(QString("-L") + s);
+- conf->addLib("-lz");
++ }
++ conf->addLib(libs);
++
++ incs.clear();
++ libs.clear();
++ if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) {
++
++ s = conf->getenv("QC_WITH_MINIZIP_INC");
++ if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) ||
++ (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) {
++ incs.append(s);
++ }
++
++ s = conf->getenv("QC_WITH_MINIZIP_LIB");
++ if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) ||
++ (s.isEmpty() && conf->findLibrary("minizip", &s))) {
++ libs = QString("-L%1 -lminizip").arg(s);
++ }
++ }
++
++ if (!incs.isEmpty() && !libs.isEmpty()) {
++ foreach(const QString &inc, incs) {
++ conf->addIncludePath(inc);
++ }
++ conf->addLib(libs);
++ } else {
++ conf->addExtra("CONFIG += psi-minizip");
++ }
+
+ return true;
+ #endif
+
+=== modified file 'qcm/zlib.qcm'
+--- qcm/zlib.qcm 2011-10-25 10:03:42 +0000
++++ qcm/zlib.qcm 2011-10-25 10:04:13 +0000
+@@ -26,41 +26,68 @@
+ {
+ #ifdef Q_OS_WIN
+ // HACK: on windows, always use psi's bundled zlib
+- conf->addExtra("CONFIG += psi-zip");
++ conf->addExtra("CONFIG += psi-winzlib psi-minizip");
+ return true;
+ #else
+- QString inc, lib;
++ QStringList incs;
++ QString version, libs, other;
+ QString s;
+
+- s = conf->getenv("QC_WITH_ZLIB_INC");
+- if(!s.isEmpty()) {
+- if(!conf->checkHeader(s, "zlib.h"))
+- return false;
+- inc = s;
+- }
+- else {
+- if(!conf->findHeader("zlib.h", QStringList(), &s))
+- return false;
+- inc = s;
+- }
+-
+- s = conf->getenv("QC_WITH_ZLIB_LIB");
+- if(!s.isEmpty()) {
+- if(!conf->checkLibrary(s, "z"))
+- return false;
+- lib = s;
+- }
+- else {
+- if(!conf->findLibrary("z", &s))
+- return false;
+- lib = s;
+- }
+-
+- if(!inc.isEmpty())
++ if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) {
++
++ s = conf->getenv("QC_WITH_ZLIB_INC");
++ if(!s.isEmpty()) {
++ if(!conf->checkHeader(s, "zlib.h"))
++ return false;
++ }
++ else {
++ if(!conf->findHeader("zlib.h", QStringList(), &s))
++ return false;
++ }
++ incs.append(s);
++
++ s = conf->getenv("QC_WITH_ZLIB_LIB");
++ if(!s.isEmpty()) {
++ if(!conf->checkLibrary(s, "z"))
++ return false;
++ }
++ else {
++ if(!conf->findLibrary("z", &s))
++ return false;
++ }
++ libs = QString("-L%1 -lz").arg(s);
++ }
++
++ foreach(const QString &inc, incs) {
+ conf->addIncludePath(inc);
+- if(!lib.isEmpty())
+- conf->addLib(QString("-L") + s);
+- conf->addLib("-lz");
++ }
++ conf->addLib(libs);
++
++ incs.clear();
++ libs.clear();
++ if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) {
++
++ s = conf->getenv("QC_WITH_MINIZIP_INC");
++ if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) ||
++ (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) {
++ incs.append(s);
++ }
++
++ s = conf->getenv("QC_WITH_MINIZIP_LIB");
++ if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) ||
++ (s.isEmpty() && conf->findLibrary("minizip", &s))) {
++ libs = QString("-L%1 -lminizip").arg(s);
++ }
++ }
++
++ if (!incs.isEmpty() && !libs.isEmpty()) {
++ foreach(const QString &inc, incs) {
++ conf->addIncludePath(inc);
++ }
++ conf->addLib(libs);
++ } else {
++ conf->addExtra("CONFIG += psi-minizip");
++ }
+
+ return true;
+ #endif
+
+=== modified file 'src/conf_iris.pri'
+--- src/conf_iris.pri 2011-10-25 10:03:42 +0000
++++ src/conf_iris.pri 2011-10-25 10:04:13 +0000
+@@ -13,11 +13,6 @@
+ CONFIG += crypto
+ }
+
+-# use zlib from psi if necessary
+-psi-zip {
+- INCLUDEPATH += $$PWD/libpsi/tools/zip/minizip/win32
+-}
+-
+ mac {
+ # Universal binaries
+ qc_universal:contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {
+
+=== modified file 'src/libpsi/tools/zip/zip.cpp'
+--- src/libpsi/tools/zip/zip.cpp 2011-10-25 10:03:42 +0000
++++ src/libpsi/tools/zip/zip.cpp 2011-10-25 10:04:13 +0000
+@@ -22,7 +22,11 @@
+ #include <QStringList>
+ #include <QFile>
+
++#ifdef PSIMINIZIP
+ #include "minizip/unzip.h"
++#else
++#include <minizip/unzip.h>
++#endif
+ #include "zip.h"
+
+ class UnZipPrivate
+
+=== modified file 'src/libpsi/tools/zip/zip.pri'
+--- src/libpsi/tools/zip/zip.pri 2011-10-25 10:03:42 +0000
++++ src/libpsi/tools/zip/zip.pri 2011-10-25 10:04:13 +0000
+@@ -2,17 +2,20 @@
+ $$PWD/zip.h
+
+ SOURCES += \
+- $$PWD/zip.cpp \
+- $$PWD/minizip/unzip.c
+-
+-INCLUDEPATH += $$PWD
+-DEPENDPATH += $$PWD
+-
+-win32: {
++ $$PWD/zip.cpp
++
++psi-minizip {
++ SOURCES += $$PWD/minizip/unzip.c
++ DEFINES += PSIMINIZIP
++ INCLUDEPATH += $$PWD
++ DEPENDPATH += $$PWD
++}
++
++psi-winzlib {
+ INCLUDEPATH += $$PWD/minizip/win32
+ DEPENDPATH += $$PWD/minizip/win32
+ LIBS += $$PWD/minizip/win32/libz.a
+ }
+-mac: {
++mac {
+ QMAKE_LFLAGS += -lz
+ }
+
diff --git a/net-im/psi/files/psi-0.14-qt-compat.patch b/net-im/psi/files/psi-0.14-qt-compat.patch
new file mode 100644
index 000000000000..99fa30794590
--- /dev/null
+++ b/net-im/psi/files/psi-0.14-qt-compat.patch
@@ -0,0 +1,40 @@
+commit ec91add0e6398ad20c7a8f14a1a08c5e3282c5bd
+Author: Michail Pishchagin <mblsha@users.sourceforge.net>
+Date: Tue Oct 19 11:26:31 2010 +0400
+
+ Fix crash in MUCAffiliationsModel on Qt 4.7 (closes #1087)
+ Based on 1610-psi-fix-crash-in-muc-configurator.diff from Psi+
+
+diff --git a/src/mucaffiliationsmodel.cpp b/src/mucaffiliationsmodel.cpp
+index 722b762..fd0a830 100644
+--- a/src/mucaffiliationsmodel.cpp
++++ b/src/mucaffiliationsmodel.cpp
+@@ -150,15 +150,18 @@ void MUCAffiliationsModel::resetAffiliationLists()
+
+ void MUCAffiliationsModel::resetAffiliationList(MUCItem::Affiliation a)
+ {
++ emit layoutAboutToBeChanged();
+ enabled_[(AffiliationListIndex) affiliationToIndex(a)] = false;
+ QModelIndex index = affiliationListIndex(a);
+ if (hasChildren(index)) {
+ removeRows(0,rowCount(index),index);
+ }
++ emit layoutChanged();
+ }
+
+ void MUCAffiliationsModel::setAffiliationListEnabled(MUCItem::Affiliation a, bool b)
+ {
++ emit layoutAboutToBeChanged();
+ QModelIndex index = affiliationListIndex(a);
+ enabled_[(AffiliationListIndex) index.row()] = b;
+ emit layoutChanged();
+@@ -208,6 +211,9 @@ void MUCAffiliationsModel::addItems(const QList<MUCItem>& items)
+ foreach(MUCItem item, items) {
+ QModelIndex list = affiliationListIndex(item.affiliation());
+ if (list.isValid() && !item.jid().isEmpty()) {
++ if (!dirty) {
++ emit layoutAboutToBeChanged();
++ }
+ int row = rowCount(list);
+ if (row == 0) {
+ enabled_[(AffiliationListIndex) list.row()] = true;
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
new file mode 100644
index 000000000000..4c567f244b8b
--- /dev/null
+++ b/net-im/psi/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-im</herd>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>nikoli@gmx.us</email>
+ <name>Nikoli</name>
+</maintainer>
+<longdescription>Psi is a very good jabber client that uses QT</longdescription>
+<use>
+ <flag name='enchant'>Use enchant spell engine instead of aspell</flag>
+ <flag name='extras'>Enables extra non official patches</flag>
+ <flag name='iconsets'>Install additional iconsets, some of them has not clear licensing</flag>
+ <flag name='plugins'>Enable plugins support</flag>
+ <flag name='powersave'>Disable some non critical timers for much less CPU usage</flag>
+ <flag name='webkit'>Enable chatlog rendering using webkit</flag>
+ <flag name='whiteboarding'>Enable experimental interactive SVG drawing</flag>
+ <flag name='xscreensaver'>Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild
new file mode 100644
index 000000000000..c67b4e010128
--- /dev/null
+++ b/net-im/psi/psi-0.14-r4.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils qt4-r2 multilib
+
+MY_P="${P/_rc/-rc}"
+
+DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
+HOMEPAGE="http://psi-im.org/"
+# Langpack:
+# http://lists.affinix.com/pipermail/psi-devel-affinix.com/2009-August/008798.html
+# Later found his site: http://fs.scs-tsa.de/psi_l10n/
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+ http://fs.scs-tsa.de/psi_l10n/psi-0.14_langpack_for_packagers_2009-12-02.zip
+ extras? ( mirror://gentoo/${PN}-extra-patches-r1428.tar.bz2
+ mirror://gentoo/${PN}-extra-iconsets-r1428.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
+IUSE="crypt dbus debug doc extras jingle spell ssl xscreensaver webkit"
+RESTRICT="test"
+
+LANGS="be cs de fr it ja pl pt_BR ru sl sv ur_PK zh_TW"
+for LNG in ${LANGS}; do
+ IUSE="${IUSE} linguas_${LNG}"
+ #SRC_URI="${SRC_URI} http://psi-im.org/download/lang/psi_${LNG/ur_PK/ur_pk}.qm"
+done
+
+RDEPEND="
+ app-arch/unzip
+ =app-crypt/qca-2.0*[qt4(+)]
+ dev-qt/qt3support:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4[qt3support]
+ >=sys-libs/zlib-1.2.5.1-r2[minizip]
+ dbus? ( dev-qt/qtdbus:4 )
+ extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
+ spell? ( >=app-text/enchant-1.3.0 )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+"
+DEPEND="${RDEPEND}
+ sys-devel/qconf
+ doc? ( app-doc/doxygen )
+"
+PDEPEND="
+ crypt? ( app-crypt/qca:2[gpg] )
+ jingle? (
+ net-im/psimedia
+ app-crypt/qca:2[openssl]
+ )
+ ssl? ( app-crypt/qca:2[openssl] )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}/psi-0.14-qt-compat.patch"
+ epatch "${FILESDIR}/psi-0.14-minizip-detection.patch"
+ epatch "${FILESDIR}/psi-0.14-input-validation.patch"
+ epatch "${FILESDIR}/psi-0.14-drop-debug-cflags.patch"
+ sed -i '/#include <errno.h>/a #include <unistd.h>' \
+ iris/src/irisnet/corelib/netinterface_unix.cpp || die 'sed failed'
+
+ if use extras; then
+ # some patches from psi+ project http://code.google.com/p/psi-dev
+ ewarn "You're about to build heavily patched version of Psi called Psi+."
+ ewarn "It has really nice features but still is under heavy development."
+ ewarn "Take a look at homepage for more info: http://code.google.com/p/psi-dev"
+ ewarn "If you wish to disable some patches just put"
+ ewarn "MY_EPATCH_EXCLUDE=\"list of patches\""
+ ewarn "into /etc/portage/env/${CATEGORY}/${PN} file."
+ ewarn
+ ewarn "Note: some patches depend on other. So if you disabled some patch"
+ ewarn "and other started to fail to apply, you'll have to disable patches"
+ ewarn "that fail too."
+
+ EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE}
+ 005-less-includes.diff
+ 755-psiplus-fix-application-info-defines.diff
+ 9999-psiplus-application-info.diff" \
+ EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
+ sed -e 's/\(^#define PROG_CAPS_NODE \).*/\1"http:\/\/psi-dev.googlecode.com\/caps";/' \
+ -e 's:\(^#define PROG_NAME "Psi\):\1+:' \
+ -i src/applicationinfo.cpp || die
+ else
+ if use webkit; then
+ ewarn "Webkit support disabled as it is only available in Psi+"
+ ewarn "(USE='extras' enabled)."
+ fi
+ fi
+
+ qconf || die "Failed to create ./configure."
+ rm -rf third-party/qca || die # We use system libraries.
+}
+
+src_configure() {
+ # unable to use econf because of non-standard configure script
+ # disable growl as it is a MacOS X extension only
+ local confcmd="./configure
+ --prefix=/usr
+ --qtdir=/usr
+ --disable-bundled-qca
+ --disable-growl
+ $(use dbus || echo '--disable-qdbus')
+ $(use debug && echo '--debug')
+ $(use spell || echo '--disable-aspell')
+ $(use spell || echo '--disable-enchant')
+ $(use xscreensaver || echo '--disable-xss')
+ $(use extras && { use webkit && echo '--enable-qtwebkit';} )"
+
+ echo ${confcmd}
+ ${confcmd} || die "configure failed"
+ # Makefile is not always created...
+ [[ ! -f Makefile ]] && die "configure failed"
+}
+
+src_compile() {
+ eqmake4
+
+ emake
+
+ if use doc; then
+ cd doc || die
+ mkdir -p api || die # 259632
+ emake api_public
+ fi
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ rm "${D}"/usr/share/psi/{COPYING,README} || die
+
+ # this way the docs will be installed in the standard gentoo dir
+ newdoc iconsets/roster/README README.roster
+ newdoc iconsets/system/README README.system
+ newdoc certs/README README.certs
+ dodoc README
+
+ if use doc; then
+ cd doc || die
+ dohtml -r api
+ fi
+
+ # install translations
+ cd "${WORKDIR}" || die
+ insinto /usr/share/${PN}/
+ local nolangs=true
+ for LNG in ${LANGS}; do
+ if use linguas_${LNG}; then
+ doins ${LNG}/${PN}_${LNG}.qm
+ newins ${LNG}/INFO INFO.${LNG}
+ nolangs=false
+ fi
+ done
+
+ # if linguas is empty install all translations
+ if ${nolangs}; then
+ for LNG in ${LANGS}; do
+ doins ${LNG}/${PN}_${LNG}.qm
+ newins ${LNG}/INFO INFO.${LNG}
+ done
+ fi
+
+ if use extras; then
+ cp -a "${WORKDIR}"/iconsets/* "${D}"/usr/share/${PN}/iconsets/ || die
+ fi
+}
diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
new file mode 100644
index 000000000000..57c82bc86d5e
--- /dev/null
+++ b/net-im/psi/psi-0.15.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="be cs de fr it ja pl pt_BR ru sl sv ur_PK zh_TW"
+inherit eutils l10n multilib gnome2-utils qt4-r2 readme.gentoo
+
+DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
+HOMEPAGE="http://psi-im.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+for LNG in ${PLOCALES}; do
+ SRC_URI="${SRC_URI}
+ linguas_${LNG}? ( http://psi-im.org/download/lang/${PN}_${LNG}.qm -> ${P}_${LNG}.qm )"
+done
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd"
+IUSE="crypt dbus debug doc jingle spell ssl xscreensaver whiteboarding"
+RESTRICT="test"
+
+RDEPEND="
+ app-arch/unzip
+ >=app-crypt/qca-2.0.2:2[qt4(+)]
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ >=sys-libs/zlib-1.2.5.1-r2[minizip]
+ x11-libs/libX11
+ dbus? ( dev-qt/qtdbus:4 )
+ spell? ( >=app-text/enchant-1.3.0 )
+ whiteboarding? ( dev-qt/qtsvg:4 )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+"
+DEPEND="${RDEPEND}
+ sys-devel/qconf
+ doc? ( app-doc/doxygen )
+"
+PDEPEND="
+ crypt? ( app-crypt/qca:2[gpg] )
+ jingle? (
+ net-im/psimedia
+ app-crypt/qca:2[openssl]
+ )
+ ssl? ( app-crypt/qca:2[openssl] )
+"
+
+DOC_CONTENTS='Psi+ support(USE="extras") was removed from ebuild since 0.15'
+FORCE_PRINT_ELOG=1
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-0.14-drop-debug-cflags.patch"
+ epatch_user
+
+ qconf || die "Failed to create ./configure."
+}
+
+src_configure() {
+ # unable to use econf because of non-standard configure script
+ # disable growl as it is a MacOS X extension only
+ local confcmd="./configure
+ --prefix=/usr
+ --qtdir=/usr
+ --disable-growl
+ $(use dbus || echo '--disable-qdbus')
+ $(use debug && echo '--debug')
+ $(use spell || echo '--disable-aspell')
+ $(use spell || echo '--disable-enchant')
+ $(use xscreensaver || echo '--disable-xss')
+ $(use whiteboarding && echo '--enable-whiteboarding')"
+
+ echo ${confcmd}
+ ${confcmd} || die "configure failed"
+ # Makefile is not always created...
+ [[ ! -f Makefile ]] && die "configure failed"
+}
+
+src_compile() {
+ eqmake4
+
+ emake
+
+ if use doc; then
+ cd doc || die
+ mkdir -p api || die # 259632
+ emake api_public
+ fi
+}
+
+src_install() {
+ install_locale() {
+ newins "${DISTDIR}/${P}_${1}.qm" "${PN}_${1}.qm"
+ }
+
+ emake INSTALL_ROOT="${D}" install
+ rm "${D}"/usr/share/psi/{COPYING,README} || die
+
+ readme.gentoo_create_doc
+
+ # this way the docs will be installed in the standard gentoo dir
+ newdoc iconsets/roster/README README.roster
+ newdoc iconsets/system/README README.system
+ newdoc certs/README README.certs
+ dodoc README
+
+ if use doc; then
+ cd doc || die
+ dohtml -r api
+ fi
+
+ # install translations
+ insinto /usr/share/${PN}
+ l10n_for_each_locale_do install_locale
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ readme.gentoo_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
new file mode 100644
index 000000000000..dddf070f8d20
--- /dev/null
+++ b/net-im/psi/psi-9999.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+LANGS="be bg ca cs de en eo es et fi fr hu it ja mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+
+EGIT_REPO_URI="git://github.com/psi-im/psi.git"
+EGIT_HAS_SUBMODULES=1
+LANGS_REPO_URI="git://github.com/psi-plus/psi-plus-l10n.git"
+
+PSI_PLUS_URI="git://github.com/psi-plus/main.git"
+PSI_PLUS_RESOURCES_URI="git://github.com/psi-plus/resources.git"
+
+inherit eutils gnome2-utils qt4-r2 multilib git-2 subversion
+
+DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
+HOMEPAGE="http://psi-im.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="crypt dbus debug doc enchant extras jingle iconsets spell ssl xscreensaver powersave
+plugins whiteboarding webkit"
+
+REQUIRED_USE="
+ iconsets? ( extras )
+ plugins? ( extras )
+ powersave? ( extras )
+ webkit? ( extras )
+"
+
+RDEPEND="
+ app-arch/unzip
+ >=app-crypt/qca-2.0.2:2[qt4(+)]
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ >=sys-libs/zlib-1.2.5.1-r2[minizip]
+ x11-libs/libX11
+ dbus? ( dev-qt/qtdbus:4 )
+ extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
+ spell? (
+ enchant? ( >=app-text/enchant-1.3.0 )
+ !enchant? ( app-text/aspell )
+ )
+ whiteboarding? ( dev-qt/qtsvg:4 )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+"
+DEPEND="${RDEPEND}
+ extras? (
+ ${SUBVERSION_DEPEND}
+ sys-devel/qconf
+ )
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig
+"
+PDEPEND="
+ crypt? ( app-crypt/qca:2[gpg] )
+ jingle? (
+ net-im/psimedia
+ app-crypt/qca:2[openssl]
+ )
+ ssl? ( app-crypt/qca:2[openssl] )
+"
+RESTRICT="test"
+
+pkg_setup() {
+ MY_PN=psi
+ if use extras; then
+ MY_PN=psi-plus
+ echo
+ ewarn "You're about to build heavily patched version of Psi called Psi+."
+ ewarn "It has really nice features but still is under heavy development."
+ ewarn "Take a look at homepage for more info: http://code.google.com/p/psi-dev"
+ ewarn "If you wish to disable some patches just put"
+ ewarn "MY_EPATCH_EXCLUDE=\"list of patches\""
+ ewarn "into /etc/portage/env/${CATEGORY}/${PN} file."
+ echo
+ ewarn "Note: some patches depend on other. So if you disabled some patch"
+ ewarn "and other started to fail to apply, you'll have to disable patches"
+ ewarn "that fail too."
+ echo
+
+ if use iconsets; then
+ echo
+ ewarn "Some artwork is from open source projects, but some is provided 'as-is'"
+ ewarn "and has not clear licensing."
+ ewarn "Possibly this build is not redistributable in some countries."
+ fi
+ fi
+}
+
+src_unpack() {
+ git-2_src_unpack
+ unset EGIT_HAS_SUBMODULES EGIT_NONBARE
+
+ # fetch translations
+ mkdir "${WORKDIR}/psi-l10n"
+ unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT
+ EGIT_REPO_URI="${LANGS_REPO_URI}" \
+ EGIT_SOURCEDIR="${WORKDIR}/psi-l10n" git-2_src_unpack
+
+ if use extras; then
+ EGIT_DIR="${EGIT_STORE_DIR}/psi-plus/main" \
+ EGIT_SOURCEDIR="${WORKDIR}/psi-plus" \
+ EGIT_REPO_URI="${PSI_PLUS_URI}" git-2_src_unpack
+ if use iconsets; then
+ EGIT_DIR="${EGIT_STORE_DIR}/psi-plus/resources" \
+ EGIT_SOURCEDIR="${WORKDIR}/resources" \
+ EGIT_REPO_URI="${PSI_PLUS_RESOURCES_URI}" git-2_src_unpack
+ fi
+ fi
+}
+
+src_prepare() {
+ if use extras; then
+ cp -a "${WORKDIR}/psi-plus/iconsets" "${S}" || die "failed to copy iconsets"
+ use iconsets && { cp -a "${WORKDIR}/resources/iconsets" "${S}" || \
+ die "failed to copy additional iconsets"; }
+ EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE} " \
+ EPATCH_SOURCE="${WORKDIR}/psi-plus/patches/" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
+
+ use powersave && epatch "${WORKDIR}/psi-plus/patches/dev/psi-reduce-power-consumption.patch"
+
+ sed -e "s/.xxx/.$(cd "${WORKDIR}/psi-plus"; echo $((`git describe --tags | \
+ cut -d - -f 2`+5000)))/" -i src/applicationinfo.cpp || die "sed failed"
+
+ qconf || die "Failed to create ./configure."
+ fi
+}
+
+src_configure() {
+ # unable to use econf because of non-standard configure script
+ # disable growl as it is a MacOS X extension only
+ local myconf="
+ --prefix="${EPREFIX}"/usr
+ --qtdir="${EPREFIX}"/usr
+ --disable-growl
+ --no-separate-debug-info
+ "
+ use dbus || myconf+=" --disable-qdbus"
+ use debug && myconf+=" --debug"
+ if use spell; then
+ use enchant && myconf+=" --disable-aspell" || myconf+=" --disable-enchant"
+ else
+ myconf+=" --disable-aspell --disable-enchant"
+ fi
+ use whiteboarding && myconf+=" --enable-whiteboarding"
+ use xscreensaver || myconf+=" --disable-xss"
+ if use extras; then
+ use plugins && myconf+=" --enable-plugins"
+ use webkit && myconf+=" --enable-webkit"
+ fi
+
+ einfo "./configure ${myconf}"
+ ./configure ${myconf} || die
+
+ eqmake4
+}
+
+src_compile() {
+ emake
+
+ if use doc; then
+ cd doc
+ mkdir -p api # 259632
+ make api_public || die "make api_public failed"
+ fi
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ # this way the docs will be installed in the standard gentoo dir
+ rm -f "${ED}"/usr/share/${MY_PN}/{COPYING,README}
+ newdoc iconsets/roster/README README.roster
+ newdoc iconsets/system/README README.system
+ newdoc certs/README README.certs
+ dodoc README
+
+ if use extras && use plugins; then
+ insinto /usr/share/${MY_PN}/plugins
+ doins src/plugins/plugins.pri
+ doins src/plugins/psiplugin.pri
+ doins -r src/plugins/include
+ sed -i -e "s:target.path.*:target.path = /usr/$(get_libdir)/${MY_PN}/plugins:" \
+ "${ED}"/usr/share/${MY_PN}/plugins/psiplugin.pri \
+ || die "sed failed"
+ fi
+
+ use doc && dohtml -r doc/api
+
+ # install translations
+ cd "${WORKDIR}/psi-l10n/translations"
+ insinto /usr/share/${MY_PN}
+ for x in ${LANGS}; do
+ if use linguas_${x}; then
+ lrelease "${PN}_${x}.ts" || die "lrelease ${x} failed"
+ doins "${PN}_${x}.qm"
+ fi
+ done
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ readme.gentoo_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/net-im/psimedia/Manifest b/net-im/psimedia/Manifest
new file mode 100644
index 000000000000..58f57cb37f03
--- /dev/null
+++ b/net-im/psimedia/Manifest
@@ -0,0 +1 @@
+DIST psimedia-1.0.3.tar.bz2 236134 SHA256 019d18034fa94299d896448841d129fd1bad5f58daeb2aba7be540a7d06fb23b
diff --git a/net-im/psimedia/files/psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch b/net-im/psimedia/files/psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch
new file mode 100644
index 000000000000..e65951932946
--- /dev/null
+++ b/net-im/psimedia/files/psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/show_bug.cgi?id=361419#c5
+
+--- gstprovider/devices.cpp 2009-06-09 10:12:11.000000000 +0200
++++ gstprovider/devices.cpp 2011-04-02 11:47:21.898041830 +0200
+@@ -90,7 +90,6 @@
+ element_name == "alsasink" ||
+ element_name == "osssrc" ||
+ element_name == "osssink" ||
+- element_name == "v4lsrc" ||
+ element_name == "v4l2src" ||
+ element_name == "osxaudiosrc" ||
+ element_name == "osxaudiosink" ||
+@@ -224,11 +223,6 @@
+ if(type == PDevice::VideoIn)
+ element_name = "osxvideosrc";
+ }
+- else if(driver == "v4l")
+- {
+- if(type == PDevice::VideoIn)
+- element_name = "v4lsrc";
+- }
+ else if(driver == "v4l2")
+ {
+ if(type == PDevice::VideoIn)
+@@ -380,7 +374,7 @@
+ bool first = true;
+ foreach(const DeviceEnum::Item &i, list)
+ {
+- if(type == PDevice::VideoIn && (element_name == "v4lsrc" || element_name == "v4l2src"))
++ if(type == PDevice::VideoIn && element_name == "v4l2src")
+ {
+ if(!test_video(element_name, i.id))
+ continue;
+@@ -444,7 +438,6 @@
+ else // PDevice::VideoIn
+ {
+ drivers
+- << "v4l"
+ << "v4l2"
+ << "osxvideo"
+ << "winks";
+--- gstprovider/gstthread.cpp 2009-05-17 19:55:27.000000000 +0200
++++ gstprovider/gstthread.cpp 2011-04-02 11:48:28.581514484 +0200
+@@ -235,7 +235,6 @@
+ #elif defined(Q_OS_LINUX)
+ reqelem
+ << "alsasrc" << "alsasink"
+- << "v4lsrc"
+ << "v4l2src";
+ #elif defined(Q_OS_UNIX)
+ reqelem
diff --git a/net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch b/net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch
new file mode 100644
index 000000000000..01a42cac12f5
--- /dev/null
+++ b/net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch
@@ -0,0 +1,52 @@
+Index: psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h
+===================================================================
+--- psimedia-1.0.3.orig/gstprovider/gstcustomelements/gstcustomelements.h
++++ psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h
+@@ -21,7 +21,7 @@
+ #ifndef GSTCUSTOMELEMENTS_H
+ #define GSTCUSTOMELEMENTS_H
+
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gst/gst.h>
+ #include <gst/base/gstpushsrc.h>
+ #include <gst/video/video.h>
+Index: psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h
+===================================================================
+--- psimedia-1.0.3.orig/gstprovider/gstelements/static/gstelements.h
++++ psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h
+@@ -21,7 +21,7 @@
+ #ifndef PSI_GSTELEMENTS_H
+ #define PSI_GSTELEMENTS_H
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+Index: psimedia-1.0.3/gstprovider/gstthread.h
+===================================================================
+--- psimedia-1.0.3.orig/gstprovider/gstthread.h
++++ psimedia-1.0.3/gstprovider/gstthread.h
+@@ -22,7 +22,7 @@
+ #define PSI_GSTTHREAD_H
+
+ #include <QThread>
+-#include <glib/gmain.h>
++#include <glib.h>
+
+ namespace PsiMedia {
+
+Index: psimedia-1.0.3/gstprovider/rwcontrol.h
+===================================================================
+--- psimedia-1.0.3.orig/gstprovider/rwcontrol.h
++++ psimedia-1.0.3/gstprovider/rwcontrol.h
+@@ -28,7 +28,7 @@
+ #include <QMutex>
+ #include <QWaitCondition>
+ #include <QTimer>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include "psimediaprovider.h"
+ #include "rtpworker.h"
+
diff --git a/net-im/psimedia/files/psimedia-1.0.3-linux-headers-2.6.38.patch b/net-im/psimedia/files/psimedia-1.0.3-linux-headers-2.6.38.patch
new file mode 100644
index 000000000000..b6076d12cbf2
--- /dev/null
+++ b/net-im/psimedia/files/psimedia-1.0.3-linux-headers-2.6.38.patch
@@ -0,0 +1,86 @@
+http://pkgs.fedoraproject.org/gitweb/?p=psimedia.git;a=blob_plain;f=psimedia-remove-v4l.patch;hb=HEAD
+
+--- gstprovider/deviceenum/deviceenum_unix.cpp
++++ gstprovider/deviceenum/deviceenum_unix.cpp
+@@ -35,7 +35,7 @@
+ # include <sys/stat.h>
+ # include <dirent.h>
+ # include <sys/ioctl.h>
+-# include <linux/videodev.h>
++# include <linux/videodev2.h>
+ #endif
+
+ namespace DeviceEnum {
+@@ -478,72 +478,7 @@
+ // v4l detection scheme adapted from PWLib (used by Ekiga/Gnomemeeting)
+ static QList<Item> get_v4l_items()
+ {
+-#ifdef Q_OS_LINUX
+- QList<Item> out;
+-
+- QList<V4LName> list = get_v4l_names("/sys/class/video4linux", true);
+- if(list.isEmpty())
+- list = get_v4l_names("/proc/video/dev", false);
+-
+- // if we can't find anything, then do a raw scan for possibilities
+- if(list.isEmpty())
+- {
+- QStringList possible = scan_for_videodevs("/dev");
+- foreach(QString str, possible)
+- {
+- V4LName v;
+- v.dev = str;
+- list += v;
+- }
+- }
+-
+- for(int n = 0; n < list.count(); ++n)
+- {
+- V4LName &v = list[n];
+-
+- // if we already have a friendly name then we'll skip the confirm
+- // in order to save resources. the only real drawback here that
+- // I can think of is if the device isn't a capture type. but
+- // what does it mean to have a V4L device that isn't capture??
+- if(v.friendlyName.isEmpty())
+- {
+- int fd = open(QFile::encodeName(v.dev).data(), O_RDONLY | O_NONBLOCK);
+- if(fd == -1)
+- continue;
+-
+- // get video capabilities and close
+- struct video_capability caps;
+- memset(&caps, 0, sizeof(caps));
+- int ret = ioctl(fd, VIDIOCGCAP, &caps);
+- close(fd);
+- if(ret == -1)
+- continue;
+-
+- if(!(caps.type & VID_TYPE_CAPTURE))
+- continue;
+-
+- v.friendlyName = caps.name;
+- }
+-
+- Item i;
+- i.type = Item::Video;
+- i.dir = Item::Input;
+- i.name = v.friendlyName;
+- i.driver = "v4l";
+- i.id = v.dev;
+-
+- // HACK
+- if(v.friendlyName == "Labtec Webcam Notebook")
+- i.explicitCaptureSize = QSize(640, 480);
+-
+- out += i;
+- }
+-
+- return out;
+-#else
+- // return empty list if non-linux
+ return QList<Item>();
+-#endif
+ }
+
+ static QList<Item> get_v4l2_items()
diff --git a/net-im/psimedia/metadata.xml b/net-im/psimedia/metadata.xml
new file mode 100644
index 000000000000..c30d109ee800
--- /dev/null
+++ b/net-im/psimedia/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-im</herd>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>nikoli@gmx.us</email>
+ <name>Nikoli</name>
+</maintainer>
+<use>
+ <flag name='demo'>build simple test application for the PsiMedia system</flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/psimedia/psimedia-1.0.3-r3.ebuild b/net-im/psimedia/psimedia-1.0.3-r3.ebuild
new file mode 100644
index 000000000000..85b1a693aebc
--- /dev/null
+++ b/net-im/psimedia/psimedia-1.0.3-r3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils qt4-r2 multilib
+
+DESCRIPTION="Psi plugin for voice/video calls"
+HOMEPAGE="http://delta.affinix.com/psimedia/"
+SRC_URI="http://delta.affinix.com/download/psimedia/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
+IUSE="demo"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18
+ >=media-libs/gstreamer-0.10.22:0.10
+ >=media-libs/gst-plugins-base-0.10.22:0.10
+ media-libs/gst-plugins-good:0.10
+ >=dev-libs/liboil-0.3
+ >=dev-qt/qtgui-4.4:4
+ >=media-libs/speex-1.2_rc1
+"
+RDEPEND="${COMMON_DEPEND}
+ media-plugins/gst-plugins-speex:0.10
+ >=media-plugins/gst-plugins-vorbis-0.10.22:0.10
+ >=media-plugins/gst-plugins-theora-0.10.22:0.10
+ >=media-plugins/gst-plugins-alsa-0.10.22:0.10
+ >=media-plugins/gst-plugins-ogg-0.10.22:0.10
+ media-plugins/gst-plugins-v4l2:0.10
+ media-plugins/gst-plugins-jpeg:0.10
+ net-im/psi
+ !<net-im/psi-0.13_rc1
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ sed -e '/^TEMPLATE/a CONFIG += ordered' -i psimedia.pro || die
+ # Don't build demo if we don't need that.
+ use demo || { sed -e '/^SUBDIRS[[:space:]]*+=[[:space:]]*demo[[:space:]]*$/d;' -i psimedia.pro || die; }
+ # Remove support for V4L v1 because linux-headers-2.6.38 stopped shipping linux/videodev.h.
+ epatch "${FILESDIR}"/${P}-linux-headers-2.6.38.patch
+ epatch "${FILESDIR}"/${P}-drop-v4lsrc-gst-plugin.patch
+
+ epatch "${FILESDIR}"/${P}-glib2.32.patch
+}
+
+src_configure() {
+ # qconf generated configure script...
+ ./configure --no-separate-debug-info || die
+
+ eqmake4
+}
+
+src_install() {
+ insinto /usr/$(get_libdir)/psi/plugins
+ doins gstprovider/libgstprovider.so
+
+ if use demo; then
+ exeinto /usr/$(get_libdir)/${PN}
+ newexe demo/demo ${PN}
+
+ # Create /usr/bin/psimedia
+ cat <<-EOF > "demo/${PN}"
+ #!/bin/bash
+
+ export PSI_MEDIA_PLUGIN=/usr/$(get_libdir)/psi/plugins/libgstprovider.so
+ /usr/$(get_libdir)/${PN}/${PN}
+ EOF
+
+ dobin demo/${PN}
+ fi
+}
diff --git a/net-im/purple-events/Manifest b/net-im/purple-events/Manifest
new file mode 100644
index 000000000000..e52151fb9454
--- /dev/null
+++ b/net-im/purple-events/Manifest
@@ -0,0 +1 @@
+DIST purple-events-0.2.tar.xz 223180 SHA256 f0908efb74fb56acaf42e1155878c610ba8271a44509e91ae4e02bd1214aa24c SHA512 2efbeae39d45157f37d6fcc8e45d89980d2adc025d64ec194a5784b0616c8bef80929549a26ce814a4fa8c5cf9fd1621155bcd4fb6d35e6104d318a76b9c4e63 WHIRLPOOL 0f59c66b3c7bb8ce8059b2266038775ba8d5b25ec0a03c309dd497591e91c523dc8c0bb2faa6dd463dcb05bbe03984c9a6dc196ebb06a93a6f5fc49098a3d02d
diff --git a/net-im/purple-events/metadata.xml b/net-im/purple-events/metadata.xml
new file mode 100644
index 000000000000..58a0efe8e228
--- /dev/null
+++ b/net-im/purple-events/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>
+ <upstream>
+ <maintainer status="active">
+ <email>sardemff7+gentoo@sardemff7.net</email>
+ <name>Quentin “Sardem FF7” Glidic</name>
+ <description>CC him on bugs</description>
+ </maintainer>
+ </upstream>
+</pkgmetadata>
+
diff --git a/net-im/purple-events/purple-events-0.2.ebuild b/net-im/purple-events/purple-events-0.2.ebuild
new file mode 100644
index 000000000000..3dfa06611508
--- /dev/null
+++ b/net-im/purple-events/purple-events-0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Allows a fine-grained control over libpurple events"
+HOMEPAGE="http://purple-events.sardemff7.net/"
+SRC_URI="mirror://github/sardemff7/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+src_configure() {
+ econf --disable-silent-rules
+}
diff --git a/net-im/pyaim-t/Manifest b/net-im/pyaim-t/Manifest
new file mode 100644
index 000000000000..525b332701d2
--- /dev/null
+++ b/net-im/pyaim-t/Manifest
@@ -0,0 +1 @@
+DIST pyaimt-0.8.0.1.tar.gz 143968 SHA256 c9447ff37b4d5d49d9ae9e88e694493cb7449008c882edbb0babf4b4dd5c4bfa SHA512 70d92cb99f36452d95b32bda04ad5f4c74387ab4cc40ed3cd06da58285f4f4b5122aa470e34e4fb1dfedc13ef33feafb3ba6a7036caee9d95edb8969df730540 WHIRLPOOL 337e4ce76c6f8997054d3e93be5d11a94121ca99200a2205fb59cc38595e626e4f2307078a9f7d1a22ec73b40298bf91a430db86cba28e8b2178f4681ff8248f
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1 b/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1
new file mode 100644
index 000000000000..c4d867e37773
--- /dev/null
+++ b/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need net
+ use jabber-server
+}
+
+start() {
+ ebegin "Starting AIM Jabber Transport"
+ checkpath -q -d -m 0755 -o jabber:jabber /var/run/jabber/
+ start-stop-daemon --start --pidfile /var/run/jabber/pyaim-t.pid -u jabber -g jabber \
+ --exec INSPATH/pyaim-t.py -- \
+ -b -c /etc/jabber/pyaim-t.xml -l /var/log/jabber/pyaim-t.log
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping AIM Jabber Transport"
+ start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyaim-t.pid
+ eend $?
+}
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch
new file mode 100644
index 000000000000..13067925c18a
--- /dev/null
+++ b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch
@@ -0,0 +1,36 @@
+diff -Naur pyaimt-0.8.0.1/src/contact.py pyaimt-0.8.0.1-1/src/contact.py
+--- pyaimt-0.8.0.1/src/contact.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-1/src/contact.py 2013-09-18 17:57:12.863780595 +0200
+@@ -13,7 +13,7 @@
+ import globals
+ import base64
+ if not config.disableAvatars:
+- import Image
++ import PIL.Image as Image
+ import StringIO
+
+
+diff -Naur pyaimt-0.8.0.1/src/imgmanip.py pyaimt-0.8.0.1-1/src/imgmanip.py
+--- pyaimt-0.8.0.1/src/imgmanip.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-1/src/imgmanip.py 2013-09-18 17:57:12.863780595 +0200
+@@ -5,7 +5,7 @@
+
+ if not config.disableAvatars:
+ try:
+- import Image
++ import PIL.Image as Image
+ import StringIO
+
+ def convertToPNG(imageData):
+diff -Naur pyaimt-0.8.0.1/tools/infodump.py pyaimt-0.8.0.1-1/tools/infodump.py
+--- pyaimt-0.8.0.1/tools/infodump.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-1/tools/infodump.py 2013-09-18 17:57:12.864780582 +0200
+@@ -41,7 +41,7 @@
+ print "Nevow Version: Unknown or Not Installed"
+
+ try:
+- from Image import VERSION
++ from PIL.Image import VERSION
+ print "Python Imaging Library (PIL) Version: " + VERSION
+ except:
+ print "Python Imaging Library (PIL) Version: Unknown or Not Installed"
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch
new file mode 100644
index 000000000000..a6fa52e757e8
--- /dev/null
+++ b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch
@@ -0,0 +1,118 @@
+diff -Naur pyaimt-0.8.0.1/src/avatar.py pyaimt-0.8.0.1-py26//src/avatar.py
+--- pyaimt-0.8.0.1/src/avatar.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/avatar.py 2011-08-24 20:30:06.146311346 +0200
+@@ -6,7 +6,7 @@
+ from twisted.words.xish.domish import Element
+ from debug import LogEvent, INFO, WARN, ERROR
+ import lang
+-import sha
++from hashlib import sha1
+ import base64
+ import os
+ import os.path
+@@ -46,7 +46,7 @@
+ class Avatar:
+ """ Represents an Avatar. Does not store the image in memory. """
+ def __init__(self, imageData, avatarCache):
+- self.__imageHash = sha.sha(imageData).hexdigest()
++ self.__imageHash = sha1(imageData).hexdigest()
+ self.__avatarCache = avatarCache
+
+ def getImageHash(self):
+diff -Naur pyaimt-0.8.0.1/src/contact.py pyaimt-0.8.0.1-py26//src/contact.py
+--- pyaimt-0.8.0.1/src/contact.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/contact.py 2011-08-24 20:30:06.146311346 +0200
+@@ -8,7 +8,6 @@
+ import config
+ from debug import LogEvent, INFO, WARN, ERROR
+ import lang
+-import sha
+ import legacy
+ import globals
+ import base64
+diff -Naur pyaimt-0.8.0.1/src/legacy/aimt.py pyaimt-0.8.0.1-py26//src/legacy/aimt.py
+--- pyaimt-0.8.0.1/src/legacy/aimt.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/legacy/aimt.py 2011-08-24 20:32:28.187361518 +0200
+@@ -11,7 +11,6 @@
+ import re
+ import time
+ import binascii
+-import md5
+ import imgmanip
+
+
+diff -Naur pyaimt-0.8.0.1/src/legacy/buddies.py pyaimt-0.8.0.1-py26//src/legacy/buddies.py
+--- pyaimt-0.8.0.1/src/legacy/buddies.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/legacy/buddies.py 2011-08-24 20:30:06.147311326 +0200
+@@ -12,7 +12,7 @@
+ import os.path
+ import binascii
+ import os.path
+-import md5
++from hashlib import md5
+
+ X = os.path.sep
+
+@@ -138,7 +138,7 @@
+ avatarData = avatar.AvatarCache().setAvatar(imgmanip.convertToPNG(iconData))
+ c.updateAvatar(avatarData, push=True)
+ if not md5Hash:
+- m = md5.new()
++ m = md5()
+ m.update(iconData)
+ md5Hash = m.digest()
+ if not numHash:
+diff -Naur pyaimt-0.8.0.1/src/legacy/glue.py pyaimt-0.8.0.1-py26//src/legacy/glue.py
+--- pyaimt-0.8.0.1/src/legacy/glue.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/legacy/glue.py 2011-08-24 20:31:20.066825898 +0200
+@@ -19,7 +19,7 @@
+ import time
+ import binascii
+ import avatar
+-import md5
++from hashlib import md5
+
+ # The name of the transport
+ name = "AIM Transport"
+@@ -450,7 +450,7 @@
+ try:
+ self.myavatar = imgmanip.convertToJPG(imageData)
+ self.myavatarlen = len(self.myavatar)
+- m=md5.new()
++ m=md5()
+ m.update(self.myavatar)
+ self.myavatarsum = m.digest()
+ self.myavatarstamp = time.time()
+diff -Naur pyaimt-0.8.0.1/src/tlib/oscar.py pyaimt-0.8.0.1-py26//src/tlib/oscar.py
+--- pyaimt-0.8.0.1/src/tlib/oscar.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/tlib/oscar.py 2011-08-24 20:30:22.415200813 +0200
+@@ -20,7 +20,7 @@
+ from scheduler import Scheduler
+
+ import struct
+-import md5
++from hashlib import md5
+ import string
+ import socket
+ import random
+@@ -106,9 +106,9 @@
+ return dict,data
+
+ def encryptPasswordMD5(password,key):
+- m=md5.new()
++ m=md5()
+ m.update(key)
+- m.update(md5.new(password).digest())
++ m.update(md5(password).digest())
+ m.update("AOL Instant Messenger (SM)")
+ return m.digest()
+
+@@ -534,7 +534,7 @@
+ self.iconSum = tlvs.get(0xd5,"")
+
+ def updateIcon(self, iconData):
+- m=md5.new()
++ m=md5()
+ m.update(iconData)
+ self.iconSum = m.digest()
+ log.msg("icon sum is %s" % binascii.hexlify(self.iconSum))
diff --git a/net-im/pyaim-t/metadata.xml b/net-im/pyaim-t/metadata.xml
new file mode 100644
index 000000000000..d67761ae6ed4
--- /dev/null
+++ b/net-im/pyaim-t/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-im</herd>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>carlin@jlab.org</email>
+ <name>Chris Carlin</name>
+ <description>Proxy maintainer</description>
+ </maintainer>
+ <longdescription>Python based jabber transport for AIM</longdescription>
+ <use>
+ <flag name="webinterface">Install dependencies needed for the web
+ interface</flag>
+ </use>
+ <upstream>
+ <remote-id type="google-code">pyaimt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild b/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
new file mode 100644
index 000000000000..dce7d7ccfec5
--- /dev/null
+++ b/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1
+
+MY_P="${P/pyaim-t/pyaimt}"
+DESCRIPTION="Python based jabber transport for AIM"
+HOMEPAGE="http://code.google.com/p/pyaimt/"
+SRC_URI="http://pyaimt.googlecode.com/files/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="webinterface"
+
+DEPEND="net-im/jabber-base"
+RDEPEND="${DEPEND}
+ dev-python/twisted-core[${PYTHON_USEDEP}]
+ dev-python/twisted-words[${PYTHON_USEDEP}]
+ dev-python/twisted-web[${PYTHON_USEDEP}]
+ webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
+ virtual/python-imaging[${PYTHON_USEDEP}]"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-python26-warnings.patch"
+ epatch "${FILESDIR}/${P}-pillow-imaging.patch"
+}
+
+src_install() {
+ python_moduleinto ${PN}
+ cp PyAIMt.py ${PN}.py
+ python_domodule ${PN}.py data tools src
+
+ insinto /etc/jabber
+ newins config_example.xml ${PN}.xml
+ fperms 600 /etc/jabber/${PN}.xml
+ fowners jabber:jabber /etc/jabber/${PN}.xml
+ fperms 755 "$(python_get_sitedir)/${PN}/${PN}.py"
+ sed -i \
+ -e "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \
+ -e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
+ "${ED}/etc/jabber/${PN}.xml" || die
+
+ newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN}
+ sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" "${ED}/etc/init.d/${PN}" || die
+ python_fix_shebang "${D}$(python_get_sitedir)/${PN}"
+}
diff --git a/net-im/pyicq-t/Manifest b/net-im/pyicq-t/Manifest
new file mode 100644
index 000000000000..647b926ce2b2
--- /dev/null
+++ b/net-im/pyicq-t/Manifest
@@ -0,0 +1 @@
+DIST pyicqt-0.8.1.5.tar.gz 183865 SHA256 15ffa7b7d8f2d749492eec3b87bf64f8a429452282ca14e36ba5aee45b5322df SHA512 5b83adf86746c2af60bed2759c7d4e3a3839bea532e0882a6dc087aee5e0afa1320c6d2d2296a667ec45c5b36be879034f079fd30cef924e8db5f66a2f1d3fde WHIRLPOOL 91a51c81d32bc688d4ffb6f4623ae1efe7e5dc5d524b7fd2f519720dc81078d6547ea64a5311bcfcfae0ad77f8fe7ab933f5b63e3f2887fe4671c71b2a6848d9
diff --git a/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1 b/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1
new file mode 100644
index 000000000000..8c46bc62c268
--- /dev/null
+++ b/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need net
+ use jabber-server
+}
+
+start() {
+ ebegin "Starting ICQ Jabber Transport"
+ checkpath -q -d -m 0755 -o jabber:jabber /var/run/jabber/
+ start-stop-daemon --start --pidfile /var/run/jabber/pyicq-t.pid -u jabber -g jabber \
+ --exec INSPATH/pyicq-t.py -- \
+ -b -c /etc/jabber/pyicq-t.xml -l /var/log/jabber/pyicq-t.log
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ICQ Jabber Transport"
+ start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyicq-t.pid
+ eend $?
+}
diff --git a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch
new file mode 100644
index 000000000000..62df75873c08
--- /dev/null
+++ b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch
@@ -0,0 +1,36 @@
+diff -Naur pyicqt-0.8.1.5/src/contact.py pyicqt-0.8.1.5-1/src/contact.py
+--- pyicqt-0.8.1.5/src/contact.py 2009-08-24 14:37:59.000000000 +0200
++++ pyicqt-0.8.1.5-1/src/contact.py 2013-09-11 22:19:01.320467367 +0200
+@@ -13,7 +13,7 @@
+ import globals
+ import base64
+ if not config.disableAvatars:
+- import Image
++ import PIL.Image as Image
+ import StringIO
+
+
+diff -Naur pyicqt-0.8.1.5/src/imgmanip.py pyicqt-0.8.1.5-1/src/imgmanip.py
+--- pyicqt-0.8.1.5/src/imgmanip.py 2009-08-24 14:37:59.000000000 +0200
++++ pyicqt-0.8.1.5-1/src/imgmanip.py 2013-09-11 22:19:25.257168117 +0200
+@@ -5,7 +5,7 @@
+
+ if not config.disableAvatars:
+ try:
+- import Image
++ import PIL.Image as Image
+ import StringIO
+
+ def convertToPNG(imageData):
+diff -Naur pyicqt-0.8.1.5/tools/infodump.py pyicqt-0.8.1.5-1/tools/infodump.py
+--- pyicqt-0.8.1.5/tools/infodump.py 2009-08-24 14:37:59.000000000 +0200
++++ pyicqt-0.8.1.5-1/tools/infodump.py 2013-09-11 22:18:34.084807860 +0200
+@@ -41,7 +41,7 @@
+ print "Nevow Version: Unknown or Not Installed"
+
+ try:
+- from Image import VERSION
++ from PIL.Image import VERSION
+ print "Python Imaging Library (PIL) Version: " + VERSION
+ except:
+ print "Python Imaging Library (PIL) Version: Unknown or Not Installed"
diff --git a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff
new file mode 100644
index 000000000000..fd8e9e5ab8f0
--- /dev/null
+++ b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff
@@ -0,0 +1,118 @@
+diff -Naur pyicqt-0.8.1.5/src/avatar.py p1//src/avatar.py
+--- pyicqt-0.8.1.5/src/avatar.py 2010-06-07 12:16:36.000000000 +0200
++++ p1//src/avatar.py 2010-06-07 12:16:16.000000000 +0200
+@@ -6,7 +6,7 @@
+ from twisted.words.xish.domish import Element
+ from debug import LogEvent, INFO, WARN, ERROR
+ import lang
+-import sha
++from hashlib import sha1
+ import base64
+ import os
+ import os.path
+@@ -46,7 +46,7 @@
+ class Avatar:
+ """ Represents an Avatar. Does not store the image in memory. """
+ def __init__(self, imageData, avatarCache):
+- self.__imageHash = sha.sha(imageData).hexdigest()
++ self.__imageHash = sha1(imageData).hexdigest()
+ self.__avatarCache = avatarCache
+
+ def getImageHash(self):
+diff -Naur pyicqt-0.8.1.5/src/contact.py p1//src/contact.py
+--- pyicqt-0.8.1.5/src/contact.py 2010-06-07 12:16:43.000000000 +0200
++++ p1//src/contact.py 2010-06-07 12:16:16.000000000 +0200
+@@ -8,7 +8,6 @@
+ import config
+ from debug import LogEvent, INFO, WARN, ERROR
+ import lang
+-import sha
+ import legacy
+ import globals
+ import base64
+diff -Naur pyicqt-0.8.1.5/src/legacy/buddies.py p1//src/legacy/buddies.py
+--- pyicqt-0.8.1.5/src/legacy/buddies.py 2009-08-24 14:37:59.000000000 +0200
++++ p1//src/legacy/buddies.py 2010-06-07 12:07:37.000000000 +0200
+@@ -12,7 +12,7 @@
+ import os.path
+ import binascii
+ import os.path
+-import md5
++from hashlib import md5
+
+ X = os.path.sep
+
+@@ -188,7 +188,7 @@
+ avatarData = avatar.AvatarCache().setAvatar(imgmanip.convertToPNG(iconData))
+ c.updateAvatar(avatarData, push=True)
+ if not md5Hash:
+- m = md5.new()
++ m = md5()
+ m.update(iconData)
+ md5Hash = m.digest()
+ if not numHash:
+diff -Naur pyicqt-0.8.1.5/src/legacy/glue.py p1//src/legacy/glue.py
+--- pyicqt-0.8.1.5/src/legacy/glue.py 2009-08-24 14:37:59.000000000 +0200
++++ p1//src/legacy/glue.py 2010-06-07 12:07:37.000000000 +0200
+@@ -18,7 +18,7 @@
+ import time
+ import binascii
+ import avatar
+-import md5
++from hashlib import md5
+ import random
+
+ from twisted.python import log
+@@ -398,7 +398,7 @@
+ try:
+ self.myavatar = imgmanip.convertToJPG(imageData)
+ self.myavatarlen = len(self.myavatar)
+- m=md5.new()
++ m=md5()
+ m.update(self.myavatar)
+ self.myavatarsum = m.digest()
+ self.myavatarstamp = time.time()
+diff -Naur pyicqt-0.8.1.5/src/legacy/icqt.py p1//src/legacy/icqt.py
+--- pyicqt-0.8.1.5/src/legacy/icqt.py 2009-08-24 14:37:59.000000000 +0200
++++ p1//src/legacy/icqt.py 2010-06-07 12:07:37.000000000 +0200
+@@ -14,7 +14,6 @@
+ import time
+ import datetime
+ import binascii
+-import md5
+ import locale
+ import struct
+
+diff -Naur pyicqt-0.8.1.5/src/tlib/oscar.py p1//src/tlib/oscar.py
+--- pyicqt-0.8.1.5/src/tlib/oscar.py 2009-08-24 14:37:59.000000000 +0200
++++ p1//src/tlib/oscar.py 2010-06-07 12:07:37.000000000 +0200
+@@ -21,7 +21,7 @@
+ from scheduler import Scheduler
+
+ import struct
+-import md5
++from hashlib import md5
+ import string
+ import socket
+ import random
+@@ -120,9 +120,9 @@
+ return dict,data
+
+ def encryptPasswordMD5(password,key):
+- m=md5.new()
++ m=md5()
+ m.update(key)
+- m.update(md5.new(password).digest())
++ m.update(md5(password).digest())
+ m.update("AOL Instant Messenger (SM)")
+ return m.digest()
+
+@@ -534,7 +534,7 @@
+ self.iconSum = tlvs.get(0xd5,"")
+
+ def updateIcon(self, iconData):
+- m=md5.new()
++ m=md5()
+ m.update(iconData)
+ self.iconSum = m.digest()
+ log.msg("icon sum is %s" % binascii.hexlify(self.iconSum))
diff --git a/net-im/pyicq-t/files/pyicq-t.service b/net-im/pyicq-t/files/pyicq-t.service
new file mode 100644
index 000000000000..852ec13315af
--- /dev/null
+++ b/net-im/pyicq-t/files/pyicq-t.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=PyICQt is an ICQ transport for Jabber/XMPP
+
+[Service]
+ExecStart=INSPATH/pyicq-t.py -c /etc/jabber/pyicq-t.xml -l /var/log/jabber/pyicq-t.log
+User=jabber
+Group=jabber
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/pyicq-t/metadata.xml b/net-im/pyicq-t/metadata.xml
new file mode 100644
index 000000000000..2ff2b66a1c29
--- /dev/null
+++ b/net-im/pyicq-t/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-im</herd>
+ <longdescription>Python based jabber transport for ICQ</longdescription>
+ <use>
+ <flag name="webinterface">Install dependencies needed for the web
+ interface</flag>
+ </use>
+ <upstream>
+ <remote-id type="google-code">pyicqt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild
new file mode 100644
index 000000000000..a873ec74ecfa
--- /dev/null
+++ b/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1 systemd
+
+MY_P="${P/pyicq-t/pyicqt}"
+DESCRIPTION="Python based jabber transport for ICQ"
+HOMEPAGE="http://code.google.com/p/pyicqt/"
+SRC_URI="http://pyicqt.googlecode.com/files/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="webinterface"
+
+DEPEND="net-im/jabber-base"
+RDEPEND="${DEPEND}
+ dev-python/twisted-core[${PYTHON_USEDEP}]
+ dev-python/twisted-words[${PYTHON_USEDEP}]
+ dev-python/twisted-web[${PYTHON_USEDEP}]
+ webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
+ virtual/python-imaging[${PYTHON_USEDEP}]"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-python26-warnings.diff"
+ epatch "${FILESDIR}/${P}-pillow-imaging.patch"
+}
+
+src_install() {
+ python_moduleinto ${PN}
+ cp PyICQt.py ${PN}.py || die
+ python_domodule ${PN}.py data tools src
+
+ insinto /etc/jabber
+ newins config_example.xml ${PN}.xml
+ fperms 600 /etc/jabber/${PN}.xml
+ fowners jabber:jabber /etc/jabber/${PN}.xml
+ fperms 755 "$(python_get_sitedir)/${PN}/${PN}.py"
+ sed -i \
+ -e "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \
+ -e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
+ "${ED}/etc/jabber/${PN}.xml" || die
+
+ newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN}
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" \
+ "${ED}/etc/init.d/${PN}" "${ED}/usr/lib/systemd/system/${PN}.service" || die
+
+ python_fix_shebang "${D}$(python_get_sitedir)/${PN}"
+}
diff --git a/net-im/qtwitter/Manifest b/net-im/qtwitter/Manifest
new file mode 100644
index 000000000000..c44a9e200b93
--- /dev/null
+++ b/net-im/qtwitter/Manifest
@@ -0,0 +1 @@
+DIST qtwitter-0.10.0-src.tar.gz 698851 SHA256 0a649d8e5cfeb5aa5c168b7b07c46b79605783a2d0f0a04527dc5883f5b4e951 SHA512 9475db148a6e78e1e087ad6b880e02797270d755d0348ddb7c72cec578150e1e3967925cf8eb660dd3a756567dc4d6ae49dd62afb9ce48b25f17704826288388 WHIRLPOOL 8cfc61366d2ed6775d6ba7e2fce2824f0e2ac42594cab3b70f6f0d7f2587f350f9844971d69764300d0abfa962bd2916e0f632fc6c2f8c34c043c2e9fb8ad7a7
diff --git a/net-im/qtwitter/files/qtwitter-0.10.0-gold.patch b/net-im/qtwitter/files/qtwitter-0.10.0-gold.patch
new file mode 100644
index 000000000000..d5aff527bead
--- /dev/null
+++ b/net-im/qtwitter/files/qtwitter-0.10.0-gold.patch
@@ -0,0 +1,12 @@
+--- qtwitter-app/qtwitter-app.pro
++++ qtwitter-app/qtwitter-app.pro
+@@ -82,7 +82,8 @@
+ else:unix {
+ LIBS += -L$${DESTDIR} \
+ -Wl,-rpath,$${DESTDIR} \
+- $$TWITTERAPI_LIB
++ $$TWITTERAPI_LIB \
++ -lX11
+ target.path = $${INSTALL_PREFIX}/bin
+ PLUGINS_DIR = $${INSTALL_PREFIX}/lib$${LIB_SUFFIX}/$${TARGET}/plugins
+ DEFINES += PLUGINS_DIR='\\\"$${PLUGINS_DIR}\\\"' \ No newline at end of file
diff --git a/net-im/qtwitter/metadata.xml b/net-im/qtwitter/metadata.xml
new file mode 100644
index 000000000000..3c9437f319df
--- /dev/null
+++ b/net-im/qtwitter/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>qt</herd>
+</pkgmetadata>
+
diff --git a/net-im/qtwitter/qtwitter-0.10.0-r1.ebuild b/net-im/qtwitter/qtwitter-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..8b12a8e8ce53
--- /dev/null
+++ b/net-im/qtwitter/qtwitter-0.10.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
+PLOCALES="ca_ES cs_CZ de_DE es_ES fr_FR it_IT ja_JP nb_NO pl_PL pt_BR"
+
+inherit l10n qt4-r2
+
+DESCRIPTION="A Qt-based microblogging client"
+HOMEPAGE="http://www.qt-apps.org/content/show.php/qTwitter?content=99087"
+SRC_URI="http://files.ayoy.net/qtwitter/release/${PV}/src/${P}-src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="x11-libs/libX11
+ >=dev-qt/qtcore-4.5:4
+ >=dev-qt/qtgui-4.5:4
+ >=dev-qt/qtdbus-4.5:4
+ >=dev-libs/qoauth-1.0"
+RDEPEND="${DEPEND}"
+
+DOCS="README CHANGELOG"
+PATCHES=( "${FILESDIR}/${P}-gold.patch" )
+
+src_prepare() {
+ qt4-r2_src_prepare
+
+ echo "CONFIG += nostrip" >> "${S}"/${PN}.pro
+
+ l10n_find_plocales_changes "${S}/translations" '${PN}' '.ts'
+
+ local langs
+ langs="$(l10n_get_locales)"
+ # remove translations and add only the selected ones
+ sed -e '/^ *LANGS/,/^$/s/^/#/' \
+ -e "/LANGS =/s/.*/LANGS = ${langs}/" \
+ -i translations/translations.pri || die "sed translations failed"
+
+ # fix insecure runpaths
+ sed -e '/-Wl,-rpath,\$\${DESTDIR}/d' \
+ -i qtwitter-app/qtwitter-app.pro || die "sed rpath failed"
+
+ # to pass validation
+ sed -e 's/Instant Messaging/InstantMessaging/' \
+ -i qtwitter-app/x11/qtwitter.desktop || die "sed .desktop failed"
+}
+
+src_configure() {
+ eqmake4 PREFIX="/usr"
+}
diff --git a/net-im/qutim/Manifest b/net-im/qutim/Manifest
new file mode 100644
index 000000000000..932c79fdbaf4
--- /dev/null
+++ b/net-im/qutim/Manifest
@@ -0,0 +1 @@
+DIST qutim-0.3.2.tar.xz 10232436 SHA256 326bd4048cdee2913b6a01900d15736c54b431b4ec1a11c88e567920c2948849 SHA512 0767552e31d6e999f6622f14a48e2da7f4497b4a958550189dce38709689cb5f12e9b91a55b5d94d1a24f3e8149cf8453dea56b7e5a8c1758a6579c4142f01cb WHIRLPOOL dac2bb0c43e4bc195c2374aa885ae8174317eccb8e02d011902f4416b3808bf598507e1c74668f1ff04a53bd828d8695c93cc83e04342fdb92688b44236eb2a5
diff --git a/net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-kde-build.patch b/net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-kde-build.patch
new file mode 100644
index 000000000000..f32379662417
--- /dev/null
+++ b/net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-kde-build.patch
@@ -0,0 +1,25 @@
+From 984d4af9568de9c54a44e4cf96cca76e0cea256a Mon Sep 17 00:00:00 2001
+From: Ruslan Nigmatullin <euroelessar@yandex.ru>
+Date: Mon, 24 Feb 2014 18:09:20 +0300
+Subject: [PATCH 2/2] Fixed compilation with the newest cmake
+
+---
+ plugins/kdeintegration/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/kdeintegration/CMakeLists.txt b/plugins/kdeintegration/CMakeLists.txt
+index 6f1a9f8..805ad80 100644
+--- a/plugins/kdeintegration/CMakeLists.txt
++++ b/plugins/kdeintegration/CMakeLists.txt
+@@ -8,6 +8,8 @@ endif()
+
+ include(KDE4Defaults)
+
++set(CMAKE_AUTOMOC true)
++
+ add_definitions( ${KDE4_DEFINITIONS} )
+
+ qutim_add_plugin(kdeintegration
+--
+2.0.4
+
diff --git a/net-im/qutim/files/qutim-0.3.2-astral-migrate-qt-telepaphy.patch b/net-im/qutim/files/qutim-0.3.2-astral-migrate-qt-telepaphy.patch
new file mode 100644
index 000000000000..dd1aba82891c
--- /dev/null
+++ b/net-im/qutim/files/qutim-0.3.2-astral-migrate-qt-telepaphy.patch
@@ -0,0 +1,151 @@
+From bb8654db870d983d5b6558d9f16b22f443315eaf Mon Sep 17 00:00:00 2001
+From: Alexander Golubev <fatzer2@gmail.com>
+Date: Mon, 3 Nov 2014 16:30:27 +0300
+Subject: [PATCH 3/3] protocol/astral: migrate to qt-telepaphy API v0.9
+
+---
+ protocols/astral/src/astralaccount.cpp | 12 ++++++------
+ protocols/astral/src/astralaccount.h | 14 +++++++-------
+ protocols/astral/src/astralcontact.h | 6 +++---
+ protocols/astral/src/astralplugin.cpp | 6 +++---
+ protocols/astral/src/astralroster.cpp | 14 +++++++-------
+ protocols/astral/src/astralsession.h | 4 ++--
+ 6 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/protocols/astral/src/astralaccount.cpp b/protocols/astral/src/astralaccount.cpp
+index 1d51707..e9bf729 100644
+--- a/protocols/astral/src/astralaccount.cpp
++++ b/protocols/astral/src/astralaccount.cpp
+@@ -26,9 +26,9 @@
+ #include "astralprotocol.h"
+ #include "astralroster.h"
+ #include "astralsessionmanager.h"
+-#include <TelepathyQt4/Account>
+-#include <TelepathyQt4/AccountManager>
+-#include <TelepathyQt4/PendingChannel>
++#include <TelepathyQt/Account>
++#include <TelepathyQt/AccountManager>
++#include <TelepathyQt/PendingChannel>
+ #include <QDebug>
+
+ struct AstralAccountPrivate
+@@ -146,14 +146,14 @@ void AstralAccount::onNewChannels(const Tp::ChannelDetailsList &channels)
+ qDebug() << "AstralAccount::onNewChannels";
+ foreach (const Tp::ChannelDetails &details, channels)
+ {
+- QString channelType = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType")).toString();
+- bool requested = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".Requested")).toBool();
++ QString channelType = details.properties.value(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType")).toString();
++ bool requested = details.properties.value(TP_QT_IFACE_CHANNEL + QLatin1String(".Requested")).toBool();
+ qDebug() << " channelType:" << channelType;
+ qDebug() << " requested :" << requested;
+ qDebug() << " channelPath:" << details.channel.path();
+ qDebug() << " properties :" << details.properties;
+
+- if (channelType == TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT && !requested)
++ if (channelType == TP_QT_IFACE_CHANNEL_TYPE_TEXT && !requested)
+ {
+ TextChannelPtr channel = TextChannel::create(p->conn,
+ details.channel.path(),
+diff --git a/protocols/astral/src/astralaccount.h b/protocols/astral/src/astralaccount.h
+index 2781fb9..6e4378d 100644
+--- a/protocols/astral/src/astralaccount.h
++++ b/protocols/astral/src/astralaccount.h
+@@ -26,13 +26,13 @@
+ #define ASTRALACCOUNT_H
+
+ #include <qutim/account.h>
+-#include <TelepathyQt4/ConnectionManager>
+-#include <TelepathyQt4/Connection>
+-#include <TelepathyQt4/TextChannel>
+-#include <TelepathyQt4/AccountManager>
+-#include <TelepathyQt4/PendingConnection>
+-#include <TelepathyQt4/PendingOperation>
+-#include <TelepathyQt4/PendingReady>
++#include <TelepathyQt/ConnectionManager>
++#include <TelepathyQt/Connection>
++#include <TelepathyQt/TextChannel>
++#include <TelepathyQt/AccountManager>
++#include <TelepathyQt/PendingConnection>
++#include <TelepathyQt/PendingOperation>
++#include <TelepathyQt/PendingReady>
+
+ #include "astralroster.h"
+
+diff --git a/protocols/astral/src/astralcontact.h b/protocols/astral/src/astralcontact.h
+index ce0e9dd..5adfb07 100644
+--- a/protocols/astral/src/astralcontact.h
++++ b/protocols/astral/src/astralcontact.h
+@@ -26,9 +26,9 @@
+ #define ASTRALCONTACT_H
+
+ #include <qutim/contact.h>
+-#include <TelepathyQt4/Types>
+-#include <TelepathyQt4/Contact>
+-#include <TelepathyQt4/Connection>
++#include <TelepathyQt/Types>
++#include <TelepathyQt/Contact>
++#include <TelepathyQt/Connection>
+
+ using namespace Tp;
+ using namespace qutim_sdk_0_3;
+diff --git a/protocols/astral/src/astralplugin.cpp b/protocols/astral/src/astralplugin.cpp
+index e907866..d79642e 100644
+--- a/protocols/astral/src/astralplugin.cpp
++++ b/protocols/astral/src/astralplugin.cpp
+@@ -24,9 +24,9 @@
+ ****************************************************************************/
+ #include "astralplugin.h"
+ #include <QtCore/QtDebug>
+-#include <TelepathyQt4/Debug>
+-#include <TelepathyQt4/Constants>
+-#include <TelepathyQt4/Types>
++#include <TelepathyQt/Debug>
++#include <TelepathyQt/Constants>
++#include <TelepathyQt/Types>
+ //#include <TelepathyQt4/ConnectionInterfaceAvatarsInterface>
+
+ AstralPlugin::AstralPlugin()
+diff --git a/protocols/astral/src/astralroster.cpp b/protocols/astral/src/astralroster.cpp
+index 9eb209f..588cc55 100644
+--- a/protocols/astral/src/astralroster.cpp
++++ b/protocols/astral/src/astralroster.cpp
+@@ -24,13 +24,13 @@
+ ****************************************************************************/
+ #include "astralroster.h"
+ #include "astralaccount.h"
+-#include <TelepathyQt4/Types>
+-#include <TelepathyQt4/Contact>
+-#include <TelepathyQt4/ContactManager>
+-#include <TelepathyQt4/PendingConnection>
+-#include <TelepathyQt4/PendingContacts>
+-#include <TelepathyQt4/PendingOperation>
+-#include <TelepathyQt4/PendingReady>
++#include <TelepathyQt/Types>
++#include <TelepathyQt/Contact>
++#include <TelepathyQt/ContactManager>
++#include <TelepathyQt/PendingConnection>
++#include <TelepathyQt/PendingContacts>
++#include <TelepathyQt/PendingOperation>
++#include <TelepathyQt/PendingReady>
+
+ struct AstralRosterPrivate
+ {
+diff --git a/protocols/astral/src/astralsession.h b/protocols/astral/src/astralsession.h
+index fa78e45..a5dd1c3 100644
+--- a/protocols/astral/src/astralsession.h
++++ b/protocols/astral/src/astralsession.h
+@@ -26,8 +26,8 @@
+ #define ASTRALSESSION_H
+
+ #include <qutim/chatunit.h>
+-#include <TelepathyQt4/TextChannel>
+-#include <TelepathyQt4/Message>
++#include <TelepathyQt/TextChannel>
++#include <TelepathyQt/Message>
+
+ using namespace qutim_sdk_0_3;
+ using namespace Tp;
+--
+2.0.4
+
diff --git a/net-im/qutim/metadata.xml b/net-im/qutim/metadata.xml
new file mode 100644
index 000000000000..8862591a628c
--- /dev/null
+++ b/net-im/qutim/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>fatzer2@gmail.com</email>
+ <name>Alexander Golubev</name>
+ <description>Proxied maintainer. Assign bugs on him</description>
+</maintainer>
+<upstream>
+ <maintainer>
+ <email>euroelessar@yandex.ru</email>
+ <name>Ruslan Nigmatullin</name>
+ </maintainer>
+ <bugs-to>https://github.com/euroelessar/qutim/issues</bugs-to>
+</upstream>
+<use>
+ <flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
+ <flag name="awn">Enable integration with <pkg>gnome-extra/avant-window-navigator</pkg></flag>
+ <flag name="crypt">Enable AES crypto plugin</flag>
+ <flag name="histman">Enable history importer plugin</flag>
+ <flag name="hunspell">Enable spellchecking using <pkg>app-text/hunspell</pkg></flag>
+ <flag name="irc">Enable IRC protocol support</flag>
+ <flag name="mrim">Enable mail.ru protocol support</flag>
+ <flag name="otr">Enable plugin for encrypted conversations (Off-The-Record messaging)</flag>
+ <flag name="phonon">Add sound support via <pkg>media-libs/phonon</pkg> or <pkg>dev-qt/qtphonon</pkg></flag>
+ <flag name="purple">Enable libpurple-based protocol support</flag>
+ <flag name="qml">Enable QtQuick-based chat plugin</flag>
+ <flag name="sdl">Add sound support via <pkg>media-libs/sdl-mixer</pkg></flag>
+ <flag name="vkontakte">Enable vkontakte protocol support</flag>
+ <flag name="webkit">Enable Adium-like WebView plugin</flag>
+ <flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag>
+ <flag name="tools">Enable some extra tools for qt developers</flag>
+ <flag name="telepathy">Enable to connect various IMs through <pkg>net-im/telepathy-*</pkg></flag>
+ <flag name="antiboss">Enable support for the antiboss plugin</flag>
+ <flag name="espionage">!!Not recomended, contains privacy risk!! Enable control plugin that controls user by sending messages and roster to remote server</flag>
+ <flag name="mobility">Enable several mobility related plugins like vibro notification</flag>
+ <flag name="plugman">Enable downloadable content management with <pkg>dev-libs/libattica</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/qutim/qutim-0.3.2.ebuild b/net-im/qutim/qutim-0.3.2.ebuild
new file mode 100644
index 000000000000..ff2e14f26b59
--- /dev/null
+++ b/net-im/qutim/qutim-0.3.2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+LANGS="ar be bg cs de en_GB es fr he nds ru sk uk uz zh_CN"
+
+inherit qt4-r2 cmake-utils
+
+DESCRIPTION="Qt4-based multi-protocol instant messenger"
+HOMEPAGE="http://www.qutim.org"
+SRC_URI="http://www.qutim.org/dwnl/68/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# general USE
+IUSE="doc +sound tools"
+# protocol uses
+IUSE="$IUSE telepathy irc xmpp jingle mrim oscar purple vkontakte"
+# plugins
+IUSE="$IUSE antiboss aspell ayatana awn crypt dbus debug -espionage histman hunspell
+ kde mobility otr plugman phonon purple qml sdl +ssl +xscreensaver webkit"
+
+REQUIRED_USE="
+ oscar? ( ssl )
+ jingle? ( xmpp )
+ qml? ( webkit )
+"
+
+# Minimum Qt version required
+QT_PV="4.7.0:4"
+
+CDEPEND="
+ x11-libs/libqxt
+ >=dev-qt/qtcore-${QT_PV}[ssl?]
+ >=dev-qt/qtgui-${QT_PV}
+ >=dev-qt/qtscript-${QT_PV}
+ >=dev-qt/qtdeclarative-${QT_PV}
+
+ telepathy? ( >=net-libs/telepathy-qt-0.3 )
+ xmpp? (
+ app-crypt/qca:2[qt4(+)]
+ >=net-libs/jreen-1.2.0
+ )
+ jingle? ( dev-qt/qt-mobility[multimedia] )
+ oscar? ( app-crypt/qca:2[qt4(+)] )
+ purple? ( net-im/pidgin )
+ vkontakte? ( >=dev-qt/qtwebkit-${QT_PV} )
+
+ aspell? ( app-text/aspell )
+ awn? ( >=dev-qt/qtdbus-${QT_PV} )
+ crypt? ( app-crypt/qca:2[qt4(+)] )
+ dbus? ( >=dev-qt/qtdbus-${QT_PV} )
+ espionage? ( app-crypt/qca:2[qt4(+)] )
+ histman? ( >=dev-qt/qtsql-${QT_PV} )
+ ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
+ hunspell? ( app-text/hunspell )
+ kde? ( kde-base/kdelibs:4 )
+ mobility? (
+ dev-qt/qt-mobility[multimedia,feedback]
+ >=dev-qt/qtbearer-${QT_PV}
+ )
+ otr? (
+ >=net-libs/libotr-3.2.0
+ <net-libs/libotr-4.0.0
+ )
+ phonon? (
+ kde? ( media-libs/phonon[qt4] )
+ !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon[qt4] ) )
+ )
+ plugman? (
+ dev-libs/libattica
+ app-arch/libarchive
+ )
+ qml? (
+ >=dev-qt/qtopengl-${QT_PV}
+ )
+ sdl? ( media-libs/sdl-mixer )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ kde? ( dev-util/automoc )
+"
+RDEPEND="${CDEPEND}
+ xmpp? ( app-crypt/qca:2[gpg] )
+ oscar? ( app-crypt/qca:2[openssl] )
+ kde-apps/oxygen-icons
+"
+
+DOCS=( AUTHORS INSTALL ChangeLog )
+PATCHES=(
+ "${FILESDIR}/${PN}-0.3.1-cmake-2.8.12-kde-build.patch"
+ "${FILESDIR}/${P}-astral-migrate-qt-telepaphy.patch"
+)
+
+src_prepare() {
+ # fix automagic dep on libXScrnSaver
+ if ! use xscreensaver; then
+ sed -i -e '/XSS xscrnsaver/d' \
+ core/src/corelayers/idledetector/CMakeLists.txt || die
+ fi
+
+ # fix automagic dep on qt-mobility for jingle
+ if ! use jingle; then
+ sed -i -e '/find_package(QtMobility)/d' \
+ protocols/jabber/CMakeLists.txt || die
+ fi
+
+ # remove unwanted translations
+ local lang
+ for lang in ${LANGS}; do
+ use linguas_${lang} || rm -f translations/modules/*/${lang}.{po,ts}
+ done
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSYSTEM_JREEN=ON
+ $(cmake-utils_use_with doc DOXYGEN)
+ $(cmake-utils_use doc QUTIM_GENERATE_DOCS)
+ $(cmake-utils_use sound QUTIM_INSTALL_SOUND_THEME )
+ $(cmake-utils_use tools QUTIM_DEVELOPER_BUILD )
+
+ # protocols
+ $(cmake-utils_use telepathy ASTRAL )
+ $(cmake-utils_use irc )
+ $(cmake-utils_use xmpp JABBER )
+ $(cmake-utils_use mrim )
+ $(cmake-utils_use oscar )
+ $(cmake-utils_use purple QUETZAL )
+ $(cmake-utils_use vkontakte )
+
+ # plugins
+ $(cmake-utils_use webkit ADIUMWEBVIEW )
+ $(cmake-utils_use crypt AESCRYPTO )
+ $(cmake-utils_use antiboss ANTIBOSS )
+ $(cmake-utils_use aspell ASPELLER )
+ $(cmake-utils_use awn AWN )
+ $(cmake-utils_use espionage CONTROL ) # Also requires -DENABLE_ESPIONAGE=ON (see bellow)
+ $(cmake-utils_use dbus DBUSAPI )
+ $(cmake-utils_use dbus DBUSNOTIFICATIONS )
+ $(cmake-utils_use histman HISTMAN )
+ $(cmake-utils_use hunspell HUNSPELLER )
+ $(cmake-utils_use ayatana INDICATOR )
+ $(cmake-utils_use kde KDEINTEGRATION )
+ $(cmake-utils_use qml KINETICPOPUPS )
+ $(cmake-utils_use phonon PHONONSOUND )
+ $(cmake-utils_use plugman PLUGMAN )
+ $(cmake-utils_use debug LOGGER )
+ $(cmake-utils_use mobility MOBILITY )
+ $(cmake-utils_use dbus NOWPLAYING )
+ $(cmake-utils_use otr OFFTHERECORD )
+ $(cmake-utils_use qml QMLCHAT )
+ $(cmake-utils_use sdl SDLSOUND )
+ $(cmake-utils_use_enable espionage )
+ -DLINUXINTEGRATION=ON
+ -DDOCKTILE=OFF # QtDockTile currenly supports only unity;
+ # consider to make it optional if it also support kde or whatever
+ -DUPDATER=OFF
+ )
+ # NOTE: Integration plugins are autodisabled:
+ # symbianintegration macintegration maemo5integration haikunotifications meegointegration winintegration
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst () {
+ elog "Next qutim plugins are enabled by default:"
+ elog " antispam autopaster autoreply birthdayreminder blogimprover clconf"
+ elog " emoedit floaties formula highlighter imagepub massmessaging"
+ elog " oldcontactdelegate qrcicons screenshoter scriptapi unreadmessageskeeper urlpreview"
+ elog " weather webhistory yandexnarod"
+ elog "If you have strong reasons to make their build optional feel free to fill bugrepot."
+
+ if use espionage; then
+ ewarn "You have enabled the control (espionage) plugin. It may "
+ ewarn "deal negative security impact on the privacy of your client."
+ fi
+}
diff --git a/net-im/qwit/Manifest b/net-im/qwit/Manifest
new file mode 100644
index 000000000000..1f1646b98a88
--- /dev/null
+++ b/net-im/qwit/Manifest
@@ -0,0 +1 @@
+DIST qwit-1.1-pre2-src.tar.bz2 186229 SHA256 c69044826ec4448765237556fa4def5c1a4df7c61d4cc825cdf9aa404f506d10 SHA512 46f105b350217b64013630611c7b895664ea76302fa3cb4bcf547f75533e40ffb5140273a9da7c3f6c301e3e63180d33bd6f2b7ce2cce864c0b4957aace45bc3 WHIRLPOOL 845043d8d5509617b931bcc49b377ddd60369f943d45cc5831283d439df58c0e03c73a0d893584b95fd5fdae49da647d630a96f6ff1f33ca80e5f8e7e4899db1
diff --git a/net-im/qwit/metadata.xml b/net-im/qwit/metadata.xml
new file mode 100644
index 000000000000..e848af84bf66
--- /dev/null
+++ b/net-im/qwit/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>qt</herd>
+ <maintainer>
+ <email>hwoarang@gentoo.org</email>
+ <name>Markos Chandras</name>
+ </maintainer>
+ <longdescription lang="en">
+ </longdescription>
+ <upstream>
+ <remote-id type="google-code">qwit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/qwit/qwit-1.1_pre2.ebuild b/net-im/qwit/qwit-1.1_pre2.ebuild
new file mode 100644
index 000000000000..c5faf0b31e6b
--- /dev/null
+++ b/net-im/qwit/qwit-1.1_pre2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit qt4-r2
+
+MY_P=${P/_/-}-src
+
+DESCRIPTION="Qt4 cross-platform client for Twitter"
+HOMEPAGE="http://code.google.com/p/qwit/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DOCS="AUTHORS"
+
+DEPEND="dev-qt/qtgui:4"
+RDEPEND="${DEPEND}
+ dev-libs/qoauth"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ eqmake4 ${PN}.pro PREFIX=/usr
+}
diff --git a/net-im/reaim/Manifest b/net-im/reaim/Manifest
new file mode 100644
index 000000000000..2ccd17a2f011
--- /dev/null
+++ b/net-im/reaim/Manifest
@@ -0,0 +1 @@
+DIST reaim-0.8.tar.gz 39944 SHA256 8a530d8b2ee40c63dd71f20657f324252732632778928ecccaea2a237be19eb5
diff --git a/net-im/reaim/files/reaim b/net-im/reaim/files/reaim
new file mode 100644
index 000000000000..f10cd7edcab4
--- /dev/null
+++ b/net-im/reaim/files/reaim
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need net iptables
+}
+
+start() {
+ ebegin "Starting reaim"
+ iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 5190 -j REDIRECT --to-ports 5190
+ start-stop-daemon --start --quiet --exec /usr/sbin/reaim
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping reaim"
+ iptables -t nat -D PREROUTING -i eth0 -p tcp --dport 5190 -j REDIRECT --to-ports 5190
+ start-stop-daemon --stop --quiet --exec /usr/sbin/reaim
+ eend $?
+}
diff --git a/net-im/reaim/metadata.xml b/net-im/reaim/metadata.xml
new file mode 100644
index 000000000000..0a0826c95a75
--- /dev/null
+++ b/net-im/reaim/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">reaim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/reaim/reaim-0.8-r1.ebuild b/net-im/reaim/reaim-0.8-r1.ebuild
new file mode 100644
index 000000000000..59cb3548f7ee
--- /dev/null
+++ b/net-im/reaim/reaim-0.8-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="AIM transport proxy over NAT firewalls"
+HOMEPAGE="http://reaim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/reaim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="net-firewall/iptables"
+
+pkg_setup() {
+ tc-export CC
+}
+
+src_prepare() {
+ sed -i -e 's/gcc/$(CC) $(CFLAGS) $(LDFLAGS)/' \
+ -e 's/ -g / /' Makefile || die "sed failed" #365863
+}
+
+src_install() {
+ dosbin reaim || die
+ doman reaim.8
+ dodoc CREDITS
+ dohtml -r -x CVS html/*
+ newinitd "${FILESDIR}"/reaim reaim
+}
diff --git a/net-im/sendxmpp/Manifest b/net-im/sendxmpp/Manifest
new file mode 100644
index 000000000000..a441cd210609
--- /dev/null
+++ b/net-im/sendxmpp/Manifest
@@ -0,0 +1,2 @@
+DIST sendxmpp-1.24.tar.gz 9657 SHA256 dfaf735b4585efd6b3b0f95db31203f9ab0fe607b50e75c6951bc18a6269837d SHA512 349aac46ad4e13836f797f953d1acb33014d66de2bebed4961bcd981b765b5f0014bd2291a7355f0f8e80db522e3e843088fe08c0a21d4dda360dc2834db4842 WHIRLPOOL 81752d7b8843be27db101c0e20ebaccfe14a403f0064214e1b430ddd1117e6b81ab3ccf3e96bcc123e79601bb4658124e11b850799bf6a984cd1127965b5af8f
+DIST sendxmpp_1.23.orig.tar.gz 9196 SHA256 8a8b408ebd1df0157418981035748d9eb2464d353c5ea8ac48b074b8a85b9616 SHA512 65cbda52450a3537982d0c8f94265a1f8c336379ea4e4bc56c772bb613ea03fe25feb85fb4c8e3b26a48ad03d0c5e07188268e07c1da9981cb1dab87b17d9ba8 WHIRLPOOL e522c3950014f1cffc890ab2bdbfe6a4d3c0a9278fb935eec6918ce013011ed6037dcc912b4671c3a8fbca02245f8192ebb915571bf96381a19d6ab923f26a01
diff --git a/net-im/sendxmpp/metadata.xml b/net-im/sendxmpp/metadata.xml
new file mode 100644
index 000000000000..b0475f13df49
--- /dev/null
+++ b/net-im/sendxmpp/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="github">lhost/sendxmpp</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/sendxmpp/sendxmpp-1.23.ebuild b/net-im/sendxmpp/sendxmpp-1.23.ebuild
new file mode 100644
index 000000000000..8e1921f7c953
--- /dev/null
+++ b/net-im/sendxmpp/sendxmpp-1.23.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="sendxmpp is a perl-script to send xmpp (jabber), similar to what mail(1) does for mail"
+HOMEPAGE="http://sendxmpp.hostname.sk/"
+SRC_URI="mirror://debian/pool/main/s/sendxmpp/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc sparc x86"
+IUSE=""
+
+RDEPEND="dev-perl/Net-XMPP
+ dev-perl/Authen-SASL
+ virtual/perl-Getopt-Long"
+
+S="${WORKDIR}"/lhost-${PN}-610082b
diff --git a/net-im/sendxmpp/sendxmpp-1.24.ebuild b/net-im/sendxmpp/sendxmpp-1.24.ebuild
new file mode 100644
index 000000000000..114b808f824a
--- /dev/null
+++ b/net-im/sendxmpp/sendxmpp-1.24.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 perl-module
+
+DESCRIPTION="A perl-script to send xmpp (jabber), similar to what mail(1) does for mail"
+HOMEPAGE="http://sendxmpp.hostname.sk/"
+SRC_URI="https://github.com/lhost/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/Net-XMPP
+ dev-perl/Authen-SASL
+ virtual/perl-Getopt-Long"
diff --git a/net-im/silc-server/Manifest b/net-im/silc-server/Manifest
new file mode 100644
index 000000000000..fc4a214fd658
--- /dev/null
+++ b/net-im/silc-server/Manifest
@@ -0,0 +1 @@
+DIST silc-server-1.1.18.tar.bz2 908188 SHA256 1a0d4efb5683b3148b3ba91d5b56fff60875bc8bb97e854330714d927986205b SHA512 bf457a5f75037c56138154cfdba62d7ec27a91bc3606c84760a2103c90dff1ea9beb09c6e86e25074142610c6e14d7dffc24956debfa8355b37a4a1fb5e68e47 WHIRLPOOL 297b5a8b673597ea41b45bf46efd746ce49dd7bb514965529b1a8f97bf7765bb668b9ee16383579325fa81eb7e8ddf954e6333c4ff3d2c103f4dbf4ea3677a9b
diff --git a/net-im/silc-server/files/silcd.initd-r1 b/net-im/silc-server/files/silcd.initd-r1
new file mode 100644
index 000000000000..2ffcfba3dc8d
--- /dev/null
+++ b/net-im/silc-server/files/silcd.initd-r1
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="Server for Secure Internet Live Conferencing"
+pidfile="/run/silcd.pid"
+command="/usr/sbin/silcd"
+command_args="-f /etc/silc/silcd.conf >/dev/null 2>&1"
+start_stop_daemon_args="-w 2000"
+
+depend() {
+ need net
+ use dns
+}
+
+start_pre() {
+ local silcdconf="/etc/silc/silcd.conf"
+
+ if [ ! -f "${silcdconf}" ] ; then
+ eerror "You need to set up a ${silcdconf} file in order to start the server."
+ eerror "You can find an example config in /usr/share/doc/silc-server*"
+ return 1
+ fi
+}
diff --git a/net-im/silc-server/metadata.xml b/net-im/silc-server/metadata.xml
new file mode 100644
index 000000000000..6ef15e900f17
--- /dev/null
+++ b/net-im/silc-server/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-irc</herd>
+</pkgmetadata>
diff --git a/net-im/silc-server/silc-server-1.1.18.ebuild b/net-im/silc-server/silc-server-1.1.18.ebuild
new file mode 100644
index 000000000000..23fad3c2c4dd
--- /dev/null
+++ b/net-im/silc-server/silc-server-1.1.18.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 flag-o-matic user
+
+DESCRIPTION="Server for Secure Internet Live Conferencing"
+SRC_URI="http://www.silcnet.org/download/server/sources/${P}.tar.bz2"
+HOMEPAGE="http://silcnet.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="gmp ipv6 debug"
+
+RDEPEND="!<=net-im/silc-toolkit-0.9.12-r1
+ !<=net-im/silc-client-1.0.1
+ gmp? ( dev-libs/gmp )"
+
+pkg_setup() {
+ enewuser silcd
+}
+
+src_configure() {
+ econf \
+ --datadir=/usr/share/${PN} \
+ --datarootdir=/usr/share/${PN} \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc/silc \
+ --libdir=/usr/$(get_libdir)/${PN} \
+ --docdir=/usr/share/doc/${PF} \
+ --disable-optimizations \
+ --with-logsdir=/var/log/${PN} \
+ --with-silcd-pid-file=/var/run/silcd.pid \
+ $(use_with gmp) \
+ $(use_enable ipv6) \
+ $(use_enable debug)
+}
+
+#src_compile() {
+# emake -j1
+#}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ insinto /etc/silc
+ doins doc/silcalgs.conf
+
+ insinto /usr/share/doc/${PF}/examples
+ doins doc/examples/*.conf
+
+ fperms 600 /etc/silc
+ keepdir /var/log/${PN}
+
+ rm -rf \
+ "${D}"/usr/libsilc* \
+ "${D}"/usr/include \
+ "${D}"/etc/silc/silcd.{pub,prv}
+
+ newinitd "${FILESDIR}/silcd.initd-r1" silcd
+ doman doc/silcd.8 doc/silcd.conf.5
+
+ sed -i \
+ -e 's:10.2.1.6:0.0.0.0:' \
+ -e 's:User = "nobody";:User = "silcd";:' \
+ -e 's:/var/run:/run:' \
+ -e 's:lassi.kuo.fi.ssh.com:localhost:' \
+ doc/example_silcd.conf \
+ || die
+ dodoc doc/example_silcd.conf
+}
+
+pkg_postinst() {
+ if [ ! -f "${ROOT}"/etc/silc/silcd.prv ] ; then
+ einfo "Creating key pair in /etc/silc"
+ silcd -C "${ROOT}"/etc/silc
+ chmod 600 "${ROOT}"/etc/silc/silcd.{prv,pub}
+ fi
+}
diff --git a/net-im/silc-toolkit/Manifest b/net-im/silc-toolkit/Manifest
new file mode 100644
index 000000000000..a81f68f863f1
--- /dev/null
+++ b/net-im/silc-toolkit/Manifest
@@ -0,0 +1 @@
+DIST silc-toolkit-1.1.10.tar.bz2 1830280 SHA256 a76cc364813b2d09dee7a9e99fda77db71b5bf752297176eb8de4fb0466eed76
diff --git a/net-im/silc-toolkit/metadata.xml b/net-im/silc-toolkit/metadata.xml
new file mode 100644
index 000000000000..6ef15e900f17
--- /dev/null
+++ b/net-im/silc-toolkit/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-irc</herd>
+</pkgmetadata>
diff --git a/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild b/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild
new file mode 100644
index 000000000000..ccd928f76b15
--- /dev/null
+++ b/net-im/silc-toolkit/silc-toolkit-1.1.10.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 eutils
+
+DESCRIPTION="SDK for the SILC protocol"
+HOMEPAGE="http://silcnet.org/"
+SRC_URI="http://silcnet.org/download/toolkit/sources/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="debug ipv6"
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ # They have incorrect DESTDIR usage
+ sed -i \
+ "s/^\(pkgconfigdir =\) \$(libdir)\/pkgconfig/\1 \/usr\/$(get_libdir)\/pkgconfig/"\
+ "${S}"/lib/Makefile.{am,in}
+}
+
+src_configure() {
+ econf \
+ --datadir="${EPREFIX}/usr/share/${PN}" \
+ --datarootdir="${EPREFIX}/usr/share/${PN}" \
+ --includedir="${EPREFIX}/usr/include/${PN}" \
+ --sysconfdir="${EPREFIX}/etc/silc" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --disable-optimizations \
+ --with-simdir=/usr/$(get_libdir)/${PN}/modules \
+ $(use_enable debug) \
+ $(use_enable ipv6)
+}
diff --git a/net-im/simpserver-bin/Manifest b/net-im/simpserver-bin/Manifest
new file mode 100644
index 000000000000..c670ddda624d
--- /dev/null
+++ b/net-im/simpserver-bin/Manifest
@@ -0,0 +1 @@
+DIST simpserver-2.1.0-linux-x86.tgz 609317 SHA256 77a28d92f3b4bc99f6cf78574fe1d9eb4d4e983ec6632fa0ff5be3e5a353d7b8
diff --git a/net-im/simpserver-bin/files/simpserver.rc b/net-im/simpserver-bin/files/simpserver.rc
new file mode 100644
index 000000000000..4a48f5833ed2
--- /dev/null
+++ b/net-im/simpserver-bin/files/simpserver.rc
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting simpserver"
+ start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/simpserver.pid \
+ --exec /opt/bin/simpserver -- /etc/simp.conf
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping simpserver"
+ start-stop-daemon --stop --quiet --pidfile /var/run/simpserver.pid
+ eend $?
+}
diff --git a/net-im/simpserver-bin/metadata.xml b/net-im/simpserver-bin/metadata.xml
new file mode 100644
index 000000000000..2db006f2a47b
--- /dev/null
+++ b/net-im/simpserver-bin/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>net-im</herd>
+<longdescription>
+SimpServer is the first lightweight instant messaging security gateway for Unix systems. Install SimpServer on a
+Unix system and configure IM clients on your local network, and conversations with Simp-equipped parties will be
+automatically encrypted. SimpServer can indeed accept simultaneous remote connections and thus secure local and/or
+remote clients.
+
+With SimpServer, corporate environments can now benefit from centralized instant messenger encryption. Linux fans
+can now secure their MSN conversations. SimpServer is currently beta software and is free for any use.
+</longdescription>
+</pkgmetadata>
diff --git a/net-im/simpserver-bin/simpserver-bin-2.1.0.ebuild b/net-im/simpserver-bin/simpserver-bin-2.1.0.ebuild
new file mode 100644
index 000000000000..cb5179e98fe5
--- /dev/null
+++ b/net-im/simpserver-bin/simpserver-bin-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_PN=${PN/-bin/}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SimpServer for Unix: IM instant security transparent proxy"
+SRC_URI="http://download.secway.com/public/products/simpserver/${MY_P}-linux-x86.tgz"
+HOMEPAGE="http://www.secway.com/"
+LICENSE="simpserver-test"
+
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+SLOT="0"
+S=${WORKDIR}/simp
+
+RESTRICT="strip"
+
+src_compile() {
+ einfo "Binary distribution. No compilation required."
+}
+
+src_install () {
+ dodoc README VERSION doc/CONFIG doc/TODO
+
+ exeinto /opt/bin
+ doexe bin/${MY_PN}
+
+ insinto /etc
+ doins etc/simp.conf
+
+ newinitd "${FILESDIR}/${MY_PN}".rc ${MY_PN}
+}
+
+pkg_postinst() {
+ elog "Please edit the configuration file: /etc/simp.conf."
+}
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
new file mode 100644
index 000000000000..0a7499bffb0a
--- /dev/null
+++ b/net-im/skype/Manifest
@@ -0,0 +1 @@
+DIST skype-4.3.0.37.tar.bz2 19310701 SHA256 8c99dc3978a588fb13303df7c8134379fb55b8dd460efefbc79ae594269b892d SHA512 935d0c06c031a90414f9b20c9a782c59deee36abff781c08f1dfd62194763dc9674bb85d478ae916b1bf440b123291d64380bc28295e9ecdd6522d17b434b7a5 WHIRLPOOL 1e5a84b04d7eb9bbf3bae9ae6e69bb41587a1cef7f5ff19af0363343fd7fc949d5202959efaf93b0ed9ccb939b8b2ad4d61fc9626fffbdc2a8d898f9fa29b300
diff --git a/net-im/skype/files/skype b/net-im/skype/files/skype
new file mode 100644
index 000000000000..3a647adddbda
--- /dev/null
+++ b/net-im/skype/files/skype
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec i686-pc-linux-gnu-apulse skype-bin "$@"
diff --git a/net-im/skype/files/skype-4.3.0.37-desktop.patch b/net-im/skype/files/skype-4.3.0.37-desktop.patch
new file mode 100644
index 000000000000..af31e0e34aea
--- /dev/null
+++ b/net-im/skype/files/skype-4.3.0.37-desktop.patch
@@ -0,0 +1,15 @@
+--- skype.desktop
++++ skype.desktop
+@@ -2,10 +2,10 @@
+ Name=Skype
+ Comment=Skype Internet Telephony
+ Exec=skype %U
+-Icon=skype.png
++Icon=skype
+ Terminal=false
+ Type=Application
+ Encoding=UTF-8
+-Categories=Network;Application;
++Categories=Network;InstantMessaging;Telephony;
+ MimeType=x-scheme-handler/skype;
+ X-KDE-Protocols=skype
diff --git a/net-im/skype/metadata.xml b/net-im/skype/metadata.xml
new file mode 100644
index 000000000000..9e6af26c0c18
--- /dev/null
+++ b/net-im/skype/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>amynka@gentoo.org</email>
+ </maintainer>
+ <longdescription>Skype is the next phenomenon from the people who
+ brought you KaZaA. Just like KaZaA, Skype uses P2P (peer-to-peer)
+ technology to connect you to other users not to share files this
+ time, but to talk and chat with your friends.
+ </longdescription>
+ <use>
+ <flag name="apulse">Use <pkg>media-sound/apulse</pkg> for PulseAudio emulation</flag>
+ <flag name="pax_kernel">Triggers a paxmarking of the main skype binary</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-im/skype/skype-4.3.0.37-r5.ebuild b/net-im/skype/skype-4.3.0.37-r5.ebuild
new file mode 100644
index 000000000000..19fc428578cb
--- /dev/null
+++ b/net-im/skype/skype-4.3.0.37-r5.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils gnome2-utils pax-utils
+
+DESCRIPTION="P2P Internet Telephony (VoiceIP) client"
+HOMEPAGE="http://www.skype.com/"
+SRC_URI="http://download.${PN}.com/linux/${P}.tar.bz2"
+
+LICENSE="skype-4.0.0.7-copyright BSD MIT RSA W3C regexp-UofT no-source-code"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apulse pax_kernel +pulseaudio selinux"
+REQUIRED_USE="apulse? ( !pulseaudio )"
+
+QA_PREBUILT=opt/bin/${PN}
+RESTRICT="mirror bindist strip" #299368
+
+EMUL_X86_VER=20120520
+
+RDEPEND="
+ virtual/ttf-fonts
+ dev-qt/qtcore:4[abi_x86_32(-)]
+ dev-qt/qtdbus:4[abi_x86_32(-)]
+ dev-qt/qtgui:4[accessibility,abi_x86_32(-)]
+ dev-qt/qtwebkit:4[abi_x86_32(-)]
+ media-libs/alsa-lib[abi_x86_32(-)]
+ x11-libs/libX11[abi_x86_32(-)]
+ x11-libs/libXext[abi_x86_32(-)]
+ x11-libs/libXScrnSaver[abi_x86_32(-)]
+ x11-libs/libXv[abi_x86_32(-)]
+ apulse? ( media-sound/apulse[abi_x86_32(-)] )
+ pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
+ selinux? ( sec-policy/selinux-skype )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-desktop.patch"
+}
+
+src_compile() {
+ if type -P lrelease >/dev/null; then
+ lrelease lang/*.ts || die
+ fi
+ rm -f lang/*.ts || die
+}
+
+src_install() {
+
+ if use apulse; then
+ into /opt
+ newbin ${PN} ${PN}-bin
+ dobin "${FILESDIR}/${PN}"
+ fowners root:audio /opt/bin/${PN} /opt/bin/${PN}-bin
+ else
+ into /opt
+ dobin ${PN}
+ fowners root:audio /opt/bin/${PN}
+ fi
+
+ insinto /etc/dbus-1/system.d
+ doins ${PN}.conf
+
+ insinto /usr/share/skype
+ doins -r avatars lang sounds
+
+ dodoc README
+
+ local res
+ for res in 16 32 48 64 96 128 256; do
+ newicon -s ${res} icons/SkypeBlue_${res}x${res}.png ${PN}.png
+ done
+
+ domenu skype.desktop
+
+ if use pax_kernel; then
+ if use apulse; then
+ pax-mark Cm "${ED}"/opt/bin/${PN}-bin || die
+ else
+ pax-mark Cm "${ED}"/opt/bin/${PN} || die
+ fi
+ eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+ eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
+ eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
+ eqawarn "you suspect that ${PN} is being broken by this modification,"
+ eqawarn "please open a bug."
+ fi
+
+ echo PRELINK_PATH_MASK=/opt/bin/${PN} > ${T}/99${PN}
+ doenvd "${T}"/99${PN} #430142
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+
+ rm -rf "${EROOT}"/usr/share/${PN} #421165
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+
+ # http://bugs.gentoo.org/360815
+ elog "For webcam support, see \"LD_PRELOAD\" section of \"README.lib\" document provided by"
+ elog "media-libs/libv4l package and \"README\" document of this package."
+
+ if ! use pulseaudio && ! use apulse; then
+ ewarn "ALSA support was removed from Skype"
+ ewarn "consider installing media-sound/pulseaudio"
+ ewarn "or media-sound/apulse for pulseaudio emulation"
+ ewarn "otherwise sound will not work for you."
+ ewarn "These packages can be pulled in by setting"
+ ewarn "appropriate USE flags for net-im/skype."
+ fi
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/net-im/skypetab-ng/Manifest b/net-im/skypetab-ng/Manifest
new file mode 100644
index 000000000000..3be0c28de8af
--- /dev/null
+++ b/net-im/skypetab-ng/Manifest
@@ -0,0 +1 @@
+DIST skypetab-ng-0.5.2.tar.gz 54244 SHA256 cb47961ddb9d5754141c10c862d991704ae065abf2cba1e4763a78a5dcbf0805 SHA512 28a19ea983a81c069bb6ad24c337561293f7ec53ca9a315fb872c9341dccecf4eb30e1652b1f012f7be34060fb955a8c085327ae03017264ccc4510976d3f6ea WHIRLPOOL 48b1a86a588dd60c3ee7b9185625027bbaef69b0a6dce237c1e38d3c7dc5b762675d7d21efb88bef7e3840ac1464cdfa3ca4a531756ab3f3f155c2a681aec0e7
diff --git a/net-im/skypetab-ng/metadata.xml b/net-im/skypetab-ng/metadata.xml
new file mode 100644
index 000000000000..fa7aec24b7bb
--- /dev/null
+++ b/net-im/skypetab-ng/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>slyfox@gentoo.org</email>
+ <name>Sergei Trofimovich</name>
+ <description>Primary Maintainer</description>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">kekekeks/skypetab-ng</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/skypetab-ng/skypetab-ng-0.5.2.ebuild b/net-im/skypetab-ng/skypetab-ng-0.5.2.ebuild
new file mode 100644
index 000000000000..e565ad2aea60
--- /dev/null
+++ b/net-im/skypetab-ng/skypetab-ng-0.5.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://github.com/kekekeks/skypetab-ng.git"
+ UNPACKER_ECLASS="git-2"
+ LIVE_EBUILD=yes
+else
+ UNPACKER_ECLASS="vcs-snapshot"
+fi
+
+inherit qt4-r2 multilib ${UNPACKER_ECLASS}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+ KEYWORDS="-* ~x86 ~amd64"
+ SRC_URI="http://github.com/kekekeks/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An LD_PRELOAD wrapper that adds tabs to Skype for Linux"
+HOMEPAGE="http://github.com/kekekeks/skypetab-ng"
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ dev-qt/qtcore:4[abi_x86_32(-)]
+ dev-qt/qtgui:4[abi_x86_32(-)]
+"
+RDEPEND="${DEPEND}
+ || ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
+"
+
+pkg_setup() {
+ use amd64 && multilib_toolchain_setup x86
+}
diff --git a/net-im/skypetab-ng/skypetab-ng-9999.ebuild b/net-im/skypetab-ng/skypetab-ng-9999.ebuild
new file mode 100644
index 000000000000..e565ad2aea60
--- /dev/null
+++ b/net-im/skypetab-ng/skypetab-ng-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://github.com/kekekeks/skypetab-ng.git"
+ UNPACKER_ECLASS="git-2"
+ LIVE_EBUILD=yes
+else
+ UNPACKER_ECLASS="vcs-snapshot"
+fi
+
+inherit qt4-r2 multilib ${UNPACKER_ECLASS}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+ KEYWORDS="-* ~x86 ~amd64"
+ SRC_URI="http://github.com/kekekeks/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An LD_PRELOAD wrapper that adds tabs to Skype for Linux"
+HOMEPAGE="http://github.com/kekekeks/skypetab-ng"
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ dev-qt/qtcore:4[abi_x86_32(-)]
+ dev-qt/qtgui:4[abi_x86_32(-)]
+"
+RDEPEND="${DEPEND}
+ || ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
+"
+
+pkg_setup() {
+ use amd64 && multilib_toolchain_setup x86
+}
diff --git a/net-im/telepathy-connection-managers/metadata.xml b/net-im/telepathy-connection-managers/metadata.xml
new file mode 100644
index 000000000000..49b41d2890b2
--- /dev/null
+++ b/net-im/telepathy-connection-managers/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>gnome</herd>
+<use>
+ <flag name='gadu'>Enable Gadu Gadu protocol support.</flag>
+ <flag name='irc'>Enable Internet Relay Chat (IRC) support.</flag>
+ <flag name='meanwhile'>Enable meanwhile support for Sametime protocol.</flag>
+ <flag name='sip'>Enable SIP/SIMPLE messaging and calling.</flag>
+ <flag name='sipe'>Enable Sip Exchange Protocol.</flag>
+ <flag name='steam'>Enable Steam Chat support.</flag>
+ <flag name='xmpp'>Enable XMPP protocol handler (this is also Google Talk).</flag>
+ <flag name='yahoo'>Enable Yahoo! messaging support.</flag>
+ <flag name='zeroconf'>Enable Link-Local Messaging via the zeroconf or Bonjour protocol.</flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild b/net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild
new file mode 100644
index 000000000000..5ca07721d5fd
--- /dev/null
+++ b/net-im/telepathy-connection-managers/telepathy-connection-managers-2-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
+
+DESCRIPTION="Meta-package for Telepathy Connection Managers"
+HOMEPAGE="http://telepathy.freedesktop.org/"
+SRC_URI=""
+LICENSE="metapackage"
+SLOT="0"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+
+IUSE="gadu icq +irc meanwhile msn sip sipe +xmpp yahoo steam zeroconf"
+
+DEPEND=""
+# These version support the 0.24.0 Telepathy specification
+# They work with Mission Control 5.14
+RDEPEND="
+ gadu? (
+ net-im/pidgin[gadu]
+ net-voip/telepathy-haze
+ )
+ icq? ( >=net-voip/telepathy-haze-0.6.0 )
+ irc? ( >=net-irc/telepathy-idle-0.1.14 )
+ meanwhile? (
+ net-im/pidgin[meanwhile]
+ net-voip/telepathy-haze
+ )
+ msn? ( >=net-voip/telepathy-gabble-0.16.4 )
+ sip? ( >=net-voip/telepathy-rakia-0.7.4 )
+ sipe? ( >=x11-plugins/pidgin-sipe-1.17.1[telepathy] )
+ steam? (
+ x11-plugins/pidgin-opensteamworks
+ net-voip/telepathy-haze
+ )
+ xmpp? ( >=net-voip/telepathy-gabble-0.16.4 )
+ yahoo? ( >=net-voip/telepathy-haze-0.6.0 )
+ zeroconf? ( >=net-voip/telepathy-salut-0.8.1 )
+"
diff --git a/net-im/telepathy-logger/Manifest b/net-im/telepathy-logger/Manifest
new file mode 100644
index 000000000000..1e84c0b8649a
--- /dev/null
+++ b/net-im/telepathy-logger/Manifest
@@ -0,0 +1,2 @@
+DIST telepathy-logger-0.8.1.tar.bz2 569680 SHA256 359528f5fa1539b250fead8d68c7a0eaef11ed4284dfb3761fff2b6dd688da39 SHA512 8c4a8b4fc6f8d98378bfa3008bcc7d921a7bdf659144bd60827d9bdd234644738224a17e5b39099b6b3df224cad8f1d03b9fed3e25b37a14d079eb22b13d5a30 WHIRLPOOL 2fefc7f5e464e845226cae9f10a2722c887fd67e0292cc634c3f624d329cd342d0c6797a70960549e2b0393ac940b4911c62dd5ec17722dffbbbec176154f2e0
+DIST telepathy-logger-0.8.2.tar.bz2 562670 SHA256 8fcad534d653b1b365132c5b158adae947810ffbae9843f72dd1797966415dae SHA512 f3eda26133a4c38eeb79b01cbe3b7801a5eb773e8b4e6ce621c47d3ca701025364c6b2b890caea00104f01ba85ae891a6fad82d7a9dc487fd7a980221cede451 WHIRLPOOL 84aabf0f9cf594ade109f37490d999cd3f37fca894a2a659b97da4314d3aa3375c97fdad4a282208c427e8c34d81568f8298c5872c8ad9a7f213d2b00b0dfe9f
diff --git a/net-im/telepathy-logger/metadata.xml b/net-im/telepathy-logger/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/net-im/telepathy-logger/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-im/telepathy-logger/telepathy-logger-0.8.1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.1.ebuild
new file mode 100644
index 000000000000..db8d1cde16b9
--- /dev/null
+++ b/net-im/telepathy-logger/telepathy-logger-0.8.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"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Telepathy Logger is a session daemon that should be activated whenever telepathy is being used"
+HOMEPAGE="http://telepathy.freedesktop.org/wiki/Logger"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+IUSE="+introspection"
+
+RDEPEND="
+ >=dev-libs/glib-2.28:2
+ >=sys-apps/dbus-1.1
+ >=dev-libs/dbus-glib-0.82
+ >=net-libs/telepathy-glib-0.19.2[introspection?]
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-db/sqlite:3
+ introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/intltool-0.35
+ virtual/pkgconfig
+"
+
+src_configure() {
+ # --enable-debug needed due https://bugs.freedesktop.org/show_bug.cgi?id=83390
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ --enable-debug \
+ --enable-public-extensions \
+ --disable-coding-style-checks \
+ --disable-Werror \
+ --disable-static
+}
+
+src_test() {
+ Xemake check
+}
diff --git a/net-im/telepathy-logger/telepathy-logger-0.8.2.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.2.ebuild
new file mode 100644
index 000000000000..6b71762d8097
--- /dev/null
+++ b/net-im/telepathy-logger/telepathy-logger-0.8.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"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Telepathy Logger is a session daemon that should be activated whenever telepathy is being used"
+HOMEPAGE="http://telepathy.freedesktop.org/wiki/Logger"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+IUSE="+introspection"
+
+RDEPEND="
+ >=dev-libs/glib-2.28:2
+ >=sys-apps/dbus-1.1
+ >=dev-libs/dbus-glib-0.82
+ >=net-libs/telepathy-glib-0.19.2[introspection?]
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-db/sqlite:3
+ introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=dev-util/gtk-doc-am-1.10
+ >=dev-util/intltool-0.35
+ virtual/pkgconfig
+"
+
+src_configure() {
+ # --enable-debug needed due to https://bugs.freedesktop.org/show_bug.cgi?id=83390
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ --enable-debug \
+ --enable-public-extensions \
+ --disable-coding-style-checks \
+ --disable-Werror \
+ --disable-static
+}
+
+src_test() {
+ Xemake check
+}
diff --git a/net-im/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest
new file mode 100644
index 000000000000..08ddd7f0aac7
--- /dev/null
+++ b/net-im/telepathy-mission-control/Manifest
@@ -0,0 +1,2 @@
+DIST telepathy-mission-control-5.16.2.tar.gz 1095760 SHA256 3dcbf8d26cd19e77ef9296c9ae501f8af6cd59aeb058f0a3d5eb75e5647268ea SHA512 6016e877db02a719846543323b3ee1336bbb0f345f9b08120c211cae3308e67adb5b0131c04c518b6a44c9ead3b996429d70c5266ced2dad5f4e5a69544d86f8 WHIRLPOOL 09ac8e351f0d550a953b30bb3c0d2e4f76f3b187159d69b6a465935d6b46d31613a644cbe590f8c6428b7dde52c04087860992b95a9c6a3f1c6972c1073bd622
+DIST telepathy-mission-control-5.16.3.tar.gz 1096019 SHA256 71575d2ff8aa7337aca355e3d921eba5cd2ff050fabc01e51577343093e98b7d SHA512 4cf8b387e74aa11536dfcc607a2bef4b1b594fb027753fc8bb702c27251ccbb611b80724f4f5b95c6cd347c53df4f0474fcc0dd4ee42313f8b655c2a745231ad WHIRLPOOL 4a905ee2b8bc92803735cdd837bd921e01236136433314e64b0c14689d7784d69495673a587134f650932769aafaabc6990f52f4a2c9ccc35427c02511bc1b8e
diff --git a/net-im/telepathy-mission-control/metadata.xml b/net-im/telepathy-mission-control/metadata.xml
new file mode 100644
index 000000000000..5265d716d02c
--- /dev/null
+++ b/net-im/telepathy-mission-control/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>gnome</herd>
+<herd>net-im</herd>
+<longdescription>Mission Control, or MC, is a telepathy component providing a
+way for "end-user" applications to abstract some of the details of connection
+managers, to provide a simple way to manipulate a bunch of connection managers
+at once, and to remove the need to have in each program the account
+definitions and credentials.</longdescription>
+<use>
+ <flag name="systemd">Rely on systemd's logind to detect suspend and resume</flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.2.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.2.ebuild
new file mode 100644
index 000000000000..75a9acba1256
--- /dev/null
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.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"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+# Needed for tests and build #489466
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1
+
+DESCRIPTION="An account manager and channel dispatcher for the Telepathy framework"
+HOMEPAGE="http://cgit.freedesktop.org/telepathy/telepathy-mission-control/"
+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 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="debug networkmanager systemd upower" # test
+
+RDEPEND="
+ >=dev-libs/dbus-glib-0.82
+ >=dev-libs/glib-2.32:2
+ >=sys-apps/dbus-0.95
+ >=net-libs/telepathy-glib-0.20
+ networkmanager? ( >=net-misc/networkmanager-0.7 )
+ !systemd? ( upower? ( >=sys-power/upower-pm-utils-0.9.23 ) )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-libs/libxslt
+ >=dev-util/gtk-doc-am-1.17
+ virtual/pkgconfig
+"
+# test? ( dev-python/twisted-words )"
+
+# Tests are broken, see upstream bug #29334 and #64212
+# upstream doesn't want it enabled everywhere (#29334#c12)
+RESTRICT="test"
+
+src_configure() {
+ # creds is not available
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable debug) \
+ $(use_with networkmanager connectivity nm) \
+ $(use_enable upower) \
+ $(use systemd && echo "--disable-upower")
+}
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.3.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.3.ebuild
new file mode 100644
index 000000000000..75a9acba1256
--- /dev/null
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.3.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"
+GNOME2_LA_PUNT="yes"
+# Needed for tests and build #489466
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1
+
+DESCRIPTION="An account manager and channel dispatcher for the Telepathy framework"
+HOMEPAGE="http://cgit.freedesktop.org/telepathy/telepathy-mission-control/"
+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 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="debug networkmanager systemd upower" # test
+
+RDEPEND="
+ >=dev-libs/dbus-glib-0.82
+ >=dev-libs/glib-2.32:2
+ >=sys-apps/dbus-0.95
+ >=net-libs/telepathy-glib-0.20
+ networkmanager? ( >=net-misc/networkmanager-0.7 )
+ !systemd? ( upower? ( >=sys-power/upower-pm-utils-0.9.23 ) )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-libs/libxslt
+ >=dev-util/gtk-doc-am-1.17
+ virtual/pkgconfig
+"
+# test? ( dev-python/twisted-words )"
+
+# Tests are broken, see upstream bug #29334 and #64212
+# upstream doesn't want it enabled everywhere (#29334#c12)
+RESTRICT="test"
+
+src_configure() {
+ # creds is not available
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable debug) \
+ $(use_with networkmanager connectivity nm) \
+ $(use_enable upower) \
+ $(use systemd && echo "--disable-upower")
+}
diff --git a/net-im/tkabber/Manifest b/net-im/tkabber/Manifest
new file mode 100644
index 000000000000..a30a25b13606
--- /dev/null
+++ b/net-im/tkabber/Manifest
@@ -0,0 +1,2 @@
+DIST tkabber-0.11.1.tar.gz 1026405 SHA256 9b12b726b609297254e7b0c5e500d415a6517bd6c951d53e7b429dca4a29bba7 SHA512 a28f4f9d2873366b4ffc6153e08d21e77dd0178fea13d894e79ce941779d8e4c97e48b572cbfd8c6c25c0636f6c8d8ca8d9b081aaccbb8e6d809de3228bdd268 WHIRLPOOL 07d45bed685067966cf514388831e6ad455ca3e15d9e1a90d03b03e8980dad9ce6376e891e6e453456f61819b592cd5db13d0eb351f99835b149cdf5bd724070
+DIST tkabber-plugins-0.11.1.tar.gz 615335 SHA256 ffad9602ef0383ffc209b6c8f235170270c98def3a5e4a5481714da6378eb94b
diff --git a/net-im/tkabber/metadata.xml b/net-im/tkabber/metadata.xml
new file mode 100644
index 000000000000..6b3ba828596a
--- /dev/null
+++ b/net-im/tkabber/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-im</herd>
+<longdescription>Tkabber is a Free and Open Source client for the Jabber instant messaging system. It's writen in Tcl/Tk, and works on many platforms.</longdescription>
+<use>
+ <flag name='plugins'>Enables installation the extra plugins</flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/tkabber/tkabber-0.11.1-r1.ebuild b/net-im/tkabber/tkabber-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..6140c6cc4c6b
--- /dev/null
+++ b/net-im/tkabber/tkabber-0.11.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A jabber client written in Tcl/Tk"
+HOMEPAGE="http://tkabber.jabber.ru/"
+SRC_URI="
+ http://files.jabber.ru/tkabber/${P}.tar.gz
+ plugins? ( http://files.jabber.ru/tkabber/tkabber-plugins-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="plugins ssl"
+
+DEPEND="
+ >=dev-lang/tcl-8.3.3:0=
+ >=dev-lang/tk-8.3.3:0=
+ >=dev-tcltk/tcllib-1.3
+ >=dev-tcltk/bwidget-1.3
+ >=dev-tcltk/tkXwin-1.0
+ >=dev-tcltk/tkimg-1.2
+ >=dev-tcltk/tktray-1.1
+ ssl? ( >=dev-tcltk/tls-1.4.1 )
+"
+RDEPEND="${DEPEND}"
+
+# Disabled because it depends on gpgme 0.3.x
+# crypt? ( >=dev-tcltk/tclgpgme-1.0 )
+
+src_compile() {
+ # dont run make, because the Makefile is broken with all=install
+ :
+}
+
+src_install() {
+ emake install DESTDIR="${D}" PREFIX=/usr \
+ DOCDIR="/usr/share/doc/${P}"
+
+ dodoc AUTHORS ChangeLog INSTALL README
+
+ if use plugins; then
+ cd "${WORKDIR}/tkabber-plugins-${PV}"
+ emake install DESTDIR="${D}" PREFIX=/usr \
+ DOCDIR="/usr/share/doc/${P}"
+ fi
+}
diff --git a/net-im/turses/Manifest b/net-im/turses/Manifest
new file mode 100644
index 000000000000..9eef8bff9527
--- /dev/null
+++ b/net-im/turses/Manifest
@@ -0,0 +1,2 @@
+DIST turses-0.2.13-r1.tar.gz 2239614 SHA256 76db7c296049c85054e4fb0e3ed86c4ea34aa0724eedd59f8ee55e0d483e0307 SHA512 ce7e2042b6a3c7fb998bb7f5523f7718f60d773d3b89d9175a462bf6f24f458f09aae8a78d481f6de69d6bc5af55dacc57c6976bcd2df2186200b0ee60627aa8 WHIRLPOOL 1920478d4d9d863149e59514700509aea432f1cf06985be635db8651900b7d1cab1f54cd5a7fc6f45df06b353e3ba12e6ab6bb65fdedb3c81645efc070eee539
+DIST turses-0.2.23.tar.gz 2241497 SHA256 f8532a317da939f8c2e285dfd00f73f7878152a5ce12c473ab8023ffe382868a SHA512 ef5b880319f4126a99787cd11fa4573b6c6ff626a759f2515ad507006625f1192e4ca1552ca687ca8ecdf2545a17c228fa956019c325d582e7f80bd8a3e6432b WHIRLPOOL a268261b44faeb3a6f88e59ac9f532fe9a578e425dc2738411d09d64715601fd17eaec979c8eaa55964ed61c6b518e7389417cc068160d5b5b85d48954a22d68
diff --git a/net-im/turses/files/turses-0.2.11-tests.patch b/net-im/turses/files/turses-0.2.11-tests.patch
new file mode 100644
index 000000000000..1d72b944ad82
--- /dev/null
+++ b/net-im/turses/files/turses-0.2.11-tests.patch
@@ -0,0 +1,28 @@
+commit c26c750103e6965bb2334938d77f213ebc2bd862
+Author: Mike Gilbert <floppym@gentoo.org>
+Date: Sun Feb 3 13:52:58 2013 -0500
+
+ Exclude tests from installation
+
+ https://bugs.gentoo.org/show_bug.cgi?id=455250
+
+diff --git a/MANIFEST.in b/MANIFEST.in
+new file mode 100644
+index 0000000..b562f73
+--- /dev/null
++++ b/MANIFEST.in
+@@ -0,0 +1 @@
++recursive-include tests *.py
+diff --git a/setup.py b/setup.py
+index 52fe1a1..705a485 100644
+--- a/setup.py
++++ b/setup.py
+@@ -63,7 +63,7 @@ setup(name=NAME,
+ description="A Twitter client for the console.",
+ long_description=long_description,
+ keywords="twitter client, curses, console, twitter",
+- packages=find_packages(),
++ packages=find_packages(exclude=["tests"]),
+ entry_points={
+ 'console_scripts':
+ ['turses = turses.cli:main']
diff --git a/net-im/turses/metadata.xml b/net-im/turses/metadata.xml
new file mode 100644
index 000000000000..b97b0d9a7e14
--- /dev/null
+++ b/net-im/turses/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>python</herd>
+ <longdescription lang="en">
+ </longdescription>
+ <upstream>
+ <remote-id type="github">alejandrogomez/turses</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/turses/turses-0.2.13-r1.ebuild b/net-im/turses/turses-0.2.13-r1.ebuild
new file mode 100644
index 000000000000..b0859431530e
--- /dev/null
+++ b/net-im/turses/turses-0.2.13-r1.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=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line twitter client"
+HOMEPAGE="https://github.com/alejandrogomez/turses"
+# NOTE: Remove the "-r1" from SRC_URI on the next version bump
+SRC_URI="https://github.com/alejandrogomez/${PN}/archive/v${PV}.tar.gz -> ${P}-r1.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-python/oauth2[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/tweepy[${PYTHON_USEDEP}]
+ dev-python/urwid[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ )
+"
+
+DOCS=( AUTHORS HISTORY.rst README.rst )
+
+python_test() {
+ nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/net-im/turses/turses-0.2.23.ebuild b/net-im/turses/turses-0.2.23.ebuild
new file mode 100644
index 000000000000..b944ed3bc8df
--- /dev/null
+++ b/net-im/turses/turses-0.2.23.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line twitter client"
+HOMEPAGE="https://github.com/alejandrogomez/turses"
+SRC_URI="https://github.com/alejandrogomez/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/oauth2[${PYTHON_USEDEP}]
+ dev-python/urwid[${PYTHON_USEDEP}]
+ >dev-python/tweepy-2.2[${PYTHON_USEDEP}]
+ <dev-python/tweepy-3[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ )
+"
+
+python_compile_all() {
+ use doc && emake -C docs html
+ emake -C docs man
+}
+
+python_test() {
+ py.test tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ doman "docs/_build/man/turses.1"
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/net-im/vacuum/Manifest b/net-im/vacuum/Manifest
new file mode 100644
index 000000000000..d9a5eab063d5
--- /dev/null
+++ b/net-im/vacuum/Manifest
@@ -0,0 +1 @@
+DIST vacuum-1.2.4.tar.xz 1617896 SHA256 3926df88b6c4c3f93453ed7cbf8d8030aaa3e9a4afe3b5a82d497cdd207ef1ce SHA512 7129ff00e0b13fb5e892540c14925bfbc27b7ad826990eda1aaa5dd0b772dfb1f734b5a5f978c42700273366b7ca0f75c2c79ab94e2ae538793e08dbd80ffd34 WHIRLPOOL aa14783f1dc739fb9f521175cac80ffab2bd2bbc8fd7b57aebfe83c87a535fab930e2bc896f7fad914915e1de54bb6dd437d44a9adb9fb6ba7debc28e397730f
diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml
new file mode 100644
index 000000000000..4d1898eb4169
--- /dev/null
+++ b/net-im/vacuum/metadata.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>nikoli@gmx.us</email>
+ <name>Nikoli</name>
+ </maintainer>
+ <maintainer>
+ <email>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+ </maintainer>
+ <use>
+ <flag name="adiummessagestyle">Use UI styles created for Adium</flag>
+ <flag name="annotations">Enable adding comments to the contacts in the roster</flag>
+ <flag name="autostatus">Change the status in accordance with the time of inactivity</flag>
+ <flag name="avatars">Enable assigning and displaying avatars</flag>
+ <flag name="birthdayreminder">Reminds about birthdays of your friends</flag>
+ <flag name="bitsofbinary">Allow other modules to receive or send a small amount of binary data in XMPP stanza</flag>
+ <flag name="bookmarks">Enable creating bookmarks of the Jabber conferences and Web pages</flag>
+ <flag name="captchaforms">Perform tests for humanity outside of Web browser</flag>
+ <flag name="chatstates">Post user's activity to the chat</flag>
+ <flag name="clientinfo">Enable sending and receiving peer's application version, local time and last activity info</flag>
+ <flag name="commands">Enable performing special commands provided by various services</flag>
+ <flag name="compress">Compress stream of messages</flag>
+ <flag name="console">Enable inspecting a raw XML stream</flag>
+ <flag name="dataforms">Allow other modules to process and display data forms intended for the user</flag>
+ <flag name="datastreamsmanager">Enable initiating a custom data stream between two XMPP entities</flag>
+ <flag name="emoticons">Enable using smiley images in messages</flag>
+ <flag name="filemessagearchive">Allows to save the history of conversations to local files</flag>
+ <flag name="filestreamsmanager">Enable transferring files between two XMPP entities</flag>
+ <flag name="filetransfer">Enable sending files to peers</flag>
+ <flag name="gateways">Simplify the interaction with gateways to other IM systems</flag>
+ <flag name="inbandstreams">Enable initiating in-band data stream between two XMPP enitites</flag>
+ <flag name="iqauth">Enable logging on Jabber servers withous SASL authentication support</flag>
+ <flag name="jabbersearch">Enable searching contacts in Jabber networks</flag>
+ <flag name="messagearchiver">Enable saving the communication history both locally and on the server</flag>
+ <flag name="messagecarbons">Allows to keep all user IM clients engaged in a conversation</flag>
+ <flag name="multiuserchat">Enable Jabber multi-user conferences</flag>
+ <flag name="pepmanager">Allows other plugins to recieve and publish PEP events</flag>
+ <flag name="privacylists">Enable blocking the undesirable contacts</flag>
+ <flag name="privatestorage">Allow other modules to store arbitrary data on the server</flag>
+ <flag name="recentcontacts">Displays a recently used contacts</flag>
+ <flag name="registration">Enable creating accounts in Jabber services</flag>
+ <flag name="remotecontrol">Allows to remotely control the client</flag>
+ <flag name="rosteritemexchange">Allows to exchange contact list items</flag>
+ <flag name="rostersearch">Allows to search for contacts in the roster</flag>
+ <flag name="servermessagearchive">Allows to save the history of communications on the server</flag>
+ <flag name="servicediscovery">Enable receiving information about Jabber entities</flag>
+ <flag name="sessionnegotiation">Enable initiating the session between two entities with setting the rules for XMPP stanzas exchange</flag>
+ <flag name="shortcutmanager">Allows to setup user defined shortcuts</flag>
+ <flag name="socksstreams">Enable initiating SOCKS5 data streams between two XMPP entities</flag>
+ <flag name="urlprocessor">Allows other plugins to load data from custom types of URLs</flag>
+ <flag name="vcard">Enable obtaining peer's personal contact information</flag>
+ <flag name="xmppuriqueries">Allow other plugins to handle XMPP URI queries</flag>
+ <flag name="vcs-revision">Add VCS revision to version number, INSECURE.</flag>
+ <flag name="aspell">Select <pkg>app-text/aspell</pkg> spell checker backend</flag>
+ <flag name="enchant">Select <pkg>app-text/enchant</pkg> spell checker backend</flag>
+ <flag name="hunspell">Select <pkg>app-text/hunspell</pkg> spell checker backend</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-im/vacuum/vacuum-1.2.4.ebuild b/net-im/vacuum/vacuum-1.2.4.ebuild
new file mode 100644
index 000000000000..1432f97a20a2
--- /dev/null
+++ b/net-im/vacuum/vacuum-1.2.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+LANGS="de pl ru uk"
+
+inherit cmake-utils
+
+DESCRIPTION="Qt4 Crossplatform Jabber client"
+HOMEPAGE="http://code.google.com/p/vacuum-im"
+SRC_URI="https://googledrive.com/host/0B7A5K_290X8-NE5nLUx5Yl9BTkk/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0/1.17" # subslot = libvacuumutils soname version
+KEYWORDS="~amd64 ~x86"
+PLUGINS=" adiummessagestyle annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver multiuserchat pepmanager privacylists privatestorage registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries"
+IUSE="${PLUGINS// / +}"
+for x in ${LANGS}; do
+ IUSE+=" linguas_${x}"
+done
+
+REQUIRED_USE="
+ annotations? ( privatestorage )
+ avatars? ( vcard )
+ birthdayreminder? ( vcard )
+ bookmarks? ( privatestorage )
+ captchaforms? ( dataforms )
+ commands? ( dataforms )
+ datastreamsmanager? ( dataforms )
+ filemessagearchive? ( messagearchiver )
+ filestreamsmanager? ( datastreamsmanager )
+ filetransfer? ( filestreamsmanager datastreamsmanager )
+ pepmanager? ( servicediscovery )
+ registration? ( dataforms )
+ remotecontrol? ( commands dataforms )
+ servermessagearchive? ( messagearchiver )
+ sessionnegotiation? ( dataforms )
+"
+
+RDEPEND="
+ dev-qt/qtcore:4[ssl]
+ dev-qt/qtgui:4
+ dev-qt/qtlockedfile[qt4(+)]
+ dev-libs/openssl:0
+ adiummessagestyle? ( dev-qt/qtwebkit:4 )
+ net-dns/libidn
+ x11-libs/libXScrnSaver
+ sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS CHANGELOG README TRANSLATORS"
+
+src_prepare() {
+ # Force usage of system libraries
+ rm -rf src/thirdparty/{idn,minizip,zlib}
+}
+
+src_configure() {
+ # linguas
+ local langs="none;" x
+ for x in ${LANGS}; do
+ use linguas_${x} && langs+="${x};"
+ done
+
+ local mycmakeargs=(
+ -DINSTALL_LIB_DIR="$(get_libdir)"
+ -DINSTALL_SDK=ON
+ -DLANGS="${langs}"
+ -DINSTALL_DOCS=OFF
+ -DFORCE_BUNDLED_MINIZIP=OFF
+ )
+
+ for x in ${PLUGINS}; do
+ mycmakeargs+=( "$(cmake-utils_use ${x} PLUGIN_${x})" )
+ done
+
+ cmake-utils_src_configure
+}
diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild
new file mode 100644
index 000000000000..f9b295f2d46e
--- /dev/null
+++ b/net-im/vacuum/vacuum-9999.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+LANGS="de pl ru uk"
+
+inherit cmake-utils git-r3
+
+DESCRIPTION="Qt4 Crossplatform Jabber client"
+HOMEPAGE="http://www.vacuum-im.org/"
+EGIT_REPO_URI="https://github.com/Vacuum-IM/vacuum-im.git"
+
+LICENSE="GPL-3"
+SLOT="0/31" # subslot = libvacuumutils soname version
+KEYWORDS=""
+PLUGINS=" adiummessagestyle annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries"
+SPELLCHECKER_BACKENDS="aspell +enchant hunspell"
+IUSE="${PLUGINS// / +} ${SPELLCHECKER_BACKENDS} +spell vcs-revision"
+for x in ${LANGS}; do
+ IUSE+=" linguas_${x}"
+done
+
+REQUIRED_USE="
+ annotations? ( privatestorage )
+ avatars? ( vcard )
+ birthdayreminder? ( vcard )
+ bookmarks? ( privatestorage )
+ captchaforms? ( dataforms )
+ commands? ( dataforms )
+ datastreamsmanager? ( dataforms )
+ filemessagearchive? ( messagearchiver )
+ filestreamsmanager? ( datastreamsmanager )
+ filetransfer? ( filestreamsmanager datastreamsmanager )
+ messagecarbons? ( servicediscovery )
+ pepmanager? ( servicediscovery )
+ recentcontacts? ( privatestorage )
+ registration? ( dataforms )
+ remotecontrol? ( commands dataforms )
+ servermessagearchive? ( messagearchiver )
+ sessionnegotiation? ( dataforms )
+ spell? ( ^^ ( ${SPELLCHECKER_BACKENDS//+/} ) )
+"
+
+RDEPEND="
+ >=dev-qt/qtcore-4.8:4[ssl]
+ >=dev-qt/qtgui-4.8:4
+ dev-qt/qtlockedfile[qt4(+)]
+ >=dev-libs/openssl-1.0.0
+ adiummessagestyle? ( >=dev-qt/qtwebkit-4.8:4 )
+ filemessagearchive? ( >=dev-qt/qtsql-4.8:4[sqlite] )
+ messagearchiver? ( >=dev-qt/qtsql-4.8:4[sqlite] )
+ spell? (
+ aspell? ( app-text/aspell )
+ enchant? ( app-text/enchant )
+ hunspell? ( app-text/hunspell )
+ )
+ net-dns/libidn
+ x11-libs/libXScrnSaver
+ sys-libs/zlib[minizip]
+ !net-im/vacuum-spellchecker
+"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS CHANGELOG README TRANSLATORS"
+
+src_prepare() {
+ # Force usage of system libraries
+ rm -rf src/thirdparty/{idn,hunspell,minizip,zlib}
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ # linguas
+ local langs="none;" x
+ for x in ${LANGS}; do
+ use linguas_${x} && langs+="${x};"
+ done
+
+ local mycmakeargs=(
+ -DINSTALL_LIB_DIR="$(get_libdir)"
+ -DINSTALL_SDK=ON
+ -DLANGS="${langs}"
+ -DINSTALL_DOCS=OFF
+ -DFORCE_BUNDLED_MINIZIP=OFF
+ -DPLUGIN_statistics=OFF
+ )
+
+ for x in ${PLUGINS}; do
+ mycmakeargs+=( "$(cmake-utils_use ${x} PLUGIN_${x})" )
+ done
+ mycmakeargs+=( "$(cmake-utils_use spell PLUGIN_spellchecker)" )
+
+ for i in ${SPELLCHECKER_BACKENDS//+/}; do
+ use "${i}" && mycmakeargs+=( -DSPELLCHECKER_BACKEND="${i}" )
+ done
+
+ if use vcs-revision; then
+ subversion_wc_info # eclass is broken
+ mycmakeargs+=( -DVER_STRING="${ESVN_WC_REVISION}" )
+ fi
+
+ cmake-utils_src_configure
+}
diff --git a/net-im/ysm/Manifest b/net-im/ysm/Manifest
new file mode 100644
index 000000000000..cab669a25774
--- /dev/null
+++ b/net-im/ysm/Manifest
@@ -0,0 +1 @@
+DIST ysmv7_2_9_9_1.tar.bz2 260796 SHA256 3d415ea55fc713527b96f9d9735fe0be225bf15ab20690cf4e5c67154d8404f2
diff --git a/net-im/ysm/metadata.xml b/net-im/ysm/metadata.xml
new file mode 100644
index 000000000000..0afcecc3c60b
--- /dev/null
+++ b/net-im/ysm/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">ysmv7</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/ysm/ysm-2.9.9.1.ebuild b/net-im/ysm/ysm-2.9.9.1.ebuild
new file mode 100644
index 000000000000..af990fa5a12f
--- /dev/null
+++ b/net-im/ysm/ysm-2.9.9.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
+
+MY_PV=${PV//./_}
+
+DESCRIPTION="A console ICQ client supporting versions 7/8"
+HOMEPAGE="http://ysmv7.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ysmv7/${PN}v7_${MY_PV}.tar.bz2"
+RESTRICT="mirror"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}/${PN}v7_${MY_PV}
+
+src_install () {
+ dobin src/ysm
+ doman src/man/ysm.1
+ dodoc README AUTHORS INSTALL
+}