* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-assistant: ChangeLog qt-assistant-4.7.3.ebuild
@ 2011-05-12 19:11 Fabian Groffen (grobian)
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen (grobian) @ 2011-05-12 19:11 UTC (permalink / raw
To: gentoo-commits
grobian 11/05/12 19:11:59
Modified: ChangeLog qt-assistant-4.7.3.ebuild
Log:
Marked ~ppc-macos, bug #346361
(Portage version: 2.2.01.18252-prefix/cvs/Darwin powerpc)
Revision Changes Path
1.108 x11-libs/qt-assistant/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.108&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.108&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?r1=1.107&r2=1.108
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- ChangeLog 10 May 2011 20:04:09 -0000 1.107
+++ ChangeLog 12 May 2011 19:11:59 -0000 1.108
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-assistant
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.107 2011/05/10 20:04:09 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.108 2011/05/12 19:11:59 grobian Exp $
+
+ 12 May 2011; Fabian Groffen <grobian@gentoo.org> qt-assistant-4.7.3.ebuild:
+ Marked ~ppc-macos, bug #346361
*qt-assistant-4.7.3 (10 May 2011)
1.2 x11-libs/qt-assistant/qt-assistant-4.7.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.3.ebuild?r1=1.1&r2=1.2
Index: qt-assistant-4.7.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-assistant-4.7.3.ebuild 10 May 2011 20:04:09 -0000 1.1
+++ qt-assistant-4.7.3.ebuild 12 May 2011 19:11:59 -0000 1.2
@@ -1,13 +1,13 @@
# Copyright 1999-2011 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.7.3.ebuild,v 1.1 2011/05/10 20:04:09 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.3.ebuild,v 1.2 2011/05/12 19:11:59 grobian Exp $
EAPI="3"
inherit qt4-build
DESCRIPTION="The assistant help module for the Qt toolkit"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos"
IUSE="compat doc +glib qt3support trace"
SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-assistant: ChangeLog qt-assistant-4.7.3.ebuild
@ 2011-11-28 23:47 Davide Pesavento (pesa)
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento (pesa) @ 2011-11-28 23:47 UTC (permalink / raw
To: gentoo-commits
pesa 11/11/28 23:47:18
Modified: ChangeLog
Removed: qt-assistant-4.7.3.ebuild
Log:
Remove Qt 4.7.3
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Revision Changes Path
1.114 x11-libs/qt-assistant/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.114&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.114&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?r1=1.113&r2=1.114
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- ChangeLog 26 Nov 2011 19:57:56 -0000 1.113
+++ ChangeLog 28 Nov 2011 23:47:18 -0000 1.114
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-assistant
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.113 2011/11/26 19:57:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.114 2011/11/28 23:47:18 pesa Exp $
+
+ 28 Nov 2011; Davide Pesavento <pesa@gentoo.org> -qt-assistant-4.7.3.ebuild:
+ Remove Qt 4.7.3
26 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> Manifest:
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-assistant: ChangeLog qt-assistant-4.7.3.ebuild
@ 2011-05-10 20:04 Theo Chatzimichos (tampakrap)
0 siblings, 0 replies; 3+ messages in thread
From: Theo Chatzimichos (tampakrap) @ 2011-05-10 20:04 UTC (permalink / raw
To: gentoo-commits
tampakrap 11/05/10 20:04:10
Modified: ChangeLog
Added: qt-assistant-4.7.3.ebuild
Log:
Version bump Qt 4.7.3
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Revision Changes Path
1.107 x11-libs/qt-assistant/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.107&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.107&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?r1=1.106&r2=1.107
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- ChangeLog 9 May 2011 22:07:47 -0000 1.106
+++ ChangeLog 10 May 2011 20:04:09 -0000 1.107
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/qt-assistant
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.106 2011/05/09 22:07:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.107 2011/05/10 20:04:09 tampakrap Exp $
+
+*qt-assistant-4.7.3 (10 May 2011)
+
+ 10 May 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+ +qt-assistant-4.7.3.ebuild:
+ Version bump Qt 4.7.3
09 May 2011; Markos Chandras <hwoarang@gentoo.org> qt-assistant-4.7.2.ebuild:
Stable on amd64 wrt bug #354033
1.1 x11-libs/qt-assistant/qt-assistant-4.7.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.3.ebuild?rev=1.1&content-type=text/plain
Index: qt-assistant-4.7.3.ebuild
===================================================================
# Copyright 1999-2011 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.7.3.ebuild,v 1.1 2011/05/10 20:04:09 tampakrap Exp $
EAPI="3"
inherit qt4-build
DESCRIPTION="The assistant help module for the Qt toolkit"
SLOT="4"
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
IUSE="compat doc +glib qt3support trace"
SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support=,trace?]
~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=,sqlite]
~x11-libs/qt-webkit-${PV}[aqua=,debug=]
~x11-libs/qt-declarative-${PV}[debug=,qt3support=]"
RDEPEND="${DEPEND}"
pkg_setup() {
# Pixeltool isn't really assistant related, but it relies on
# the assistant libraries. doc/qch/
QT4_TARGET_DIRECTORIES="
tools/assistant
tools/pixeltool
tools/qdoc3"
QT4_EXTRACT_DIRECTORIES="
tools/
demos/
examples/
src/
include/
doc/"
use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
tools/qttracereplay"
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
${QT4_EXTRACT_DIRECTORIES}"
qt4-build_pkg_setup
}
src_unpack() {
qt4-build_src_unpack
# compat version
# http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
if use compat; then
unpack "${PN}"-qassistantclient-library-compat-src-4.6.3.tar.gz
mv "${WORKDIR}"/"${PN}"-qassistantclient-library-compat-version-4.6.3 \
"${S}"/tools/assistant/compat ||
die "moving compat to the right place failed"
tar xzf "${FILESDIR}"/"${PN}"-4.7-include.tar.gz -C "${S}"/include/ ||
die "unpacking the include files failed"
fi
}
src_prepare() {
qt4-build_src_prepare
if use compat; then
epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch
fi
}
src_configure() {
myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon
-no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
-no-fontconfig -no-multimedia -no-svg $(qt_use qt3support)"
! use glib && myconf="${myconf} -no-glib"
qt4-build_src_configure
}
src_compile() {
# help libQtHelp find freshly built libQtCLucene (bug #289811)
export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
qt4-build_src_compile
# ugly hack to build docs
cd "${S}"
qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
emake qch_docs || die "emake qch_docs failed"
if use doc; then
emake docs || die "emake docs failed"
fi
qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
}
src_install() {
qt4-build_src_install
cd "${S}"
emake INSTALL_ROOT="${D}" install_qchdocs \
|| die "failed to install qch docs"
if use doc; then
emake INSTALL_ROOT="${D}" install_htmldocs \
|| die "failed to install htmldocs"
fi
dobin "${S}"/bin/qdoc3 || die "Failed to install qdoc3"
# install correct assistant icon, bug 241208
dodir /usr/share/pixmaps/ || die "dodir failed"
insinto /usr/share/pixmaps/
doins tools/assistant/tools/assistant/images/assistant.png ||
die "doins failed"
# Note: absolute image path required here!
make_desktop_entry "${EPREFIX}"/usr/bin/assistant Assistant \
"${EPREFIX}"/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' ||
die "make_desktop_entry failed"
if use compat; then
insinto /usr/share/qt4/mkspecs/features || die "insinto failed"
doins tools/assistant/compat/features/assistant.prf || die "doins failed"
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-28 23:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-12 19:11 [gentoo-commits] gentoo-x86 commit in x11-libs/qt-assistant: ChangeLog qt-assistant-4.7.3.ebuild Fabian Groffen (grobian)
-- strict thread matches above, loose matches on Subject: below --
2011-11-28 23:47 Davide Pesavento (pesa)
2011-05-10 20:04 Theo Chatzimichos (tampakrap)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox