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

Package-Manager: portage-2.1.2.2

diff --git a/dev-db/qt-unixODBC/ChangeLog b/dev-db/qt-unixODBC/ChangeLog
index ca3b55893bf0512855251b50f7e1acf6d8c596bb..e85c891a77fa1d46344974b71ef80b1ca61f56bf 100644 (file)
--- 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/Manifest b/dev-db/qt-unixODBC/Manifest
index 58de094327b0711cf68d95ef33a031147e82ecc9..d8554baabda3be5e7db0870c88b7b1926d484aad 100644 (file)
--- a/dev-db/qt-unixODBC/Manifest
+++ b/dev-db/qt-unixODBC/Manifest
@@ -3,24 +3,19 @@ MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
 RMD160 2b5f24c23594531976f39723a4112261f4ad296a files/qt-no-rpath.patch 352
 SHA256 8cc1de2b9cebf6ef5a77d9deb18e7aa83d53258503076fb262d2981c1e25b1a4 files/qt-no-rpath.patch 352
 DIST qt-x11-free-3.3.4.tar.bz2 14439722 RMD160 3298331d545511956eb0910cbc5867a2a453ea1e SHA1 cb5f452bcdc9d2ed0201481f4b8f152edfda9523 SHA256 4e47251eddb0cef058e1bfd89c3320c03d966eba12760a781c95cf5468bf30b3
-DIST qt-x11-free-3.3.6.tar.bz2 14565843 RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 SHA1 bbb075054b8a2923a8a7f5afff1c4c7a8bf5a946 SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae
 DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66b74eb4 SHA1 919e470beb32ec5d8e96c4dd1b6a10a2c79511a1 SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139
-EBUILD qt-unixODBC-3.3.4-r1.ebuild 1611 RMD160 80ac1f8bc3417dfaf1bc5eacf1b7f8357c9b3d67 SHA1 bb790fc84093d27a425f53519721c95e168c4da4 SHA256 81a94b8e35a2ad64cb9a856f9c9814d8956ed60ea64cadcad592b63c13eb4345
-MD5 6acfcc91ce7ffb564dd08069756040fd qt-unixODBC-3.3.4-r1.ebuild 1611
-RMD160 80ac1f8bc3417dfaf1bc5eacf1b7f8357c9b3d67 qt-unixODBC-3.3.4-r1.ebuild 1611
-SHA256 81a94b8e35a2ad64cb9a856f9c9814d8956ed60ea64cadcad592b63c13eb4345 qt-unixODBC-3.3.4-r1.ebuild 1611
-EBUILD qt-unixODBC-3.3.6.ebuild 1608 RMD160 b610da12fce07c659f9ecc8501d9a08307e9767a SHA1 881687f9df928f8704f4885c313fea48d592ac26 SHA256 9b3f3bcba45beb8d96ce696e96c16d010cda9fff50c79a09c13484c8615fcce2
-MD5 18107076f1a7226ea8c9d26251b36cca qt-unixODBC-3.3.6.ebuild 1608
-RMD160 b610da12fce07c659f9ecc8501d9a08307e9767a qt-unixODBC-3.3.6.ebuild 1608
-SHA256 9b3f3bcba45beb8d96ce696e96c16d010cda9fff50c79a09c13484c8615fcce2 qt-unixODBC-3.3.6.ebuild 1608
+EBUILD qt-unixODBC-3.3.4-r1.ebuild 1571 RMD160 552e82f324d139c4db59310884eedb6319e87653 SHA1 2febd00089a100e3e018318b9f5c5fef08e12d74 SHA256 7912b153ce68bff8a9425cd642e2c4e6439492354f998c641cf63360b0056458
+MD5 68c4fe03470d0f6530c2fb8fd391e8bd qt-unixODBC-3.3.4-r1.ebuild 1571
+RMD160 552e82f324d139c4db59310884eedb6319e87653 qt-unixODBC-3.3.4-r1.ebuild 1571
+SHA256 7912b153ce68bff8a9425cd642e2c4e6439492354f998c641cf63360b0056458 qt-unixODBC-3.3.4-r1.ebuild 1571
 EBUILD qt-unixODBC-3.3.8.ebuild 1608 RMD160 1e417fce84045070ede31aa68d226cdbe92df750 SHA1 7ebc90d6c38a9a3ae88e0bdde07cb7a259e495ff SHA256 1639106f9a852d284f6e90f249e56efb56b38ffe5ee8501d6966af27bcaf17e9
 MD5 eb784f5698d2abf07bbf2de6e9f9aeb8 qt-unixODBC-3.3.8.ebuild 1608
 RMD160 1e417fce84045070ede31aa68d226cdbe92df750 qt-unixODBC-3.3.8.ebuild 1608
 SHA256 1639106f9a852d284f6e90f249e56efb56b38ffe5ee8501d6966af27bcaf17e9 qt-unixODBC-3.3.8.ebuild 1608
-MISC ChangeLog 4058 RMD160 4ba853722c11ca806755bba93017d9c919a4a9f2 SHA1 f7a3a1e78462ac6a38819f64e8ed53827115a8c2 SHA256 f08f97ee4fcc91389377ba52122be423a0b8eb2cf013b83e3dd4fc7d8bd19961
-MD5 7400e879f14e89fc46d671cbf460ceb5 ChangeLog 4058
-RMD160 4ba853722c11ca806755bba93017d9c919a4a9f2 ChangeLog 4058
-SHA256 f08f97ee4fcc91389377ba52122be423a0b8eb2cf013b83e3dd4fc7d8bd19961 ChangeLog 4058
+MISC ChangeLog 4188 RMD160 b5ced5b62cf8cd54bd6d13eac0eeb7aaad8db544 SHA1 c3fdf76848eda61dd353b401f869f2878ca14890 SHA256 7fc4afb61a42d5e0fafea780e4b94200de178da6aa7fc8c9767154a745b6751f
+MD5 3222ee977da9452d12d78a0e6bbadd38 ChangeLog 4188
+RMD160 b5ced5b62cf8cd54bd6d13eac0eeb7aaad8db544 ChangeLog 4188
+SHA256 7fc4afb61a42d5e0fafea780e4b94200de178da6aa7fc8c9767154a745b6751f ChangeLog 4188
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -28,9 +23,6 @@ SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 metadata
 MD5 15cd7e2c6494e974dba0137930c5fea3 files/digest-qt-unixODBC-3.3.4-r1 262
 RMD160 84e9b7af2a896a886a622d6f876ff64f2c9f1311 files/digest-qt-unixODBC-3.3.4-r1 262
 SHA256 910ec8fe18303dc4403ff6a5fcc8a12da6b3cd2cfe6b7bcbe64b9958be29a0bc files/digest-qt-unixODBC-3.3.4-r1 262
-MD5 2f0c7d9dd55c1a6ddf00345311aa8c00 files/digest-qt-unixODBC-3.3.6 262
-RMD160 43c7daffb851a540a41ab8801be9a9809013f9e8 files/digest-qt-unixODBC-3.3.6 262
-SHA256 4a9a81c947e83043956ba643697134b25a74188e4f3e2c9575e71cf2e07dff35 files/digest-qt-unixODBC-3.3.6 262
 MD5 7614e448ba10fcfb3c97a5561756035f files/digest-qt-unixODBC-3.3.8 259
 RMD160 0afd000a1a1d5f2002149d20428830aa9fca559f files/digest-qt-unixODBC-3.3.8 259
 SHA256 b7918859f493325124e8465e01058601a9b3cab5de3e9eb1041f011e68dd7074 files/digest-qt-unixODBC-3.3.8 259

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 (file)
index 2f02f9a..0000000
--- 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 5d5c29a36c7ffda0b35b28d4aeeb4497aefcec51..ed01fbb8110f060536f2b286da58592267efa4a6 100644 (file)
--- 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 (file)
index 961b2c7..0000000
--- 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
-}