From 7169fc988bcd52235248df970890a43b5d097438 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 4 Aug 2017 20:00:55 +0200 Subject: [PATCH 1/2] www-client/dooble: Drop USE=qt4 Build with Qt5 unconditionally. Package-Manager: Portage-2.3.6, Repoman-2.3.1 --- www-client/dooble/dooble-1.56c.ebuild | 37 +++++++++++++++-------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/www-client/dooble/dooble-1.56c.ebuild b/www-client/dooble/dooble-1.56c.ebuild index 832509c1122..c97bffc1d07 100644 --- a/www-client/dooble/dooble-1.56c.ebuild +++ b/www-client/dooble/dooble-1.56c.ebuild @@ -13,29 +13,24 @@ ${P}.tar.gz" LICENSE="BSD GPL-3 LGPL-2.1" SLOT="0" KEYWORDS="~amd64" -IUSE="qt4" -DEPEND="dev-db/sqlite:3 +IUSE="" + +RDEPEND=" + dev-db/sqlite:3 dev-libs/libgcrypt:0 dev-libs/libgpg-error - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtsql:4 - dev-qt/qtwebkit:4 - ) - !qt4? ( - dev-qt/linguist-tools:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtwebkit:5 - dev-qt/qtxml:5 - ) + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtwebkit:5 + dev-qt/qtxml:5 +" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 " -RDEPEND="${DEPEND}" S="${WORKDIR}/dooble.d/Version 1.x/" @@ -63,7 +58,7 @@ src_prepare() { } src_configure() { - use qt4 && eqmake4 dooble.pro || eqmake5 dooble.qt5.pro + eqmake5 dooble.qt5.pro } src_install() { -- 2.13.0 From a71673608db9dada7b5600d3888b83184c96f550 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 4 Aug 2017 20:01:32 +0200 Subject: [PATCH 2/2] www-client/dooble: Drop old Package-Manager: Portage-2.3.6, Repoman-2.3.1 --- www-client/dooble/Manifest | 1 - www-client/dooble/dooble-1.55.ebuild | 65 ---------------------- .../dooble/files/00-dooble-1.55-path-fix.patch | 45 --------------- www-client/dooble/metadata.xml | 3 - 4 files changed, 114 deletions(-) delete mode 100644 www-client/dooble/dooble-1.55.ebuild delete mode 100644 www-client/dooble/files/00-dooble-1.55-path-fix.patch diff --git a/www-client/dooble/Manifest b/www-client/dooble/Manifest index 8ee2de42326..10869f4c93b 100644 --- a/www-client/dooble/Manifest +++ b/www-client/dooble/Manifest @@ -1,2 +1 @@ -DIST dooble-1.55.tar.gz 11663614 SHA256 024003e7c397a925d48e41cba10a2a35b89dd1745120caf4fd2010c1e254c5e5 SHA512 413727f74ab7fba89f7b617a774a0dceaa8a03b826f12950e31ca3fedda7e607539759b946eacccd57087429e6a37acd967a2c376b0b195b560c8c9beaf4e3d6 WHIRLPOOL ebe0b69a3dde0c0977c6295c6c67811195ca6d4e66dd95d09b51eae7da32170f737e62275e17020213c640e10a368f3792c8d34b495f15ee004e7a644a914700 DIST dooble-1.56c.tar.gz 12218062 SHA256 03b5bb0460aa8f4f731a47b70c571942a186fb0e7c4b74f546cef356be0afe6a SHA512 6a42eed4320437b0e43020d661963ff385fd08dd225f96337d778bca13aec85df3a49eb6cb0f7bd9ae26a8822df62dd580b407ed27c6df58bd0720a50867aa42 WHIRLPOOL bca7982447ed0d64c2f19c7d208869cc740866683bb056b6fb635c0585e1b5aed63a2c421027bf2e8fb8daca68604c23c525bca487c82b5c59b9fc72103ef622 diff --git a/www-client/dooble/dooble-1.55.ebuild b/www-client/dooble/dooble-1.55.ebuild deleted file mode 100644 index aa186c050e0..00000000000 --- a/www-client/dooble/dooble-1.55.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils qt4-r2 fdo-mime -DESCRIPTION="A Secure and Open Source Web Browser" -HOMEPAGE="http://dooble.sourceforge.net/" - -SRC_URI="mirror://sourceforge/${PN}/Version%20${PV}/Dooble_Src.d.tar.gz -> -${P}.tar.gz" - -# icon sets are GPL-3 LGPL-2.1 while the code is BSD -LICENSE="BSD GPL-3 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" -DEPEND="dev-db/sqlite:3 - dev-libs/libgcrypt:0/20 - dev-libs/libgpg-error - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtsql:4 - dev-qt/qtwebkit:4 -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/dooble.d/Version 1.x/" - -src_prepare() { - # Adjust paths from FreeBSD locations to Gentoo locations - # XXX: Fix the build system to be more flexible and upstream fix - epatch "${FILESDIR}/00-dooble-${PV}-path-fix.patch" - sed -i -e "s:\"Icons:\"${EROOT}usr/share/dooble/Icons:" \ - ./Source/dsettings.cc - sed -i -e '/export/d' -e "s:/usr/local/dooble/Dooble:${EROOT}usr/bin/Dooble:g" \ - -e "s:cd /usr/local/dooble:cd /usr/share/dooble:" \ - -e "s:exec ./Dooble:exec ${EROOT}usr/bin/Dooble:" ./dooble.sh - sed -i -e "s:/usr/local:${EROOT}/usr/share:" -e 's:/text/xml:text/xml:' \ - ./dooble.desktop -} - -src_configure() { - eqmake4 dooble.pro -} - -src_install() { - dohtml ../Documentation/RELEASE-NOTES.html - dodoc Documentation/{THEMES,TO-DO} - dosym ../share/dooble/dooble.sh /usr/bin/dooble - dosym ../../lib/nsbrowser/plugins /usr/share/dooble/Plugins - dolib.so libSpotOn/libspoton.so - emake INSTALL_ROOT="${ED}" install - - # XXX: The build system installs the build path into INSTALL_ROOT. - # It should be fixed not to do this. - rm -r "${ED}/var" || die "Failed to remove build path from ${ED}" -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/www-client/dooble/files/00-dooble-1.55-path-fix.patch b/www-client/dooble/files/00-dooble-1.55-path-fix.patch deleted file mode 100644 index 8edc8c547bd..00000000000 --- a/www-client/dooble/files/00-dooble-1.55-path-fix.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/dooble.pro b/dooble.pro -index 8df489e..d448f6e 100644 ---- a/dooble.pro -+++ b/dooble.pro -@@ -240,33 +240,32 @@ TRANSLATIONS = Translations/dooble_en.ts \ - PROJECTNAME = Dooble - TARGET = Dooble - --dooble.path = /usr/local/dooble -+dooble.path = /usr/bin - dooble.files = Dooble --dooble_sh.path = /usr/local/dooble -+dooble_sh.path = /usr/share/dooble - dooble_sh.files = dooble.sh - desktop.path = /usr/share/applications - desktop.files = dooble.desktop - desktopicon.path = /usr/share/icons/hicolor/48x48 - desktopicon.files = Icons/48x48/dooble.png --icons.path = /usr/local/dooble -+icons.path = /usr/share/dooble - icons.files = Icons --images.path = /usr/local/dooble -+images.path = /usr/share/dooble - images.files = Images --libspoton_install.path = /usr/local/dooble/Lib -+libspoton_install.path = /usr/lib - libspoton_install.files = libSpotOn/libspoton.so - lrelease.extra = $$[QT_INSTALL_BINS]/lrelease dooble.pro - lrelease.path = . - lupdate.extra = $$[QT_INSTALL_BINS]/lupdate dooble.pro - lupdate.path = . --pluginsdir.path = /usr/local/dooble/Plugins/dooble -+pluginsdir.path = /usr/lib/nsbrowser/plugins --pluginsdir.files = Plugins/README --plugspec.path = /usr/local/include/dooble/plugin-spec -+plugspec.path = /usr/include/dooble/plugin-spec - plugspec.files = plugin-spec/*.h --postinstall.path = /usr/local/dooble -+postinstall.path = /usr/share/dooble - postinstall.extra = find /usr/local/dooble -name .svn -exec rm -rf {} \\; 2>/dev/null; echo --tab.path = /usr/local/dooble -+tab.path = /usr/share/dooble - tab.files = Tab - translations.path = /usr/local/dooble/Translations - translations.files = Translations/*.qm diff --git a/www-client/dooble/metadata.xml b/www-client/dooble/metadata.xml index c7cdf0d0059..3a62b649ccd 100644 --- a/www-client/dooble/metadata.xml +++ b/www-client/dooble/metadata.xml @@ -5,9 +5,6 @@ ryao@gentoo.org Richard Yao - - Build using qt4 instead of qt5 - dooble -- 2.13.0