public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: www-client/dooble/
@ 2017-02-22  4:49 Richard Yao
  0 siblings, 0 replies; 3+ messages in thread
From: Richard Yao @ 2017-02-22  4:49 UTC (permalink / raw
  To: gentoo-commits

commit:     da6e954544257aa5054cde1022341c23d5238025
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 04:38:38 2017 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 04:49:21 2017 +0000
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 <ryao <AT> 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 0000000000..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 "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/metadata.xml b/www-client/dooble/metadata.xml
index 3a62b649cc..c7cdf0d005 100644
--- a/www-client/dooble/metadata.xml
+++ b/www-client/dooble/metadata.xml
@@ -5,6 +5,9 @@
 		<email>ryao@gentoo.org</email>
 		<name>Richard Yao</name>
 	</maintainer>
+	<use>
+		<flag name="qt4">Build using qt4 instead of qt5</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">dooble</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-client/dooble/
@ 2017-08-12 14:41 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-08-12 14:41 UTC (permalink / raw
  To: gentoo-commits

commit:     6787c3c2dbb8cd97b6d03a83fe20f929b6472ef2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  4 18:00:55 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 14:40:59 2017 +0000
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() {


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-client/dooble/
@ 2018-03-17  9:24 Pacho Ramos
  0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2018-03-17  9:24 UTC (permalink / raw
  To: gentoo-commits

commit:     44cabaa5e408ec4f57ef0bd741d317a2e7c567cd
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 09:18:42 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 09:21:42 2018 +0000
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>ryao@gentoo.org</email>
-		<name>Richard Yao</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dooble</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-03-17  9:24 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-17  9:24 [gentoo-commits] repo/gentoo:master commit in: www-client/dooble/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2017-08-12 14:41 Andreas Sturmlechner
2017-02-22  4:49 Richard Yao

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox