bump and remove some older versions that depend on qt versions that have security issues

(Portage version: 2.1.2.2)

8 files changed, 17 insertions, 305 deletions

diff --git a/x11-libs/qt-embedded/ChangeLog b/x11-libs/qt-embedded/ChangeLog
index e8a619bdbd05..29744a8987ea 100644
--- a/x11-libs/qt-embedded/ChangeLog
+++ b/x11-libs/qt-embedded/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-libs/qt-embedded
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/ChangeLog,v 1.21 2007/02/01 13:00:04 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/ChangeLog,v 1.22 2007/04/22 11:48:33 caleb Exp $
+
+  22 Apr 2007; Caleb Tennis <caleb@gentoo.org> -qt-embedded-3.3.4.ebuild,
+  -qt-embedded-3.3.4-r1.ebuild, -qt-embedded-3.3.7.ebuild,
+  +qt-embedded-3.3.8.ebuild:
+  had to remove old versions, because they depend on qt versions that have
+  security issues
+
+*qt-embedded-3.3.8 (22 Apr 2007)
+
+  22 Apr 2007; Caleb Tennis <caleb@gentoo.org> +qt-embedded-3.3.8.ebuild:
+  bump
 
 *qt-embedded-3.3.7 (31 Jan 2007)
 
diff --git a/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.4 b/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.4
deleted file mode 100644
index e853041fd333..000000000000
--- a/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bb456d9fba432b29422ce5338c44eadc qt-embedded-free-3.3.4.tar.bz2 19714149
-RMD160 42f676afd52ee5df6fe2246bec6063e2f1755d90 qt-embedded-free-3.3.4.tar.bz2 19714149
-SHA256 db2821e7cc0bd8545b24b84a589c68f819ff375cb6295e14d918b523c6fbd537 qt-embedded-free-3.3.4.tar.bz2 19714149
diff --git a/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.4-r1 b/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.4-r1
deleted file mode 100644
index e853041fd333..000000000000
--- a/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bb456d9fba432b29422ce5338c44eadc qt-embedded-free-3.3.4.tar.bz2 19714149
-RMD160 42f676afd52ee5df6fe2246bec6063e2f1755d90 qt-embedded-free-3.3.4.tar.bz2 19714149
-SHA256 db2821e7cc0bd8545b24b84a589c68f819ff375cb6295e14d918b523c6fbd537 qt-embedded-free-3.3.4.tar.bz2 19714149
diff --git a/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.7 b/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.7
deleted file mode 100644
index 339c14639eb8..000000000000
--- a/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 defcd404e597db4cdaa2954c5a3a36c3 qt-embedded-free-3.3.7.tar.bz2 20107009
-RMD160 77ffb9c296e7e3bb9638c4cec4a182debabd7b87 qt-embedded-free-3.3.7.tar.bz2 20107009
-SHA256 820f6e75c26f911c3c336458568931331aaeac50666fd503a9ae1a3526c36d01 qt-embedded-free-3.3.7.tar.bz2 20107009
diff --git a/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.8 b/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.8
new file mode 100644
index 000000000000..21f5a7131e26
--- /dev/null
+++ b/x11-libs/qt-embedded/files/digest-qt-embedded-3.3.8
@@ -0,0 +1,3 @@
+MD5 3ab5c1896114d44ed7b1fe43e3672d19 qt-embedded-free-3.3.8.tar.bz2 19897760
+RMD160 02a57fd74109a3a3d71268b25e7d7cc9f905b4b3 qt-embedded-free-3.3.8.tar.bz2 19897760
+SHA256 8994220134370797929cf731c66fe234bdf8e0f521171c29a68b62ddedffa2ae qt-embedded-free-3.3.8.tar.bz2 19897760
diff --git a/x11-libs/qt-embedded/qt-embedded-3.3.4-r1.ebuild b/x11-libs/qt-embedded/qt-embedded-3.3.4-r1.ebuild
deleted file mode 100644
index 756790bf0183..000000000000
--- a/x11-libs/qt-embedded/qt-embedded-3.3.4-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2006 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.4-r1.ebuild,v 1.3 2006/11/23 20:11:01 vivo Exp $
-
-DESCRIPTION="Embedded Linux port of Qt"
-HOMEPAGE="http://www.trolltech.com/products/embedded/"
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2"
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-
-SLOT="3"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="cups debug doc firebird gif ipv6 mysql nis odbc opengl postgres sqlite"
-
-DEPEND="media-libs/libpng
-	media-libs/jpeg
-	media-libs/libmng
-	media-libs/lcms
-	sys-libs/zlib
-	cups? ( net-print/cups )
-	firebird? ( dev-db/firebird )
-	mysql? ( virtual/mysql )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( dev-db/postgresql )"
-PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )"
-
-S=${WORKDIR}/qt-embedded-free-${PV}
-
-QTBASE=/usr/qt/3-embedded
-
-pkg_setup() {
-	ewarn "Note: this ebuild provides a Qt/Embedded setup that is suitable for testing,"
-	ewarn "but definitely not tailored for real embedded systems."
-	ewarn "I advise you select your own featureset (e.g. by editing this ebuild)"
-	ewarn "if building for such a system."
-
-	export QTDIR=${S}
-
-	# values for 'PLATFORM' (host system) can be found in mkspecs/
-	# values for 'XPLATFORM' (target system) can be found in mkspecs/qws/
-	if use x86; then
-		export PLATFORM="linux-g++"
-		export XPLATFORM="qws/linux-x86-g++"
-	elif use amd64; then
-		export PLATFORM="linux-g++-64"
-		export XPLATFORM="qws/linux-x86-g++"
-	elif use ppc; then
-		export PLATFORM="linux-g++"
-		export XPLATFORM="qws/linux-generic-g++"
-	else
-		die "Unknown platform"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i -e 's:read acceptance:acceptance=yes:' configure
-
-	# avoid using -rpath
-	find mkspecs/ -name qmake.conf -exec sed -i -e "s:QMAKE_RPATH.*:QMAKE_RPATH =:" {} \;
-}
-
-src_compile() {
-	addwrite "${QTBASE}/etc/settings"
-
-	use gif && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
-	use cups && myconf="${myconf} -cups" || myconf="${myconf} -no-cups"
-	use nis && myconf="${myconf} -nis" || myconf="${myconf} -no-nis"
-	use ipv6 && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
-	use opengl || myconf="${myconf} -disable-opengl"
-	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 firebird && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
-	use sqlite && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
-	use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
-
-	./configure ${myconf} -shared -depths 8,16,24,32 -system-zlib -thread -stl \
-		-freetype -qvfb -plugin-imgfmt-{jpeg,mng,png} -system-lib{jpeg,mng,png} \
-		-prefix ${QTBASE} -platform ${PLATFORM} -xplatform ${XPLATFORM} \
-		-embedded -no-sql-odbc || die
-
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	cd ${S} && emake symlinks src-qmake src-moc sub-src || die "make failed"
-
-	# the designer is not compiled when using -embedded, but we need the uic
-	cd ${S}/tools/designer/uic && emake || die "making uic failed"
-
-	cd ${S} && emake sub-tools || die "making tools failed"
-
-	if use doc; then
-		cd ${S} && emake sub-tutorial sub-examples || die "making examples failed"
-	fi
-}
-
-src_install() {
-	INSTALL_ROOT=${D} emake install
-
-	# fix .prl files
-	find ${D}/${QTBASE}/lib* -name "*.prl" -exec sed -i -e "s:${S}:${QTBASE}:g" {} \;
-
-	# remove broken link
-	rm -f ${D}/${QTBASE}/mkspecs/${PLATFORM}/${PLATFORM}
-
-	# fonts
-	insinto ${QTBASE}/lib/fonts
-	doins ${S}/lib/fonts/*
-
-	# environment variables
-	cat <<EOF > ${T}/47qt-embedded3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-LDPATH=${QTBASE}/lib
-EOF
-	insinto /etc/env.d
-	doins ${T}/47qt-embedded3
-
-	# qmake cache file
-	sed -i -e "s:${S}:${QTBASE}:" .qmake.cache
-	insinto ${QTBASE}
-	doins .qmake.cache
-
-	# documentation
-	if use doc; then
-		find examples tutorial -name Makefile -exec sed -i -e "s:${S}:${QTBASE}:g" {} \;
-
-		cp -r ${S}/tutorial ${D}/${QTBASE}
-		cp -r ${S}/examples ${D}/${QTBASE}
-	fi
-
-	# default target link (overriden by QMAKESPEC env var)
-	rm -f "${D}/${QTBASE}/mkspecs/default"
-	ln -s "${XPLATFORM}" "${D}/${QTBASE}/mkspecs/default"
-}
-
-pkg_postinst() {
-	echo
-	einfo "If you want to compile and run a test application using"
-	einfo "QT/Embedded instead of standard Qt, you must properly"
-	einfo "set the QTDIR and QMAKESPEC variables, e.g.:"
-	einfo
-	einfo "    export QTDIR=${QTBASE}"
-	einfo "    export QMAKESPEC=${QTBASE}/mkspecs/${XPLATFORM}"
-	echo
-}
diff --git a/x11-libs/qt-embedded/qt-embedded-3.3.4.ebuild b/x11-libs/qt-embedded/qt-embedded-3.3.4.ebuild
deleted file mode 100644
index 81ca4e202139..000000000000
--- a/x11-libs/qt-embedded/qt-embedded-3.3.4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2006 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.4.ebuild,v 1.4 2006/11/23 20:11:01 vivo Exp $
-
-DESCRIPTION="Embedded Linux port of Qt"
-HOMEPAGE="http://www.trolltech.com/products/embedded/"
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2"
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-
-SLOT="3"
-KEYWORDS="x86 ~amd64 ~ppc"
-IUSE="cups debug doc firebird gif ipv6 mysql nis odbc opengl postgres sqlite"
-
-DEPEND="media-libs/libpng
-	media-libs/jpeg
-	media-libs/libmng
-	media-libs/lcms
-	sys-libs/zlib
-	cups? ( net-print/cups )
-	odbc? ( >=dev-db/unixODBC-2 )
-	firebird? ( dev-db/firebird )
-	mysql? ( virtual/mysql )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( dev-db/postgresql )"
-
-S=${WORKDIR}/qt-embedded-free-${PV}
-
-QTBASE=/usr/qt/3-embedded
-
-pkg_setup() {
-	ewarn "Note: this ebuild provides a Qt/Embedded setup that is suitable for testing,"
-	ewarn "but definitely not tailored for real embedded systems."
-	ewarn "I advise you select your own featureset (e.g. by editing this ebuild)"
-	ewarn "if building for such a system."
-
-	export QTDIR=${S}
-
-	# values for 'PLATFORM' (host system) can be found in mkspecs/
-	# values for 'XPLATFORM' (target system) can be found in mkspecs/qws/
-	if use x86; then
-		export PLATFORM="linux-g++"
-		export XPLATFORM="qws/linux-x86-g++"
-	elif use amd64; then
-		export PLATFORM="linux-g++-64"
-		export XPLATFORM="qws/linux-x86-g++"
-	elif use ppc; then
-		export PLATFORM="linux-g++"
-		export XPLATFORM="qws/linux-generic-g++"
-	else
-		die "Unknown platform"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i -e 's:read acceptance:acceptance=yes:' configure
-
-	# avoid using -rpath
-	find mkspecs/ -name qmake.conf -exec sed -i -e "s:QMAKE_RPATH.*:QMAKE_RPATH =:" {} \;
-}
-
-src_compile() {
-	addwrite "${QTBASE}/etc/settings"
-
-	use gif && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
-	use cups && myconf="${myconf} -cups" || myconf="${myconf} -no-cups"
-	use nis && myconf="${myconf} -nis" || myconf="${myconf} -no-nis"
-	use ipv6 && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
-	use opengl || myconf="${myconf} -disable-opengl"
-	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 firebird && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
-	use sqlite && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
-	use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
-
-	./configure ${myconf} -shared -depths 8,16,24,32 -system-zlib -thread -stl \
-		-freetype -qvfb -plugin-imgfmt-{jpeg,mng,png} -system-lib{jpeg,mng,png} \
-		-prefix ${QTBASE} -platform ${PLATFORM} -xplatform ${XPLATFORM} \
-		-embedded || die
-
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	cd ${S} && emake symlinks src-qmake src-moc sub-src || die "make failed"
-
-	# the designer is not compiled when using -embedded, but we need the uic
-	cd ${S}/tools/designer/uic && emake || die "making uic failed"
-
-	cd ${S} && emake sub-tools || die "making tools failed"
-
-	if use doc; then
-		cd ${S} && emake sub-tutorial sub-examples || die "making examples failed"
-	fi
-}
-
-src_install() {
-	INSTALL_ROOT=${D} emake install
-
-	# fix .prl files
-	find ${D}/${QTBASE}/lib* -name "*.prl" -exec sed -i -e "s:${S}:${QTBASE}:g" {} \;
-
-	# remove broken link
-	rm -f ${D}/${QTBASE}/mkspecs/${PLATFORM}/${PLATFORM}
-
-	# fonts
-	insinto ${QTBASE}/lib/fonts
-	doins ${S}/lib/fonts/*
-
-	# environment variables
-	cat <<EOF > ${T}/47qt-embedded3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-LDPATH=${QTBASE}/lib
-EOF
-	insinto /etc/env.d
-	doins ${T}/47qt-embedded3
-
-	# qmake cache file
-	sed -i -e "s:${S}:${QTBASE}:" .qmake.cache
-	insinto ${QTBASE}
-	doins .qmake.cache
-
-	# documentation
-	if use doc; then
-		find examples tutorial -name Makefile -exec sed -i -e "s:${S}:${QTBASE}:g" {} \;
-
-		cp -r ${S}/tutorial ${D}/${QTBASE}
-		cp -r ${S}/examples ${D}/${QTBASE}
-	fi
-
-	# default target link (overriden by QMAKESPEC env var)
-	rm -f "${D}/${QTBASE}/mkspecs/default"
-	ln -s "${XPLATFORM}" "${D}/${QTBASE}/mkspecs/default"
-}
-
-pkg_postinst() {
-	echo
-	einfo "If you want to compile and run a test application using"
-	einfo "QT/Embedded instead of standard Qt, you must properly"
-	einfo "set the QTDIR and QMAKESPEC variables, e.g.:"
-	einfo
-	einfo "    export QTDIR=${QTBASE}"
-	einfo "    export QMAKESPEC=${QTBASE}/mkspecs/${XPLATFORM}"
-	echo
-}
diff --git a/x11-libs/qt-embedded/qt-embedded-3.3.7.ebuild b/x11-libs/qt-embedded/qt-embedded-3.3.8.ebuild
index d06bec493bb7..0ab41ca3a582 100644
--- a/x11-libs/qt-embedded/qt-embedded-3.3.7.ebuild
+++ b/x11-libs/qt-embedded/qt-embedded-3.3.8.ebuild
@@ -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-embedded/qt-embedded-3.3.7.ebuild,v 1.1 2007/02/01 13:00:04 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.3.8.ebuild,v 1.1 2007/04/22 11:48:33 caleb Exp $
 
 DESCRIPTION="Embedded Linux port of Qt"
 HOMEPAGE="http://www.trolltech.com/products/embedded/"
@@ -21,7 +21,7 @@ DEPEND="media-libs/libpng
 	mysql? ( virtual/mysql )
 	opengl? ( virtual/opengl virtual/glu )
 	postgres? ( dev-db/postgresql )"
-PDEPEND="odbc? ( ~dev-db/qt-unixODBC-3.3.6 )"
+PDEPEND="odbc? ( ~dev-db/qt-unixODBC-3.3.8 )"
 
 S=${WORKDIR}/qt-embedded-free-${PV}