diff options
| -rw-r--r-- | x11-libs/qt-assistant/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-libs/qt-assistant/files/qt-assistant-4.6.0_rc1-tools.patch (renamed from x11-libs/qt-assistant/files/qt-assistant-4.6-tools.patch) | 10 | ||||
| -rw-r--r-- | x11-libs/qt-assistant/qt-assistant-4.6.0_rc1.ebuild (renamed from x11-libs/qt-assistant/qt-assistant-4.6.0_beta1.ebuild) | 4 |
3 files changed, 16 insertions, 8 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog index 6a08a35f9a35..ecde99040c26 100644 --- a/x11-libs/qt-assistant/ChangeLog +++ b/x11-libs/qt-assistant/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-libs/qt-assistant # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.60 2009/11/18 15:38:32 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.61 2009/11/18 20:50:13 wired Exp $ + +*qt-assistant-4.6.0_rc1 (18 Nov 2009) + + 18 Nov 2009; Alex Alexander <wired@gentoo.org> + -qt-assistant-4.6.0_beta1.ebuild, +qt-assistant-4.6.0_rc1.ebuild, + +files/qt-assistant-4.6.0_rc1-tools.patch, + -files/qt-assistant-4.6-tools.patch: + added 4.6.0_rc1, removed 4.6.0_beta1 18 Nov 2009; Raúl Porcel <armin76@gentoo.org> qt-assistant-4.5.3.ebuild: Add ~sparc diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.6-tools.patch b/x11-libs/qt-assistant/files/qt-assistant-4.6.0_rc1-tools.patch index b9f897dfdeab..6426ee9aef3c 100644 --- a/x11-libs/qt-assistant/files/qt-assistant-4.6-tools.patch +++ b/x11-libs/qt-assistant/files/qt-assistant-4.6.0_rc1-tools.patch @@ -1,12 +1,11 @@ diff --git a/tools/tools.pro b/tools/tools.pro -index 4b36115..d3dd1a5 100644 +index 87ba3c9..26a82ed 100644 --- a/tools/tools.pro +++ b/tools/tools.pro -@@ -4,31 +4,9 @@ no-png { - message("Some graphics-related tools are unavailable without PNG support") +@@ -5,31 +5,8 @@ no-png { } else { SUBDIRS += assistant \ - pixeltool \ + pixeltool \ - porting \ - qtestlib \ - qttracereplay @@ -20,7 +19,7 @@ index 4b36115..d3dd1a5 100644 - wince*: SUBDIRS = qtestlib designer - unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig - win32:!wince*:SUBDIRS += activeqt -+ qdoc3 ++ qdoc3 } -mac { @@ -29,6 +28,7 @@ index 4b36115..d3dd1a5 100644 - -embedded:SUBDIRS += kmap2qmap - +-contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer qmldebugger -contains(QT_CONFIG, dbus):SUBDIRS += qdbus -!wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator -embedded: SUBDIRS += makeqpf diff --git a/x11-libs/qt-assistant/qt-assistant-4.6.0_beta1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.6.0_rc1.ebuild index 62d5c0ded777..7ca7346d2ddb 100644 --- a/x11-libs/qt-assistant/qt-assistant-4.6.0_beta1.ebuild +++ b/x11-libs/qt-assistant/qt-assistant-4.6.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.0_beta1.ebuild,v 1.3 2009/10/31 11:53:14 ayoy Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.0_rc1.ebuild,v 1.1 2009/11/18 20:50:13 wired Exp $ EAPI="2" inherit qt4-build @@ -18,7 +18,7 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${PN}-4.6-tools.patch" + "${FILESDIR}/${P}-tools.patch" ) # Pixeltool isn't really assistant related, but it relies on |