[gentoo-commits] gentoo-x86 commit in x11-libs/qt-qt3support: qt-qt3support-4.4.0_rc1.ebuild

["Caleb Tennis (caleb)" <caleb@gentoo.org>]

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