[gentoo-commits] repo/gentoo:master commit in: www-client/dooble/, profiles/

2018-12-04 Thread Michał Górny
commit: 435dee0a6989b9c511bfea4d1900ae11c353ea8d
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Dec  4 17:05:29 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Dec  4 17:10:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=435dee0a

www-client/dooble: Remove last-rited pkg

Closes: https://bugs.gentoo.org/565894
Signed-off-by: Michał Górny  gentoo.org>

 profiles/package.mask |  5 ---
 www-client/dooble/Manifest|  1 -
 www-client/dooble/dooble-1.56c.ebuild | 83 ---
 www-client/dooble/metadata.xml|  7 ---
 4 files changed, 96 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index c5fd28b0e13..fd29890fbb5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -354,11 +354,6 @@ app-benchmarks/os-autoinst
 net-proxy/squidclamav
 net-proxy/c-icap
 
-# Pacho Ramos  (04 Nov 2018)
-# Outdated, doesn't respect CC, installs files in /usr/local (#565894,
-# #664370). Removal in a month.
-www-client/dooble
-
 # Andreas Sturmlechner  (03 Nov 2018)
 # Breaks revdeps (GDir and GDirEntry split from gfile.h into new gdir.h)
 # See tracker: https://bugs.gentoo.org/670222

diff --git a/www-client/dooble/Manifest b/www-client/dooble/Manifest
deleted file mode 100644
index 5723effc20b..000
--- a/www-client/dooble/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dooble-1.56c.tar.gz 12218062 BLAKE2B 
2f145c96f7ad994eeb47b2201aed6122d8cd45f21485a34a3d2438f78702805a91194fb54265cceb52eaf109e7dc64d3dcc9cff6a2f568b1ca9563de50917941
 SHA512 
6a42eed4320437b0e43020d661963ff385fd08dd225f96337d778bca13aec85df3a49eb6cb0f7bd9ae26a8822df62dd580b407ed27c6df58bd0720a50867aa42

diff --git a/www-client/dooble/dooble-1.56c.ebuild 
b/www-client/dooble/dooble-1.56c.ebuild
deleted file mode 100644
index c97bffc1d07..000
--- a/www-client/dooble/dooble-1.56c.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qmake-utils fdo-mime
-DESCRIPTION="A Secure and Open Source Web Browser"
-HOMEPAGE="http://dooble.sourceforge.net/";
-
-SRC_URI="mirror://sourceforge/${PN}/Version%20${PV}/Dooble.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=""
-
-RDEPEND="
-   dev-db/sqlite:3
-   dev-libs/libgcrypt:0
-   dev-libs/libgpg-error
-   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
-"
-
-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
-   sed -i -e 's/\(dooble.path[[:space:]]*= \)\(.*\)$/\1\/usr\/bin/' \
-   -e 's/\(dooble_sh.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/share\/dooble/' \
-   -e 's/\(icons.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/share\/dooble/' \
-   -e 's/\(images.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/share\/dooble/' \
-   -e 's/\(spoton_install.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/lib/' \
-   -e 's/\(pluginsdir.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/lib\/nsbrowser\/plugins/' \
-   -e 's/\(plugspec.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/include\/dooble\/plugin-spec/' \
-   -e 's/\(postinstall.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/share\/dooble/' \
-   -e 's/\(tab.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/share\/dooble/' \
-   dooble.pro dooble.qt5.pro
-
-   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() {
-   eqmake5 dooble.qt5.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

[gentoo-commits] repo/gentoo:master commit in: www-client/dooble/

2018-03-17 Thread Pacho Ramos
commit: 44cabaa5e408ec4f57ef0bd741d317a2e7c567cd
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Mar 17 09:18:42 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Mar 17 09:21:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44cabaa5

www-client/dooble: Update maintainer due to bug #405105

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-client/dooble/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/www-client/dooble/metadata.xml b/www-client/dooble/metadata.xml
index 3a62b649ccd..e6d7b04e49a 100644
--- a/www-client/dooble/metadata.xml
+++ b/www-client/dooble/metadata.xml
@@ -1,10 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   r...@gentoo.org
-   Richard Yao
-   

dooble




[gentoo-commits] repo/gentoo:master commit in: www-client/dooble/, www-client/dooble/files/

2017-08-12 Thread Andreas Sturmlechner
commit: e9f2166473f13a152c6eb1e28743a3be2a213f6e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug  4 18:01:32 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 12 14:40:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9f21664

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(-)

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..000
--- 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..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: www-client/dooble/

2017-08-12 Thread Andreas Sturmlechner
commit: 6787c3c2dbb8cd97b6d03a83fe20f929b6472ef2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug  4 18:00:55 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 12 14:40:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6787c3c2

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() {



[gentoo-commits] repo/gentoo:master commit in: www-client/dooble/

2017-02-21 Thread Richard Yao
commit: da6e954544257aa5054cde1022341c23d5238025
Author: Richard Yao  gentoo  org>
AuthorDate: Wed Feb 22 04:38:38 2017 +
Commit: Richard Yao  gentoo  org>
CommitDate: Wed Feb 22 04:49:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6e9545

www-client/dooble: Bump to 1.56c

This introduces optional Qt5 support. It is enabled when USE=-qt4 is
set.

Package-Manager: Portage-2.3.3

Signed-off-by: Richard Yao  gentoo.org>

 www-client/dooble/Manifest|  1 +
 www-client/dooble/dooble-1.56c.ebuild | 89 +++
 www-client/dooble/metadata.xml|  3 ++
 3 files changed, 93 insertions(+)

diff --git a/www-client/dooble/Manifest b/www-client/dooble/Manifest
index 56022b3861..8ee2de4232 100644
--- a/www-client/dooble/Manifest
+++ b/www-client/dooble/Manifest
@@ -1 +1,2 @@
 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.56c.ebuild 
b/www-client/dooble/dooble-1.56c.ebuild
new file mode 100644
index 00..dff50cb6bf
--- /dev/null
+++ b/www-client/dooble/dooble-1.56c.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils qmake-utils fdo-mime
+DESCRIPTION="A Secure and Open Source Web Browser"
+HOMEPAGE="http://dooble.sourceforge.net/";
+
+SRC_URI="mirror://sourceforge/${PN}/Version%20${PV}/Dooble.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="qt4"
+DEPEND="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
+   )
+"
+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
+   sed -i -e 's/\(dooble.path[[:space:]]*= \)\(.*\)$/\1\/usr\/bin/' \
+   -e 's/\(dooble_sh.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/share\/dooble/' \
+   -e 's/\(icons.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/share\/dooble/' \
+   -e 's/\(images.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/share\/dooble/' \
+   -e 's/\(spoton_install.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/lib/' \
+   -e 's/\(pluginsdir.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/lib\/nsbrowser\/plugins/' \
+   -e 's/\(plugspec.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/include\/dooble\/plugin-spec/' \
+   -e 's/\(postinstall.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/share\/dooble/' \
+   -e 's/\(tab.path[[:space:]]*= 
\)\(.*\)$/\1\/usr\/share\/dooble/' \
+   dooble.pro dooble.qt5.pro
+
+   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() {
+   use qt4 && eqmake4 dooble.pro || eqmake5 dooble.qt5.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 "

[gentoo-commits] repo/gentoo:master commit in: www-client/dooble/files/, www-client/dooble/

2015-11-15 Thread Richard Yao
commit: d4e29685681dfb3bfb0a1630d8604c46d9e0e3c3
Author: Richard Yao  gentoo  org>
AuthorDate: Sun Nov 15 18:54:03 2015 +
Commit: Richard Yao  gentoo  org>
CommitDate: Sun Nov 15 18:54:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e29685

www-client/dooble: new package, "a secure web browser"

This is a rewrite of the www-client/dooble package from Sabayon's
for-gentoo repository:

https://github.com/Sabayon/for-gentoo/tree/master/www-client/dooble

I have not audited the package to verify the security claims, but a
cursory peek at how it restricts possible exploit vectors has been
promising. I would like this to be scrutinized by others, but I feel
good enough about this that I am committing it to ~amd64 for our users
to evaluate.

At the moment, I am only committing the Qt4 version, which is the 1.x
series. The 2.x series is the Qt5 version. This probably should be
changed to be slotted when that is committed.

Package-Manager: portage-2.2.20.1

 www-client/dooble/Manifest |  1 +
 www-client/dooble/dooble-1.55.ebuild   | 66 ++
 .../dooble/files/00-dooble-1.55-path-fix.patch | 45 +++
 www-client/dooble/metadata.xml | 11 
 4 files changed, 123 insertions(+)

diff --git a/www-client/dooble/Manifest b/www-client/dooble/Manifest
new file mode 100644
index 000..56022b3
--- /dev/null
+++ b/www-client/dooble/Manifest
@@ -0,0 +1 @@
+DIST dooble-1.55.tar.gz 11663614 SHA256 
024003e7c397a925d48e41cba10a2a35b89dd1745120caf4fd2010c1e254c5e5 SHA512 
413727f74ab7fba89f7b617a774a0dceaa8a03b826f12950e31ca3fedda7e607539759b946eacccd57087429e6a37acd967a2c376b0b195b560c8c9beaf4e3d6
 WHIRLPOOL 
ebe0b69a3dde0c0977c6295c6c67811195ca6d4e66dd95d09b51eae7da32170f737e62275e17020213c640e10a368f3792c8d34b495f15ee004e7a644a914700

diff --git a/www-client/dooble/dooble-1.55.ebuild 
b/www-client/dooble/dooble-1.55.ebuild
new file mode 100644
index 000..554b0c0
--- /dev/null
+++ b/www-client/dooble/dooble-1.55.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
new file mode 100644
index 000..8edc8c5
--- /dev/null
+++ b/www-client/dooble/files/00-dooble-1.55-path-fix.patch
@@ -0,0 +1,45 @@
+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