Gentoo Archives: gentoo-commits

From: Ben de Groot <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: /
Date: Sun, 02 Jun 2013 08:04:55
Message-Id: 1370160255.17b96a216224840b8ff1b64829a83ed5fab4a610.yngwin@gentoo
1 commit: 17b96a216224840b8ff1b64829a83ed5fab4a610
2 Author: Ben de Groot <yngwin <AT> gmail <DOT> com>
3 AuthorDate: Sun Jun 2 08:04:15 2013 +0000
4 Commit: Ben de Groot <yngwin <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 2 08:04:15 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=17b96a21
7
8 README.rst: update info
9
10 ---
11 README.rst | 21 ++++++++++-----------
12 1 file changed, 10 insertions(+), 11 deletions(-)
13
14 diff --git a/README.rst b/README.rst
15 index fce25a1..dc4e203 100644
16 --- a/README.rst
17 +++ b/README.rst
18 @@ -2,36 +2,35 @@ Welcome to the qt overlay!
19 ==========================
20
21 This is where the Gentoo Qt team develops and maintains ebuilds for
22 -experimental Qt4 versions (pre-releases and "live" code from git) and
23 -Qt4 related packages. For your convenience we provide some sets and
24 +experimental Qt versions (pre-releases and "live" code from git) and
25 +Qt related packages. For your convenience we provide some sets and
26 ``package.keyword`` files.
27
28 The overlay is hosted on Github and on the official Gentoo overlays
29 infrastructure at
30
31 -https://github.com/gentoo/qt
32 -http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=summary
33 +- https://github.com/gentoo/qt
34 +- http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=summary
35
36
37 Please note that we use the following versioning scheme:
38
39 -- 4.x.y_beta, 4.x.y_rc are official pre-releases.
40 +- 4.x.y_beta, 4.x.y_rc and so on are official pre-releases.
41
42 You don't need to emerge the Qt ebuilds specifically, they are normally pulled
43 -in as dependencies for packages that use Qt4. But you may want to have all of
44 -Qt4 installed, for example if you are a developer or tester. In that case we
45 +in as dependencies for packages that use Qt. But you may want to have all of
46 +Qt installed, for example if you are a developer or tester. In that case we
47 recommend you copy the most applicable set to your ``/etc/portage/sets/``
48 directory, rename it (to prevent portage error on set redefinition), and
49 customize it to your own wishes.
50
51 KDE users should note that at this point they need to use the
52 media-libs/phonon package instead of dev-qt/qtphonon. As a result we have
53 -commented out qt-phonon in the qt-all-live-kde set. Apart from that, KDE can
54 -use the official Nokia Qt version, but has specific patches in kde-qt that
55 +commented out qtphonon in the qt-all-live-kde set. Apart from that, KDE can
56 +use the official Qt version, but has specific patches in kde-qt that
57 should result in a smoother KDE user experience.
58
59 -Non-KDE users should stick to the official Qt packages from Nokia Qt Software
60 -(previously Trolltech).
61 +Non-KDE users should stick to the official Qt packages from Digia / Qt Project.
62
63 If you have questions, you can find us on IRC in #gentoo-qt on Freenode or at
64 qt@g.o.