Use new eclass for build

(Portage version: 2.1.3.16)

2 files changed, 17 insertions, 101 deletions

diff --git a/x11-libs/qt-webkit/files/configure.patch b/x11-libs/qt-webkit/files/configure.patch
deleted file mode 100644
index 2e07f6b0cc74..000000000000
--- a/x11-libs/qt-webkit/files/configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig      2007-12-20 08:22:04.000000000 -0500
-+++ configure   2007-12-20 08:22:08.000000000 -0500
-@@ -3615,7 +3615,7 @@
- }
-
- # build qmake
--if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
-     echo "Creating qmake. Please wait..."
-
-     OLD_QCONFIG_H=
-
diff --git a/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild
index 6a229fd3e445..84d43fcde4a1 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild
@@ -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-webkit/qt-webkit-4.4.0_rc1.ebuild,v 1.4 2007/12/20 22:08:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild,v 1.5 2007/12/21 19:34:07 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 Webkit module for the Qt toolkit."
 HOMEPAGE="http://www.trolltech.com/"
 
 MY_PV=${PV/_rc/-tp}
@@ -17,116 +17,44 @@ LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="4"
 KEYWORDS="~x86"
 
-IUSE="debug pch"
+IUSE="debug"
 
-RDEPEND="=x11-libs/qt-4.4.0_rc1"
+RDEPEND="~x11-libs/qt-gui-${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() {
+	qt4-build_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
+	skip_qmake_build_patch
+	skip_project_generation_patch
+	install_binaries_to_buildtree
 }
 
 src_compile() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
-	# Disable visibility explicitly if gcc version isn't 4
-	if [[ "$(gcc-major-version)" != "4" ]]; then
-		myconf="${myconf} -no-reduce-exports"
-	fi
-
-	# 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 -webkit"
-	use debug	&& myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
-	use pch		&& myconf="${myconf} -pch" || myconf="${myconf} -no-pch"
-	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}"
+	local myconf=$(standard_configure_options)
+
+	myconf="${myconf} -webkit"
 
 	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/3rdparty/webkit/WebCore
-	qmake "LIBS+=-L${QTLIBDIR}" && emake || die
-
-	cd "${S}"/tools/designer/src/plugins/qwebview
-	qmake "LIBS+=-L${QTLIBDIR}" && emake || die
+	build_directories src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview
 }
 
 src_install() {
-	cd "${S}"/src/3rdparty/webkit/WebCore
-	emake INSTALL_ROOT="${D}" install || die
-
-	cd "${S}"/tools/designer/src/plugins/qwebview
-	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
+	install_directories src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview
 
-	# Move .pc files into the pkgconfig directory
-	dodir ${QTPCDIR}
-	mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR}
+	fix_library_files
 }
 
 pkg_postinst()
 {
-	# Need to add webkit to QT_CONFIG line
-	sed -i -e "s:webkit ::g" ${QTDATADIR}/mkspecs/qconfig.pri
-	sed -i -e "s:QT_CONFIG += :QT_CONFIG += webkit :g" ${QTDATADIR}/mkspecs/qconfig.pri
+	qconfig_add_option webkit
 }
 
 pkg_postrm()
 {
-	# Need to add qdbus to QT_CONFIG line
-	sed -i -e "s:webkit ::g" ${QTDATADIR}/mkspecs/qconfig.pri
+	qconfig_remove_option webkit
 }