From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CD995138330 for ; Sat, 8 Oct 2016 16:40:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C59D4E0994; Sat, 8 Oct 2016 16:40:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A8C0E0994 for ; Sat, 8 Oct 2016 16:40:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F3E43414E7 for ; Sat, 8 Oct 2016 16:39:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F3B9248D for ; Sat, 8 Oct 2016 16:39:58 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1475944788.e3b9553843f20adf56e66101a9ae3abea9af4ccd.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/qupzilla/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/qupzilla/Manifest www-client/qupzilla/qupzilla-1.8.9.ebuild www-client/qupzilla/qupzilla-2.0.0.ebuild X-VCS-Directories: www-client/qupzilla/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: e3b9553843f20adf56e66101a9ae3abea9af4ccd X-VCS-Branch: master Date: Sat, 8 Oct 2016 16:39:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c4d349c3-1218-4872-97ae-662fdfb0e628 X-Archives-Hash: 4587d145d96716115c7fecd7ff33c051 commit: e3b9553843f20adf56e66101a9ae3abea9af4ccd Author: Michael Palimaka gentoo org> AuthorDate: Sat Oct 8 16:39:40 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Oct 8 16:39:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b95538 www-client/qupzilla: remove old Package-Manager: portage-2.3.1 www-client/qupzilla/Manifest | 4 -- www-client/qupzilla/qupzilla-1.8.9.ebuild | 113 ------------------------------ www-client/qupzilla/qupzilla-2.0.0.ebuild | 106 ---------------------------- 3 files changed, 223 deletions(-) diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest index 4d47310..054114a 100644 --- a/www-client/qupzilla/Manifest +++ b/www-client/qupzilla/Manifest @@ -1,6 +1,2 @@ -DIST QupZilla-1.8.9.tar.xz 3004644 SHA256 620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac SHA512 64ee064aa55f4aa1c56ca3a925dbec66612d522eec570a96448d940d52239cb74dfb08b89610008b3ee669cfb4b287393020b8070162697e991aa8c04c57c448 WHIRLPOOL 4f5864c35d008b64292afbfb615cbb33a9e327446d637cbcd1bf41d0e4ffa7a3cf6a529d1eda14cba6bf28664aa40ee743f812b165698ba997a90cb2285cbc0d -DIST QupZilla-2.0.0.tar.xz 2787692 SHA256 b357e2d3de91ec833a34f958c6eb649d86113235ee27a519722d8cae58bc8c78 SHA512 d7075017d0feabf6632540343ddef77e75fd693e859a34863f9d515545ac70a87b340fc50fef32569b67bbc93c3c3e360c3c124503279367c6f70316795107f5 WHIRLPOOL d0647f779577c7f4c8e2c9971b962e02fd8f6e475070a4fbd272b8f732838c4b941e50695a6264cf9ce6b38e4245ce17c3f5903ffe57f90d1d75d248562fee43 DIST QupZilla-2.0.1.tar.xz 2700184 SHA256 38b89d00ad235687ca1ad327f7f108aee2d85cdc047a78b6811dedff0d07850d SHA512 5da50378f0129269ee322c8b8517797cc29abd272c65b39b96762dfd62c3ec1ac158d8b44deaf8158336d41f111fcda466ffa56511f6b56ab964e1ba36575b45 WHIRLPOOL 341e453733a69a3c298bc7fdb2bb0f67887c8a1fbda7ab64f6c9b8d8008b7577be261f9178c9b91cfbb8abb239f9c0e7cba295d3aad8b304e3aafb3f98dc737c -DIST qupzilla-plugins-2015.06.05.tar.gz 335627 SHA256 afc9589e54c3ed49f58c727c3ff7bd59d4467dfaf2ff78f57cd98afc4dfc1f7b SHA512 5f2a4b1796431c62580e569b57445b2a309b2314f59ceb0c99da2a1703a2ee23bd2d1cac8a1532be5f2161976b4dd5f439c08abe5c1826115e9adf636fc12522 WHIRLPOOL 10b53426888dc8868de783403463d0bbf83ee59fdf74f2409b78a725b4f90d08aa9698e622d3acfdedbca469397b2e3d4ed8f06d3112bd9cff6e76527b1611eb -DIST qupzilla-plugins-2015.10.02.tar.gz 335649 SHA256 9e167a6f1234b0b51c26cbd4acc5bcdc83c760ef5c2ff8573f90aa64c3a40553 SHA512 de2208fec40a1412a1feb4bd995ae25ff04a1f3577449f7c90bc5d2f46b01c8cf33757db5a0fa69ddb5a1a27764a0230664a5b2adc89ebc2b43df5df5e2b4f31 WHIRLPOOL 8fc24f0891fbb7e8378aae900c25bc29604f13febd9b30594e2e25d55a02707d047835e2fef82482c632ef35b93046a7e2990a82d285c159de6cf603525d01d5 DIST qupzilla-plugins-2016.05.02.tar.gz 425314 SHA256 276491a89daf1b64d6eab861b54d313e85c815d322bf51d47491f00ad22f55bc SHA512 b294ecb2372b3267603a43bc7412ab75d2cd29a8c4667331f0d2c74e3b0b99d0c2a005b9e4854c6d777894522bba9fb3b1607e85e8da6dcbaa760c9ddc6288f2 WHIRLPOOL 471807dc70dd3ea072f1e429a6e67ea97ecd5eadc02ac19debdcddfca4f5cb8e1767ad754aed1ff8a557f0734460a87b4e2d5e01ea57d07c473f48b006e32ef1 diff --git a/www-client/qupzilla/qupzilla-1.8.9.ebuild b/www-client/qupzilla/qupzilla-1.8.9.ebuild deleted file mode 100644 index 301c37b..00000000 --- a/www-client/qupzilla/qupzilla-1.8.9.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -MY_PN="QupZilla" -MY_P=${MY_PN}-${PV} -PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID 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 sr sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW" -PLUGINS_HASH="7c66cb2efbd18eacbd04ba211162b1a042e5b759" -PLUGINS_VERSION="2015.06.05" # if there are no updates, we can use the older archive - -inherit eutils l10n multilib qmake-utils vcs-snapshot - -DESCRIPTION="Qt WebKit web browser" -HOMEPAGE="http://www.qupzilla.com/" -SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz - https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 arm ~ppc64 x86" -IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs +qt4 qt5" -REQUIRED_USE="^^ ( qt4 qt5 ) - kde? ( qt4 )" - -RDEPEND=" - x11-libs/libX11 - gnome-keyring? ( gnome-base/gnome-keyring ) - kde? ( - kde-base/kdelibs:4 - kde-apps/kwalletd:4 - ) - libressl? ( dev-libs/libressl ) - !libressl? ( dev-libs/openssl:0 ) - qt4? ( - >=dev-qt/qtcore-4.8:4 - >=dev-qt/qtgui-4.8:4 - >=dev-qt/qtscript-4.8:4 - >=dev-qt/qtsql-4.8:4[sqlite] - >=dev-qt/qtwebkit-4.8:4 - dbus? ( >=dev-qt/qtdbus-4.8:4 ) - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtconcurrent:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtprintsupport:5 - dev-qt/qtscript:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dbus? ( dev-qt/qtdbus:5 ) - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 )" - -DOCS=( AUTHORS CHANGELOG FAQ README.md ) -S=${WORKDIR}/${MY_P} - -src_prepare() { - rm_loc() { - # remove localizations the user has not specified - sed -i -e "/${1}.ts/d" translations/translations.pri || die - rm translations/${1}.ts || die - } - - epatch_user - - # remove outdated prebuilt localizations - rm -rf bin/locale || die - - # remove empty locale - rm translations/empty.ts || die - - # get extra plugins into qupzilla build tree - mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_VERSION}/plugins/* "${S}"/src/plugins/ || die - - l10n_find_plocales_changes "translations" "" ".ts" - l10n_for_each_disabled_locale_do rm_loc -} - -src_configure() { - # see BUILDING document for explanation of options - export \ - QUPZILLA_PREFIX="${EPREFIX}/usr/" \ - USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \ - USE_QTWEBKIT_2_2=true \ - DISABLE_DBUS=$(usex dbus '' 'true') \ - KDE_INTEGRATION=$(usex kde 'true' '') \ - NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs 'true' '') - - if use qt4 ; then - eqmake4 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION") - else - eqmake5 $(use gnome-keyring && echo "DEFINES+=GNOME_INTEGRATION") - fi -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs -} - -pkg_postinst() { - if has_version www-plugins/adobe-flash; then - ewarn "For using adobe flash plugin you may need to run" - ewarn " \"paxctl-ng -m /usr/bin/qupzilla\"" - fi -} diff --git a/www-client/qupzilla/qupzilla-2.0.0.ebuild b/www-client/qupzilla/qupzilla-2.0.0.ebuild deleted file mode 100644 index f02ae4b..00000000 --- a/www-client/qupzilla/qupzilla-2.0.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PLOCALES="ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR - fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV - nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian - sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW" -PLUGINS_HASH='7b037cc326921cefbfc6b5e54e2091eb4191e73f' -PLUGINS_VERSION='2015.10.02' # if there are no updates, we can use the older archive - -inherit l10n qmake-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 ~x86" - S=${WORKDIR}/${MY_P} -fi - -DESCRIPTION="A cross-platform web browser using QtWebEngine" -HOMEPAGE="http://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 kde libressl nonblockdialogs" - -RDEPEND=" - >=dev-qt/qtconcurrent-5.6:5 - >=dev-qt/qtcore-5.6:5 - >=dev-qt/qtdeclarative-5.6:5[widgets] - >=dev-qt/qtgui-5.6:5 - >=dev-qt/qtnetwork-5.6:5[ssl] - >=dev-qt/qtprintsupport-5.6:5 - >=dev-qt/qtsql-5.6:5[sqlite] - >=dev-qt/qtwebchannel-5.6:5 - >=dev-qt/qtwebengine-5.6:5[widgets] - >=dev-qt/qtwidgets-5.6:5 - >=dev-qt/qtx11extras-5.6:5 - x11-libs/libxcb:= - dbus? ( >=dev-qt/qtdbus-5.6:5 ) - gnome-keyring? ( gnome-base/gnome-keyring ) - kde? ( kde-frameworks/kwallet:5 ) - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0 ) -" -DEPEND="${RDEPEND} - >=dev-qt/linguist-tools-5.6:5 - virtual/pkgconfig -" - -DOCS=( AUTHORS BUILDING 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/* "${S}"/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 kde true '') \ - NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '') - - eqmake5 -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs -}