* [gentoo-commits] proj/qt:master commit in: dev-qt/assistant-tools/, dev-qt/qthelp/, sets/
@ 2014-09-10 23:50 Davide Pesavento
0 siblings, 0 replies; only message in thread
From: Davide Pesavento @ 2014-09-10 23:50 UTC (permalink / raw
To: gentoo-commits
commit: e8b82c3d1fb2fa62e484f5157c95c1e76b977ca5
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 10 23:48:58 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Sep 10 23:48:58 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e8b82c3d
[Qt5] Merge assistant-tools into qthelp. Fixes bug 517714.
---
dev-qt/assistant-tools/Manifest | 1 -
.../assistant-tools/assistant-tools-5.3.1.ebuild | 33 ----------------------
.../assistant-tools-5.3.9999.ebuild | 33 ----------------------
.../assistant-tools-5.4.9999.ebuild | 33 ----------------------
.../assistant-tools/assistant-tools-5.9999.ebuild | 33 ----------------------
dev-qt/assistant-tools/metadata.xml | 9 ------
...{qthelp-5.3.1.ebuild => qthelp-5.3.1-r1.ebuild} | 5 +++-
dev-qt/qthelp/qthelp-5.3.9999.ebuild | 5 +++-
dev-qt/qthelp/qthelp-5.4.9999.ebuild | 5 +++-
dev-qt/qthelp/qthelp-5.9999.ebuild | 5 +++-
sets/qt5-tools | 1 -
11 files changed, 16 insertions(+), 147 deletions(-)
diff --git a/dev-qt/assistant-tools/Manifest b/dev-qt/assistant-tools/Manifest
deleted file mode 100644
index aea5faf..0000000
--- a/dev-qt/assistant-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qttools-opensource-src-5.3.1.tar.xz 8992380 SHA256 edf59eeead3c1d202883c2e6091abd1d40ac37b6e6b0e240b29ab75f86c515a7 SHA512 d8097b055c88e8f8cfa2a6c2c973d13827352e3298395b5a2c2d16204a92e5770fbc3ab2325575a80a676016ce699bddfec3616a21ecc1320b1e1ad60eabec93 WHIRLPOOL 957a9b65991f61a87b6af57889d43aa2cf32c6174a68a3d094bf5a8c5377a93843fcf9815ba226c3c6ff30b19a9c3b00502bd94c2f63b288aca40f780f74fccd
diff --git a/dev-qt/assistant-tools/assistant-tools-5.3.1.ebuild b/dev-qt/assistant-tools/assistant-tools-5.3.1.ebuild
deleted file mode 100644
index be3a8c2..0000000
--- a/dev-qt/assistant-tools/assistant-tools-5.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-QT5_MODULE="qttools"
-
-inherit qt5-build
-
-DESCRIPTION="Extra tools for working with Qt help files"
-
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64"
-fi
-
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtcore-${PV}:5[debug=]
- >=dev-qt/qtgui-${PV}:5[debug=]
- >=dev-qt/qthelp-${PV}:5[debug=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/assistant/qcollectiongenerator
- src/assistant/qhelpconverter
- src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/assistant-tools/assistant-tools-5.3.9999.ebuild b/dev-qt/assistant-tools/assistant-tools-5.3.9999.ebuild
deleted file mode 100644
index be3a8c2..0000000
--- a/dev-qt/assistant-tools/assistant-tools-5.3.9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-QT5_MODULE="qttools"
-
-inherit qt5-build
-
-DESCRIPTION="Extra tools for working with Qt help files"
-
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64"
-fi
-
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtcore-${PV}:5[debug=]
- >=dev-qt/qtgui-${PV}:5[debug=]
- >=dev-qt/qthelp-${PV}:5[debug=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/assistant/qcollectiongenerator
- src/assistant/qhelpconverter
- src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/assistant-tools/assistant-tools-5.4.9999.ebuild b/dev-qt/assistant-tools/assistant-tools-5.4.9999.ebuild
deleted file mode 100644
index be3a8c2..0000000
--- a/dev-qt/assistant-tools/assistant-tools-5.4.9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-QT5_MODULE="qttools"
-
-inherit qt5-build
-
-DESCRIPTION="Extra tools for working with Qt help files"
-
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64"
-fi
-
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtcore-${PV}:5[debug=]
- >=dev-qt/qtgui-${PV}:5[debug=]
- >=dev-qt/qthelp-${PV}:5[debug=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/assistant/qcollectiongenerator
- src/assistant/qhelpconverter
- src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/assistant-tools/assistant-tools-5.9999.ebuild b/dev-qt/assistant-tools/assistant-tools-5.9999.ebuild
deleted file mode 100644
index be3a8c2..0000000
--- a/dev-qt/assistant-tools/assistant-tools-5.9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-QT5_MODULE="qttools"
-
-inherit qt5-build
-
-DESCRIPTION="Extra tools for working with Qt help files"
-
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64"
-fi
-
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtcore-${PV}:5[debug=]
- >=dev-qt/qtgui-${PV}:5[debug=]
- >=dev-qt/qthelp-${PV}:5[debug=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/assistant/qcollectiongenerator
- src/assistant/qhelpconverter
- src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/assistant-tools/metadata.xml b/dev-qt/assistant-tools/metadata.xml
deleted file mode 100644
index 9d5bff1..0000000
--- a/dev-qt/assistant-tools/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>qt</herd>
- <upstream>
- <bugs-to>https://bugreports.qt-project.org/</bugs-to>
- <doc>http://qt-project.org/doc/</doc>
- </upstream>
-</pkgmetadata>
diff --git a/dev-qt/qthelp/qthelp-5.3.1.ebuild b/dev-qt/qthelp/qthelp-5.3.1-r1.ebuild
similarity index 80%
rename from dev-qt/qthelp/qthelp-5.3.1.ebuild
rename to dev-qt/qthelp/qthelp-5.3.1-r1.ebuild
index 27e3ce4..6bfe9bc 100644
--- a/dev-qt/qthelp/qthelp-5.3.1.ebuild
+++ b/dev-qt/qthelp/qthelp-5.3.1-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtsql-${PV}:5[debug=]
+ >=dev-qt/qtsql-${PV}:5[debug=,sqlite]
>=dev-qt/qtwidgets-${PV}:5[debug=]
"
RDEPEND="${DEPEND}"
@@ -30,4 +30,7 @@ RDEPEND="${DEPEND}"
QT5_TARGET_SUBDIRS=(
src/assistant/clucene
src/assistant/help
+ src/assistant/qcollectiongenerator
+ src/assistant/qhelpconverter
+ src/assistant/qhelpgenerator
)
diff --git a/dev-qt/qthelp/qthelp-5.3.9999.ebuild b/dev-qt/qthelp/qthelp-5.3.9999.ebuild
index 27e3ce4..6bfe9bc 100644
--- a/dev-qt/qthelp/qthelp-5.3.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.3.9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtsql-${PV}:5[debug=]
+ >=dev-qt/qtsql-${PV}:5[debug=,sqlite]
>=dev-qt/qtwidgets-${PV}:5[debug=]
"
RDEPEND="${DEPEND}"
@@ -30,4 +30,7 @@ RDEPEND="${DEPEND}"
QT5_TARGET_SUBDIRS=(
src/assistant/clucene
src/assistant/help
+ src/assistant/qcollectiongenerator
+ src/assistant/qhelpconverter
+ src/assistant/qhelpgenerator
)
diff --git a/dev-qt/qthelp/qthelp-5.4.9999.ebuild b/dev-qt/qthelp/qthelp-5.4.9999.ebuild
index 27e3ce4..6bfe9bc 100644
--- a/dev-qt/qthelp/qthelp-5.4.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.4.9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtsql-${PV}:5[debug=]
+ >=dev-qt/qtsql-${PV}:5[debug=,sqlite]
>=dev-qt/qtwidgets-${PV}:5[debug=]
"
RDEPEND="${DEPEND}"
@@ -30,4 +30,7 @@ RDEPEND="${DEPEND}"
QT5_TARGET_SUBDIRS=(
src/assistant/clucene
src/assistant/help
+ src/assistant/qcollectiongenerator
+ src/assistant/qhelpconverter
+ src/assistant/qhelpgenerator
)
diff --git a/dev-qt/qthelp/qthelp-5.9999.ebuild b/dev-qt/qthelp/qthelp-5.9999.ebuild
index 27e3ce4..6bfe9bc 100644
--- a/dev-qt/qthelp/qthelp-5.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-5.9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtsql-${PV}:5[debug=]
+ >=dev-qt/qtsql-${PV}:5[debug=,sqlite]
>=dev-qt/qtwidgets-${PV}:5[debug=]
"
RDEPEND="${DEPEND}"
@@ -30,4 +30,7 @@ RDEPEND="${DEPEND}"
QT5_TARGET_SUBDIRS=(
src/assistant/clucene
src/assistant/help
+ src/assistant/qcollectiongenerator
+ src/assistant/qhelpconverter
+ src/assistant/qhelpgenerator
)
diff --git a/sets/qt5-tools b/sets/qt5-tools
index f03bc3e..0736784 100644
--- a/sets/qt5-tools
+++ b/sets/qt5-tools
@@ -1,5 +1,4 @@
dev-qt/assistant:5
-dev-qt/assistant-tools:5
dev-qt/designer:5
dev-qt/linguist:5
dev-qt/linguist-tools:5
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-10 23:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-10 23:50 [gentoo-commits] proj/qt:master commit in: dev-qt/assistant-tools/, dev-qt/qthelp/, sets/ Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox