gentoo resync : 21.12.2017

3 files changed, 10 insertions, 119 deletions

diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index 4e95a065ef62..699a0675629c 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -1,10 +1,8 @@
 AUX qupzilla-2.1.2-openssl-1.1.0.patch 4631 BLAKE2B 27ede6f8ac9f198b147bf3eddecbe9f78c50dff050f3e9bd8565620847eec1cb6fb3c3f8164a51f7220b9365c275ce9ea4321e0e7e99976170748a75ef674c8c SHA512 0171a9d64c4202c3893767c962b7951d6f431d7e70a7de1385e80c097dd6d1e55fd77be8da3621a9d15cb6982a92d4049e0dc6058c00b7bf7fc90439d659479f
 DIST QupZilla-2.1.2.tar.xz 2767560 BLAKE2B 4d012f86618680a112c227d07d71c24d6fc2c517be63fe172abc99eb0c20e8b2756e2cc51049b0dff91e1739357121afe0b1e7328df372370dec969995447eb0 SHA512 d09a394ba70ae0f7f908940a26d6554a3706b6638c197d16b75e1e5855f76015c8e13b7155c40dacee3a38080a0c277d9410eaf07cf912dc4b295eafe1ff6343
-DIST QupZilla-2.2.1.tar.xz 2465248 BLAKE2B def052751ccd5e6947b671140462b7bb3765bc3448d490b76e133335e4da902ab6f704a098ba8bfc770909dc6898d3bd2d27e02abf727e2453559724be03f1ea SHA512 b98754d31657caede8ecd0402d543a5010d3f0c5515932e9c80512f5982400b2065840f1cd9be190cc73460798cb8138d7408c8c08a87541372b68e5b56cee06
 DIST QupZilla-2.2.2.tar.xz 2499180 BLAKE2B 4fda216aa9698e7185ecae6229f511e77c152454c33208966a1def9726ff097cdb198ad368b23606f756985ad8a5fea85269ebc030b49e0d74c48ca53ab044b1 SHA512 15d5b8c9fa1fa88ca8af49527068258eaec49181c3acf2142a6fbc59057e2f2765733fe51bc283bd7ce52c9815520ad5bc5185b5ee284b13139ab9706ea188b3
 DIST qupzilla-plugins-2016.05.02.tar.gz 425314 BLAKE2B c10f9f3fe17f36b91a77b4bdb15b3d0c63160c50b558ba2f180ec83b2d226b15baea51e9125e0c72d3960c2f99f8f3753d90c7eeb4b88eb07381da19bc3ea777 SHA512 b294ecb2372b3267603a43bc7412ab75d2cd29a8c4667331f0d2c74e3b0b99d0c2a005b9e4854c6d777894522bba9fb3b1607e85e8da6dcbaa760c9ddc6288f2
 DIST qupzilla-plugins-2017.03.26.tar.gz 430926 BLAKE2B d5db8c854886b1af8db20aaffe9a244600259d4f8cbc40890bf0f1075f790afe1a6e2ac19abe06c585eff0353127a3a7b1b1b79013bfc1b81bf5df750e5d9d20 SHA512 3b04b41208dddd25fd58937986cf12f2b521cf78a64380b915d46735ada3f4776f914056c5511daa781c89867d0309af7cbf833eb71dfa4b14b6b9ba25d80315
-EBUILD qupzilla-2.1.2.ebuild 3001 BLAKE2B d8e37ac6615f0c047556fe61e4c0d14e00bff8b36a3d24bb9f9d30b142731525ad614fb2d2da967b59645d2a6984ac0d221a20d30fe2991a8feb21b1e111c7ec SHA512 a3e1b61d21a035c8ffed67cd60369e68267778a2611d6ff4a28fc9606742a27c5253e476dd3d74d229ce83cd0293da62ad9da46235ab60d22ef60d27c6b68525
-EBUILD qupzilla-2.2.1.ebuild 3037 BLAKE2B 1fe496f6668b67b1504be621318a7c0a73690b7b5a61b899bd54cb3344f7d9edd50af02c33660b1da16ce9524eed8294f37c2774442a393b81418e850c715c2f SHA512 1083262c01d57a1774514c4ff11733767ab7574207559625b20d418bbf45e0f8e9248610b89f70a7fc66fb4f854ced0851fec845c9818fc752c343cf369fec52
+EBUILD qupzilla-2.1.2.ebuild 3107 BLAKE2B 759e2b8ca800b96a7132986b4c776f260b05c6397999351abaf624d3aeceb46433aa7f6de662b35d7fc4079ac775b379569bd087ed3ecf59ba9b780053a09462 SHA512 d3d945b8fc44e0e7b64867b6cc66f018640791745fbb6e67fe533cb397046ac133a72ddd256d86d232421366ebc6eda90295f22f1cf2279e5fe0707c33e6097d
 EBUILD qupzilla-2.2.2.ebuild 3043 BLAKE2B c93d8f6d4647b14aabf6f7b7585cd271765b2ecf39d5f8ff1315ad7ed3801d6536b1d39757d08bdcbd08fab4469314359dfc9afcbab81e9b730298c281bd1ef1 SHA512 e3aea1e4a26e53b73914a9eb15733b98ca4f59766cff6ac2b46bacb4b00dd54069610ac433dfbe37319c549e5b60e1b13af65e3edca8e7b4714e2cdbc2dc1d2f
 MISC metadata.xml 691 BLAKE2B 242030684387619d08dfc3aa46f7f0c82055bfac4693bf2e5f655d6d2762b026af5bc1f87ec05eb099d80fd48bde8df80f7deb6ac16263c4067fafd0aa389122 SHA512 585fed97ee3390094552cb5350c185dcdfaba1df7d5d3608cddbb6c05812223276b661121518ffce7921456983ee073aea58ada17ee6347d01a9e5559f75388d
diff --git a/www-client/qupzilla/qupzilla-2.1.2.ebuild b/www-client/qupzilla/qupzilla-2.1.2.ebuild
index c17924c3323c..2ea1fc82dbec 100644
--- a/www-client/qupzilla/qupzilla-2.1.2.ebuild
+++ b/www-client/qupzilla/qupzilla-2.1.2.ebuild
@@ -12,7 +12,7 @@ PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_ES es_MX es_VE eu_ES
 PLUGINS_HASH='c332d306c0f6cf645c75eaf198d2fc5e12339e9e'
 PLUGINS_VERSION='2016.05.02' # if there are no updates, we can use the older archive
 
-inherit l10n qmake-utils
+inherit l10n qmake-utils xdg-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -107,3 +107,11 @@ src_install() {
 	emake INSTALL_ROOT="${D}" install
 	einstalldocs
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/www-client/qupzilla/qupzilla-2.2.1.ebuild b/www-client/qupzilla/qupzilla-2.2.1.ebuild
deleted file mode 100644
index 95346a2071bd..000000000000
--- a/www-client/qupzilla/qupzilla-2.2.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_419 es_ES es_MX es_VE
-	eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID is it_IT ja_JP
-	ka_GE lg lt lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sr
-	sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn
-	zh_CN zh_HK zh_TW"
-
-PLUGINS_HASH="80fea7df7765fdf9c9c64fdb667052b25f1c0a22"
-PLUGINS_VERSION="2017.03.26" # if there are no updates, we can use the older archive
-
-inherit l10n qmake-utils xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/QupZilla/${PN}.git"
-else
-	MY_P=QupZilla-${PV}
-	SRC_URI="https://github.com/QupZilla/${PN}/releases/download/v${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="A cross-platform web browser using QtWebEngine"
-HOMEPAGE="https://www.qupzilla.com/"
-SRC_URI+=" https://github.com/QupZilla/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="dbus debug gnome-keyring kwallet libressl nonblockdialogs"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.8:5
-	>=dev-qt/qtdeclarative-5.8:5[widgets]
-	>=dev-qt/qtgui-5.8:5
-	>=dev-qt/qtnetwork-5.8:5[ssl]
-	>=dev-qt/qtprintsupport-5.8:5
-	>=dev-qt/qtsql-5.8:5[sqlite]
-	>=dev-qt/qtwebchannel-5.8:5
-	>=dev-qt/qtwebengine-5.8:5[widgets]
-	>=dev-qt/qtwidgets-5.8:5
-	>=dev-qt/qtx11extras-5.8:5
-	x11-libs/libxcb:=
-	dbus? ( >=dev-qt/qtdbus-5.8:5 )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	kwallet? ( kde-frameworks/kwallet:5 )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-5.8:5
-	>=dev-qt/qtconcurrent-5.8:5
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS BUILDING.md CHANGELOG FAQ README.md )
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	# get extra plugins into qupzilla build tree
-	mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/* src/plugins/ || die
-
-	rm_loc() {
-		# remove localizations the user has not specified
-		sed -i -e "/${1}.ts/d" translations/translations.pri || die
-		rm translations/${1}.ts || die
-	}
-
-	# remove outdated prebuilt localizations
-	rm -rf bin/locale || die
-
-	# remove empty locale
-	rm translations/empty.ts || die
-
-	l10n_find_plocales_changes translations '' .ts
-	l10n_for_each_disabled_locale_do rm_loc
-
-	default
-}
-
-src_configure() {
-	# see BUILDING document for explanation of options
-	export \
-		QUPZILLA_PREFIX="${EPREFIX}/usr" \
-		USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		DEBUG_BUILD=$(usex debug true '') \
-		DISABLE_DBUS=$(usex dbus '' true) \
-		GNOME_INTEGRATION=$(usex gnome-keyring true '') \
-		KDE_INTEGRATION=$(usex kwallet true '') \
-		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '')
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}