proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

4 files changed, 616 insertions, 0 deletions

diff --git a/net-im/psi/files/psi-0.14-drop-debug-cflags.patch b/net-im/psi/files/psi-0.14-drop-debug-cflags.patch
new file mode 100644
index 000000000000..227265696ae6
--- /dev/null
+++ b/net-im/psi/files/psi-0.14-drop-debug-cflags.patch
@@ -0,0 +1,35 @@
+Drop -g from CFLAGS
+
+--- qcm/buildmodeapp.qcm	2011-10-19 14:38:55.621699641 +0200
++++ qcm/buildmodeapp.qcm	2011-10-19 14:39:11.868700486 +0200
+@@ -130,8 +130,6 @@
+ 		if(qc_buildmode_separate_debug_info)
+ 		{
+ 			opts += "separate_debug_info";
+-			other += "*-g++*:QMAKE_CFLAGS += -g\n";
+-			other += "*-g++*:QMAKE_CXXFLAGS += -g\n";
+ 		}
+ 
+ 		QString str = QString("CONFIG += ") + opts.join(" ") + '\n';
+--- iris/qcm/extra.qcm.old	2011-10-19 14:39:40.268701738 +0200
++++ iris/qcm/extra.qcm	2011-10-19 14:40:01.904699887 +0200
+@@ -55,8 +55,6 @@
+ 		if(debug_info)
+ 		{
+ 			str += QString("CONFIG += separate_debug_info\n");
+-			str += "QMAKE_CFLAGS += -g\n";
+-			str += "QMAKE_CXXFLAGS += -g\n";
+ 		}
+ 		if(universal)
+ 		{
+--- iris/qcm/buildmode.qcm.old	2011-10-19 14:40:23.794701147 +0200
++++ iris/qcm/buildmode.qcm	2011-10-19 14:40:42.157701302 +0200
+@@ -186,8 +186,6 @@
+ 		if(qc_buildmode_separate_debug_info)
+ 		{
+ 			opts += "separate_debug_info";
+-			other += "QMAKE_CFLAGS += -g\n";
+-			other += "QMAKE_CXXFLAGS += -g\n";
+ 		}
+ 
+ 		QString str = QString("CONFIG += ") + opts.join(" ") + '\n';
diff --git a/net-im/psi/files/psi-0.14-input-validation.patch b/net-im/psi/files/psi-0.14-input-validation.patch
new file mode 100644
index 000000000000..7260c80e1ff9
--- /dev/null
+++ b/net-im/psi/files/psi-0.14-input-validation.patch
@@ -0,0 +1,257 @@
+commit c68fdd9926a38b2820bc5df97fd1905355a2640d
+Author: rion <rion4ik@gmail.com>
+Date:   Fri Oct 7 22:19:05 2011 +0600
+
+    Fixed QLabel CVE
+
+--- src/Certificates/CertificateDisplay.ui	2011-10-19 08:30:15 +0000
++++ src/Certificates/CertificateDisplay.ui	2011-10-19 08:31:23 +0000
+@@ -1,105 +1,118 @@
+-<ui version="4.0" >
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
+  <class>CertificateDisplay</class>
+- <widget class="QDialog" name="CertificateDisplay" >
+-  <property name="geometry" >
++ <widget class="QDialog" name="CertificateDisplay">
++  <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+-    <width>518</width>
++    <width>525</width>
+     <height>369</height>
+    </rect>
+   </property>
+-  <property name="windowTitle" >
++  <property name="windowTitle">
+    <string>Certificate Information</string>
+   </property>
+-  <layout class="QVBoxLayout" >
+-   <property name="margin" >
++  <layout class="QVBoxLayout">
++   <property name="spacing">
++    <number>6</number>
++   </property>
++   <property name="margin">
+     <number>11</number>
+    </property>
+-   <property name="spacing" >
+-    <number>6</number>
+-   </property>
+    <item>
+-    <layout class="QHBoxLayout" >
+-     <property name="margin" >
++    <layout class="QHBoxLayout">
++     <property name="spacing">
++      <number>6</number>
++     </property>
++     <property name="margin">
+       <number>0</number>
+      </property>
+-     <property name="spacing" >
+-      <number>6</number>
+-     </property>
+      <item>
+-      <layout class="QVBoxLayout" >
+-       <property name="margin" >
++      <layout class="QVBoxLayout">
++       <property name="spacing">
++        <number>6</number>
++       </property>
++       <property name="margin">
+         <number>0</number>
+        </property>
+-       <property name="spacing" >
+-        <number>6</number>
+-       </property>
+        <item>
+-        <widget class="QLabel" name="textLabel4" >
+-         <property name="text" >
++        <widget class="QLabel" name="textLabel4">
++         <property name="text">
+           <string>Certificate Validation:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+-        <widget class="QLabel" name="lb_valid" >
+-         <property name="text" >
++        <widget class="QLabel" name="lb_valid">
++         <property name="text">
+           <string/>
+          </property>
++         <property name="textFormat">
++          <enum>Qt::PlainText</enum>
++         </property>
+         </widget>
+        </item>
+        <item>
+-        <widget class="QLabel" name="textLabel2" >
+-         <property name="text" >
++        <widget class="QLabel" name="textLabel2">
++         <property name="text">
+           <string>Valid From:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+-        <widget class="QLabel" name="lb_notBefore" >
+-         <property name="text" >
++        <widget class="QLabel" name="lb_notBefore">
++         <property name="text">
+           <string/>
+          </property>
++         <property name="textFormat">
++          <enum>Qt::PlainText</enum>
++         </property>
+         </widget>
+        </item>
+        <item>
+-        <widget class="QLabel" name="textLabel3" >
+-         <property name="text" >
++        <widget class="QLabel" name="textLabel3">
++         <property name="text">
+           <string>Valid Until:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+-        <widget class="QLabel" name="lb_notAfter" >
+-         <property name="text" >
++        <widget class="QLabel" name="lb_notAfter">
++         <property name="text">
+           <string/>
+          </property>
++         <property name="textFormat">
++          <enum>Qt::PlainText</enum>
++         </property>
+         </widget>
+        </item>
+        <item>
+-        <widget class="QLabel" name="textLabel1" >
+-         <property name="text" >
++        <widget class="QLabel" name="textLabel1">
++         <property name="text">
+           <string>Serial Number:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+-        <widget class="QLabel" name="lb_sn" >
+-         <property name="text" >
++        <widget class="QLabel" name="lb_sn">
++         <property name="text">
+           <string/>
+          </property>
++         <property name="textFormat">
++          <enum>Qt::PlainText</enum>
++         </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+-         <property name="orientation" >
++         <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+-         <property name="sizeType" >
++         <property name="sizeType">
+           <enum>QSizePolicy::Expanding</enum>
+          </property>
+-         <property name="sizeHint" >
++         <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>106</height>
+@@ -110,14 +123,14 @@
+       </layout>
+      </item>
+      <item>
+-      <widget class="QTextBrowser" name="tb_cert" >
+-       <property name="minimumSize" >
++      <widget class="QTextBrowser" name="tb_cert">
++       <property name="minimumSize">
+         <size>
+          <width>350</width>
+          <height>300</height>
+         </size>
+        </property>
+-       <property name="horizontalScrollBarPolicy" >
++       <property name="horizontalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOff</enum>
+        </property>
+       </widget>
+@@ -125,35 +138,35 @@
+     </layout>
+    </item>
+    <item>
+-    <widget class="Line" name="line1" >
+-     <property name="frameShape" >
++    <widget class="Line" name="line1">
++     <property name="frameShape">
+       <enum>QFrame::HLine</enum>
+      </property>
+-     <property name="frameShadow" >
++     <property name="frameShadow">
+       <enum>QFrame::Sunken</enum>
+      </property>
+-     <property name="orientation" >
++     <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+    <item>
+-    <layout class="QHBoxLayout" >
+-     <property name="margin" >
++    <layout class="QHBoxLayout">
++     <property name="spacing">
++      <number>6</number>
++     </property>
++     <property name="margin">
+       <number>0</number>
+      </property>
+-     <property name="spacing" >
+-      <number>6</number>
+-     </property>
+      <item>
+       <spacer>
+-       <property name="orientation" >
++       <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+-       <property name="sizeType" >
++       <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+-       <property name="sizeHint" >
++       <property name="sizeHint" stdset="0">
+         <size>
+          <width>421</width>
+          <height>20</height>
+@@ -162,17 +175,17 @@
+       </spacer>
+      </item>
+      <item>
+-      <widget class="QPushButton" native="1" name="pb_close">
+-	    <property name="text">
+-		  <string>Close</string>
+-		</property>
+-	  </widget>
++      <widget class="QPushButton" name="pb_close">
++       <property name="text">
++        <string>Close</string>
++       </property>
++      </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+- <layoutdefault spacing="6" margin="11" />
++ <layoutdefault spacing="6" margin="11"/>
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+  <tabstops>
+   <tabstop>tb_cert</tabstop>
+
diff --git a/net-im/psi/files/psi-0.14-minizip-detection.patch b/net-im/psi/files/psi-0.14-minizip-detection.patch
new file mode 100644
index 000000000000..1eff6dadec4d
--- /dev/null
+++ b/net-im/psi/files/psi-0.14-minizip-detection.patch
@@ -0,0 +1,284 @@
+=== modified file 'conf_windows.pri'
+--- conf_windows.pri	2011-10-25 10:03:42 +0000
++++ conf_windows.pri	2011-10-25 10:04:13 +0000
+@@ -5,7 +5,7 @@
+ #CONFIG += qca-static
+ 
+ # tell iris to use our internal libz
+-CONFIG += psi-zip
++CONFIG += psi-winzlib
+ 
+ # OpenSSL
+ qca-static {
+
+=== modified file 'configure'
+--- configure	2011-10-25 10:03:42 +0000
++++ configure	2011-10-25 10:04:13 +0000
+@@ -955,41 +955,68 @@
+ 	{
+ #ifdef Q_OS_WIN
+ 		// HACK: on windows, always use psi's bundled zlib
+-		conf->addExtra("CONFIG += psi-zip");
++		conf->addExtra("CONFIG += psi-winzlib psi-minizip");
+ 		return true;
+ #else
+-		QString inc, lib;
++		QStringList incs;
++		QString version, libs, other;
+ 		QString s;
+ 
+-		s = conf->getenv("QC_WITH_ZLIB_INC");
+-		if(!s.isEmpty()) {
+-			if(!conf->checkHeader(s, "zlib.h"))
+-				return false;
+-			inc = s;
+-		}
+-		else {
+-			if(!conf->findHeader("zlib.h", QStringList(), &s))
+-				return false;
+-			inc = s;
+-		}
+-
+-		s = conf->getenv("QC_WITH_ZLIB_LIB");
+-		if(!s.isEmpty()) {
+-			if(!conf->checkLibrary(s, "z"))
+-				return false;
+-			lib = s;
+-		}
+-		else {
+-			if(!conf->findLibrary("z", &s))
+-				return false;
+-			lib = s;
+-		}
+-
+-		if(!inc.isEmpty())
++		if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) {
++
++			s = conf->getenv("QC_WITH_ZLIB_INC");
++			if(!s.isEmpty()) {
++				if(!conf->checkHeader(s, "zlib.h"))
++					return false;
++			}
++			else {
++				if(!conf->findHeader("zlib.h", QStringList(), &s))
++					return false;
++			}
++			incs.append(s);
++
++			s = conf->getenv("QC_WITH_ZLIB_LIB");
++			if(!s.isEmpty()) {
++				if(!conf->checkLibrary(s, "z"))
++					return false;
++			}
++			else {
++				if(!conf->findLibrary("z", &s))
++					return false;
++			}
++			libs = QString("-L%1 -lz").arg(s);
++		}
++
++		foreach(const QString &inc, incs) {
+ 			conf->addIncludePath(inc);
+-		if(!lib.isEmpty())
+-			conf->addLib(QString("-L") + s);
+-		conf->addLib("-lz");
++		}
++		conf->addLib(libs);
++
++		incs.clear();
++		libs.clear();
++		if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) {
++
++			s = conf->getenv("QC_WITH_MINIZIP_INC");
++			if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) ||
++			    (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) {
++				incs.append(s);
++			}
++
++			s = conf->getenv("QC_WITH_MINIZIP_LIB");
++			if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) ||
++			   (s.isEmpty() && conf->findLibrary("minizip", &s))) {
++				libs = QString("-L%1 -lminizip").arg(s);
++			}
++		}
++
++		if (!incs.isEmpty() && !libs.isEmpty()) {
++			foreach(const QString &inc, incs) {
++				conf->addIncludePath(inc);
++			}
++			conf->addLib(libs);
++		} else {
++			conf->addExtra("CONFIG += psi-minizip");
++		}
+ 
+ 		return true;
+ #endif
+
+=== modified file 'qcm/zlib.qcm'
+--- qcm/zlib.qcm	2011-10-25 10:03:42 +0000
++++ qcm/zlib.qcm	2011-10-25 10:04:13 +0000
+@@ -26,41 +26,68 @@
+ 	{
+ #ifdef Q_OS_WIN
+ 		// HACK: on windows, always use psi's bundled zlib
+-		conf->addExtra("CONFIG += psi-zip");
++		conf->addExtra("CONFIG += psi-winzlib psi-minizip");
+ 		return true;
+ #else
+-		QString inc, lib;
++		QStringList incs;
++		QString version, libs, other;
+ 		QString s;
+ 
+-		s = conf->getenv("QC_WITH_ZLIB_INC");
+-		if(!s.isEmpty()) {
+-			if(!conf->checkHeader(s, "zlib.h"))
+-				return false;
+-			inc = s;
+-		}
+-		else {
+-			if(!conf->findHeader("zlib.h", QStringList(), &s))
+-				return false;
+-			inc = s;
+-		}
+-
+-		s = conf->getenv("QC_WITH_ZLIB_LIB");
+-		if(!s.isEmpty()) {
+-			if(!conf->checkLibrary(s, "z"))
+-				return false;
+-			lib = s;
+-		}
+-		else {
+-			if(!conf->findLibrary("z", &s))
+-				return false;
+-			lib = s;
+-		}
+-
+-		if(!inc.isEmpty())
++		if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) {
++
++			s = conf->getenv("QC_WITH_ZLIB_INC");
++			if(!s.isEmpty()) {
++				if(!conf->checkHeader(s, "zlib.h"))
++					return false;
++			}
++			else {
++				if(!conf->findHeader("zlib.h", QStringList(), &s))
++					return false;
++			}
++			incs.append(s);
++
++			s = conf->getenv("QC_WITH_ZLIB_LIB");
++			if(!s.isEmpty()) {
++				if(!conf->checkLibrary(s, "z"))
++					return false;
++			}
++			else {
++				if(!conf->findLibrary("z", &s))
++					return false;
++			}
++			libs = QString("-L%1 -lz").arg(s);
++		}
++
++		foreach(const QString &inc, incs) {
+ 			conf->addIncludePath(inc);
+-		if(!lib.isEmpty())
+-			conf->addLib(QString("-L") + s);
+-		conf->addLib("-lz");
++		}
++		conf->addLib(libs);
++
++		incs.clear();
++		libs.clear();
++		if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) {
++
++			s = conf->getenv("QC_WITH_MINIZIP_INC");
++			if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) ||
++			    (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) {
++				incs.append(s);
++			}
++
++			s = conf->getenv("QC_WITH_MINIZIP_LIB");
++			if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) ||
++			   (s.isEmpty() && conf->findLibrary("minizip", &s))) {
++				libs = QString("-L%1 -lminizip").arg(s);
++			}
++		}
++
++		if (!incs.isEmpty() && !libs.isEmpty()) {
++			foreach(const QString &inc, incs) {
++				conf->addIncludePath(inc);
++			}
++			conf->addLib(libs);
++		} else {
++			conf->addExtra("CONFIG += psi-minizip");
++		}
+ 
+ 		return true;
+ #endif
+
+=== modified file 'src/conf_iris.pri'
+--- src/conf_iris.pri	2011-10-25 10:03:42 +0000
++++ src/conf_iris.pri	2011-10-25 10:04:13 +0000
+@@ -13,11 +13,6 @@
+ 	CONFIG += crypto
+ }
+ 
+-# use zlib from psi if necessary
+-psi-zip {
+-	INCLUDEPATH += $$PWD/libpsi/tools/zip/minizip/win32
+-}
+-
+ mac {
+ 	# Universal binaries
+ 	qc_universal:contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {
+
+=== modified file 'src/libpsi/tools/zip/zip.cpp'
+--- src/libpsi/tools/zip/zip.cpp	2011-10-25 10:03:42 +0000
++++ src/libpsi/tools/zip/zip.cpp	2011-10-25 10:04:13 +0000
+@@ -22,7 +22,11 @@
+ #include <QStringList>
+ #include <QFile>
+ 
++#ifdef PSIMINIZIP
+ #include "minizip/unzip.h"
++#else
++#include <minizip/unzip.h>
++#endif
+ #include "zip.h"
+ 
+ class UnZipPrivate
+
+=== modified file 'src/libpsi/tools/zip/zip.pri'
+--- src/libpsi/tools/zip/zip.pri	2011-10-25 10:03:42 +0000
++++ src/libpsi/tools/zip/zip.pri	2011-10-25 10:04:13 +0000
+@@ -2,17 +2,20 @@
+ 	$$PWD/zip.h
+ 
+ SOURCES += \
+-	$$PWD/zip.cpp \
+-	$$PWD/minizip/unzip.c
+-
+-INCLUDEPATH += $$PWD
+-DEPENDPATH  += $$PWD
+-
+-win32: {
++ 	$$PWD/zip.cpp
++ 
++psi-minizip {
++	SOURCES += $$PWD/minizip/unzip.c
++	DEFINES += PSIMINIZIP
++	INCLUDEPATH += $$PWD
++	DEPENDPATH  += $$PWD
++}
++
++psi-winzlib {
+ 	INCLUDEPATH += $$PWD/minizip/win32
+ 	DEPENDPATH  += $$PWD/minizip/win32
+ 	LIBS += $$PWD/minizip/win32/libz.a
+ }
+-mac: {
++mac {
+ 	QMAKE_LFLAGS += -lz
+ }
+
diff --git a/net-im/psi/files/psi-0.14-qt-compat.patch b/net-im/psi/files/psi-0.14-qt-compat.patch
new file mode 100644
index 000000000000..99fa30794590
--- /dev/null
+++ b/net-im/psi/files/psi-0.14-qt-compat.patch
@@ -0,0 +1,40 @@
+commit ec91add0e6398ad20c7a8f14a1a08c5e3282c5bd
+Author: Michail Pishchagin <mblsha@users.sourceforge.net>
+Date:   Tue Oct 19 11:26:31 2010 +0400
+
+    Fix crash in MUCAffiliationsModel on Qt 4.7 (closes #1087)
+    Based on 1610-psi-fix-crash-in-muc-configurator.diff from Psi+
+
+diff --git a/src/mucaffiliationsmodel.cpp b/src/mucaffiliationsmodel.cpp
+index 722b762..fd0a830 100644
+--- a/src/mucaffiliationsmodel.cpp
++++ b/src/mucaffiliationsmodel.cpp
+@@ -150,15 +150,18 @@ void MUCAffiliationsModel::resetAffiliationLists()
+ 
+ void MUCAffiliationsModel::resetAffiliationList(MUCItem::Affiliation a)
+ {
++	emit layoutAboutToBeChanged();
+ 	enabled_[(AffiliationListIndex) affiliationToIndex(a)] = false;
+ 	QModelIndex index = affiliationListIndex(a);
+ 	if (hasChildren(index)) {
+ 		removeRows(0,rowCount(index),index);
+ 	}
++	emit layoutChanged();
+ }
+ 
+ void MUCAffiliationsModel::setAffiliationListEnabled(MUCItem::Affiliation a, bool b)
+ {
++	emit layoutAboutToBeChanged();
+ 	QModelIndex index = affiliationListIndex(a);
+ 	enabled_[(AffiliationListIndex) index.row()] = b;
+ 	emit layoutChanged();
+@@ -208,6 +211,9 @@ void MUCAffiliationsModel::addItems(const QList<MUCItem>& items)
+ 	foreach(MUCItem item, items) {
+ 		QModelIndex list = affiliationListIndex(item.affiliation());
+ 		if (list.isValid() && !item.jid().isEmpty()) {
++			if (!dirty) {
++				emit layoutAboutToBeChanged();
++			}
+ 			int row = rowCount(list);
+ 			if (row == 0) {
+ 				enabled_[(AffiliationListIndex) list.row()] = true;