Attachment #487950 for bug #620756

View | Details | Raw Unified | Return to bug 620756
Collapse All | Expand All




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
		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_configure() {
	eqmake5 dooble.qt5.pro
}

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

Lines 1-2 Link Here

(-)a/www-client/dooble/Manifest (-1 lines)
1	DIST dooble-1.55.tar.gz 11663614 SHA256 024003e7c397a925d48e41cba10a2a35b89dd1745120caf4fd2010c1e254c5e5 SHA512 413727f74ab7fba89f7b617a774a0dceaa8a03b826f12950e31ca3fedda7e607539759b946eacccd57087429e6a37acd967a2c376b0b195b560c8c9beaf4e3d6 WHIRLPOOL ebe0b69a3dde0c0977c6295c6c67811195ca6d4e66dd95d09b51eae7da32170f737e62275e17020213c640e10a368f3792c8d34b495f15ee004e7a644a914700
2	DIST dooble-1.56c.tar.gz 12218062 SHA256 03b5bb0460aa8f4f731a47b70c571942a186fb0e7c4b74f546cef356be0afe6a SHA512 6a42eed4320437b0e43020d661963ff385fd08dd225f96337d778bca13aec85df3a49eb6cb0f7bd9ae26a8822df62dd580b407ed27c6df58bd0720a50867aa42 WHIRLPOOL bca7982447ed0d64c2f19c7d208869cc740866683bb056b6fb635c0585e1b5aed63a2c421027bf2e8fb8daca68604c23c525bca487c82b5c59b9fc72103ef622	1	DIST dooble-1.56c.tar.gz 12218062 SHA256 03b5bb0460aa8f4f731a47b70c571942a186fb0e7c4b74f546cef356be0afe6a SHA512 6a42eed4320437b0e43020d661963ff385fd08dd225f96337d778bca13aec85df3a49eb6cb0f7bd9ae26a8822df62dd580b407ed27c6df58bd0720a50867aa42 WHIRLPOOL bca7982447ed0d64c2f19c7d208869cc740866683bb056b6fb635c0585e1b5aed63a2c421027bf2e8fb8daca68604c23c525bca487c82b5c59b9fc72103ef622




# 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/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

Lines 5-13 Link Here

(-)a/www-client/dooble/metadata.xml (-4 lines)
5	<email>ryao@gentoo.org</email>	5	<email>ryao@gentoo.org</email>
6	<name>Richard Yao</name>	6	<name>Richard Yao</name>
7	</maintainer>	7	</maintainer>
8	<use>
9	<flag name="qt4">Build using qt4 instead of qt5</flag>
10	</use>
11	<upstream>	8	<upstream>
12	<remote-id type="sourceforge">dooble</remote-id>	9	<remote-id type="sourceforge">dooble</remote-id>
13	</upstream>	10	</upstream>
14	-

Return to bug 620756

Lines 13-41 ${P}.tar.gz" Link Here

(-)a/www-client/dooble/dooble-1.56c.ebuild (-23 / +16 lines)
13	LICENSE="BSD GPL-3 LGPL-2.1"	13	LICENSE="BSD GPL-3 LGPL-2.1"
14	SLOT="0"	14	SLOT="0"
15	KEYWORDS="~amd64"	15	KEYWORDS="~amd64"
16	IUSE="qt4"	16	IUSE=""
17	DEPEND="dev-db/sqlite:3	17
		18	RDEPEND="
		19	dev-db/sqlite:3
18	dev-libs/libgcrypt:0	20	dev-libs/libgcrypt:0
19	dev-libs/libgpg-error	21	dev-libs/libgpg-error
20	qt4? (	22	dev-qt/qtconcurrent:5
21	dev-qt/qtcore:4	23	dev-qt/qtcore:5
22	dev-qt/qtgui:4	24	dev-qt/qtdeclarative:5
23	dev-qt/qtsql:4	25	dev-qt/qtgui:5
24	dev-qt/qtwebkit:4	26	dev-qt/qtprintsupport:5
25	)	27	dev-qt/qtsql:5
26	!qt4? (	28	dev-qt/qtwebkit:5
27	dev-qt/linguist-tools:5	29	dev-qt/qtxml:5
28	dev-qt/qtconcurrent:5	30	"
29	dev-qt/qtcore:5	31	DEPEND="${RDEPEND}
30	dev-qt/qtdeclarative:5	32	dev-qt/linguist-tools:5
31	dev-qt/qtgui:5
32	dev-qt/qtprintsupport:5
33	dev-qt/qtsql:5
34	dev-qt/qtwebkit:5
35	dev-qt/qtxml:5
36	)
37	"	33	"
38	RDEPEND="${DEPEND}"
39		34
40	S="${WORKDIR}/dooble.d/Version 1.x/"	35	S="${WORKDIR}/dooble.d/Version 1.x/"
41		36
Lines 63-69 src_prepare() { Link Here
63	}	58	}
64		59
65	src_configure() {	60	src_configure() {
66	use qt4 && eqmake4 dooble.pro \|\| eqmake5 dooble.qt5.pro	61	eqmake5 dooble.qt5.pro
67	}	62	}
68		63
69	src_install() {	64	src_install() {
70	-
71	--
72	www-client/dooble/Manifest \| 1 -	65	www-client/dooble/Manifest \| 1 -
73	www-client/dooble/dooble-1.55.ebuild \| 65 ----------------------	66	www-client/dooble/dooble-1.55.ebuild \| 65 ----------------------
74	.../dooble/files/00-dooble-1.55-path-fix.patch \| 45 ---------------	67	.../dooble/files/00-dooble-1.55-path-fix.patch \| 45 ---------------
75	www-client/dooble/metadata.xml \| 3 -	68	www-client/dooble/metadata.xml \| 3 -
76	4 files changed, 114 deletions(-)	69	4 files changed, 114 deletions(-)
77	delete mode 100644 www-client/dooble/dooble-1.55.ebuild	70	delete mode 100644 www-client/dooble/dooble-1.55.ebuild
78	delete mode 100644 www-client/dooble/files/00-dooble-1.55-path-fix.patch	71	delete mode 100644 www-client/dooble/files/00-dooble-1.55-path-fix.patch

Lines 1-65 Link Here

(-)a/www-client/dooble/dooble-1.55.ebuild (-65 lines)
1	# Copyright 1999-2015 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2
3
4	EAPI=5
5	inherit eutils qt4-r2 fdo-mime
6	DESCRIPTION="A Secure and Open Source Web Browser"
7	HOMEPAGE="http://dooble.sourceforge.net/"
8
9	SRC_URI="mirror://sourceforge/${PN}/Version%20${PV}/Dooble_Src.d.tar.gz ->
10	${P}.tar.gz"
11
12	# icon sets are GPL-3 LGPL-2.1 while the code is BSD
13	LICENSE="BSD GPL-3 LGPL-2.1"
14	SLOT="0"
15	KEYWORDS="~amd64"
16	IUSE=""
17	DEPEND="dev-db/sqlite:3
18	dev-libs/libgcrypt:0/20
19	dev-libs/libgpg-error
20	dev-qt/qtcore:4
21	dev-qt/qtgui:4
22	dev-qt/qtsql:4
23	dev-qt/qtwebkit:4
24	"
25	RDEPEND="${DEPEND}"
26
27	S="${WORKDIR}/dooble.d/Version 1.x/"
28
29	src_prepare() {
30	# Adjust paths from FreeBSD locations to Gentoo locations
31	# XXX: Fix the build system to be more flexible and upstream fix
32	epatch "${FILESDIR}/00-dooble-${PV}-path-fix.patch"
33	sed -i -e "s:\"Icons:\"${EROOT}usr/share/dooble/Icons:" \
34	./Source/dsettings.cc
35	sed -i -e '/export/d' -e "s:/usr/local/dooble/Dooble:${EROOT}usr/bin/Dooble:g" \
36	-e "s:cd /usr/local/dooble:cd /usr/share/dooble:" \
37	-e "s:exec ./Dooble:exec ${EROOT}usr/bin/Dooble:" ./dooble.sh
38	sed -i -e "s:/usr/local:${EROOT}/usr/share:" -e 's:/text/xml:text/xml:' \
39	./dooble.desktop
40	}
41
42	src_configure() {
43	eqmake4 dooble.pro
44	}
45
46	src_install() {
47	dohtml ../Documentation/RELEASE-NOTES.html
48	dodoc Documentation/{THEMES,TO-DO}
49	dosym ../share/dooble/dooble.sh /usr/bin/dooble
50	dosym ../../lib/nsbrowser/plugins /usr/share/dooble/Plugins
51	dolib.so libSpotOn/libspoton.so
52	emake INSTALL_ROOT="${ED}" install
53
54	# XXX: The build system installs the build path into INSTALL_ROOT.
55	# It should be fixed not to do this.
56	rm -r "${ED}/var" \|\| die "Failed to remove build path from ${ED}"
57	}
58
59	pkg_postinst() {
60	fdo-mime_desktop_database_update
61	}
62
63	pkg_postrm() {
64	fdo-mime_desktop_database_update
65	}

Lines 1-45 Link Here

(-)a/www-client/dooble/files/00-dooble-1.55-path-fix.patch (-45 lines)
1	diff --git a/dooble.pro b/dooble.pro
2	index 8df489e..d448f6e 100644
3	--- a/dooble.pro
4	+++ b/dooble.pro
5	@@ -240,33 +240,32 @@ TRANSLATIONS = Translations/dooble_en.ts \
6	PROJECTNAME = Dooble
7	TARGET = Dooble
8
9	-dooble.path = /usr/local/dooble
10	+dooble.path = /usr/bin
11	dooble.files = Dooble
12	-dooble_sh.path = /usr/local/dooble
13	+dooble_sh.path = /usr/share/dooble
14	dooble_sh.files = dooble.sh
15	desktop.path = /usr/share/applications
16	desktop.files = dooble.desktop
17	desktopicon.path = /usr/share/icons/hicolor/48x48
18	desktopicon.files = Icons/48x48/dooble.png
19	-icons.path = /usr/local/dooble
20	+icons.path = /usr/share/dooble
21	icons.files = Icons
22	-images.path = /usr/local/dooble
23	+images.path = /usr/share/dooble
24	images.files = Images
25	-libspoton_install.path = /usr/local/dooble/Lib
26	+libspoton_install.path = /usr/lib
27	libspoton_install.files = libSpotOn/libspoton.so
28	lrelease.extra = $$[QT_INSTALL_BINS]/lrelease dooble.pro
29	lrelease.path = .
30	lupdate.extra = $$[QT_INSTALL_BINS]/lupdate dooble.pro
31	lupdate.path = .
32	-pluginsdir.path = /usr/local/dooble/Plugins/dooble
33	+pluginsdir.path = /usr/lib/nsbrowser/plugins
34	-pluginsdir.files = Plugins/README
35	-plugspec.path = /usr/local/include/dooble/plugin-spec
36	+plugspec.path = /usr/include/dooble/plugin-spec
37	plugspec.files = plugin-spec/*.h
38	-postinstall.path = /usr/local/dooble
39	+postinstall.path = /usr/share/dooble
40	postinstall.extra = find /usr/local/dooble -name .svn -exec rm -rf {} \\; 2>/dev/null; echo
41	-tab.path = /usr/local/dooble
42	+tab.path = /usr/share/dooble
43	tab.files = Tab
44	translations.path = /usr/local/dooble/Translations
45	translations.files = Translations/*.qm