Removing 3.3.6 since its corresponding qt isn't in portage anymore, and add x86 to 3.3.4 due to hardened

(Portage version: 2.1.2.2)

4 files changed, 7 insertions, 69 deletions

diff --git a/dev-db/qt-unixODBC/ChangeLog b/dev-db/qt-unixODBC/ChangeLog
index ca3b55893bf0..e85c891a77fa 100644
--- a/dev-db/qt-unixODBC/ChangeLog
+++ b/dev-db/qt-unixODBC/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/qt-unixODBC
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/ChangeLog,v 1.33 2007/04/18 17:11:18 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/ChangeLog,v 1.34 2007/04/20 16:45:52 caleb Exp $
+
+  20 Apr 2007; Caleb Tennis <caleb@gentoo.org> -qt-unixODBC-3.3.6.ebuild:
+  remove 3.3.6 as it's qt 3.3.6 isn't in portage anymore
 
   18 Apr 2007; Jose Luis Rivero <yoswink@gentoo.org>
   qt-unixODBC-3.3.8.ebuild:
diff --git a/dev-db/qt-unixODBC/files/digest-qt-unixODBC-3.3.6 b/dev-db/qt-unixODBC/files/digest-qt-unixODBC-3.3.6
deleted file mode 100644
index 2f02f9a1953e..000000000000
--- a/dev-db/qt-unixODBC/files/digest-qt-unixODBC-3.3.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dc1384c03ac08af21f6fefab32d982cf qt-x11-free-3.3.6.tar.bz2 14565843
-RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 qt-x11-free-3.3.6.tar.bz2 14565843
-SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae qt-x11-free-3.3.6.tar.bz2 14565843
diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild
index 5d5c29a36c7f..ed01fbb8110f 100644
--- a/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild
+++ b/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild,v 1.6 2005/09/29 01:31:32 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild,v 1.7 2007/04/20 16:45:52 caleb Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2"
 IUSE=""
 LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="3"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="mips x86"
 
 DEPEND="~x11-libs/qt-$PV
 	dev-db/unixODBC"
diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.6.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.6.ebuild
deleted file mode 100644
index 961b2c769aa9..000000000000
--- a/dev-db/qt-unixODBC/qt-unixODBC-3.3.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.6.ebuild,v 1.9 2006/10/15 21:41:54 kloeri Exp $
-
-inherit eutils
-
-SRCTYPE="free"
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2"
-IUSE=""
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="3"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-
-DEPEND="~x11-libs/qt-$PV
-	dev-db/unixODBC"
-
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-QTBASE=/usr/qt/3
-export QTDIR=${S}
-export PLATFORM=linux-g++
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/qt-no-rpath.patch
-
-
-	cp configure configure.orig
-	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-}
-
-src_compile() {
-	export QTDIR=${S}
-	export SYSCONF=${D}${QTBASE}/etc/settings
-
-	# Let's just allow writing to these directories during Qt emerge
-	# as it makes Qt much happier.
-	addwrite "${QTBASE}/etc/settings"
-	addwrite "$HOME/.qt"
-
-	export YACC='byacc -d'
-
-	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
-		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
-		-system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \
-		${PLATFORM} -xrender -prefix ${QTBASE} -fast ${myconf} \
-		-dlopen-opengl -plugin-sql-odbc -L${QTBASE}/lib || die
-
-	export QTDIR=${S}
-
-	cd $S/plugins/src/sqldrivers/odbc
-	emake || die
-}
-
-src_install() {
-	mkdir -p $D/$QTBASE/plugins/sqldrivers
-	cp $S/plugins/sqldrivers/libqsqlodbc.so $D/$QTBASE/plugins/sqldrivers/ || die
-}