Remove old.

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

4 files changed, 5 insertions, 260 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index e6c58f93fddb..2a8790023b19 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.183 2012/07/09 11:34:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.184 2012/07/09 12:15:03 johu Exp $
+
+  09 Jul 2012; Johannes Huber <johu@gentoo.org> -files/blacklist_ssl.patch,
+  -files/qt-4.6-nolibx11.patch, -files/qt-4.6-nox11r6.patch:
+  Remove old.
 
   09 Jul 2012; Johannes Huber <johu@gentoo.org> -qt-core-4.6.3-r1.ebuild:
   Drop Qt-4.6.3
diff --git a/x11-libs/qt-core/files/blacklist_ssl.patch b/x11-libs/qt-core/files/blacklist_ssl.patch
deleted file mode 100644
index abefeff8fc69..000000000000
--- a/x11-libs/qt-core/files/blacklist_ssl.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
-index 618ac79..a5cdf01 100644
---- a/src/network/ssl/qsslcertificate.cpp
-+++ b/src/network/ssl/qsslcertificate.cpp
-@@ -219,17 +219,19 @@ bool QSslCertificate::isNull() const
-     Returns true if this certificate is valid; otherwise returns
-     false.
- 
--    Note: Currently, this function only checks that the current
-+    Note: Currently, this function checks that the current
-     data-time is within the date-time range during which the
--    certificate is considered valid. No other checks are
--    currently performed.
-+    certificate is considered valid, and checks that the
-+    certificate is not in a blacklist of fraudulent certificates.
- 
-     \sa isNull()
- */
- bool QSslCertificate::isValid() const
- {
-     const QDateTime currentTime = QDateTime::currentDateTime();
--    return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;
-+    return currentTime >= d->notValidBefore &&
-+            currentTime <= d->notValidAfter &&
-+            ! QSslCertificatePrivate::isBlacklisted(*this);
- }
- 
- /*!
-@@ -798,6 +800,30 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
-     return certificates;
- }
- 
-+// These certificates are known to be fraudulent and were created during the comodo
-+// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
-+static const char *certificate_blacklist[] = {
-+    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
-+    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
-+    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
-+    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
-+    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
-+    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
-+    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
-+    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
-+    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
-+    0
-+};
-+
-+bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
-+{
-+    for (int a = 0; certificate_blacklist[a] != 0; a++) {
-+        if (certificate.serialNumber() == certificate_blacklist[a])
-+            return true;
-+    }
-+    return false;
-+}
-+
- #ifndef QT_NO_DEBUG_STREAM
- QDebug operator<<(QDebug debug, const QSslCertificate &certificate)
- {
-diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h
-index cdceb0f..1ce33d3 100644
---- a/src/network/ssl/qsslcertificate_p.h
-+++ b/src/network/ssl/qsslcertificate_p.h
-@@ -96,6 +96,7 @@ public:
-     static QSslCertificate QSslCertificate_from_X509(X509 *x509);
-     static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);
-     static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);
-+    static bool isBlacklisted(const QSslCertificate &certificate);
- 
-     friend class QSslSocketBackendPrivate;
- 
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 0866534..2427193 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -1193,6 +1193,13 @@ bool QSslSocketBackendPrivate::startHandshake()
-     X509 *x509 = q_SSL_get_peer_certificate(ssl);
-     configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
-     q_X509_free(x509);
-+    if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
-+        q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
-+        q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
-+        emit q->error(QAbstractSocket::SslHandshakeFailedError);
-+        plainSocket->disconnectFromHost();
-+        return false;
-+    }
- 
-     // Start translating errors.
-     QList<QSslError> errors;
diff --git a/x11-libs/qt-core/files/qt-4.6-nolibx11.patch b/x11-libs/qt-core/files/qt-4.6-nolibx11.patch
deleted file mode 100644
index e5d13327b8ce..000000000000
--- a/x11-libs/qt-core/files/qt-4.6-nolibx11.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure-orig	2010-01-20 14:18:32.466798257 +0200
-+++ configure	2010-01-20 14:18:58.516799116 +0200
-@@ -5059,15 +5059,6 @@
-         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
-     fi
- 
--    # Check we actually have X11 :-)
--    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
--    if [ $? != "0" ]; then
--        echo "Basic XLib functionality test failed!"
--        echo " You might need to modify the include and library search paths by editing"
--        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
--        exit 1
--    fi
--
-     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
-         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
diff --git a/x11-libs/qt-core/files/qt-4.6-nox11r6.patch b/x11-libs/qt-core/files/qt-4.6-nox11r6.patch
deleted file mode 100644
index ec5ef92fa441..000000000000
--- a/x11-libs/qt-core/files/qt-4.6-nox11r6.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
-index 1ae5608..9c603a6 100644
---- a/mkspecs/common/linux.conf
-+++ b/mkspecs/common/linux.conf
-@@ -7,12 +7,12 @@ QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
- 
- QMAKE_INCDIR          =
- QMAKE_LIBDIR          =
--QMAKE_INCDIR_X11      = /usr/X11R6/include
--QMAKE_LIBDIR_X11      = /usr/X11R6/lib
-+QMAKE_INCDIR_X11      = /usr/include
-+QMAKE_LIBDIR_X11      = /usr/lib
- QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
- QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
--QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
-+QMAKE_INCDIR_OPENGL   = /usr/include
-+QMAKE_LIBDIR_OPENGL   = /usr/lib
- QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
- QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
- QMAKE_INCDIR_OPENGL_ES1CL = $$QMAKE_INCDIR_OPENGL
-diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
-index 633b738..a37c05b 100644
---- a/mkspecs/linux-cxx/qmake.conf
-+++ b/mkspecs/linux-cxx/qmake.conf
-@@ -37,12 +37,12 @@ QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
- 
- QMAKE_INCDIR		=
- QMAKE_LIBDIR		=
--QMAKE_INCDIR_X11	= /usr/X11R6/include
--QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-+QMAKE_INCDIR_X11	= /usr/include
-+QMAKE_LIBDIR_X11	= /usr/lib
- QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
- QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
--QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-+QMAKE_INCDIR_OPENGL	= /usr/include
-+QMAKE_LIBDIR_OPENGL	= /usr/lib
- 
- QMAKE_LINK		= cxx
- QMAKE_LINK_SHLIB	= cxx
-diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
-index 359d44b..2d3f9a5 100644
---- a/mkspecs/linux-ecc-64/qmake.conf
-+++ b/mkspecs/linux-ecc-64/qmake.conf
-@@ -39,12 +39,12 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
- 
- QMAKE_INCDIR		=
- QMAKE_LIBDIR		=
--QMAKE_INCDIR_X11	= /usr/X11R6/include
--QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-+QMAKE_INCDIR_X11	= /usr/include
-+QMAKE_LIBDIR_X11	= /usr/lib
- QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
- QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
--QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-+QMAKE_INCDIR_OPENGL	= /usr/include
-+QMAKE_LIBDIR_OPENGL	= /usr/lib
- 
- QMAKE_LINK		= ecpc
- QMAKE_LINK_SHLIB	= ecpc
-diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
-index 4f8794f..cf7be62 100644
---- a/mkspecs/linux-g++-64/qmake.conf
-+++ b/mkspecs/linux-g++-64/qmake.conf
-@@ -17,7 +17,7 @@ QMAKE_LFLAGS		= -m64
- include(../common/g++.conf)
- include(../common/linux.conf)
- 
--QMAKE_LIBDIR_X11      = /usr/X11R6/lib64
--QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib64
-+QMAKE_LIBDIR_X11      = /usr/lib64
-+QMAKE_LIBDIR_OPENGL   = /usr/lib64
- 
- load(qt_config)
-diff --git a/mkspecs/linux-icc-64/qmake.conf b/mkspecs/linux-icc-64/qmake.conf
-index 7962026..9b4bade 100644
---- a/mkspecs/linux-icc-64/qmake.conf
-+++ b/mkspecs/linux-icc-64/qmake.conf
-@@ -12,5 +12,5 @@ include(../linux-icc/qmake.conf)
- 
- # Change the all LIBDIR variables to use lib64 instead of lib
- 
--QMAKE_LIBDIR_X11	= /usr/X11R6/lib64
--QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib64
-+QMAKE_LIBDIR_X11	= /usr/lib64
-+QMAKE_LIBDIR_OPENGL	= /usr/lib64
-diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
-index 965de0c..b778a89 100644
---- a/mkspecs/linux-icc/qmake.conf
-+++ b/mkspecs/linux-icc/qmake.conf
-@@ -45,12 +45,12 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
- 
- QMAKE_INCDIR		=
- QMAKE_LIBDIR		=
--QMAKE_INCDIR_X11	= /usr/X11R6/include
--QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-+QMAKE_INCDIR_X11	= /usr/include
-+QMAKE_LIBDIR_X11	= /usr/lib
- QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
- QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
--QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-+QMAKE_INCDIR_OPENGL	= /usr/include
-+QMAKE_LIBDIR_OPENGL	= /usr/lib
- 
- QMAKE_LINK		= icpc
- QMAKE_LINK_SHLIB	= icpc
-diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
-index 009c486..0e3d301 100644
---- a/mkspecs/linux-kcc/qmake.conf
-+++ b/mkspecs/linux-kcc/qmake.conf
-@@ -48,12 +48,12 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
- 
- QMAKE_INCDIR		=
- QMAKE_LIBDIR		=
--QMAKE_INCDIR_X11	= /usr/X11R6/include
--QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-+QMAKE_INCDIR_X11	= /usr/include
-+QMAKE_LIBDIR_X11	= /usr/lib
- QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
- QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
--QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-+QMAKE_INCDIR_OPENGL	= /usr/include
-+QMAKE_LIBDIR_OPENGL	= /usr/lib
- 
- QMAKE_LINK		= KCC
- QMAKE_LINK_SHLIB	= KCC
-diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
-index 756f1af..2c40635 100644
---- a/mkspecs/linux-pgcc/qmake.conf
-+++ b/mkspecs/linux-pgcc/qmake.conf
-@@ -39,12 +39,12 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
- 
- QMAKE_INCDIR		=
- QMAKE_LIBDIR		=
--QMAKE_INCDIR_X11	= /usr/X11R6/include
--QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-+QMAKE_INCDIR_X11	= /usr/include
-+QMAKE_LIBDIR_X11	= /usr/lib
- QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
- QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
--QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-+QMAKE_INCDIR_OPENGL	= /usr/include
-+QMAKE_LIBDIR_OPENGL	= /usr/lib
- 
- QMAKE_LINK		= pgCC
- QMAKE_LINK_SHLIB	= pgCC