* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-qt3support: qt-qt3support-4.4.0_rc1.ebuild
@ 2007-12-20 13:40 Caleb Tennis (caleb)
0 siblings, 0 replies; 11+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-20 13:40 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/20 13:40:53
Modified: qt-qt3support-4.4.0_rc1.ebuild
Log:
Make compilation faster
(Portage version: 2.1.3.16)
Revision Changes Path
1.2 x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?r1=1.1&r2=1.2
Index: qt-qt3support-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-qt3support-4.4.0_rc1.ebuild 20 Dec 2007 13:01:44 -0000 1.1
+++ qt-qt3support-4.4.0_rc1.ebuild 20 Dec 2007 13:40:53 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.1 2007/12/20 13:01:44 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.2 2007/12/20 13:40:53 caleb Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -54,6 +54,9 @@
append-flags -fno-stack-protector
fi
+ # Override the creation of qmake and copy over the one from the system. This speeds up compilation time a lot.
+ epatch "${FILESDIR}"/configure.patch
+ cp ${QTBINDIR}/qmake "${S}"/bin/qmake
}
src_compile() {
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-qt3support: qt-qt3support-4.4.0_rc1.ebuild
@ 2007-12-20 16:09 Caleb Tennis (caleb)
0 siblings, 0 replies; 11+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-20 16:09 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/20 16:09:18
Modified: qt-qt3support-4.4.0_rc1.ebuild
Log:
add qt3support to qconfig.pri
(Portage version: 2.1.3.16)
Revision Changes Path
1.3 x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?r1=1.2&r2=1.3
Index: qt-qt3support-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-qt3support-4.4.0_rc1.ebuild 20 Dec 2007 13:40:53 -0000 1.2
+++ qt-qt3support-4.4.0_rc1.ebuild 20 Dec 2007 16:09:17 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.2 2007/12/20 13:40:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.3 2007/12/20 16:09:17 caleb Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -57,6 +57,12 @@
# Override the creation of qmake and copy over the one from the system. This speeds up compilation time a lot.
epatch "${FILESDIR}"/configure.patch
cp ${QTBINDIR}/qmake "${S}"/bin/qmake
+
+ if use accessibility && !built_with_use =x11-libs/qt-4* accessibility; then
+ eerror "Attempting to build qt3support with accessibility use flag without support in Qt4."
+ eerror "You must either turn off this use flag or re-emerge x11-libs/qt with accessibility support."
+ die
+ fi
}
src_compile() {
@@ -127,3 +133,17 @@
dodir ${QTPCDIR}
mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR}
}
+
+pkg_postinst()
+{
+ # Need to add qt3support to QT_CONFIG line
+ sed -i -e "s:qt3support ::g" ${QTDATADIR}/mkspecs/qconfig.pri
+ sed -i -e "s:QT_CONFIG += :QT_CONFIG += qt3support :g" ${QTDATADIR}/mkspecs/qconfig.pri
+}
+
+pkg_postrm()
+{
+ # Need to add qt3support to QT_CONFIG line
+ sed -i -e "s:qt3support ::g" ${QTDATADIR}/mkspecs/qconfig.pri
+}
+
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-qt3support: qt-qt3support-4.4.0_rc1.ebuild
@ 2007-12-20 18:47 Caleb Tennis (caleb)
0 siblings, 0 replies; 11+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-20 18:47 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/20 18:47:51
Modified: qt-qt3support-4.4.0_rc1.ebuild
Log:
Add uic3 to qt3support
(Portage version: 2.1.3.16)
Revision Changes Path
1.4 x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?r1=1.3&r2=1.4
Index: qt-qt3support-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt-qt3support-4.4.0_rc1.ebuild 20 Dec 2007 16:09:17 -0000 1.3
+++ qt-qt3support-4.4.0_rc1.ebuild 20 Dec 2007 18:47:51 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.3 2007/12/20 16:09:17 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.4 2007/12/20 18:47:51 caleb Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -107,6 +107,9 @@
cd "${S}"/tools/qtconfig
qmake "LIBS+=-L${QTLIBDIR}" && emake || die
+
+ cd "${S}"/src/tools/uic3
+ qmake "LIBS+=-L${QTLIBDIR}" && emake || die
}
src_install() {
@@ -122,6 +125,9 @@
cd "${S}"/tools/qtconfig
emake INSTALL_ROOT="${D}" install || die
+ cd "${S}"/src/tools/uic3
+ emake INSTALL_ROOT="${D}" install || die
+
sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.la
sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.prl
sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-qt3support: qt-qt3support-4.4.0_rc1.ebuild
@ 2007-12-20 22:07 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 11+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2007-12-20 22:07 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 07/12/20 22:07:51
Modified: qt-qt3support-4.4.0_rc1.ebuild
Log:
whitespace
(Portage version: 2.1.3.19)
Revision Changes Path
1.5 x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?r1=1.4&r2=1.5
Index: qt-qt3support-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qt-qt3support-4.4.0_rc1.ebuild 20 Dec 2007 18:47:51 -0000 1.4
+++ qt-qt3support-4.4.0_rc1.ebuild 20 Dec 2007 22:07:50 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.4 2007/12/20 18:47:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.5 2007/12/20 22:07:50 mr_bones_ Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -152,4 +152,3 @@
# Need to add qt3support to QT_CONFIG line
sed -i -e "s:qt3support ::g" ${QTDATADIR}/mkspecs/qconfig.pri
}
-
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-qt3support: qt-qt3support-4.4.0_rc1.ebuild
@ 2007-12-21 19:36 Caleb Tennis (caleb)
0 siblings, 0 replies; 11+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-21 19:36 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/21 19:36:24
Modified: qt-qt3support-4.4.0_rc1.ebuild
Log:
Make use of new eclass
(Portage version: 2.1.3.16)
Revision Changes Path
1.6 x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?r1=1.5&r2=1.6
Index: qt-qt3support-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qt-qt3support-4.4.0_rc1.ebuild 20 Dec 2007 22:07:50 -0000 1.5
+++ qt-qt3support-4.4.0_rc1.ebuild 21 Dec 2007 19:36:23 -0000 1.6
@@ -1,11 +1,11 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.5 2007/12/20 22:07:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.6 2007/12/21 19:36:23 caleb Exp $
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit qt4-build
SRCTYPE="preview-opensource-src"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
+DESCRIPTION="The Qt3 support module for the Qt toolkit."
HOMEPAGE="http://www.trolltech.com/"
MY_PV=${PV/_rc/-tp}
@@ -19,136 +19,54 @@
IUSE="debug accessibility"
-RDEPEND="=x11-libs/qt-4.4.0_rc1"
+RDEPEND="~x11-libs/qt-gui-${PV}
+ ~x11-libs/qt-sql-${PV}"
DEPEND="${RDEPEND}"
pkg_setup() {
- QTBASEDIR=/usr/$(get_libdir)/qt4
- QTPREFIXDIR=/usr
- QTBINDIR=/usr/bin
- QTLIBDIR=/usr/$(get_libdir)/qt4
- QTPCDIR=/usr/$(get_libdir)/pkgconfig
- QTDATADIR=/usr/share/qt4
- QTDOCDIR=/usr/share/doc/${PF}
- QTHEADERDIR=/usr/include/qt4
- QTPLUGINDIR=${QTLIBDIR}/plugins
- QTSYSCONFDIR=/etc/qt4
- QTTRANSDIR=${QTDATADIR}/translations
- QTEXAMPLESDIR=${QTDATADIR}/examples
- QTDEMOSDIR=${QTDATADIR}/demos
-}
-
-src_unpack() {
-
- unpack ${A}
- cd "${S}"
-
- # Don't let the user go too overboard with flags. If you really want to, uncomment
- # out the line below and give 'er a whirl.
- strip-flags
- replace-flags -O3 -O2
-
- if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
- ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
- append-flags -fno-stack-protector
- fi
-
- # Override the creation of qmake and copy over the one from the system. This speeds up compilation time a lot.
- epatch "${FILESDIR}"/configure.patch
- cp ${QTBINDIR}/qmake "${S}"/bin/qmake
-
- if use accessibility && !built_with_use =x11-libs/qt-4* accessibility; then
+ if use accessibility && !built_with_use =x11-libs/qt-gui-4* accessibility; then
eerror "Attempting to build qt3support with accessibility use flag without support in Qt4."
eerror "You must either turn off this use flag or re-emerge x11-libs/qt with accessibility support."
die
fi
+
+ if !built_with_use =x11-libs/qt-core-4* qt3support; then
+ eerror "In order for the qt-qt3support package to install, you must set the \"qt3support\" use flag, then"
+ eerror "re-emerge the following packages: x11-libs/qt-core, x11-libs/qt-gui, x11-libs/qt-sql."
+ die
+ fi
}
-src_compile() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+src_unpack() {
+ qt4-build_src_unpack
- [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+ skip_qmake_build_patch
+ skip_project_generation_patch
+ install_binaries_to_buildtree
+}
- # Disable visibility explicitly if gcc version isn't 4
- if [[ "$(gcc-major-version)" != "4" ]]; then
- myconf="${myconf} -no-reduce-exports"
- fi
+src_compile() {
+ local myconf=$(standard_configure_options)
# Add a switch that will attempt to use recent binutils to reduce relocations. Should be harmless for other
# cases. From bug #178535
- myconf="${myconf} -fast -reduce-relocations -qt3support"
- use debug && myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
use accessibility && myconf="${myconf} -accessibility" || myconf="${myconf} -no-accessibility"
- myconf="${myconf} -nomake examples -nomake demos"
-
- myconf="-stl -verbose -largefile -confirm-license \
- -no-rpath \
- -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
- -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
- -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
- -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf}"
+ myconf="${myconf} -qt3support"
echo ./configure ${myconf}
./configure ${myconf} || die
- # Edit the .qmake.cache file
- sed -i -e "s:QMAKE_MOC:\#QMAKE_MOC:g" "${S}"/.qmake.cache
- sed -i -e "s:QMAKE_UIC:\#QMAKE_UIC:g" "${S}"/.qmake.cache
- sed -i -e "s:QMAKE_RCC:\#QMAKE_RCC:g" "${S}"/.qmake.cache
-
- cd "${S}"/src/qt3support
- qmake "LIBS+=-L${QTLIBDIR}" && emake || die
-
- cd "${S}"/tools/designer/src/plugins/widgets
- qmake "LIBS+=-L${QTLIBDIR}" && emake || die
-
- cd "${S}"/tools/qtconfig
- qmake "LIBS+=-L${QTLIBDIR}" && emake || die
-
- cd "${S}"/src/tools/uic3
- qmake "LIBS+=-L${QTLIBDIR}" && emake || die
+ build_directories src/qt3support tools/designer/src/plugins/widgets tools/qtconfig src/tools/uic3
}
src_install() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- cd "${S}"/src/qt3support
- emake INSTALL_ROOT="${D}" install || die
-
- cd "${S}"/tools/designer/src/plugins/widgets
- emake INSTALL_ROOT="${D}" install || die
+ install_directories src/qt3support tools/designer/src/plugins/widgets tools/qtconfig src/tools/uic3
- cd "${S}"/tools/qtconfig
- emake INSTALL_ROOT="${D}" install || die
-
- cd "${S}"/src/tools/uic3
- emake INSTALL_ROOT="${D}" install || die
-
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.la
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.prl
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
-
- # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix:
- sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
-
- # Move .pc files into the pkgconfig directory
- dodir ${QTPCDIR}
- mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR}
+ fix_library_files
}
-pkg_postinst()
-{
- # Need to add qt3support to QT_CONFIG line
- sed -i -e "s:qt3support ::g" ${QTDATADIR}/mkspecs/qconfig.pri
- sed -i -e "s:QT_CONFIG += :QT_CONFIG += qt3support :g" ${QTDATADIR}/mkspecs/qconfig.pri
-}
+# Don't postinst qt3support into qconfig.pri here, it's handled in qt-core by way of the use flag.
+
-pkg_postrm()
-{
- # Need to add qt3support to QT_CONFIG line
- sed -i -e "s:qt3support ::g" ${QTDATADIR}/mkspecs/qconfig.pri
-}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-qt3support: qt-qt3support-4.4.0_rc1.ebuild
@ 2007-12-21 19:41 Caleb Tennis (caleb)
0 siblings, 0 replies; 11+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-21 19:41 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/21 19:41:25
Modified: qt-qt3support-4.4.0_rc1.ebuild
Log:
I think we can get away without this use flag here
(Portage version: 2.1.3.16)
Revision Changes Path
1.7 x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?r1=1.6&r2=1.7
Index: qt-qt3support-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qt-qt3support-4.4.0_rc1.ebuild 21 Dec 2007 19:36:23 -0000 1.6
+++ qt-qt3support-4.4.0_rc1.ebuild 21 Dec 2007 19:41:24 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.6 2007/12/21 19:36:23 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.7 2007/12/21 19:41:24 caleb Exp $
inherit qt4-build
@@ -17,7 +17,7 @@
SLOT="4"
KEYWORDS="~x86"
-IUSE="debug accessibility"
+IUSE="debug"
RDEPEND="~x11-libs/qt-gui-${PV}
~x11-libs/qt-sql-${PV}"
@@ -25,13 +25,7 @@
DEPEND="${RDEPEND}"
pkg_setup() {
- if use accessibility && !built_with_use =x11-libs/qt-gui-4* accessibility; then
- eerror "Attempting to build qt3support with accessibility use flag without support in Qt4."
- eerror "You must either turn off this use flag or re-emerge x11-libs/qt with accessibility support."
- die
- fi
-
- if !built_with_use =x11-libs/qt-core-4* qt3support; then
+ if ! built_with_use =x11-libs/qt-core-4* qt3support; then
eerror "In order for the qt-qt3support package to install, you must set the \"qt3support\" use flag, then"
eerror "re-emerge the following packages: x11-libs/qt-core, x11-libs/qt-gui, x11-libs/qt-sql."
die
@@ -49,9 +43,11 @@
src_compile() {
local myconf=$(standard_configure_options)
- # Add a switch that will attempt to use recent binutils to reduce relocations. Should be harmless for other
- # cases. From bug #178535
- use accessibility && myconf="${myconf} -accessibility" || myconf="${myconf} -no-accessibility"
+ if built_with_use ~x11-libs/qt-gui-${PV} accessibility; then
+ myconf="${myconf} -accessibility"
+ else
+ myconf="${myconf} -no-accessibility"
+ fi
myconf="${myconf} -qt3support"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-qt3support: qt-qt3support-4.4.0_rc1.ebuild
@ 2007-12-21 19:44 Caleb Tennis (caleb)
0 siblings, 0 replies; 11+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-21 19:44 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/21 19:44:18
Modified: qt-qt3support-4.4.0_rc1.ebuild
Log:
Missed calling this
(Portage version: 2.1.3.16)
Revision Changes Path
1.8 x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?r1=1.7&r2=1.8
Index: qt-qt3support-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qt-qt3support-4.4.0_rc1.ebuild 21 Dec 2007 19:41:24 -0000 1.7
+++ qt-qt3support-4.4.0_rc1.ebuild 21 Dec 2007 19:44:18 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.7 2007/12/21 19:41:24 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.8 2007/12/21 19:44:18 caleb Exp $
inherit qt4-build
@@ -25,6 +25,8 @@
DEPEND="${RDEPEND}"
pkg_setup() {
+ qt4-build_pkg_setup
+
if ! built_with_use =x11-libs/qt-core-4* qt3support; then
eerror "In order for the qt-qt3support package to install, you must set the \"qt3support\" use flag, then"
eerror "re-emerge the following packages: x11-libs/qt-core, x11-libs/qt-gui, x11-libs/qt-sql."
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-qt3support: qt-qt3support-4.4.0_rc1.ebuild
@ 2007-12-21 20:05 Caleb Tennis (caleb)
0 siblings, 0 replies; 11+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-21 20:05 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/21 20:05:50
Modified: qt-qt3support-4.4.0_rc1.ebuild
Log:
Use flag fix
(Portage version: 2.1.3.16)
Revision Changes Path
1.9 x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?r1=1.8&r2=1.9
Index: qt-qt3support-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qt-qt3support-4.4.0_rc1.ebuild 21 Dec 2007 19:44:18 -0000 1.8
+++ qt-qt3support-4.4.0_rc1.ebuild 21 Dec 2007 20:05:50 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.8 2007/12/21 19:44:18 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.9 2007/12/21 20:05:50 caleb Exp $
inherit qt4-build
@@ -17,8 +17,6 @@
SLOT="4"
KEYWORDS="~x86"
-IUSE="debug"
-
RDEPEND="~x11-libs/qt-gui-${PV}
~x11-libs/qt-sql-${PV}"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-qt3support: qt-qt3support-4.4.0_rc1.ebuild
@ 2007-12-21 22:38 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 11+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2007-12-21 22:38 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 07/12/21 22:38:18
Modified: qt-qt3support-4.4.0_rc1.ebuild
Log:
whitespace
(Portage version: 2.1.3.19)
Revision Changes Path
1.10 x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?r1=1.9&r2=1.10
Index: qt-qt3support-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qt-qt3support-4.4.0_rc1.ebuild 21 Dec 2007 20:05:50 -0000 1.9
+++ qt-qt3support-4.4.0_rc1.ebuild 21 Dec 2007 22:38:17 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.9 2007/12/21 20:05:50 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.10 2007/12/21 22:38:17 mr_bones_ Exp $
inherit qt4-build
@@ -64,5 +64,3 @@
}
# Don't postinst qt3support into qconfig.pri here, it's handled in qt-core by way of the use flag.
-
-
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-qt3support: qt-qt3support-4.4.0_rc1.ebuild
@ 2007-12-22 17:57 Caleb Tennis (caleb)
0 siblings, 0 replies; 11+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-22 17:57 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/22 17:57:23
Modified: qt-qt3support-4.4.0_rc1.ebuild
Log:
Use new eclass functions
(Portage version: 2.1.3.16)
Revision Changes Path
1.11 x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?r1=1.10&r2=1.11
Index: qt-qt3support-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qt-qt3support-4.4.0_rc1.ebuild 21 Dec 2007 22:38:17 -0000 1.10
+++ qt-qt3support-4.4.0_rc1.ebuild 22 Dec 2007 17:57:22 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.10 2007/12/21 22:38:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.11 2007/12/22 17:57:22 caleb Exp $
inherit qt4-build
@@ -22,6 +22,8 @@
DEPEND="${RDEPEND}"
+QT4_TARGET_DIRECTORIES="src/qt3support tools/designer/src/plugins/widgets tools/qtconfig src/tools/uic3"
+
pkg_setup() {
qt4-build_pkg_setup
@@ -54,13 +56,7 @@
echo ./configure ${myconf}
./configure ${myconf} || die
- build_directories src/qt3support tools/designer/src/plugins/widgets tools/qtconfig src/tools/uic3
-}
-
-src_install() {
- install_directories src/qt3support tools/designer/src/plugins/widgets tools/qtconfig src/tools/uic3
-
- fix_library_files
+ build_target_directories
}
# Don't postinst qt3support into qconfig.pri here, it's handled in qt-core by way of the use flag.
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-qt3support: qt-qt3support-4.4.0_rc1.ebuild
@ 2008-01-05 0:11 Caleb Tennis (caleb)
0 siblings, 0 replies; 11+ messages in thread
From: Caleb Tennis (caleb) @ 2008-01-05 0:11 UTC (permalink / raw
To: gentoo-commits
caleb 08/01/05 00:11:32
Modified: qt-qt3support-4.4.0_rc1.ebuild
Log:
Add qt3to4 tool
(Portage version: 2.1.4_rc11)
Revision Changes Path
1.12 x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?r1=1.11&r2=1.12
Index: qt-qt3support-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qt-qt3support-4.4.0_rc1.ebuild 22 Dec 2007 17:57:22 -0000 1.11
+++ qt-qt3support-4.4.0_rc1.ebuild 5 Jan 2008 00:11:32 -0000 1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.11 2007/12/22 17:57:22 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.12 2008/01/05 00:11:32 caleb Exp $
inherit qt4-build
@@ -22,7 +22,7 @@
DEPEND="${RDEPEND}"
-QT4_TARGET_DIRECTORIES="src/qt3support tools/designer/src/plugins/widgets tools/qtconfig src/tools/uic3"
+QT4_TARGET_DIRECTORIES="src/qt3support tools/designer/src/plugins/widgets tools/qtconfig src/tools/uic3 tools/porting"
pkg_setup() {
qt4-build_pkg_setup
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2008-01-05 0:11 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-20 16:09 [gentoo-commits] gentoo-x86 commit in x11-libs/qt-qt3support: qt-qt3support-4.4.0_rc1.ebuild Caleb Tennis (caleb)
-- strict thread matches above, loose matches on Subject: below --
2008-01-05 0:11 Caleb Tennis (caleb)
2007-12-22 17:57 Caleb Tennis (caleb)
2007-12-21 22:38 Michael Sterrett (mr_bones_)
2007-12-21 20:05 Caleb Tennis (caleb)
2007-12-21 19:44 Caleb Tennis (caleb)
2007-12-21 19:41 Caleb Tennis (caleb)
2007-12-21 19:36 Caleb Tennis (caleb)
2007-12-20 22:07 Michael Sterrett (mr_bones_)
2007-12-20 18:47 Caleb Tennis (caleb)
2007-12-20 13:40 Caleb Tennis (caleb)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox