New ebuild version, supplied at bug #53402

6 files changed, 149 insertions, 3 deletions

diff --git a/x11-libs/qt-embedded/ChangeLog b/x11-libs/qt-embedded/ChangeLog
index 55c998614ebf..db4f42c765c7 100644
--- a/x11-libs/qt-embedded/ChangeLog
+++ b/x11-libs/qt-embedded/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-embedded
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/ChangeLog,v 1.6 2004/06/24 22:07:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/ChangeLog,v 1.7 2004/07/01 14:02:46 caleb Exp $
+
+*qt-embedded-3.3.2 (01 Jul 2004)
+
+  01 Jul 2004; Caleb Tennis <caleb@gentoo.org> qt-embedded-3.3.2.ebuild,
+  files/47qt-embedded3, files/50qt-embeddeddir3:
+  New ebuild version, supplied at bug #53402
 
   23 Jun 2004; Aron Griffis <agriffis@gentoo.org> qt-embedded-3.0.5.ebuild,
   qt-embedded-3.1.2.ebuild:
diff --git a/x11-libs/qt-embedded/Manifest b/x11-libs/qt-embedded/Manifest
index 0ec67a07b54c..1f255b79f5e6 100644
--- a/x11-libs/qt-embedded/Manifest
+++ b/x11-libs/qt-embedded/Manifest
@@ -1,8 +1,11 @@
+MD5 1adf0e4f84b3bc446a6096e893c1d719 qt-embedded-3.3.2.ebuild 4619
 MD5 30c1f52a24ae025a677f62f8cdc3c75e qt-embedded-3.0.5.ebuild 4312
 MD5 b851e6541476e029eacd117f7703ca72 qt-embedded-3.1.2.ebuild 4388
 MD5 3d2732b35939b4f38a4779b5ba9facd0 ChangeLog 1093
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 1fcffbb83d84af4b0d6d074ec508db20 files/digest-qt-embedded-3.0.5 77
 MD5 81e8e195b18cba662da2c540ce2a1dbc files/digest-qt-embedded-3.1.2 77
-MD5 536e8d26e72b889022acd20f73b41778 files/47qt-embedded3 110
+MD5 fc553746a0c77730e1785fc7fc0da47d files/digest-qt-embedded-3.3.2 77
+MD5 5f0cacec360762cefef2d5219aee443a files/50qt-embeddeddir3 25
+MD5 b0719cf6e99f249585e84430fbbc2883 files/47qt-embedded3 118
 MD5 097bb712d277f17864951d77b56ca46b files/tools-Makefile 2053
diff --git a/x11-libs/qt-embedded/files/47qt-embedded3 b/x11-libs/qt-embedded/files/47qt-embedded3
index 9dc57ca40715..c07f4e78c4cb 100644
--- a/x11-libs/qt-embedded/files/47qt-embedded3
+++ b/x11-libs/qt-embedded/files/47qt-embedded3
@@ -1,4 +1,4 @@
 PATH=/usr/qt/3-embedded/bin
 ROOTPATH=/usr/qt/3-embedded/bin
 LDPATH=/usr/qt/3-embedded/lib
-QMAKESPEC=linux-g++
+QMAKESPEC=qws/linux-x86-g++
diff --git a/x11-libs/qt-embedded/files/50qt-embeddeddir3 b/x11-libs/qt-embedded/files/50qt-embeddeddir3
new file mode 100644
index 000000000000..eb72a8adaf59
--- /dev/null
+++ b/x11-libs/qt-embedded/files/50qt-embeddeddir3
@@ -0,0 +1 @@
+QTDIR=/usr/qt/3-embedded
diff --git a/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.2 b/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.2
new file mode 100644
index 000000000000..d9199500b33e
--- /dev/null
+++ b/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.2
@@ -0,0 +1 @@
+MD5 d93fecc080455dbfbbc0f1807e0bd53b qt-embedded-free-3.3.2.tar.bz2 19619660
diff --git a/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild b/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild
new file mode 100644
index 000000000000..d72bad075bd5
--- /dev/null
+++ b/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild,v 1.1 2004/07/01 14:02:46 caleb Exp $
+
+DESCRIPTION="QT version ${PV}"
+HOMEPAGE="http://www.trolltech.com/"
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2"
+
+LICENSE="QPL-1.0 | GPL-2"
+SLOT="3"
+KEYWORDS="~x86"
+IUSE="gif opengl mysql odbc postgres debug build doc"
+
+DEPEND="media-libs/lcms
+	>=media-libs/freetype-2
+	!build? (
+		media-libs/libpng
+		media-libs/jpeg
+		>=media-libs/libmng-1.0.0
+		odbc? ( >=dev-db/unixODBC-2.0 )
+		mysql? ( >=dev-db/mysql-3.2.10 )
+		opengl? ( virtual/opengl virtual/glu )
+		postgres? ( >=dev-db/postgresql-7.2 )
+	)"
+
+S=${WORKDIR}/qt-embedded-free-${PV}
+
+QTBASE=/usr/qt/3-embedded
+export QTDIR=${S}
+
+pkg_setup() {
+	if use build; then
+		return 0
+	else
+		ewarn "Note: this will build a rather bloated qt/e, with all features enabled."
+		ewarn "It may be suitable for testing, but definitely not for real embedded systems"
+		ewarn "where memory is precious. I advise you select your own featureset (e.g. by"
+		ewarn "editing this ebuild) if building for such a system."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp configure configure.orig
+	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
+}
+
+src_compile() {
+	export QTDIR=${S}
+
+	if ! use build; then
+		# ordinary setup, rather bloated
+		use gif && myconf="${myconf} -qt-gif"
+		use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql" || myconf="${myconf} -no-sql-mysql"
+		use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql"
+		use odbc && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
+		use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
+		use x86 && myconf="$myconf -embedded x86" || myconf="$myconf -xplatform generic -embedded generic"
+
+		./configure $myconf -shared -depths 8,16,24,32 -system-zlib -thread -stl \
+			-freetype -qvfb -plugin-imgfmt-{jpeg,mng,png} -system-lib{png,jpeg,mng} \
+			-prefix ${QTBASE} || die
+	else
+		# use build == we're building for the gentoo intaller project
+		# and know exactly which features we'll need
+		# not all of these features are as yet reflected in the configure call below
+		#png only, builtin. also zlib, system.
+		#no sql or other fancy stuff.
+		#no debug
+		#thread support
+		#freetype2 support
+		#vnc
+		#all styles as plugins
+		./configure -depths 8,16 -no-gif -no-lib{jpeg,mng} -qt-libpng -system-zlib \
+			-release -no-g++-exceptions -no-qvfb -thread -freetype -vnc  || die
+	fi
+
+	emake symlinks src-qmake src-moc sub-src sub-tools || die "making main"
+	cd ${S}/tools/designer/uic && emake || die "making uic"
+	cd ${S}/tools/assistant/lib && emake || die "making qassistantclientlib"
+	
+	if ! use doc; then
+		cd ${S} && emake sub-tutorial || die "making tutorial"
+		LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \
+			cd ${S} && emake sub-examples || die "making examples"
+	fi
+}
+
+src_install() {
+	INSTALL_ROOT=${D} emake install
+
+	# symlinks shouldn't be necessary! The qmakespec file tells qmake to use the 
+	# correct library. Uncomment these if it causes a problem
+	# libqt -> libqt-mt symlinks
+#	into ${QTBASE}/lib
+#    dosym libqte-mt.so.3.3.2 ${QTBASE}/lib/libqt.so.3.3.2
+#    dosym libqte-mt.so.3.3 ${QTBASE}/lib/libqt.so.3.3
+#    dosym libqte-mt.so.3 ${QTBASE}/lib/libqt.so.3
+#    dosym libqte-mt.so ${QTBASE}/lib/libqt.so
+#    dosym libqte-mt.so.3.3.2 ${QTBASE}/lib/libqt-mt.so.3.3.2
+#    dosym libqte-mt.so.3.3 ${QTBASE}/lib/libqt-mt.so.3.3
+#    dosym libqte-mt.so.3 ${QTBASE}/lib/libqt-mt.so.3
+#    dosym libqte-mt.so ${QTBASE}/lib/libqt-mt.so
+
+	# fonts
+	dodir ${QTBASE}/lib/fonts
+	insinto ${QTBASE}/lib/fonts
+	doins ${S}/lib/fonts/*
+
+	# environment variables
+	insinto /etc/env.d
+	doins ${FILESDIR}/{47qt-embedded3,50qt-embeddeddir3}
+
+	# qmake cache file
+	dodir ${QTBASE}/mkspecs/linux-g++
+	insinto ${QTBASE}/mkspecs/linux-g++
+	cd ${S}
+	doins mkspecs/linux-g++/*
+	sed -e "s:${S}:${QTBASE}:" .qmake.cache > .qmake.cache.fixed
+	insinto ${QTBASE}
+	newins .qmake.cache.fixed .qmake.cache
+
+	# documentation
+	if use doc; then
+		cp -r ${S}/{examples,tutorial}  ${D}/${QTBASE}
+		cd ${D}/${QTBASE}
+		find examples tutorial -name Makefile -exec sed -i -e 's:${S}:${QTBASE}:g' {} \;
+	fi
+
+	# default target link (overriden by QMAKESPEC env var)
+	cd ${D}/${QTBASE}/mkspecs
+	rm -f default
+	ln -s qws/linux-x86-g++ default
+}