www/choqok: update to 1.6.0 (kf5 based) and move the kde4 version to www/choqok-kde4

Differential Revision:	https://reviews.freebsd.org/D10168

12 files changed, 586 insertions, 171 deletions

diff --git a/www/Makefile b/www/Makefile
index a9e979f22941..5e71b5187e31 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -76,6 +76,7 @@
     SUBDIR += chems
     SUBDIR += cherokee
     SUBDIR += choqok
+    SUBDIR += choqok-kde4
     SUBDIR += chpasswd
     SUBDIR += chromium
     SUBDIR += ckeditor
diff --git a/www/choqok-kde4/Makefile b/www/choqok-kde4/Makefile
new file mode 100644
index 000000000000..5d11cf37a8dd
--- /dev/null
+++ b/www/choqok-kde4/Makefile
@@ -0,0 +1,30 @@
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	choqok
+PORTVERSION=	1.5
+PORTREVISION=	5
+CATEGORIES=	www kde
+PKGNAMESUFFIX=	-kde4
+MASTER_SITES=	SF/${PORTNAME}/Choqok/
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	KDE micro-blogging client
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libqjson.so:devel/qjson@qt4 \
+		libqoauth.so:net/qoauth \
+		libtelepathy-qt4.so:net-im/telepathy-qt4
+
+USES=		cmake gettext kde:4 tar:xz
+USE_KDE=	attica automoc4 kdelibs
+USE_QT4=	gui imageformats_run network \
+		moc_build qmake_build rcc_build uic_build
+USE_LDCONFIG=	yes
+
+CONFLICTS_INSTALL=	${PORTNAME}-1.6.*
+PORTSCOUT=	limit:^1\.5.*
+
+.include <bsd.port.mk>
diff --git a/www/choqok-kde4/distinfo b/www/choqok-kde4/distinfo
new file mode 100644
index 000000000000..591c53bb2f27
--- /dev/null
+++ b/www/choqok-kde4/distinfo
@@ -0,0 +1,2 @@
+SHA256 (choqok-1.5.tar.xz) = 5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4
+SIZE (choqok-1.5.tar.xz) = 1068516
diff --git a/www/choqok-kde4/files/patch-cmake__modules__DBusMacros.cmake b/www/choqok-kde4/files/patch-cmake__modules__DBusMacros.cmake
new file mode 100644
index 000000000000..16f1899cb062
--- /dev/null
+++ b/www/choqok-kde4/files/patch-cmake__modules__DBusMacros.cmake
@@ -0,0 +1,10 @@
+--- ./cmake/modules/DBusMacros.cmake.bak	2010-12-15 19:50:32.015441170 +1000
++++ ./cmake/modules/DBusMacros.cmake	2010-12-15 19:52:27.213438681 +1000
+@@ -26,6 +26,6 @@
+         string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
+         set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_output_file})
+         configure_file(${_service_file} ${_target})
+-        install(FILES ${_target} DESTINATION ${DATA_INSTALL_DIR}/dbus-1/services)
++        install(FILES ${_target} DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
+     endforeach (_i ${ARGN})
+ endmacro(dbus_add_activation_service _sources)
diff --git a/www/choqok-kde4/pkg-descr b/www/choqok-kde4/pkg-descr
new file mode 100644
index 000000000000..d20671ff1f48
--- /dev/null
+++ b/www/choqok-kde4/pkg-descr
@@ -0,0 +1,21 @@
+Choqok is free/open-source micro-blogging client for K Desktop Environment.
+The name comes from an ancient Persian word, means Sparrow.  Features are:
+
+  - Supports Twitter.com, Identi.ca, and self hosted StatusNet (formerly
+    Laconica) websites (via their Twitter compatible API)
+  - Supporting Friends, @Reply, Favorites and Public time-lines
+  - Allows to easily send and receive direct messages
+  - Supports multiple accounts simultaneously
+  - Supports search APIs for all services
+  - Users can make quick tweets with global shortcuts
+  - Ability to notify user about new statuses text, with KNotification or
+    Libnotify
+  - Supports URL shortening with more than 30 characters, UnTiny short URLs
+  - Support for configuring status lists appearance
+  - Supports filtering to hide unwanted posts
+  - Preview Images from Twitpic, YFrog, and TweetPhoto services
+  - Preview videos from YouTube and Vimeo services
+  - KWallet integration and proxy support
+  - Official Repeat/ReTweet functions
+
+WWW: http://choqok.gnufolks.org/
diff --git a/www/choqok-kde4/pkg-plist b/www/choqok-kde4/pkg-plist
new file mode 100644
index 000000000000..76711b4cc5a1
--- /dev/null
+++ b/www/choqok-kde4/pkg-plist
@@ -0,0 +1,279 @@
+bin/choqok
+include/kde4/choqok/account.h
+include/kde4/choqok/accountmanager.h
+include/kde4/choqok/application.h
+include/kde4/choqok/choqok_export.h
+include/kde4/choqok/choqokappearancesettings.h
+include/kde4/choqok/choqokbehaviorsettings.h
+include/kde4/choqok/choqokid.h
+include/kde4/choqok/choqokmainwindow.h
+include/kde4/choqok/choqoktabbar.h
+include/kde4/choqok/choqoktextedit.h
+include/kde4/choqok/choqoktools.h
+include/kde4/choqok/choqoktypes.h
+include/kde4/choqok/choqokuiglobal.h
+include/kde4/choqok/composerwidget.h
+include/kde4/choqok/dbushandler.h
+include/kde4/choqok/editaccountwidget.h
+include/kde4/choqok/mediamanager.h
+include/kde4/choqok/microblog.h
+include/kde4/choqok/microblogwidget.h
+include/kde4/choqok/notifymanager.h
+include/kde4/choqok/passwordmanager.h
+include/kde4/choqok/plugin.h
+include/kde4/choqok/pluginmanager.h
+include/kde4/choqok/postwidget.h
+include/kde4/choqok/quickpost.h
+include/kde4/choqok/shortener.h
+include/kde4/choqok/shortenmanager.h
+include/kde4/choqok/textbrowser.h
+include/kde4/choqok/timelinewidget.h
+include/kde4/choqok/twitterapihelper/twitterapiaccount.h
+include/kde4/choqok/twitterapihelper/twitterapicomposerwidget.h
+include/kde4/choqok/twitterapihelper/twitterapidmessagedialog.h
+include/kde4/choqok/twitterapihelper/twitterapimicroblog.h
+include/kde4/choqok/twitterapihelper/twitterapimicroblogwidget.h
+include/kde4/choqok/twitterapihelper/twitterapipostwidget.h
+include/kde4/choqok/twitterapihelper/twitterapisearch.h
+include/kde4/choqok/twitterapihelper/twitterapisearchdialog.h
+include/kde4/choqok/twitterapihelper/twitterapisearchtimelinewidget.h
+include/kde4/choqok/twitterapihelper/twitterapishowthread.h
+include/kde4/choqok/twitterapihelper/twitterapitextedit.h
+include/kde4/choqok/twitterapihelper/twitterapitimelinewidget.h
+include/kde4/choqok/twitterapihelper/twitterapiwhoiswidget.h
+include/kde4/choqok/uploader.h
+include/kde4/choqok/uploadmediadialog.h
+lib/kde4/choqok_betternotify.so
+lib/kde4/choqok_bit_ly.so
+lib/kde4/choqok_filter.so
+lib/kde4/choqok_flickr.so
+lib/kde4/choqok_goo_gl.so
+lib/kde4/choqok_imagepreview.so
+lib/kde4/choqok_imageshack.so
+lib/kde4/choqok_imstatus.so
+lib/kde4/choqok_is_gd.so
+lib/kde4/choqok_laconica.so
+lib/kde4/choqok_longurl.so
+lib/kde4/choqok_mobypicture.so
+lib/kde4/choqok_nowlistening.so
+lib/kde4/choqok_ocs.so
+lib/kde4/choqok_posterous.so
+lib/kde4/choqok_pumpio.so
+lib/kde4/choqok_quickfilter.so
+lib/kde4/choqok_searchaction.so
+lib/kde4/choqok_tighturl.so
+lib/kde4/choqok_tinyarro_ws.so
+lib/kde4/choqok_twitgoo.so
+lib/kde4/choqok_twitpic.so
+lib/kde4/choqok_twitter.so
+lib/kde4/choqok_ur1_ca.so
+lib/kde4/choqok_ur_ly.so
+lib/kde4/choqok_videopreview.so
+lib/kde4/choqok_yourls.so
+lib/kde4/kcm_choqok_accountsconfig.so
+lib/kde4/kcm_choqok_appearanceconfig.so
+lib/kde4/kcm_choqok_behaviorconfig.so
+lib/kde4/kcm_choqok_betternotify.so
+lib/kde4/kcm_choqok_bit_ly.so
+lib/kde4/kcm_choqok_flickr.so
+lib/kde4/kcm_choqok_imstatus.so
+lib/kde4/kcm_choqok_is_gd.so
+lib/kde4/kcm_choqok_mobypicture.so
+lib/kde4/kcm_choqok_nowlistening.so
+lib/kde4/kcm_choqok_pluginconfig.so
+lib/kde4/kcm_choqok_posterous.so
+lib/kde4/kcm_choqok_tinyarro_ws.so
+lib/kde4/kcm_choqok_twitgoo.so
+lib/kde4/kcm_choqok_twitpic.so
+lib/kde4/kcm_choqok_yourls.so
+lib/kde4/konqchoqokplugin.so
+lib/libchoqok.so
+lib/libchoqok.so.1
+lib/libchoqok.so.1.3.0
+lib/libtwitterapihelper.so
+lib/libtwitterapihelper.so.1
+lib/libtwitterapihelper.so.1.2.0
+share/applications/kde4/choqok.desktop
+share/appdata/choqok.appdata.xml
+share/apps/choqok/choqok.notifyrc
+share/apps/choqok/choqokui.rc
+share/apps/choqok/images/splash_screen.png
+share/apps/choqok_filter/filterui.rc
+share/apps/choqok_nowlistening/nowlisteningui.rc
+share/apps/choqok_quickfilter/quickfilterui.rc
+share/apps/choqok_searchaction/searchactionui.rc
+share/apps/cmake/modules/FindChoqok.cmake
+share/apps/khtml/kpartplugins/konqchoqok.desktop
+share/apps/khtml/kpartplugins/konqchoqok.rc
+share/config.kcfg/bit_ly_settings.kcfg
+share/config.kcfg/choqokappearancesettings.kcfg
+share/config.kcfg/choqokbehaviorsettings.kcfg
+share/config.kcfg/flickrsettings.kcfg
+share/config.kcfg/imstatussettings.kcfg
+share/config.kcfg/is_gd_settings.kcfg
+share/config.kcfg/mobypicturesettings.kcfg
+share/config.kcfg/nowlisteningsettings.kcfg
+share/config.kcfg/posteroussettings.kcfg
+share/config.kcfg/tinyarro_ws_settings.kcfg
+share/config.kcfg/twitgoosettings.kcfg
+share/config.kcfg/twitpicsettings.kcfg
+share/config.kcfg/yourlssettings.kcfg
+share/dbus-1/services/org.kde.choqok.service
+share/doc/HTML/en/choqok/add_account.png
+share/doc/HTML/en/choqok/choqok.png
+share/doc/HTML/en/choqok/choqok_quick.png
+share/doc/HTML/en/choqok/choqok_search.png
+share/doc/HTML/en/choqok/common
+share/doc/HTML/en/choqok/index.cache.bz2
+share/doc/HTML/en/choqok/index.docbook
+share/icons/hicolor/128x128/apps/choqok.png
+share/icons/hicolor/16x16/actions/retweet.png
+share/icons/hicolor/16x16/apps/choqok.png
+share/icons/hicolor/16x16/apps/choqok_offline.png
+share/icons/hicolor/16x16/apps/flickr_uploader.png
+share/icons/hicolor/16x16/apps/imageshack_uploader.png
+share/icons/hicolor/16x16/apps/laconica_microblog.png
+share/icons/hicolor/16x16/apps/mobypicture_uploader.png
+share/icons/hicolor/16x16/apps/ocs_microblog.png
+share/icons/hicolor/16x16/apps/posterous_uploader.png
+share/icons/hicolor/16x16/apps/pumpio_microblog.png
+share/icons/hicolor/16x16/apps/twitgoo_uploader.png
+share/icons/hicolor/16x16/apps/twitpic_uploader.png
+share/icons/hicolor/16x16/apps/twitter_microblog.png
+share/icons/hicolor/22x22/apps/choqok.png
+share/icons/hicolor/22x22/apps/choqok_offline.png
+share/icons/hicolor/22x22/apps/flickr_uploader.png
+share/icons/hicolor/22x22/apps/imageshack_uploader.png
+share/icons/hicolor/22x22/apps/laconica_microblog.png
+share/icons/hicolor/22x22/apps/mobypicture_uploader.png
+share/icons/hicolor/22x22/apps/ocs_microblog.png
+share/icons/hicolor/22x22/apps/posterous_uploader.png
+share/icons/hicolor/22x22/apps/pumpio_microblog.png
+share/icons/hicolor/22x22/apps/twitgoo_uploader.png
+share/icons/hicolor/22x22/apps/twitpic_uploader.png
+share/icons/hicolor/22x22/apps/twitter_microblog.png
+share/icons/hicolor/32x32/apps/choqok.png
+share/icons/hicolor/32x32/apps/choqok_offline.png
+share/icons/hicolor/32x32/apps/flickr_uploader.png
+share/icons/hicolor/32x32/apps/imageshack_uploader.png
+share/icons/hicolor/32x32/apps/laconica_microblog.png
+share/icons/hicolor/32x32/apps/mobypicture_uploader.png
+share/icons/hicolor/32x32/apps/ocs_microblog.png
+share/icons/hicolor/32x32/apps/posterous_uploader.png
+share/icons/hicolor/32x32/apps/pumpio_microblog.png
+share/icons/hicolor/32x32/apps/twitgoo_uploader.png
+share/icons/hicolor/32x32/apps/twitpic_uploader.png
+share/icons/hicolor/32x32/apps/twitter_microblog.png
+share/icons/hicolor/48x48/apps/choqok.png
+share/icons/hicolor/48x48/apps/choqok_offline.png
+share/icons/hicolor/48x48/apps/flickr_uploader.png
+share/icons/hicolor/48x48/apps/imageshack_uploader.png
+share/icons/hicolor/48x48/apps/laconica_microblog.png
+share/icons/hicolor/48x48/apps/mobypicture_uploader.png
+share/icons/hicolor/48x48/apps/ocs_microblog.png
+share/icons/hicolor/48x48/apps/posterous_uploader.png
+share/icons/hicolor/48x48/apps/pumpio_microblog.png
+share/icons/hicolor/48x48/apps/twitgoo_uploader.png
+share/icons/hicolor/48x48/apps/twitter_microblog.png
+share/icons/hicolor/64x64/apps/choqok.png
+share/icons/hicolor/64x64/apps/choqok_offline.png
+share/icons/hicolor/64x64/apps/flickr_uploader.png
+share/icons/hicolor/64x64/apps/imageshack_uploader.png
+share/icons/hicolor/64x64/apps/mobypicture_uploader.png
+share/icons/hicolor/64x64/apps/ocs_microblog.png
+share/icons/hicolor/64x64/apps/posterous_uploader.png
+share/icons/hicolor/64x64/apps/pumpio_microblog.png
+share/icons/hicolor/64x64/apps/twitgoo_uploader.png
+share/kde4/services/ServiceMenus/choqok_share.desktop
+share/kde4/services/ServiceMenus/choqok_upload.desktop
+share/kde4/services/choqok_accountsconfig.desktop
+share/kde4/services/choqok_appearanceconfig.desktop
+share/kde4/services/choqok_behaviorconfig.desktop
+share/kde4/services/choqok_bit_ly.desktop
+share/kde4/services/choqok_bit_ly_config.desktop
+share/kde4/services/choqok_filter.desktop
+share/kde4/services/choqok_flickr.desktop
+share/kde4/services/choqok_flickr_config.desktop
+share/kde4/services/choqok_goo_gl.desktop
+share/kde4/services/choqok_imagepreview.desktop
+share/kde4/services/choqok_imageshack.desktop
+share/kde4/services/choqok_imstatus.desktop
+share/kde4/services/choqok_imstatus_config.desktop
+share/kde4/services/choqok_is_gd.desktop
+share/kde4/services/choqok_is_gd_config.desktop
+share/kde4/services/choqok_laconica.desktop
+share/kde4/services/choqok_longurl.desktop
+share/kde4/services/choqok_mobypicture.desktop
+share/kde4/services/choqok_mobypicture_config.desktop
+share/kde4/services/choqok_notify.desktop
+share/kde4/services/choqok_notify_config.desktop
+share/kde4/services/choqok_nowlistening.desktop
+share/kde4/services/choqok_nowlistening_config.desktop
+share/kde4/services/choqok_ocs.desktop
+share/kde4/services/choqok_pluginconfig.desktop
+share/kde4/services/choqok_posterous.desktop
+share/kde4/services/choqok_posterous_config.desktop
+share/kde4/services/choqok_pumpio.desktop
+share/kde4/services/choqok_quickfilter.desktop
+share/kde4/services/choqok_searchaction.desktop
+share/kde4/services/choqok_tighturl.desktop
+share/kde4/services/choqok_tinyarro_ws.desktop
+share/kde4/services/choqok_tinyarro_ws_config.desktop
+share/kde4/services/choqok_twitgoo.desktop
+share/kde4/services/choqok_twitgoo_config.desktop
+share/kde4/services/choqok_twitpic.desktop
+share/kde4/services/choqok_twitpic_config.desktop
+share/kde4/services/choqok_twitter.desktop
+share/kde4/services/choqok_ur1_ca.desktop
+share/kde4/services/choqok_ur_ly.desktop
+share/kde4/services/choqok_videopreview.desktop
+share/kde4/services/choqok_yourls.desktop
+share/kde4/services/choqok_yourls_config.desktop
+share/kde4/servicetypes/choqokplugin.desktop
+share/kde4/servicetypes/choqokshortenerplugin.desktop
+share/kde4/servicetypes/choqokuploaderplugin.desktop
+share/locale/bg/LC_MESSAGES/choqok.mo
+share/locale/bs/LC_MESSAGES/choqok.mo
+share/locale/ca/LC_MESSAGES/choqok.mo
+share/locale/ca@valencia/LC_MESSAGES/choqok.mo
+share/locale/cs/LC_MESSAGES/choqok.mo
+share/locale/da/LC_MESSAGES/choqok.mo
+share/locale/de/LC_MESSAGES/choqok.mo
+share/locale/el/LC_MESSAGES/choqok.mo
+share/locale/en_GB/LC_MESSAGES/choqok.mo
+share/locale/eo/LC_MESSAGES/choqok.mo
+share/locale/es/LC_MESSAGES/choqok.mo
+share/locale/et/LC_MESSAGES/choqok.mo
+share/locale/fa/LC_MESSAGES/choqok.mo
+share/locale/fi/LC_MESSAGES/choqok.mo
+share/locale/fr/LC_MESSAGES/choqok.mo
+share/locale/ga/LC_MESSAGES/choqok.mo
+share/locale/gl/LC_MESSAGES/choqok.mo
+share/locale/hr/LC_MESSAGES/choqok.mo
+share/locale/hu/LC_MESSAGES/choqok.mo
+share/locale/ia/LC_MESSAGES/choqok.mo
+share/locale/it/LC_MESSAGES/choqok.mo
+share/locale/is/LC_MESSAGES/choqok.mo
+share/locale/ja/LC_MESSAGES/choqok.mo
+share/locale/km/LC_MESSAGES/choqok.mo
+share/locale/lt/LC_MESSAGES/choqok.mo
+share/locale/mr/LC_MESSAGES/choqok.mo
+share/locale/ms/LC_MESSAGES/choqok.mo
+share/locale/nb/LC_MESSAGES/choqok.mo
+share/locale/nds/LC_MESSAGES/choqok.mo
+share/locale/nl/LC_MESSAGES/choqok.mo
+share/locale/pa/LC_MESSAGES/choqok.mo
+share/locale/pl/LC_MESSAGES/choqok.mo
+share/locale/pt/LC_MESSAGES/choqok.mo
+share/locale/pt_BR/LC_MESSAGES/choqok.mo
+share/locale/ro/LC_MESSAGES/choqok.mo
+share/locale/ru/LC_MESSAGES/choqok.mo
+share/locale/sk/LC_MESSAGES/choqok.mo
+share/locale/sl/LC_MESSAGES/choqok.mo
+share/locale/sq/LC_MESSAGES/choqok.mo
+share/locale/sv/LC_MESSAGES/choqok.mo
+share/locale/tr/LC_MESSAGES/choqok.mo
+share/locale/ug/LC_MESSAGES/choqok.mo
+share/locale/uk/LC_MESSAGES/choqok.mo
+share/locale/zh_CN/LC_MESSAGES/choqok.mo
+share/locale/zh_TW/LC_MESSAGES/choqok.mo
diff --git a/www/choqok/Makefile b/www/choqok/Makefile
index a39ce74f363f..35f2c4062b05 100644
--- a/www/choqok/Makefile
+++ b/www/choqok/Makefile
@@ -1,11 +1,10 @@
-# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	choqok
-PORTVERSION=	1.5
-PORTREVISION=	4
+DISTVERSION=	1.6.0
 CATEGORIES=	www kde
-MASTER_SITES=	SF/${PORTNAME}/Choqok/
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION:R}/src
+DIST_SUBDIR=	KDE/${PORTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE micro-blogging client
@@ -13,14 +12,23 @@ COMMENT=	KDE micro-blogging client
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libqjson.so:devel/qjson@qt4 \
-		libqoauth.so:net/qoauth \
-		libtelepathy-qt4.so:net-im/telepathy-qt4
+LIB_DEPENDS=	libqjson-qt5.so:devel/qjson@qt5 \
+		libqca-qt5.so:devel/qca@qt5 \
+		libqoauth-qt5.so:net/qoauth-qt5 \
+		libtelepathy-qt5.so:net-im/telepathy-qt5
+
+USES=		cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig tar:xz
+USE_KDE=	attica auth bookmarks codecs completion config configwidgets \
+		coreaddons doctools ecm emoticons globalaccel guiaddons i18n \
+		itemviews jobwidgets kcmutils kdewebkit kio notifications \
+		notifyconfig parts service solid sonnet textwidgets wallet \
+		widgetsaddons xmlgui \
+		kded_run
+USE_QT5=	core dbus gui network widgets xml \
+		buildtools_build qmake_build 
 
-USES=		cmake gettext kde:4 tar:xz
-USE_KDE=	attica automoc4 kdelibs
-USE_QT4=	gui imageformats_run network \
-		moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
+CONFLICTS_INSTALL=	${PORTNAME}-kde4
+
 .include <bsd.port.mk>
diff --git a/www/choqok/distinfo b/www/choqok/distinfo
index 591c53bb2f27..d485cc248347 100644
--- a/www/choqok/distinfo
+++ b/www/choqok/distinfo
@@ -1,2 +1,3 @@
-SHA256 (choqok-1.5.tar.xz) = 5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4
-SIZE (choqok-1.5.tar.xz) = 1068516
+TIMESTAMP = 1483011953
+SHA256 (KDE/choqok/choqok-1.6.0.tar.xz) = 8a7527067b3694ad16faafac754cfd5f1e5f5fd1547f066d8f14fbcf8327310f
+SIZE (KDE/choqok/choqok-1.6.0.tar.xz) = 1170748
diff --git a/www/choqok/files/patch-CMakeLists.txt b/www/choqok/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..16c89846fa27
--- /dev/null
+++ b/www/choqok/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2017-01-24 21:41:36 UTC
++++ CMakeLists.txt
+@@ -41,6 +41,7 @@ find_package(KF5 REQUIRED
+ 
+ find_package(Qca-qt5 REQUIRED)
+ find_package(QtOAuth 2.0.1 REQUIRED)
++include_directories(${QTOAUTH_INCLUDE_DIR})
+ 
+ #if(NOT QTINDICATE_DISABLE)
+ #    find_package(QtIndicate)
diff --git a/www/choqok/files/patch-cmake_modules_FindQtOAuth.cmake b/www/choqok/files/patch-cmake_modules_FindQtOAuth.cmake
new file mode 100644
index 000000000000..47ae698815d5
--- /dev/null
+++ b/www/choqok/files/patch-cmake_modules_FindQtOAuth.cmake
@@ -0,0 +1,22 @@
+--- cmake/modules/FindQtOAuth.cmake.orig	2016-10-07 15:54:41 UTC
++++ cmake/modules/FindQtOAuth.cmake
+@@ -18,16 +18,17 @@ if (QTOAUTH_INCLUDE_DIR AND QTOAUTH_LIBR
+ else (QTOAUTH_INCLUDE_DIR AND QTOAUTH_LIBRARY)
+   if (NOT WIN32)
+     find_package(PkgConfig)
+-    pkg_check_modules(PC_QTOAUTH QUIET qoauth)
++    pkg_check_modules(PC_QTOAUTH QUIET qoauth-qt5)
+     set(QTOAUTH_DEFINITIONS ${PC_QTOAUTH_CFLAGS_OTHER})
+   endif(NOT WIN32)
+ 
+-  find_library(QTOAUTH_LIBRARY NAMES qoauth
++  find_library(QTOAUTH_LIBRARY NAMES qoauth-qt5
+     HINTS ${PC_QTOAUTH_LIBDIR} ${PC_QTOAUTH_LIBRARY_DIRS}
+   )
+ 
+   find_path(QTOAUTH_INCLUDE_DIR QtOAuth/interface.h
+     HINTS ${PC_QTOAUTH_INCLUDEDIR} ${PC_QTOAUTH_INCLUDE_DIRS}
++    PATH_SUFFIXES QtOAuth-qt5
+   )
+ 
+   include(FindPackageHandleStandardArgs)
diff --git a/www/choqok/pkg-descr b/www/choqok/pkg-descr
index d20671ff1f48..651b87e7267e 100644
--- a/www/choqok/pkg-descr
+++ b/www/choqok/pkg-descr
@@ -18,4 +18,4 @@ The name comes from an ancient Persian word, means Sparrow.  Features are:
   - KWallet integration and proxy support
   - Official Repeat/ReTweet functions
 
-WWW: http://choqok.gnufolks.org/
+WWW: https://www.kde.org/applications/internet/choqok/
diff --git a/www/choqok/pkg-plist b/www/choqok/pkg-plist
index 76711b4cc5a1..39de360b8555 100644
--- a/www/choqok/pkg-plist
+++ b/www/choqok/pkg-plist
@@ -1,110 +1,108 @@
 bin/choqok
-include/kde4/choqok/account.h
-include/kde4/choqok/accountmanager.h
-include/kde4/choqok/application.h
-include/kde4/choqok/choqok_export.h
-include/kde4/choqok/choqokappearancesettings.h
-include/kde4/choqok/choqokbehaviorsettings.h
-include/kde4/choqok/choqokid.h
-include/kde4/choqok/choqokmainwindow.h
-include/kde4/choqok/choqoktabbar.h
-include/kde4/choqok/choqoktextedit.h
-include/kde4/choqok/choqoktools.h
-include/kde4/choqok/choqoktypes.h
-include/kde4/choqok/choqokuiglobal.h
-include/kde4/choqok/composerwidget.h
-include/kde4/choqok/dbushandler.h
-include/kde4/choqok/editaccountwidget.h
-include/kde4/choqok/mediamanager.h
-include/kde4/choqok/microblog.h
-include/kde4/choqok/microblogwidget.h
-include/kde4/choqok/notifymanager.h
-include/kde4/choqok/passwordmanager.h
-include/kde4/choqok/plugin.h
-include/kde4/choqok/pluginmanager.h
-include/kde4/choqok/postwidget.h
-include/kde4/choqok/quickpost.h
-include/kde4/choqok/shortener.h
-include/kde4/choqok/shortenmanager.h
-include/kde4/choqok/textbrowser.h
-include/kde4/choqok/timelinewidget.h
-include/kde4/choqok/twitterapihelper/twitterapiaccount.h
-include/kde4/choqok/twitterapihelper/twitterapicomposerwidget.h
-include/kde4/choqok/twitterapihelper/twitterapidmessagedialog.h
-include/kde4/choqok/twitterapihelper/twitterapimicroblog.h
-include/kde4/choqok/twitterapihelper/twitterapimicroblogwidget.h
-include/kde4/choqok/twitterapihelper/twitterapipostwidget.h
-include/kde4/choqok/twitterapihelper/twitterapisearch.h
-include/kde4/choqok/twitterapihelper/twitterapisearchdialog.h
-include/kde4/choqok/twitterapihelper/twitterapisearchtimelinewidget.h
-include/kde4/choqok/twitterapihelper/twitterapishowthread.h
-include/kde4/choqok/twitterapihelper/twitterapitextedit.h
-include/kde4/choqok/twitterapihelper/twitterapitimelinewidget.h
-include/kde4/choqok/twitterapihelper/twitterapiwhoiswidget.h
-include/kde4/choqok/uploader.h
-include/kde4/choqok/uploadmediadialog.h
-lib/kde4/choqok_betternotify.so
-lib/kde4/choqok_bit_ly.so
-lib/kde4/choqok_filter.so
-lib/kde4/choqok_flickr.so
-lib/kde4/choqok_goo_gl.so
-lib/kde4/choqok_imagepreview.so
-lib/kde4/choqok_imageshack.so
-lib/kde4/choqok_imstatus.so
-lib/kde4/choqok_is_gd.so
-lib/kde4/choqok_laconica.so
-lib/kde4/choqok_longurl.so
-lib/kde4/choqok_mobypicture.so
-lib/kde4/choqok_nowlistening.so
-lib/kde4/choqok_ocs.so
-lib/kde4/choqok_posterous.so
-lib/kde4/choqok_pumpio.so
-lib/kde4/choqok_quickfilter.so
-lib/kde4/choqok_searchaction.so
-lib/kde4/choqok_tighturl.so
-lib/kde4/choqok_tinyarro_ws.so
-lib/kde4/choqok_twitgoo.so
-lib/kde4/choqok_twitpic.so
-lib/kde4/choqok_twitter.so
-lib/kde4/choqok_ur1_ca.so
-lib/kde4/choqok_ur_ly.so
-lib/kde4/choqok_videopreview.so
-lib/kde4/choqok_yourls.so
-lib/kde4/kcm_choqok_accountsconfig.so
-lib/kde4/kcm_choqok_appearanceconfig.so
-lib/kde4/kcm_choqok_behaviorconfig.so
-lib/kde4/kcm_choqok_betternotify.so
-lib/kde4/kcm_choqok_bit_ly.so
-lib/kde4/kcm_choqok_flickr.so
-lib/kde4/kcm_choqok_imstatus.so
-lib/kde4/kcm_choqok_is_gd.so
-lib/kde4/kcm_choqok_mobypicture.so
-lib/kde4/kcm_choqok_nowlistening.so
-lib/kde4/kcm_choqok_pluginconfig.so
-lib/kde4/kcm_choqok_posterous.so
-lib/kde4/kcm_choqok_tinyarro_ws.so
-lib/kde4/kcm_choqok_twitgoo.so
-lib/kde4/kcm_choqok_twitpic.so
-lib/kde4/kcm_choqok_yourls.so
-lib/kde4/konqchoqokplugin.so
+include/choqok/account.h
+include/choqok/accountmanager.h
+include/choqok/application.h
+include/choqok/choqok_export.h
+include/choqok/choqokappearancesettings.h
+include/choqok/choqokbehaviorsettings.h
+include/choqok/choqokmainwindow.h
+include/choqok/choqoktabbar.h
+include/choqok/choqoktextedit.h
+include/choqok/choqoktools.h
+include/choqok/choqoktypes.h
+include/choqok/choqokuiglobal.h
+include/choqok/composerwidget.h
+include/choqok/dbushandler.h
+include/choqok/editaccountwidget.h
+include/choqok/gnusocialapihelper/gnusocialapiaccount.h
+include/choqok/gnusocialapihelper/gnusocialapicomposerwidget.h
+include/choqok/gnusocialapihelper/gnusocialapiconversationtimelinewidget.h
+include/choqok/gnusocialapihelper/gnusocialapidmessagedialog.h
+include/choqok/gnusocialapihelper/gnusocialapimicroblog.h
+include/choqok/gnusocialapihelper/gnusocialapipostwidget.h
+include/choqok/gnusocialapihelper/gnusocialapisearch.h
+include/choqok/mediamanager.h
+include/choqok/microblog.h
+include/choqok/microblogwidget.h
+include/choqok/notifymanager.h
+include/choqok/passwordmanager.h
+include/choqok/plugin.h
+include/choqok/pluginmanager.h
+include/choqok/postwidget.h
+include/choqok/quickpost.h
+include/choqok/shortener.h
+include/choqok/shortenmanager.h
+include/choqok/textbrowser.h
+include/choqok/timelinewidget.h
+include/choqok/twitterapihelper/twitterapiaccount.h
+include/choqok/twitterapihelper/twitterapicomposerwidget.h
+include/choqok/twitterapihelper/twitterapidmessagedialog.h
+include/choqok/twitterapihelper/twitterapimicroblog.h
+include/choqok/twitterapihelper/twitterapimicroblogwidget.h
+include/choqok/twitterapihelper/twitterapipostwidget.h
+include/choqok/twitterapihelper/twitterapisearch.h
+include/choqok/twitterapihelper/twitterapisearchdialog.h
+include/choqok/twitterapihelper/twitterapisearchtimelinewidget.h
+include/choqok/twitterapihelper/twitterapishowthread.h
+include/choqok/twitterapihelper/twitterapitextedit.h
+include/choqok/twitterapihelper/twitterapitimelinewidget.h
+include/choqok/twitterapihelper/twitterapiwhoiswidget.h
+include/choqok/uploader.h
+include/choqok/uploadmediadialog.h
 lib/libchoqok.so
 lib/libchoqok.so.1
 lib/libchoqok.so.1.3.0
+lib/libgnusocialapihelper.so
+lib/libgnusocialapihelper.so.1
+lib/libgnusocialapihelper.so.1.3.0
 lib/libtwitterapihelper.so
 lib/libtwitterapihelper.so.1
-lib/libtwitterapihelper.so.1.2.0
-share/applications/kde4/choqok.desktop
-share/appdata/choqok.appdata.xml
-share/apps/choqok/choqok.notifyrc
-share/apps/choqok/choqokui.rc
-share/apps/choqok/images/splash_screen.png
-share/apps/choqok_filter/filterui.rc
-share/apps/choqok_nowlistening/nowlisteningui.rc
-share/apps/choqok_quickfilter/quickfilterui.rc
-share/apps/choqok_searchaction/searchactionui.rc
-share/apps/cmake/modules/FindChoqok.cmake
-share/apps/khtml/kpartplugins/konqchoqok.desktop
-share/apps/khtml/kpartplugins/konqchoqok.rc
+lib/libtwitterapihelper.so.1.3.0
+%%QT_PLUGINDIR%%/choqok_betternotify.so
+%%QT_PLUGINDIR%%/choqok_bit_ly.so
+%%QT_PLUGINDIR%%/choqok_filter.so
+%%QT_PLUGINDIR%%/choqok_flickr.so
+%%QT_PLUGINDIR%%/choqok_friendica.so
+%%QT_PLUGINDIR%%/choqok_goo_gl.so
+%%QT_PLUGINDIR%%/choqok_imagepreview.so
+%%QT_PLUGINDIR%%/choqok_imageshack.so
+%%QT_PLUGINDIR%%/choqok_imstatus.so
+%%QT_PLUGINDIR%%/choqok_is_gd.so
+%%QT_PLUGINDIR%%/choqok_laconica.so
+%%QT_PLUGINDIR%%/choqok_mobypicture.so
+%%QT_PLUGINDIR%%/choqok_nowlistening.so
+%%QT_PLUGINDIR%%/choqok_ocs.so
+%%QT_PLUGINDIR%%/choqok_posterous.so
+%%QT_PLUGINDIR%%/choqok_pumpio.so
+%%QT_PLUGINDIR%%/choqok_quickfilter.so
+%%QT_PLUGINDIR%%/choqok_searchaction.so
+%%QT_PLUGINDIR%%/choqok_tighturl.so
+%%QT_PLUGINDIR%%/choqok_tinyarro_ws.so
+%%QT_PLUGINDIR%%/choqok_twitgoo.so
+%%QT_PLUGINDIR%%/choqok_twitter.so
+%%QT_PLUGINDIR%%/choqok_untiny.so
+%%QT_PLUGINDIR%%/choqok_ur1_ca.so
+%%QT_PLUGINDIR%%/choqok_videopreview.so
+%%QT_PLUGINDIR%%/choqok_yourls.so
+%%QT_PLUGINDIR%%/kcm_choqok_accountsconfig.so
+%%QT_PLUGINDIR%%/kcm_choqok_appearanceconfig.so
+%%QT_PLUGINDIR%%/kcm_choqok_behaviorconfig.so
+%%QT_PLUGINDIR%%/kcm_choqok_betternotify.so
+%%QT_PLUGINDIR%%/kcm_choqok_bit_ly.so
+%%QT_PLUGINDIR%%/kcm_choqok_flickr.so
+%%QT_PLUGINDIR%%/kcm_choqok_imstatus.so
+%%QT_PLUGINDIR%%/kcm_choqok_is_gd.so
+%%QT_PLUGINDIR%%/kcm_choqok_mobypicture.so
+%%QT_PLUGINDIR%%/kcm_choqok_nowlistening.so
+%%QT_PLUGINDIR%%/kcm_choqok_pluginconfig.so
+%%QT_PLUGINDIR%%/kcm_choqok_posterous.so
+%%QT_PLUGINDIR%%/kcm_choqok_tinyarro_ws.so
+%%QT_PLUGINDIR%%/kcm_choqok_twitgoo.so
+%%QT_PLUGINDIR%%/kcm_choqok_yourls.so
+%%QT_PLUGINDIR%%/kf5/parts/konqchoqokplugin.so
+share/applications/org.kde.choqok.desktop
+%%DATADIR%%/images/splash_screen.png
+share/cmake/modules/FindChoqok.cmake
 share/config.kcfg/bit_ly_settings.kcfg
 share/config.kcfg/choqokappearancesettings.kcfg
 share/config.kcfg/choqokbehaviorsettings.kcfg
@@ -116,21 +114,42 @@ share/config.kcfg/nowlisteningsettings.kcfg
 share/config.kcfg/posteroussettings.kcfg
 share/config.kcfg/tinyarro_ws_settings.kcfg
 share/config.kcfg/twitgoosettings.kcfg
-share/config.kcfg/twitpicsettings.kcfg
+share/config.kcfg/untinysettings.kcfg
 share/config.kcfg/yourlssettings.kcfg
 share/dbus-1/services/org.kde.choqok.service
+share/doc/HTML/ca/choqok/index.cache.bz2
+share/doc/HTML/ca/choqok/index.docbook
+share/doc/HTML/de/choqok/index.cache.bz2
+share/doc/HTML/de/choqok/index.docbook
 share/doc/HTML/en/choqok/add_account.png
 share/doc/HTML/en/choqok/choqok.png
 share/doc/HTML/en/choqok/choqok_quick.png
 share/doc/HTML/en/choqok/choqok_search.png
-share/doc/HTML/en/choqok/common
 share/doc/HTML/en/choqok/index.cache.bz2
 share/doc/HTML/en/choqok/index.docbook
-share/icons/hicolor/128x128/apps/choqok.png
+share/doc/HTML/es/choqok/index.cache.bz2
+share/doc/HTML/es/choqok/index.docbook
+share/doc/HTML/fr/choqok/choqok_quick.png
+share/doc/HTML/fr/choqok/index.cache.bz2
+share/doc/HTML/fr/choqok/index.docbook
+share/doc/HTML/it/choqok/index.cache.bz2
+share/doc/HTML/it/choqok/index.docbook
+share/doc/HTML/nl/choqok/index.cache.bz2
+share/doc/HTML/nl/choqok/index.docbook
+share/doc/HTML/pt/choqok/index.cache.bz2
+share/doc/HTML/pt/choqok/index.docbook
+share/doc/HTML/pt_BR/choqok/index.cache.bz2
+share/doc/HTML/pt_BR/choqok/index.docbook
+share/doc/HTML/sv/choqok/index.cache.bz2
+share/doc/HTML/sv/choqok/index.docbook
+share/doc/HTML/uk/choqok/index.cache.bz2
+share/doc/HTML/uk/choqok/index.docbook
+share/icons/hicolor/128x128/apps/pumpio_microblog.png
 share/icons/hicolor/16x16/actions/retweet.png
 share/icons/hicolor/16x16/apps/choqok.png
 share/icons/hicolor/16x16/apps/choqok_offline.png
 share/icons/hicolor/16x16/apps/flickr_uploader.png
+share/icons/hicolor/16x16/apps/friendica_microblog.png
 share/icons/hicolor/16x16/apps/imageshack_uploader.png
 share/icons/hicolor/16x16/apps/laconica_microblog.png
 share/icons/hicolor/16x16/apps/mobypicture_uploader.png
@@ -138,23 +157,22 @@ share/icons/hicolor/16x16/apps/ocs_microblog.png
 share/icons/hicolor/16x16/apps/posterous_uploader.png
 share/icons/hicolor/16x16/apps/pumpio_microblog.png
 share/icons/hicolor/16x16/apps/twitgoo_uploader.png
-share/icons/hicolor/16x16/apps/twitpic_uploader.png
 share/icons/hicolor/16x16/apps/twitter_microblog.png
 share/icons/hicolor/22x22/apps/choqok.png
 share/icons/hicolor/22x22/apps/choqok_offline.png
 share/icons/hicolor/22x22/apps/flickr_uploader.png
+share/icons/hicolor/22x22/apps/friendica_microblog.png
 share/icons/hicolor/22x22/apps/imageshack_uploader.png
 share/icons/hicolor/22x22/apps/laconica_microblog.png
 share/icons/hicolor/22x22/apps/mobypicture_uploader.png
 share/icons/hicolor/22x22/apps/ocs_microblog.png
 share/icons/hicolor/22x22/apps/posterous_uploader.png
 share/icons/hicolor/22x22/apps/pumpio_microblog.png
-share/icons/hicolor/22x22/apps/twitgoo_uploader.png
-share/icons/hicolor/22x22/apps/twitpic_uploader.png
 share/icons/hicolor/22x22/apps/twitter_microblog.png
 share/icons/hicolor/32x32/apps/choqok.png
 share/icons/hicolor/32x32/apps/choqok_offline.png
 share/icons/hicolor/32x32/apps/flickr_uploader.png
+share/icons/hicolor/32x32/apps/friendica_microblog.png
 share/icons/hicolor/32x32/apps/imageshack_uploader.png
 share/icons/hicolor/32x32/apps/laconica_microblog.png
 share/icons/hicolor/32x32/apps/mobypicture_uploader.png
@@ -162,11 +180,11 @@ share/icons/hicolor/32x32/apps/ocs_microblog.png
 share/icons/hicolor/32x32/apps/posterous_uploader.png
 share/icons/hicolor/32x32/apps/pumpio_microblog.png
 share/icons/hicolor/32x32/apps/twitgoo_uploader.png
-share/icons/hicolor/32x32/apps/twitpic_uploader.png
 share/icons/hicolor/32x32/apps/twitter_microblog.png
 share/icons/hicolor/48x48/apps/choqok.png
 share/icons/hicolor/48x48/apps/choqok_offline.png
 share/icons/hicolor/48x48/apps/flickr_uploader.png
+share/icons/hicolor/48x48/apps/friendica_microblog.png
 share/icons/hicolor/48x48/apps/imageshack_uploader.png
 share/icons/hicolor/48x48/apps/laconica_microblog.png
 share/icons/hicolor/48x48/apps/mobypicture_uploader.png
@@ -178,60 +196,72 @@ share/icons/hicolor/48x48/apps/twitter_microblog.png
 share/icons/hicolor/64x64/apps/choqok.png
 share/icons/hicolor/64x64/apps/choqok_offline.png
 share/icons/hicolor/64x64/apps/flickr_uploader.png
+share/icons/hicolor/64x64/apps/friendica_microblog.png
 share/icons/hicolor/64x64/apps/imageshack_uploader.png
+share/icons/hicolor/64x64/apps/laconica_microblog.png
 share/icons/hicolor/64x64/apps/mobypicture_uploader.png
 share/icons/hicolor/64x64/apps/ocs_microblog.png
 share/icons/hicolor/64x64/apps/posterous_uploader.png
 share/icons/hicolor/64x64/apps/pumpio_microblog.png
 share/icons/hicolor/64x64/apps/twitgoo_uploader.png
-share/kde4/services/ServiceMenus/choqok_share.desktop
-share/kde4/services/ServiceMenus/choqok_upload.desktop
-share/kde4/services/choqok_accountsconfig.desktop
-share/kde4/services/choqok_appearanceconfig.desktop
-share/kde4/services/choqok_behaviorconfig.desktop
-share/kde4/services/choqok_bit_ly.desktop
-share/kde4/services/choqok_bit_ly_config.desktop
-share/kde4/services/choqok_filter.desktop
-share/kde4/services/choqok_flickr.desktop
-share/kde4/services/choqok_flickr_config.desktop
-share/kde4/services/choqok_goo_gl.desktop
-share/kde4/services/choqok_imagepreview.desktop
-share/kde4/services/choqok_imageshack.desktop
-share/kde4/services/choqok_imstatus.desktop
-share/kde4/services/choqok_imstatus_config.desktop
-share/kde4/services/choqok_is_gd.desktop
-share/kde4/services/choqok_is_gd_config.desktop
-share/kde4/services/choqok_laconica.desktop
-share/kde4/services/choqok_longurl.desktop
-share/kde4/services/choqok_mobypicture.desktop
-share/kde4/services/choqok_mobypicture_config.desktop
-share/kde4/services/choqok_notify.desktop
-share/kde4/services/choqok_notify_config.desktop
-share/kde4/services/choqok_nowlistening.desktop
-share/kde4/services/choqok_nowlistening_config.desktop
-share/kde4/services/choqok_ocs.desktop
-share/kde4/services/choqok_pluginconfig.desktop
-share/kde4/services/choqok_posterous.desktop
-share/kde4/services/choqok_posterous_config.desktop
-share/kde4/services/choqok_pumpio.desktop
-share/kde4/services/choqok_quickfilter.desktop
-share/kde4/services/choqok_searchaction.desktop
-share/kde4/services/choqok_tighturl.desktop
-share/kde4/services/choqok_tinyarro_ws.desktop
-share/kde4/services/choqok_tinyarro_ws_config.desktop
-share/kde4/services/choqok_twitgoo.desktop
-share/kde4/services/choqok_twitgoo_config.desktop
-share/kde4/services/choqok_twitpic.desktop
-share/kde4/services/choqok_twitpic_config.desktop
-share/kde4/services/choqok_twitter.desktop
-share/kde4/services/choqok_ur1_ca.desktop
-share/kde4/services/choqok_ur_ly.desktop
-share/kde4/services/choqok_videopreview.desktop
-share/kde4/services/choqok_yourls.desktop
-share/kde4/services/choqok_yourls_config.desktop
-share/kde4/servicetypes/choqokplugin.desktop
-share/kde4/servicetypes/choqokshortenerplugin.desktop
-share/kde4/servicetypes/choqokuploaderplugin.desktop
+share/icons/hicolor/scalable/apps/choqok.svgz
+share/icons/hicolor/scalable/apps/choqok_offline.svgz
+share/knotifications5/choqok/choqok.notifyrc
+share/kservices5/ServiceMenus/choqok_share.desktop
+share/kservices5/ServiceMenus/choqok_upload.desktop
+share/kservices5/choqok_accountsconfig.desktop
+share/kservices5/choqok_appearanceconfig.desktop
+share/kservices5/choqok_behaviorconfig.desktop
+share/kservices5/choqok_bit_ly.desktop
+share/kservices5/choqok_bit_ly_config.desktop
+share/kservices5/choqok_filter.desktop
+share/kservices5/choqok_flickr.desktop
+share/kservices5/choqok_flickr_config.desktop
+share/kservices5/choqok_friendica.desktop
+share/kservices5/choqok_goo_gl.desktop
+share/kservices5/choqok_imagepreview.desktop
+share/kservices5/choqok_imageshack.desktop
+share/kservices5/choqok_imstatus.desktop
+share/kservices5/choqok_imstatus_config.desktop
+share/kservices5/choqok_is_gd.desktop
+share/kservices5/choqok_is_gd_config.desktop
+share/kservices5/choqok_laconica.desktop
+share/kservices5/choqok_mobypicture.desktop
+share/kservices5/choqok_mobypicture_config.desktop
+share/kservices5/choqok_notify.desktop
+share/kservices5/choqok_notify_config.desktop
+share/kservices5/choqok_nowlistening.desktop
+share/kservices5/choqok_nowlistening_config.desktop
+share/kservices5/choqok_ocs.desktop
+share/kservices5/choqok_pluginconfig.desktop
+share/kservices5/choqok_posterous.desktop
+share/kservices5/choqok_posterous_config.desktop
+share/kservices5/choqok_pumpio.desktop
+share/kservices5/choqok_quickfilter.desktop
+share/kservices5/choqok_searchaction.desktop
+share/kservices5/choqok_tighturl.desktop
+share/kservices5/choqok_tinyarro_ws.desktop
+share/kservices5/choqok_tinyarro_ws_config.desktop
+share/kservices5/choqok_twitgoo.desktop
+share/kservices5/choqok_twitgoo_config.desktop
+share/kservices5/choqok_twitter.desktop
+share/kservices5/choqok_untiny.desktop
+share/kservices5/choqok_ur1_ca.desktop
+share/kservices5/choqok_videopreview.desktop
+share/kservices5/choqok_yourls.desktop
+share/kservices5/choqok_yourls_config.desktop
+share/kservices5/konqchoqok.desktop
+share/kservicetypes5/choqokplugin.desktop
+share/kservicetypes5/choqokshortenerplugin.desktop
+share/kservicetypes5/choqokuploaderplugin.desktop
+share/kxmlgui5/choqok/choqokui.rc
+share/kxmlgui5/choqok_filter/filterui.rc
+share/kxmlgui5/choqok_nowlistening/nowlisteningui.rc
+share/kxmlgui5/choqok_quickfilter/quickfilterui.rc
+share/kxmlgui5/choqok_searchaction/searchactionui.rc
+share/kxmlgui5/konqchoqokplugin/konqchoqok.rc
+share/locale/ar/LC_MESSAGES/choqok.mo
+share/locale/ast/LC_MESSAGES/choqok.mo
 share/locale/bg/LC_MESSAGES/choqok.mo
 share/locale/bs/LC_MESSAGES/choqok.mo
 share/locale/ca/LC_MESSAGES/choqok.mo
@@ -252,8 +282,8 @@ share/locale/gl/LC_MESSAGES/choqok.mo
 share/locale/hr/LC_MESSAGES/choqok.mo
 share/locale/hu/LC_MESSAGES/choqok.mo
 share/locale/ia/LC_MESSAGES/choqok.mo
-share/locale/it/LC_MESSAGES/choqok.mo
 share/locale/is/LC_MESSAGES/choqok.mo
+share/locale/it/LC_MESSAGES/choqok.mo
 share/locale/ja/LC_MESSAGES/choqok.mo
 share/locale/km/LC_MESSAGES/choqok.mo
 share/locale/lt/LC_MESSAGES/choqok.mo
@@ -277,3 +307,4 @@ share/locale/ug/LC_MESSAGES/choqok.mo
 share/locale/uk/LC_MESSAGES/choqok.mo
 share/locale/zh_CN/LC_MESSAGES/choqok.mo
 share/locale/zh_TW/LC_MESSAGES/choqok.mo
+share/metainfo/org.kde.choqok.appdata.xml