';
+ const HTML_SEARCH_SUMMARY_START = '
';
+ const HTML_SEARCH_SUMMARY_END = '
';
// replace all spaces for "+"
keyWord = strReplace(keyWord, " ", "+");
// init search results object
-@@ -110,7 +183,7 @@
+@@ -110,7 +188,7 @@
var http = new Http();
var html = http.downloadWebpage(strFormat(URL_SEARCH, keyWord, pageIndex, searchResults.getUserLanguage()));
// get the search summary
@@ -165,7 +182,7 @@
searchResults.setSummary(cleanSummary(summary));
// get results html block
var htmlResults = copyBetween(html, HTML_SEARCH_START, HTML_SEARCH_FINISH);
-@@ -148,14 +221,17 @@
+@@ -148,14 +226,17 @@
var tmp, videoUrl, imageUrl, title, description, duration, rating;
// get video url
videoUrl = VIDEO_URL + copyBetween(html, 'href="', '"');
diff --git a/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild b/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..3d718361f71a
--- /dev/null
+++ b/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild,v 1.1 2012/07/11 19:51:16 hwoarang Exp $
+
+EAPI=2
+
+LANGS="br ca cs da de es fr gl hu it ja ko nl pl ro ru sv"
+
+inherit eutils qt4-r2 versionator
+
+MY_PV=$(replace_all_version_separators '_')
+MY_P="xVST_${MY_PV}_src"
+
+DESCRIPTION="Download (and convert) videos from various Web Video Services"
+HOMEPAGE="http://xviservicethief.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xviservicethief/${MY_P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+DEPEND="app-arch/unzip
+ >=x11-libs/qt-gui-4.5.3:4
+ >=x11-libs/qt-webkit-4.5.3:4
+ doc? ( app-doc/doxygen )"
+RDEPEND=">=x11-libs/qt-gui-4.5.3:4
+ virtual/ffmpeg
+ media-video/flvstreamer"
+
+RES_NAME="xVST"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ # fix translations
+ mv "${S}"/resources/translations/${RES_NAME}_cz.ts \
+ "${S}"/resources/translations/${RES_NAME}_cs.ts ||die
+ mv "${S}"/resources/translations/${RES_NAME}_jp.ts \
+ "${S}"/resources/translations/${RES_NAME}_ja.ts || die
+ mv "${S}"/resources/translations/${RES_NAME}_du.ts \
+ "${S}"/resources/translations/${RES_NAME}_nl.ts || die
+ mv "${S}"/resources/translations/${RES_NAME}_kr.ts \
+ "${S}"/resources/translations/${RES_NAME}_ko.ts || die
+ # fix plugins, language path
+ sed -i -e "s/getApplicationPath()\ +\ \"/\"\/usr\/share\/${PN}/g" \
+ "${S}"/src/options.cpp || die "failed to fix paths"
+ epatch "${FILESDIR}"/${P}-youtube-api.patch
+}
+
+src_compile() {
+ local lang=
+ emake || die "emake failed"
+ for lang in "${S}"/resources/translations/*.ts; do
+ lrelease ${lang}
+ done
+}
+
+src_install() {
+ dobin bin/xvst || die "dobin failed"
+ local dest=/usr/share/${PN}/plugins
+ dodir ${dest}
+ find resources/services -name '*.js' -exec cp -dpR {} "${D}"${dest} \;
+ newicon resources/images/InformationLogo.png xvst.png
+ make_desktop_entry /usr/bin/xvst xVideoServiceThief xvst 'Qt;AudioVideo;Video'
+ if use doc; then
+ cd "${S}/documentation/source"
+ sed -i "/OUTPUT_DIRECTORY/s:G\:.*:docs:" Doxyfile
+ doxygen Doxyfile
+ dohtml -r docs/html/* || die "dohtml failed"
+ fi
+
+ #install translations
+ insinto /usr/share/${PN}/languages/
+ local lang= tlang=
+ for lang in ${LINGUAS}; do
+ for tlang in ${LANGS}; do
+ [[ ${lang} == ${tlang} ]] && doins "${S}"/resources/translations/xVST_${tlang}.qm
+ done
+ done
+}
diff --git a/metadata/cache/app-admin/389-console-1.1.6 b/metadata/cache/app-admin/389-console-1.1.6
index f9f6f89ecf39..589a2e294625 100644
--- a/metadata/cache/app-admin/389-console-1.1.6
+++ b/metadata/cache/app-admin/389-console-1.1.6
@@ -1,5 +1,5 @@
->=virtual/jdk-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 app-admin/389-admin-console >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
-|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 app-admin/389-admin-console >=dev-java/java-config-2.1.9-r1
+>=virtual/jdk-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=dev-java/java-config-2.1.9-r1
1.1
http://directory.fedoraproject.org/sources/389-console-1.1.6.tar.bz2 http://dev.gentoo.org/~lxnay/389-console/fedora.png
diff --git a/metadata/cache/app-admin/389-console-1.1.7 b/metadata/cache/app-admin/389-console-1.1.7
index e5f0029d5d64..4c59506f78a5 100644
--- a/metadata/cache/app-admin/389-console-1.1.7
+++ b/metadata/cache/app-admin/389-console-1.1.7
@@ -1,5 +1,5 @@
->=virtual/jdk-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 app-admin/389-admin-console >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
-|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 app-admin/389-admin-console >=dev-java/java-config-2.1.9-r1
+>=virtual/jdk-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=dev-java/java-config-2.1.9-r1
1.1
http://directory.fedoraproject.org/sources/389-console-1.1.7.tar.bz2 http://dev.gentoo.org/~lxnay/389-console/fedora.png
diff --git a/metadata/cache/app-admin/equo-1.0_rc124 b/metadata/cache/app-admin/equo-1.0_rc124
new file mode 100644
index 000000000000..2c592bc63dfa
--- /dev/null
+++ b/metadata/cache/app-admin/equo-1.0_rc124
@@ -0,0 +1,22 @@
+~sys-apps/entropy-1.0_rc124 =dev-lang/python-2*
+~sys-apps/entropy-1.0_rc124 sys-apps/file[python] =dev-lang/python-2*
+0
+mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+
+http://www.sabayon.org
+GPL-2
+Entropy Package Manager text-based client
+~amd64 ~arm ~x86
+bash-completion-r1 eutils multilib python toolchain-funcs user
+
+
+
+
+3
+
+compile install postinst postrm
+
+
+
+
+
diff --git a/metadata/cache/app-admin/eselect-opengl-1.2.5-r1 b/metadata/cache/app-admin/eselect-opengl-1.2.5-r1
index 30707e7cb7dc..d74431d4c0dc 100644
--- a/metadata/cache/app-admin/eselect-opengl-1.2.5-r1
+++ b/metadata/cache/app-admin/eselect-opengl-1.2.5-r1
@@ -6,7 +6,7 @@ http://dev.gentooexperimental.org/~scarabeus//glext.h.75.xz http://dev.gentooexp
http://www.gentoo.org/
GPL-2
Utility to change the OpenGL interface being used
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
multilib toolchain-funcs
diff --git a/metadata/cache/app-admin/rigo-1.0_rc124 b/metadata/cache/app-admin/rigo-1.0_rc124
new file mode 100644
index 000000000000..9ca41de23634
--- /dev/null
+++ b/metadata/cache/app-admin/rigo-1.0_rc124
@@ -0,0 +1,22 @@
+>=sys-apps/sed-4 =dev-lang/python-2*
+|| ( dev-python/pygobject-cairo:3 dev-python/pygobject:3[cairo] ) ~sys-apps/entropy-1.0_rc124 ~sys-apps/rigo-daemon-1.0_rc124 sys-devel/gettext x11-libs/gtk+:3 x11-libs/vte:2.90 >=x11-misc/xdg-utils-1.1.0_rc1_p20120319 =dev-lang/python-2*
+0
+mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+
+http://www.sabayon.org
+GPL-3
+Rigo, the Sabayon Application Browser
+~amd64 ~arm ~x86
+eutils fdo-mime gnome2-utils multilib python toolchain-funcs user
+
+
+
+
+3
+
+compile install postinst postrm
+
+
+
+
+
diff --git a/metadata/cache/app-editors/jedit-4.5.2 b/metadata/cache/app-editors/jedit-4.5.2
new file mode 100644
index 000000000000..ec27a9303fd0
--- /dev/null
+++ b/metadata/cache/app-editors/jedit-4.5.2
@@ -0,0 +1,22 @@
+>=virtual/jdk-1.5 doc? ( virtual/jdk:1.6 =app-text/docbook-xml-dtd-4.3* >=app-text/docbook-xsl-stylesheets-1.65.1 dev-libs/libxslt ) dev-java/bsh >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps dev-java/ant-apache-bsf dev-java/ant-contrib >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
+0
+mirror://sourceforge/jedit/jedit4.5.2source.tar.bz2
+
+http://www.jedit.org
+GPL-2
+Programmer's editor written in Java
+~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+eutils fdo-mime java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD doc elibc_FreeBSD
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/app-misc/magneto-loader-1.0_rc124 b/metadata/cache/app-misc/magneto-loader-1.0_rc124
new file mode 100644
index 000000000000..bf3b54e790f0
--- /dev/null
+++ b/metadata/cache/app-misc/magneto-loader-1.0_rc124
@@ -0,0 +1,22 @@
+~sys-apps/magneto-core-1.0_rc124
+~sys-apps/magneto-core-1.0_rc124
+0
+mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+
+http://www.sabayon.org
+GPL-2
+Official Sabayon Linux Entropy Notification Applet Loader
+~amd64 ~arm ~x86
+eutils multilib toolchain-funcs user
+
+
+
+
+2
+
+compile install
+
+
+
+
+
diff --git a/metadata/cache/app-portage/gentoolkit-0.3.0.6-r3 b/metadata/cache/app-portage/gentoolkit-0.3.0.6-r3
index e88faa6438cd..5544ecb56b3c 100644
--- a/metadata/cache/app-portage/gentoolkit-0.3.0.6-r3
+++ b/metadata/cache/app-portage/gentoolkit-0.3.0.6-r3
@@ -6,7 +6,7 @@ mirror://gentoo/gentoolkit-0.3.0.6.tar.gz
http://www.gentoo.org/proj/en/portage/tools/index.xml
GPL-2
Collection of administration scripts for Gentoo
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
distutils eutils multilib python toolchain-funcs user
diff --git a/metadata/cache/app-shells/bash-4.2_p36 b/metadata/cache/app-shells/bash-4.2_p36
new file mode 100644
index 000000000000..5a5223a02cf7
--- /dev/null
+++ b/metadata/cache/app-shells/bash-4.2_p36
@@ -0,0 +1,22 @@
+>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl ) virtual/yacc
+>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl ) !
=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1
+>=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1
+0
+http://slon.ttk.ru/esh/esh-0.8.5.tar.gz
+
+http://slon.ttk.ru/esh/
+GPL-2
+A UNIX Shell with a simplified Scheme syntax
+~amd64 ~ppc ~x86
+eutils flag-o-matic multilib toolchain-funcs user
+debug
+
+
+
+2
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/app-text/barcode-0.98 b/metadata/cache/app-text/barcode-0.98
deleted file mode 100644
index 260a718d0aad..000000000000
--- a/metadata/cache/app-text/barcode-0.98
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-mirror://gnu/barcode/barcode-0.98.tar.gz
-
-http://www.gnu.org/software/barcode/
-GPL-2
-barcode generator
-amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-eutils multilib toolchain-funcs user
-
-
-
-
-3
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-db/libiodbc-3.52.7-r1 b/metadata/cache/dev-db/libiodbc-3.52.7-r1
index ee6ef04951ca..3a2f8d19ecfc 100644
--- a/metadata/cache/dev-db/libiodbc-3.52.7-r1
+++ b/metadata/cache/dev-db/libiodbc-3.52.7-r1
@@ -6,7 +6,7 @@ http://www.iodbc.org/downloads/iODBC/libiodbc-3.52.7.tar.gz
http://www.iodbc.org/
|| ( LGPL-2 BSD )
ODBC Interface for Linux.
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
eutils multilib toolchain-funcs user
gtk static-libs
diff --git a/metadata/cache/dev-java/ant-eclipse-ecj-4.2 b/metadata/cache/dev-java/ant-eclipse-ecj-4.2
new file mode 100644
index 000000000000..00de676f8b64
--- /dev/null
+++ b/metadata/cache/dev-java/ant-eclipse-ecj-4.2
@@ -0,0 +1,22 @@
+>=virtual/jre-1.4 ~dev-java/eclipse-ecj-4.2 >=dev-java/ant-core-1.7 app-arch/unzip >=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1
+>=virtual/jre-1.4 ~dev-java/eclipse-ecj-4.2 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.1.9-r1
+4.2
+http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/ecjsrc-4.2.jar
+
+http://www.eclipse.org/
+EPL-1.0
+Ant Compiler Adapter for Eclipse Java Compiler
+~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+eutils java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD
+
+
+
+4
+
+compile install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/commons-fileupload-1.2-r1 b/metadata/cache/dev-java/commons-fileupload-1.2-r1
deleted file mode 100644
index 98d4929a11f0..000000000000
--- a/metadata/cache/dev-java/commons-fileupload-1.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=virtual/jdk-1.4 test? ( dev-java/ant-junit =dev-java/junit-3.8* ) >=dev-java/commons-io-1.3 =dev-java/portletapi-1* ~java-virtuals/servlet-api-2.3 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
->=virtual/jre-1.4 >=dev-java/commons-io-1.3 =dev-java/portletapi-1* ~java-virtuals/servlet-api-2.3 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
-0
-mirror://apache/jakarta/commons/fileupload/source/commons-fileupload-1.2-src.tar.gz
-
-http://commons.apache.org/fileupload/
-Apache-2.0
-A Java library for adding robust, high-performance, file upload capability to your servlets and web applications.
-amd64 ppc ppc64 x86 ~x86-fbsd
-eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
-test elibc_FreeBSD doc source elibc_FreeBSD
-
-
-
-
-
-compile install preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-java/commons-fileupload-1.2.1 b/metadata/cache/dev-java/commons-fileupload-1.2.1
deleted file mode 100644
index ac12d81452ff..000000000000
--- a/metadata/cache/dev-java/commons-fileupload-1.2.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=virtual/jdk-1.4 test? ( dev-java/ant-junit =dev-java/junit-3.8* ) >=dev-java/commons-io-1.3 =dev-java/portletapi-1* ~java-virtuals/servlet-api-2.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
->=virtual/jre-1.4 >=dev-java/commons-io-1.3 =dev-java/portletapi-1* ~java-virtuals/servlet-api-2.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
-0
-mirror://apache/commons/fileupload/source/commons-fileupload-1.2.1-src.tar.gz
-
-http://commons.apache.org/fileupload/
-Apache-2.0
-A Java library for adding robust, high-performance, file upload capability to your servlets and web applications.
-amd64 ppc ppc64 x86
-eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
-test elibc_FreeBSD doc source elibc_FreeBSD
-
-
-
-
-
-compile install preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-java/commons-fileupload-1.2.2 b/metadata/cache/dev-java/commons-fileupload-1.2.2
new file mode 100644
index 000000000000..be2c583c0b79
--- /dev/null
+++ b/metadata/cache/dev-java/commons-fileupload-1.2.2
@@ -0,0 +1,22 @@
+dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5 >=virtual/jdk-1.4 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+0
+mirror://apache/commons/fileupload/source/commons-fileupload-1.2.2-src.tar.gz
+
+http://commons.apache.org/fileupload/
+Apache-2.0
+Add robust, high-performance, file upload capability to your servlets and web applications.
+~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD doc source test elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-java/eclipse-ecj-4.2 b/metadata/cache/dev-java/eclipse-ecj-4.2
new file mode 100644
index 000000000000..491cfed93d54
--- /dev/null
+++ b/metadata/cache/dev-java/eclipse-ecj-4.2
@@ -0,0 +1,22 @@
+|| ( app-admin/eselect-java app-admin/eselect-ecj ) >=virtual/jdk-1.6 app-arch/unzip userland_GNU? ( sys-apps/findutils ) >=dev-java/java-config-2.1.9-r1
+|| ( app-admin/eselect-java app-admin/eselect-ecj ) >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
+4.2
+http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/ecjsrc-4.2.jar
+
+http://www.eclipse.org/
+EPL-1.0
+Eclipse Compiler for Java
+~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+eutils java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
++ant userland_GNU elibc_FreeBSD
+
+ant? ( ~dev-java/ant-eclipse-ecj-4.2 )
+
+4
+
+compile install postinst postrm preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/php-5.3.14 b/metadata/cache/dev-lang/php-5.3.14
index f671ebb62a12..d409b4b2cee6 100644
--- a/metadata/cache/dev-lang/php-5.3.14
+++ b/metadata/cache/dev-lang/php-5.3.14
@@ -6,7 +6,7 @@ mirror
http://php.net/
PHP-3
The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
-alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd
+alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd
apache-module autotools db-use depend.apache eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user versionator
kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode +session sharedmem +simplexml snmp soap sockets spell sqlite sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib suhosin apache2
truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
diff --git a/metadata/cache/dev-lang/php-5.4.4 b/metadata/cache/dev-lang/php-5.4.4
index e4a4f9acc297..e9896aa4a1e7 100644
--- a/metadata/cache/dev-lang/php-5.4.4
+++ b/metadata/cache/dev-lang/php-5.4.4
@@ -6,7 +6,7 @@ http://www.php.net/distributions/php-5.4.4.tar.bz2 http://dev.gentoo.org/~olemar
http://php.net/
PHP-3
The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs.
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
apache-module autotools db-use depend.apache eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user versionator
kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode +session sharedmem +simplexml snmp soap sockets spell sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib apache2
truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xsl? ( xml ) ldap-sasl? ( ldap ) kolab? ( imap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
diff --git a/metadata/cache/dev-lang/swig-2.0.7 b/metadata/cache/dev-lang/swig-2.0.7
new file mode 100644
index 000000000000..d9169336c884
--- /dev/null
+++ b/metadata/cache/dev-lang/swig-2.0.7
@@ -0,0 +1,22 @@
+pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
+pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
+0
+mirror://sourceforge/swig/swig-2.0.7.tar.gz
+test
+http://www.swig.org/
+GPL-3 as-is
+Simplified Wrapper and Interface Generator
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+
+ccache doc pcre
+
+
+
+4
+
+configure install
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/v8-3.10.8.20 b/metadata/cache/dev-lang/v8-3.10.8.20
new file mode 100644
index 000000000000..19eda7c0f82f
--- /dev/null
+++ b/metadata/cache/dev-lang/v8-3.10.8.20
@@ -0,0 +1,22 @@
+|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+0
+http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.10.8.20.tar.bz2
+
+http://code.google.com/p/v8
+BSD
+Google's open source JavaScript engine
+amd64 ~x86 ~x86-fbsd ~x64-macos ~x86-macos
+eutils multilib pax-utils python toolchain-funcs user versionator
+
+
+
+
+4
+
+compile install postinst preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r3 b/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r3
new file mode 100644
index 000000000000..f919bff7919f
--- /dev/null
+++ b/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r3
@@ -0,0 +1,22 @@
+authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+2
+ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
+
+http://cyrusimap.web.cmu.edu/
+as-is
+The Cyrus SASL (Simple Authentication and Security Layer).
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+autotools db-use eutils flag-o-matic java-pkg-opt-2 java-utils-2 libtool multilib multiprocessing pam toolchain-funcs user versionator
+authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom elibc_FreeBSD java
+
+
+
+4
+
+compile configure install postinst preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/libestr-0.1.3 b/metadata/cache/dev-libs/libestr-0.1.3
new file mode 100644
index 000000000000..c41d70322b75
--- /dev/null
+++ b/metadata/cache/dev-libs/libestr-0.1.3
@@ -0,0 +1,22 @@
+
+
+0
+http://libestr.adiscon.com/files/download/libestr-0.1.3.tar.gz
+
+http://libestr.adiscon.com/
+LGPL-2.1
+Library for some string essentials
+~amd64 ~x86
+
+debug static-libs
+
+
+
+4
+
+configure install
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/libpcre-8.31 b/metadata/cache/dev-libs/libpcre-8.31
new file mode 100644
index 000000000000..7d6fe1cc206c
--- /dev/null
+++ b/metadata/cache/dev-libs/libpcre-8.31
@@ -0,0 +1,22 @@
+bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline )
+3
+mirror://sourceforge/pcre/pcre-8.31.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.31.tar.bz2
+
+http://www.pcre.org/
+BSD
+Perl-compatible regular expression library
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils flag-o-matic libtool multilib toolchain-funcs user
+bzip2 +cxx +jit libedit pcre16 +readline +recursion-limit static-libs unicode zlib
+readline? ( !libedit ) libedit? ( !readline )
+
+
+4
+
+configure install postinst preinst prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/mozldap-6.0.6-r2 b/metadata/cache/dev-libs/mozldap-6.0.6-r2
index b033029c9160..098ae1ffe908 100644
--- a/metadata/cache/dev-libs/mozldap-6.0.6-r2
+++ b/metadata/cache/dev-libs/mozldap-6.0.6-r2
@@ -6,7 +6,7 @@ ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.6/src/mozlda
http://wiki.mozilla.org/LDAP_C_SDK
MPL-1.1 GPL-2 LGPL-2.1
Mozilla LDAP C SDK
-~amd64 ~x86
+amd64 x86
autotools eutils libtool multilib multiprocessing toolchain-funcs user versionator
ipv6 debug +sasl
diff --git a/metadata/cache/dev-libs/svrcore-4.0.4 b/metadata/cache/dev-libs/svrcore-4.0.4
index fc3b6e47e671..95e3acb0f932 100644
--- a/metadata/cache/dev-libs/svrcore-4.0.4
+++ b/metadata/cache/dev-libs/svrcore-4.0.4
@@ -6,7 +6,7 @@ http://ftp.mozilla.org/pub/mozilla.org/directory/svrcore/releases/4.0.4/src/svrc
http://wiki.mozilla.org/LDAP_C_SDK
MPL-1.1 GPL-2 LGPL-2.1
Mozilla LDAP C SDK
-~amd64 ~x86
+amd64 x86
autotools eutils libtool multilib multiprocessing toolchain-funcs user
diff --git a/metadata/cache/dev-php/ZendFramework-1.11.12 b/metadata/cache/dev-php/ZendFramework-1.11.12
index 479cf3a8a6b6..7b2200c4b8d2 100644
--- a/metadata/cache/dev-php/ZendFramework-1.11.12
+++ b/metadata/cache/dev-php/ZendFramework-1.11.12
@@ -6,7 +6,7 @@ cli? ( dev-lang/php[simplexml,tokenizer] ) dev-lang/php dev-lang/php
http://framework.zend.com/
BSD
Zend Framework is a high quality and open source framework for developing Web Applications.
-amd64 ~hppa ~ppc ~ppc64 x86
+amd64 hppa ~ppc ~ppc64 x86
depend.php eutils multilib php-lib-r1 phpconfutils toolchain-funcs user
doc examples minimal cli
diff --git a/metadata/cache/dev-php/pecl-apc-3.1.10 b/metadata/cache/dev-php/pecl-apc-3.1.10
index 0b85e63206b5..2cc48de6b968 100644
--- a/metadata/cache/dev-php/pecl-apc-3.1.10
+++ b/metadata/cache/dev-php/pecl-apc-3.1.10
@@ -6,7 +6,7 @@ http://pecl.php.net/get/APC-3.1.10.tgz
http://pecl.php.net/APC
PHP-3.01
A free, open, and robust framework for caching and optimizing PHP code.
-~amd64 ~ppc ~ppc64 ~x86
+~amd64 ~mips ~ppc ~ppc64 ~x86
autotools confutils eutils flag-o-matic libtool multilib multiprocessing php-ext-pecl-r2 php-ext-source-r2 toolchain-funcs user
mmap +lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore php_targets_php5-3 php_targets_php5-4
^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore )
diff --git a/metadata/cache/dev-python/apiextractor-0.10.10 b/metadata/cache/dev-python/apiextractor-0.10.10
deleted file mode 100644
index c9e456f4e472..000000000000
--- a/metadata/cache/dev-python/apiextractor-0.10.10
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-xmlpatterns-4.7.0:4 test? ( >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
->=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-xmlpatterns-4.7.0:4
-0
-http://www.pyside.org/files/apiextractor-0.10.10.tar.bz2
-
-http://www.pyside.org/
-GPL-2
-Library used to create an internal representation of an API in order to create Python bindings
-amd64 x86
-base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
-debug test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-python/generatorrunner-0.6.16 b/metadata/cache/dev-python/generatorrunner-0.6.16
deleted file mode 100644
index acec2705b6f3..000000000000
--- a/metadata/cache/dev-python/generatorrunner-0.6.16
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-python/apiextractor-0.10.10 >=x11-libs/qt-core-4.7.0:4 test? ( >=x11-libs/qt-test-4.7.0:4 ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
->=dev-python/apiextractor-0.10.10 >=x11-libs/qt-core-4.7.0:4
-0
-http://www.pyside.org/files/generatorrunner-0.6.16.tar.bz2
-
-http://www.pyside.org/
-GPL-2
-A tool to control bindings generation
-amd64 x86
-base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
-debug test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-python/psutil-0.5.1 b/metadata/cache/dev-python/psutil-0.5.1
new file mode 100644
index 000000000000..3fbe024e5f47
--- /dev/null
+++ b/metadata/cache/dev-python/psutil-0.5.1
@@ -0,0 +1,22 @@
+dev-lang/python
+dev-lang/python
+0
+http://psutil.googlecode.com/files/psutil-0.5.1.tar.gz
+test
+http://code.google.com/p/psutil/ http://pypi.python.org/pypi/psutil
+BSD
+Retrieve information on running processes and system utilization
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/bcat-0.6.2 b/metadata/cache/dev-ruby/bcat-0.6.2
index 67a2d69d846d..6f26c1bad47c 100644
--- a/metadata/cache/dev-ruby/bcat-0.6.2
+++ b/metadata/cache/dev-ruby/bcat-0.6.2
@@ -6,7 +6,7 @@ mirror://rubygems/bcat-0.6.2.gem
http://github.com/rtomayko/bcat
MIT
A pipe to browser utility for use at the shell and within editors like Vim or Emacs.
-~amd64 ~hppa ~x86-fbsd
+~amd64 ~hppa ~x86 ~x86-fbsd
eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc test test
|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
diff --git a/metadata/cache/dev-ruby/capistrano-2.9.0 b/metadata/cache/dev-ruby/capistrano-2.9.0
index 38c1cfc32527..96669c324130 100644
--- a/metadata/cache/dev-ruby/capistrano-2.9.0
+++ b/metadata/cache/dev-ruby/capistrano-2.9.0
@@ -6,7 +6,7 @@ mirror://rubygems/capistrano-2.9.0.gem
http://capify.org/
MIT
A distributed application deployment system
-amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
test elibc_FreeBSD ruby_targets_ruby18 test test
diff --git a/metadata/cache/dev-ruby/gherkin-2.7.3 b/metadata/cache/dev-ruby/gherkin-2.7.3
index a02e997ff826..3e473e773056 100644
--- a/metadata/cache/dev-ruby/gherkin-2.7.3
+++ b/metadata/cache/dev-ruby/gherkin-2.7.3
@@ -6,7 +6,7 @@ https://github.com/cucumber/gherkin/tarball/v2.7.3 -> gherkin-2.7.3.tgz
http://wiki.github.com/aslakhellesoy/cucumber/gherkin
MIT
Fast Gherkin lexer and parser based on Ragel.
-~amd64 ~hppa
+~amd64 ~hppa ~x86
eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc doc test
|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
diff --git a/metadata/cache/dev-ruby/net-ssh-gateway-1.1.0 b/metadata/cache/dev-ruby/net-ssh-gateway-1.1.0
index 05c920a9b3ca..5afde0f521f3 100644
--- a/metadata/cache/dev-ruby/net-ssh-gateway-1.1.0
+++ b/metadata/cache/dev-ruby/net-ssh-gateway-1.1.0
@@ -6,7 +6,7 @@ mirror://rubygems/net-ssh-gateway-1.1.0.gem
http://net-ssh.rubyforge.org/gateway
GPL-2
A simple library to assist in enabling tunneled Net::SSH connections
-amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test test
diff --git a/metadata/cache/dev-ruby/prawn-0.8.4-r1 b/metadata/cache/dev-ruby/prawn-0.8.4-r1
index 9b60a02812fb..6414849a0d81 100644
--- a/metadata/cache/dev-ruby/prawn-0.8.4-r1
+++ b/metadata/cache/dev-ruby/prawn-0.8.4-r1
@@ -6,7 +6,7 @@ mirror://rubygems/prawn-0.8.4.gem
http://prawn.majesticseacreature.com/
|| ( GPL-2 Ruby )
Fast, Nimble PDF Generation For Ruby
-~amd64 ~hppa
+~amd64 ~hppa ~x86
eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby ruby_targets_ruby19 test
diff --git a/metadata/cache/dev-ruby/prawn-core-0.8.4-r2 b/metadata/cache/dev-ruby/prawn-core-0.8.4-r2
index fbfa15d75de0..0145010f21b0 100644
--- a/metadata/cache/dev-ruby/prawn-core-0.8.4-r2
+++ b/metadata/cache/dev-ruby/prawn-core-0.8.4-r2
@@ -6,7 +6,7 @@ mirror://rubygems/prawn-core-0.8.4.gem
http://prawn.majesticseacreature.com/
|| ( GPL-2 Ruby )
Fast, Nimble PDF Generation For Ruby
-~amd64 ~hppa ~x86-fbsd
+~amd64 ~hppa ~x86 ~x86-fbsd
eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
examples elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
diff --git a/metadata/cache/dev-ruby/prawn-layout-0.8.4-r2 b/metadata/cache/dev-ruby/prawn-layout-0.8.4-r2
index 01d46313b5ff..9b9e6088e9de 100644
--- a/metadata/cache/dev-ruby/prawn-layout-0.8.4-r2
+++ b/metadata/cache/dev-ruby/prawn-layout-0.8.4-r2
@@ -6,7 +6,7 @@ mirror://rubygems/prawn-layout-0.8.4.gem
http://prawn.majesticseacreature.com/
|| ( GPL-2 Ruby )
An extension to Prawn offering table support, grid layouts and other things
-~amd64 ~hppa ~x86-fbsd
+~amd64 ~hppa ~x86 ~x86-fbsd
eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
examples test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
diff --git a/metadata/cache/dev-ruby/prawn-security-0.8.4-r1 b/metadata/cache/dev-ruby/prawn-security-0.8.4-r1
index 342bc3ef34af..f0625b9fbf5e 100644
--- a/metadata/cache/dev-ruby/prawn-security-0.8.4-r1
+++ b/metadata/cache/dev-ruby/prawn-security-0.8.4-r1
@@ -6,7 +6,7 @@ mirror://rubygems/prawn-security-0.8.4.gem
http://prawn.majesticseacreature.com/
|| ( GPL-2 Ruby )
Popular Password Protection & Permissions for Prawn PDFs
-~amd64 ~hppa
+~amd64 ~hppa ~x86
eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
examples test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby ruby_targets_ruby19 doc doc test test
diff --git a/metadata/cache/dev-util/aruba-0.4.11 b/metadata/cache/dev-util/aruba-0.4.11
index 3ea765d456bf..d7e86c8bcb6b 100644
--- a/metadata/cache/dev-util/aruba-0.4.11
+++ b/metadata/cache/dev-util/aruba-0.4.11
@@ -6,7 +6,7 @@ mirror://rubygems/aruba-0.4.11.gem
https://github.com/cucumber/aruba
MIT
Cucumber steps for driving out command line applications.
-~amd64 ~hppa
+~amd64 ~hppa ~x86
eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
diff --git a/metadata/cache/dev-util/cucumber-1.1.4 b/metadata/cache/dev-util/cucumber-1.1.4
index bec18900ed7d..6d6241b79db2 100644
--- a/metadata/cache/dev-util/cucumber-1.1.4
+++ b/metadata/cache/dev-util/cucumber-1.1.4
@@ -6,7 +6,7 @@ mirror://rubygems/cucumber-1.1.4.gem
https://github.com/cucumber/cucumber/wikis
Ruby
Executable feature scenarios
-~amd64 ~hppa
+~amd64 ~hppa ~x86
eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
examples test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
diff --git a/metadata/cache/dev-util/qt-creator-2.5.0 b/metadata/cache/dev-util/qt-creator-2.5.0
index ac09e3c79977..a7bb2716f82a 100644
--- a/metadata/cache/dev-util/qt-creator-2.5.0
+++ b/metadata/cache/dev-util/qt-creator-2.5.0
@@ -6,7 +6,7 @@ http://get.qt.nokia.com/qtcreator/qt-creator-2.5.0-src.tar.gz
http://qt.nokia.com/products/developer-tools
LGPL-2.1
Lightweight IDE for C++ development centering around Qt
-amd64 ~ppc ppc64 x86
+amd64 ppc ppc64 x86
base eutils flag-o-matic multilib qt4-r2 toolchain-funcs user
+botan-bundled debug doc examples autotools bazaar cmake cvs fakevim git madde mercurial perforce subversion valgrind linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_ru linguas_sl linguas_uk linguas_zh_CN
diff --git a/metadata/cache/games-board/openyahtzee-1.9.1 b/metadata/cache/games-board/openyahtzee-1.9.1
new file mode 100644
index 000000000000..4ff0c8878bc5
--- /dev/null
+++ b/metadata/cache/games-board/openyahtzee-1.9.1
@@ -0,0 +1,22 @@
+x11-libs/wxGTK:2.8[X] || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8[X]
+0
+mirror://sourceforge/openyahtzee/openyahtzee-1.9.1.tar.bz2
+
+http://openyahtzee.sourceforge.net/
+GPL-2
+A full-featured wxWidgets version of the classic dice game Yahtzee
+~amd64 ~ppc ~x86
+autotools base eutils games libtool multilib multiprocessing toolchain-funcs user wxwidgets
+
+
+
+
+2
+
+compile configure install postinst preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/games-fps/quake3-bin-1.32c-r1 b/metadata/cache/games-fps/quake3-bin-1.32c-r1
index b3c48515c59a..71a1e97bd5f9 100644
--- a/metadata/cache/games-fps/quake3-bin-1.32c-r1
+++ b/metadata/cache/games-fps/quake3-bin-1.32c-r1
@@ -4,7 +4,7 @@ sys-libs/glibc dedicated? ( app-misc/screen ) amd64? ( app-emulation/emul-linux-
mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.x86.run mirror://idsoftware/quake3/quake3-1.32c.zip
strip
http://www.idsoftware.com/
-Q3AEULA
+Q3AEULA GPL-2
3rd installment of the classic id 3D first-person shooter
-* ~amd64 ~x86
base eutils games multilib toolchain-funcs unpacker user
diff --git a/metadata/cache/games-fps/rtcw-1.41b b/metadata/cache/games-fps/rtcw-1.41b
index 4e2d44c921e3..d72d8be00e27 100644
--- a/metadata/cache/games-fps/rtcw-1.41b
+++ b/metadata/cache/games-fps/rtcw-1.41b
@@ -4,7 +4,7 @@ sys-libs/glibc dedicated? ( app-misc/screen ) !dedicated? ( virtual/opengl x86?
mirror://idsoftware/wolf/linux/wolf-linux-GOTY-maps.x86.run mirror://idsoftware/wolf/linux/wolf-linux-1.41b.x86.run
strip mirror
http://games.activision.com/games/wolfenstein/
-RTCW
+RTCW GPL-2
Return to Castle Wolfenstein - Long awaited sequel to Wolfenstein 3D
amd64 x86
base eutils games multilib toolchain-funcs unpacker user
diff --git a/metadata/cache/games-fps/rtcwmp-demo-1.1 b/metadata/cache/games-fps/rtcwmp-demo-1.1
index 7934015efa97..aafd3590b22b 100644
--- a/metadata/cache/games-fps/rtcwmp-demo-1.1
+++ b/metadata/cache/games-fps/rtcwmp-demo-1.1
@@ -4,7 +4,7 @@ sys-libs/glibc dedicated? ( app-misc/screen ) !dedicated? ( virtual/opengl x11-l
mirror://idsoftware/wolf/linux/old/wolfmpdemo-linux-1.1-MP.x86.run mirror://3dgamers/returnwolfenstein/wolfmpdemo-linux-1.1-MP.x86.run
strip mirror
http://games.activision.com/games/wolfenstein/
-RTCW
+RTCW GPL-2
Return to Castle Wolfenstein - Multi-player demo
-* amd64 x86
base eutils games multilib toolchain-funcs unpacker user
diff --git a/metadata/cache/games-server/halflife-steam-2.0 b/metadata/cache/games-server/halflife-steam-2.0
index fe0408f6b618..bae575388444 100644
--- a/metadata/cache/games-server/halflife-steam-2.0
+++ b/metadata/cache/games-server/halflife-steam-2.0
@@ -4,7 +4,7 @@
http://www.steampowered.com/download/hldsupdatetool.bin
mirror
http://www.steampowered.com/
-ValveServer
+ValveServer GPL-2
client for Valve Software's Steam content delivery program
-* x86
base eutils games multilib toolchain-funcs unpacker user
diff --git a/metadata/cache/games-strategy/wesnoth-1.10 b/metadata/cache/games-strategy/wesnoth-1.10
deleted file mode 100644
index 6e8594640b52..000000000000
--- a/metadata/cache/games-strategy/wesnoth-1.10
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-libs/libsdl-1.2.7[video,X] media-libs/sdl-net >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] !dedicated? ( dbus? ( sys-apps/dbus ) ) >=dev-libs/boost-1.36 sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig virtual/libintl virtual/pkgconfig sys-devel/gettext >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
->=media-libs/libsdl-1.2.7[video,X] media-libs/sdl-net >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] !dedicated? ( dbus? ( sys-apps/dbus ) ) >=dev-libs/boost-1.36 sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig virtual/libintl
-0
-mirror://sourceforge/wesnoth/wesnoth-1.10.tar.bz2
-
-http://www.wesnoth.org/
-GPL-2
-Battle for Wesnoth - A fantasy turn-based strategy game
-amd64 ppc ~ppc64 x86 ~x86-fbsd
-base cmake-utils eutils flag-o-matic games multilib toolchain-funcs user
-dbus dedicated doc nls server
-
-
-
-2
-
-compile configure install postinst preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/kde-misc/magneto-kde-1.0_rc124 b/metadata/cache/kde-misc/magneto-kde-1.0_rc124
new file mode 100644
index 000000000000..4f7fd0a0aedc
--- /dev/null
+++ b/metadata/cache/kde-misc/magneto-kde-1.0_rc124
@@ -0,0 +1,22 @@
+=dev-lang/python-2*
+~app-misc/magneto-loader-1.0_rc124 kde-base/pykde4 dev-python/PyQt4[dbus] =dev-lang/python-2*
+0
+mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+
+http://www.sabayon.org
+GPL-2
+Entropy Package Manager notification applet KDE frontend
+~amd64 ~arm ~x86
+eutils multilib python toolchain-funcs user
+
+
+
+
+3
+
+compile install postinst postrm
+
+
+
+
+
diff --git a/metadata/cache/media-fonts/font-util-1.3.0 b/metadata/cache/media-fonts/font-util-1.3.0
index d6696e31a914..36798ed11001 100644
--- a/metadata/cache/media-fonts/font-util-1.3.0
+++ b/metadata/cache/media-fonts/font-util-1.3.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/font/font-util-1.3.0.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org font utilities
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/media-gfx/gimp-2.6.12-r2 b/metadata/cache/media-gfx/gimp-2.6.12-r2
index 713f90c1f99b..2b51d4a57262 100644
--- a/metadata/cache/media-gfx/gimp-2.6.12-r2
+++ b/metadata/cache/media-gfx/gimp-2.6.12-r2
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~jlec/distfiles/gimp-2.6.11-underlinking.patch.xz mirror:/
http://www.gimp.org/
GPL-2
GNU Image Manipulation Program
-~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86
eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib python toolchain-funcs user versionator
alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf linguas_am linguas_ar linguas_ast linguas_az linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_dz linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mk linguas_ml linguas_mr linguas_ms linguas_my linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_or linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_th linguas_tr linguas_tt linguas_uk linguas_vi linguas_xh linguas_yi linguas_zh_CN linguas_zh_HK linguas_zh_TW debug
diff --git a/metadata/cache/media-gfx/jhead-2.90 b/metadata/cache/media-gfx/jhead-2.90
deleted file mode 100644
index a7c75e4aca4e..000000000000
--- a/metadata/cache/media-gfx/jhead-2.90
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-http://www.sentex.net/~mwandel/jhead/jhead-2.90.tar.gz
-
-http://www.sentex.net/~mwandel/jhead
-public-domain
-Exif Jpeg camera setting parser and thumbnail remover
-alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-eutils multilib toolchain-funcs user
-
-
-
-
-4
-
-compile install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-gfx/jhead-2.94 b/metadata/cache/media-gfx/jhead-2.94
deleted file mode 100644
index 40b5a04997ef..000000000000
--- a/metadata/cache/media-gfx/jhead-2.94
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-http://www.sentex.net/~mwandel/jhead/jhead-2.94.tar.gz
-
-http://www.sentex.net/~mwandel/jhead
-public-domain
-Exif Jpeg camera setting parser and thumbnail remover
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-eutils multilib toolchain-funcs user
-
-
-
-
-4
-
-compile install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-gfx/pngcrush-1.7.31 b/metadata/cache/media-gfx/pngcrush-1.7.31
new file mode 100644
index 000000000000..9bc1f317b28d
--- /dev/null
+++ b/metadata/cache/media-gfx/pngcrush-1.7.31
@@ -0,0 +1,22 @@
+>=media-libs/libpng-1.4:0 sys-libs/zlib app-arch/xz-utils
+>=media-libs/libpng-1.4:0 sys-libs/zlib
+0
+mirror://sourceforge/pmt/pngcrush-1.7.31-nolib.tar.xz
+
+http://pmt.sourceforge.net/pngcrush/
+as-is
+Portable Network Graphics (PNG) optimizing utility
+~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+multilib toolchain-funcs
+
+
+
+
+4
+
+compile install
+
+
+
+
+
diff --git a/metadata/cache/media-libs/libbs2b-3.0.0 b/metadata/cache/media-libs/libbs2b-3.0.0
deleted file mode 100644
index 69f46253aafd..000000000000
--- a/metadata/cache/media-libs/libbs2b-3.0.0
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libsndfile virtual/pkgconfig
-media-libs/libsndfile
-0
-mirror://sourceforge/bs2b/libbs2b-3.0.0.tar.bz2
-
-http://bs2b.sourceforge.net/
-MIT
-Bauer stereophonic-to-binaural DSP library
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
-base eutils multilib toolchain-funcs user
-
-
-
-
-
-
-compile install unpack
-
-
-
-
-
diff --git a/metadata/cache/media-libs/libcue-1.3.0 b/metadata/cache/media-libs/libcue-1.3.0
deleted file mode 100644
index a9df0cfa0153..000000000000
--- a/metadata/cache/media-libs/libcue-1.3.0
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/flex || ( dev-util/yacc sys-devel/bison )
-
-0
-mirror://sourceforge/libcue/libcue-1.3.0.tar.bz2
-
-http://libcue.sourceforge.net
-GPL-2
-CUE Sheet Parser Library
-alpha amd64 arm hppa ppc ppc64 sh sparc x86
-
-
-
-
-
-2
-
-install
-
-
-
-
-
diff --git a/metadata/cache/media-libs/libfishsound-0.9.1 b/metadata/cache/media-libs/libfishsound-0.9.1
deleted file mode 100644
index 50dff69922a4..000000000000
--- a/metadata/cache/media-libs/libfishsound-0.9.1
+++ /dev/null
@@ -1,22 +0,0 @@
-vorbis? ( media-libs/libvorbis media-libs/libogg ) media-libs/speex doc? ( app-doc/doxygen virtual/latex-base )
-vorbis? ( media-libs/libvorbis media-libs/libogg ) media-libs/speex
-0
-http://downloads.xiph.org/releases/libfishsound/libfishsound-0.9.1.tar.gz
-
-http://www.xiph.org/fishsound/
-BSD
-Simple programming interface for decoding and encoding audio data using vorbis or speex
-amd64 x86
-
-doc vorbis
-
-
-
-
-
-compile install unpack
-
-
-
-
-
diff --git a/metadata/cache/media-libs/libfishsound-0.9.2 b/metadata/cache/media-libs/libfishsound-0.9.2
deleted file mode 100644
index fb99dd2614c0..000000000000
--- a/metadata/cache/media-libs/libfishsound-0.9.2
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libvorbis media-libs/libogg speex? ( media-libs/speex ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base )
-media-libs/libvorbis media-libs/libogg speex? ( media-libs/speex )
-0
-http://downloads.xiph.org/releases/libfishsound/libfishsound-0.9.2.tar.gz
-
-http://www.xiph.org/fishsound/
-BSD
-Simple programming interface for decoding and encoding audio data using vorbis or speex
-~amd64 ~x86
-
-doc speex
-
-
-
-
-
-compile install unpack
-
-
-
-
-
diff --git a/metadata/cache/media-libs/libpano13-2.9.14 b/metadata/cache/media-libs/libpano13-2.9.14
deleted file mode 100644
index 86f839183a59..000000000000
--- a/metadata/cache/media-libs/libpano13-2.9.14
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libpng media-libs/tiff sys-libs/zlib virtual/jpeg java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-media-libs/libpng media-libs/tiff sys-libs/zlib virtual/jpeg java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-0
-mirror://sourceforge/panotools/libpano13-2.9.14.tar.gz
-
-http://panotools.sf.net
-GPL-2
-Helmut Dersch's panorama toolbox library
-amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-eutils java-pkg-opt-2 java-utils-2 multilib toolchain-funcs user versionator
-java elibc_FreeBSD java
-
-
-
-
-
-compile install preinst setup
-
-
-
-
-
diff --git a/metadata/cache/media-libs/libpano13-2.9.17 b/metadata/cache/media-libs/libpano13-2.9.17
deleted file mode 100644
index b5b249df858b..000000000000
--- a/metadata/cache/media-libs/libpano13-2.9.17
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libpng media-libs/tiff sys-libs/zlib virtual/jpeg java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-media-libs/libpng media-libs/tiff sys-libs/zlib virtual/jpeg java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-0
-mirror://sourceforge/panotools/libpano13-2.9.17.tar.gz
-
-http://panotools.sourceforge.net/
-GPL-2
-Helmut Dersch's panorama toolbox library
-amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-eutils java-pkg-opt-2 java-utils-2 multilib toolchain-funcs user versionator
-java static-libs elibc_FreeBSD java
-
-
-
-2
-
-configure install postinst preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/media-libs/libvorbis-1.3.1 b/metadata/cache/media-libs/libvorbis-1.3.1
deleted file mode 100644
index 08d79d2dc467..000000000000
--- a/metadata/cache/media-libs/libvorbis-1.3.1
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libogg virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-media-libs/libogg
-0
-http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.1.tar.bz2
-
-http://xiph.org/vorbis
-BSD
-The Ogg Vorbis sound file format library
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
-autotools libtool multilib multiprocessing toolchain-funcs
-static-libs
-
-
-
-2
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-libs/libvorbis-1.3.2 b/metadata/cache/media-libs/libvorbis-1.3.2
deleted file mode 100644
index f9353163de85..000000000000
--- a/metadata/cache/media-libs/libvorbis-1.3.2
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libogg app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-media-libs/libogg
-0
-http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.xz
-
-http://xiph.org/vorbis
-BSD
-The Ogg Vorbis sound file format library
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
-autotools libtool multilib multiprocessing toolchain-funcs
-static-libs
-
-
-
-4
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-libs/mesa-8.0.3 b/metadata/cache/media-libs/mesa-8.0.3
index 3abac41241be..1779b69def52 100644
--- a/metadata/cache/media-libs/mesa-8.0.3
+++ b/metadata/cache/media-libs/mesa-8.0.3
@@ -6,7 +6,7 @@ ftp://ftp.freedesktop.org/pub/mesa/8.0.3/MesaLib-8.0.3.tar.bz2 mirror://gentoo/m
http://mesa3d.sourceforge.net/
MIT LGPL-3 SGI-B-2.0
OpenGL-like graphic library for Linux
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
autotools base eutils flag-o-matic libtool multilib multiprocessing python toolchain-funcs user
video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_nouveau video_cards_vmware bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xa xvmc kernel_FreeBSD
d3d? ( gallium ) g3dvl? ( gallium ) llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) xa? ( gallium ) xvmc? ( g3dvl ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_vmware? ( gallium )
diff --git a/metadata/cache/media-plugins/mythplugins-0.25.1 b/metadata/cache/media-plugins/mythplugins-0.25.1
index 09e212f1d384..1f65ea44d67f 100644
--- a/metadata/cache/media-plugins/mythplugins-0.25.1
+++ b/metadata/cache/media-plugins/mythplugins-0.25.1
@@ -1,5 +1,5 @@
-!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.25.1*[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/imaging media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff exif? ( >media-libs/libexif-0.6.9 ) opengl? ( virtual/opengl ) raw? ( media-gfx/dcraw ) ) mythmusic? ( dev-libs/libcdio media-gfx/dcraw >=media-libs/flac-1.1.2 >=media-libs/libmad-0.15.1b >=media-libs/libvorbis-1.0 >=media-libs/taglib-1.4 cdr? ( virtual/cdrtools ) fftw? ( sci-libs/fftw ) opengl? ( virtual/opengl ) projectm? ( >=media-libs/libsdl-1.2.5[opengl] =media-libs/libvisual-0.4* media-plugins/libvisual-projectm ) ) mythnetvision? ( dev-python/lxml dev-python/mysql-python dev-python/oauth dev-python/pycurl ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 dev-perl/ImageSize dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.25.1*[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/imaging media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff exif? ( >media-libs/libexif-0.6.9 ) opengl? ( virtual/opengl ) raw? ( media-gfx/dcraw ) ) mythmusic? ( dev-libs/libcdio media-gfx/dcraw >=media-libs/flac-1.1.2 >=media-libs/libmad-0.15.1b >=media-libs/libvorbis-1.0 >=media-libs/taglib-1.4 cdr? ( virtual/cdrtools ) fftw? ( sci-libs/fftw ) opengl? ( virtual/opengl ) projectm? ( >=media-libs/libsdl-1.2.5[opengl] =media-libs/libvisual-0.4* media-plugins/libvisual-projectm ) ) mythnetvision? ( dev-python/lxml dev-python/mysql-python dev-python/oauth dev-python/pycurl ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 dev-perl/ImageSize dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.25.1*[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/imaging media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff virtual/opengl exif? ( >media-libs/libexif-0.6.9 ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2 >=media-libs/libvorbis-1.0 >=media-libs/taglib-1.6 media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw ) ) mythnetvision? ( =dev-lang/python-2*[xml] dev-python/lxml dev-python/mysql-python dev-python/oauth dev-python/pycurl ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.25.1*[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/imaging media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff virtual/opengl exif? ( >media-libs/libexif-0.6.9 ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2 >=media-libs/libvorbis-1.0 >=media-libs/taglib-1.6 media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw ) ) mythnetvision? ( =dev-lang/python-2*[xml] dev-python/lxml dev-python/mysql-python dev-python/oauth dev-python/pycurl ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
0
ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.25.1.tar.bz2
@@ -8,8 +8,8 @@ GPL-2
Official MythTV plugins
~amd64 ~x86
eutils multilib python toolchain-funcs user
-mytharchive mythbrowser mythgallery mythgame mythmusic mythnetvision mythnews mythweather cdr exif fftw opengl projectm raw
-cdr? ( mythmusic ) exif? ( mythgallery ) fftw? ( mythmusic ) mythnews? ( mythbrowser ) opengl? ( || ( mythgallery mythmusic ) ) projectm? ( mythmusic ) raw? ( mythgallery )
+mytharchive mythbrowser mythgallery mythgame mythmusic mythnetvision mythnews mythweather cdda cdr exif fftw raw
+cdda? ( mythmusic ) cdr? ( mythmusic cdda ) exif? ( mythgallery ) fftw? ( mythmusic ) mythnews? ( mythbrowser ) raw? ( mythgallery )
4
diff --git a/metadata/cache/media-sound/abcm2ps-6.6.15 b/metadata/cache/media-sound/abcm2ps-6.6.18
similarity index 81%
rename from metadata/cache/media-sound/abcm2ps-6.6.15
rename to metadata/cache/media-sound/abcm2ps-6.6.18
index 1a4eb94936de..a962dc77c20a 100644
--- a/metadata/cache/media-sound/abcm2ps-6.6.15
+++ b/metadata/cache/media-sound/abcm2ps-6.6.18
@@ -1,7 +1,7 @@
pango? ( x11-libs/pango media-libs/freetype:2 ) virtual/pkgconfig
pango? ( x11-libs/pango media-libs/freetype:2 )
0
-http://moinejf.free.fr/abcm2ps-6.6.15.tar.gz http://moinejf.free.fr/transpose_abc.pl
+http://moinejf.free.fr/abcm2ps-6.6.18.tar.gz http://moinejf.free.fr/transpose_abc.pl
http://moinejf.free.fr/
GPL-2
diff --git a/metadata/cache/media-sound/abcm2ps-6.6.9 b/metadata/cache/media-sound/abcm2ps-6.6.9
deleted file mode 100644
index ba102b93dc03..000000000000
--- a/metadata/cache/media-sound/abcm2ps-6.6.9
+++ /dev/null
@@ -1,22 +0,0 @@
-pango? ( x11-libs/pango media-libs/freetype:2 ) virtual/pkgconfig
-pango? ( x11-libs/pango media-libs/freetype:2 )
-0
-http://moinejf.free.fr/abcm2ps-6.6.9.tar.gz http://moinejf.free.fr/transpose_abc.pl
-
-http://moinejf.free.fr/
-GPL-2
-A program to convert abc files to Postscript files
-~amd64 ~ppc ~x86
-
-examples pango
-
-
-
-4
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/media-sound/abcm2ps-7.0.10 b/metadata/cache/media-sound/abcm2ps-7.0.13
similarity index 81%
rename from metadata/cache/media-sound/abcm2ps-7.0.10
rename to metadata/cache/media-sound/abcm2ps-7.0.13
index 50124d4e63b0..d8dfe0aa5c08 100644
--- a/metadata/cache/media-sound/abcm2ps-7.0.10
+++ b/metadata/cache/media-sound/abcm2ps-7.0.13
@@ -1,7 +1,7 @@
pango? ( x11-libs/pango media-libs/freetype:2 ) virtual/pkgconfig
pango? ( x11-libs/pango media-libs/freetype:2 )
0
-http://moinejf.free.fr/abcm2ps-7.0.10.tar.gz http://moinejf.free.fr/transpose_abc.pl
+http://moinejf.free.fr/abcm2ps-7.0.13.tar.gz http://moinejf.free.fr/transpose_abc.pl
http://moinejf.free.fr/
GPL-2
diff --git a/metadata/cache/media-sound/abcmidi-2012.05.29 b/metadata/cache/media-sound/abcmidi-2012.05.29
deleted file mode 100644
index 89fcf98c528e..000000000000
--- a/metadata/cache/media-sound/abcmidi-2012.05.29
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-
-0
-http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2012-05-29.zip
-
-http://abc.sourceforge.net/abcMIDI/
-GPL-2
-Programs for processing ABC music notation files
-~amd64 ~x86
-autotools eutils libtool multilib multiprocessing toolchain-funcs user versionator
-examples
-
-
-
-4
-
-install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-sound/abcmidi-2012.04.15 b/metadata/cache/media-sound/abcmidi-2012.07.04
similarity index 84%
rename from metadata/cache/media-sound/abcmidi-2012.04.15
rename to metadata/cache/media-sound/abcmidi-2012.07.04
index 577777f11409..5070a4ca972a 100644
--- a/metadata/cache/media-sound/abcmidi-2012.04.15
+++ b/metadata/cache/media-sound/abcmidi-2012.07.04
@@ -1,7 +1,7 @@
app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
0
-http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2012-04-15.zip
+http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2012-07-04.zip
http://abc.sourceforge.net/abcMIDI/
GPL-2
diff --git a/metadata/cache/media-sound/denemo-0.9.4 b/metadata/cache/media-sound/denemo-0.9.4
new file mode 100644
index 000000000000..fac246f47142
--- /dev/null
+++ b/metadata/cache/media-sound/denemo-0.9.4
@@ -0,0 +1,22 @@
+>=app-text/evince-3 dev-libs/libxml2:2 >=dev-scheme/guile-1.8 gnome-base/librsvg:2 >=media-libs/libsmf-1.3 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.102 ) fluidsynth? ( media-sound/fluidsynth ) portaudio? ( media-libs/portaudio media-libs/aubio sci-libs/fftw:3.0 media-libs/libsamplerate ) portmidi? ( media-libs/portmidi ) sys-devel/flex virtual/pkgconfig virtual/yacc nls? ( sys-devel/gettext )
+>=app-text/evince-3 dev-libs/libxml2:2 >=dev-scheme/guile-1.8 gnome-base/librsvg:2 >=media-libs/libsmf-1.3 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.102 ) fluidsynth? ( media-sound/fluidsynth ) portaudio? ( media-libs/portaudio media-libs/aubio sci-libs/fftw:3.0 media-libs/libsamplerate ) portmidi? ( media-libs/portmidi ) media-sound/lilypond
+0
+mirror://gnu/denemo/denemo-0.9.4.tar.gz
+
+http://www.denemo.org/
+GPL-3 OFL-1.1
+A music notation editor
+~amd64 ~x86
+eutils fdo-mime multilib toolchain-funcs user
+alsa jack +fluidsynth nls +portaudio portmidi
+
+
+
+4
+
+configure postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/media-sound/mpd-0.17 b/metadata/cache/media-sound/mpd-0.17
index 3428c796b407..481b9f21beeb 100644
--- a/metadata/cache/media-sound/mpd-0.17
+++ b/metadata/cache/media-sound/mpd-0.17
@@ -1,5 +1,5 @@
-!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) soup? ( net-libs/libsoup:2.4 ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) virtual/pkgconfig !=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) soup? ( net-libs/libsoup:2.4 ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib )
+!=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) soup? ( net-libs/libsoup:2.4 ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) virtual/pkgconfig !=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) soup? ( net-libs/libsoup:2.4 ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib )
0
mirror://sourceforge/musicpd/mpd-0.17.tar.bz2
@@ -8,7 +8,7 @@ GPL-2
The Music Player Daemon (mpd)
~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos
eutils flag-o-matic linux-info multilib systemd toolchain-funcs user versionator
-aac +alsa ao audiofile bzip2 cdio +curl debug +fifo +ffmpeg flac fluidsynth +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio recorder sid sndfile soundcloud soup sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip
+aac +alsa ao audiofile bzip2 cdio +curl debug +fifo +ffmpeg flac fluidsynth +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio recorder sid sndfile soundcloud soup sqlite systemd tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip
|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) lastfmradio? ( curl )
diff --git a/metadata/cache/media-tv/mythtv-0.25.1_p20120708 b/metadata/cache/media-tv/mythtv-0.25.1_p20120708
index 6421ccb72a1b..d18edd49a1f4 100644
--- a/metadata/cache/media-tv/mythtv-0.25.1_p20120708
+++ b/metadata/cache/media-tv/mythtv-0.25.1_p20120708
@@ -14,7 +14,7 @@ alsa altivec libass autostart bluray cec crystalhd debug dvb dvd fftw +hls ieee1
4
-compile config configure info install postinst postrm preinst prepare setup
+config configure info install postinst postrm preinst prepare setup
diff --git a/metadata/cache/media-video/xvideoservicethief-2.4.1-r2 b/metadata/cache/media-video/xvideoservicethief-2.4.1-r2
new file mode 100644
index 000000000000..981f056b6711
--- /dev/null
+++ b/metadata/cache/media-video/xvideoservicethief-2.4.1-r2
@@ -0,0 +1,22 @@
+app-arch/unzip >=x11-libs/qt-gui-4.5.3:4 >=x11-libs/qt-webkit-4.5.3:4 doc? ( app-doc/doxygen )
+>=x11-libs/qt-gui-4.5.3:4 virtual/ffmpeg media-video/flvstreamer
+0
+mirror://sourceforge/xviservicethief/xVST_2_4_1_src.zip
+
+http://xviservicethief.sourceforge.net/
+GPL-3
+Download (and convert) videos from various Web Video Services
+~amd64 ~x86
+base eutils multilib qt4-r2 toolchain-funcs user versionator
+debug doc linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_es linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_ko linguas_nl linguas_pl linguas_ro linguas_ru linguas_sv
+
+
+
+2
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/net-analyzer/arping-2.12 b/metadata/cache/net-analyzer/arping-2.12
new file mode 100644
index 000000000000..f321e490e786
--- /dev/null
+++ b/metadata/cache/net-analyzer/arping-2.12
@@ -0,0 +1,22 @@
+net-libs/libpcap net-libs/libnet:1.1
+net-libs/libpcap net-libs/libnet:1.1
+2
+http://www.habets.pp.se/synscan/files/arping-2.12.tar.gz
+
+http://www.habets.pp.se/synscan/programs.php?prog=arping
+GPL-2
+A utility to see if a specific IP address is taken and what MAC address owns it
+~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+
+
+
+
+
+4
+
+install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-dns/opendnssec-1.3.6 b/metadata/cache/net-dns/opendnssec-1.3.6
index d83a590d7e5f..9a6090fb7233 100644
--- a/metadata/cache/net-dns/opendnssec-1.3.6
+++ b/metadata/cache/net-dns/opendnssec-1.3.6
@@ -4,7 +4,7 @@ dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor?
http://www.opendnssec.org/files/source/opendnssec-1.3.6.tar.gz
http://www.opendnssec.org/
-BSD
+BSD GPL-2
An open-source turn-key solution for DNSSEC
~amd64 ~x86
autotools base eutils libtool multilib multiprocessing toolchain-funcs user
diff --git a/metadata/cache/net-dns/opendnssec-1.3.7 b/metadata/cache/net-dns/opendnssec-1.3.7
index 7ca49a8ab59e..5d2da7d95239 100644
--- a/metadata/cache/net-dns/opendnssec-1.3.7
+++ b/metadata/cache/net-dns/opendnssec-1.3.7
@@ -4,7 +4,7 @@ dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor?
http://www.opendnssec.org/files/source/opendnssec-1.3.7.tar.gz
http://www.opendnssec.org/
-BSD
+BSD GPL-2
An open-source turn-key solution for DNSSEC
~amd64 ~x86
autotools base eutils libtool multilib multiprocessing toolchain-funcs user
diff --git a/metadata/cache/net-firewall/ipsec-tools-0.7.3 b/metadata/cache/net-firewall/ipsec-tools-0.7.3
index 9b17500c225c..4c9ddc745a14 100644
--- a/metadata/cache/net-firewall/ipsec-tools-0.7.3
+++ b/metadata/cache/net-firewall/ipsec-tools-0.7.3
@@ -4,7 +4,7 @@
mirror://sourceforge/ipsec-tools/ipsec-tools-0.7.3.tar.bz2
http://ipsec-tools.sourceforge.net/
-BSD
+BSD GPL-2
A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
~amd64 ~ppc ~sparc ~x86
autotools eutils flag-o-matic libtool linux-info multilib multiprocessing toolchain-funcs user versionator
diff --git a/metadata/cache/net-firewall/ipsec-tools-0.7.3-r1 b/metadata/cache/net-firewall/ipsec-tools-0.7.3-r1
index 2262dbe2770c..61107dec4268 100644
--- a/metadata/cache/net-firewall/ipsec-tools-0.7.3-r1
+++ b/metadata/cache/net-firewall/ipsec-tools-0.7.3-r1
@@ -4,7 +4,7 @@ selinux? ( sys-libs/libselinux ) readline? ( sys-libs/readline ) pam? ( sys-libs
mirror://sourceforge/ipsec-tools/ipsec-tools-0.7.3.tar.bz2
http://ipsec-tools.sourceforge.net/
-BSD
+BSD GPL-2
A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
~amd64 ~ppc ~sparc ~x86
autotools eutils flag-o-matic libtool linux-info multilib multiprocessing toolchain-funcs user versionator
diff --git a/metadata/cache/net-firewall/ipsec-tools-0.8.0-r3 b/metadata/cache/net-firewall/ipsec-tools-0.8.0-r3
index e69d8dd04bb5..a3c56ca3c079 100644
--- a/metadata/cache/net-firewall/ipsec-tools-0.8.0-r3
+++ b/metadata/cache/net-firewall/ipsec-tools-0.8.0-r3
@@ -4,9 +4,9 @@ dev-libs/openssl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sy
mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.0.tar.bz2
http://ipsec-tools.sourceforge.net/
-BSD
+BSD GPL-2
A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation
-~amd64 ~ppc ~ppc64 ~x86
+~amd64 ppc ppc64 ~x86
autotools eutils flag-o-matic libtool linux-info multilib multiprocessing pam toolchain-funcs user versionator
hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats
diff --git a/metadata/cache/net-firewall/pglinux-2.2.1 b/metadata/cache/net-firewall/pglinux-2.2.1
deleted file mode 100644
index 772d2bf6272d..000000000000
--- a/metadata/cache/net-firewall/pglinux-2.2.1
+++ /dev/null
@@ -1,22 +0,0 @@
-net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 || ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss ) ) virtual/pkgconfig sys-devel/libtool:2 >=sys-apps/sed-4
-net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 || ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss ) ) net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) logrotate? ( app-admin/logrotate ) networkmanager? ( net-misc/networkmanager )
-0
-mirror://sourceforge/peerguardian/pgl-2.2.1.tar.gz
-
-https://sourceforge.net/projects/peerguardian/
-GPL-3
-Privacy oriented firewall application
-~amd64 ~x86
-eutils gnome2-utils linux-info multilib toolchain-funcs user versionator
-cron dbus logrotate networkmanager qt4 zlib
-qt4? ( dbus )
-
-
-4
-
-configure postinst postrm preinst setup
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/pglinux-2.2.0 b/metadata/cache/net-firewall/pglinux-2.2.1_p20120711
similarity index 93%
rename from metadata/cache/net-firewall/pglinux-2.2.0
rename to metadata/cache/net-firewall/pglinux-2.2.1_p20120711
index 23a763ffd034..7c1a79708832 100644
--- a/metadata/cache/net-firewall/pglinux-2.2.0
+++ b/metadata/cache/net-firewall/pglinux-2.2.1_p20120711
@@ -1,7 +1,7 @@
net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 || ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss ) ) virtual/pkgconfig sys-devel/libtool:2 >=sys-apps/sed-4
net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 || ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss ) ) net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) logrotate? ( app-admin/logrotate ) networkmanager? ( net-misc/networkmanager )
0
-mirror://sourceforge/peerguardian/pgl-2.2.0.tar.gz
+http://dev.gentoo.org/~hasufell/distfiles/pgl-2.2.1_p20120711.tar.xz
https://sourceforge.net/projects/peerguardian/
GPL-3
diff --git a/metadata/cache/net-ftp/pureadmin-0.2.2 b/metadata/cache/net-ftp/pureadmin-0.2.2
deleted file mode 100644
index eaadead30f18..000000000000
--- a/metadata/cache/net-ftp/pureadmin-0.2.2
+++ /dev/null
@@ -1,22 +0,0 @@
-gnome-base/libglade:2.0 sys-libs/zlib virtual/fam x11-libs/gtk+:2 virtual/pkgconfig
-gnome-base/libglade:2.0 sys-libs/zlib virtual/fam x11-libs/gtk+:2
-0
-mirror://sourceforge/purify/pureadmin-0.2.2.tar.gz
-
-http://purify.sourceforge.net/
-GPL-2
-PureAdmin is a GUI tool used to make the management of Pure-FTPd a little easier.
-amd64 ~ppc x86
-eutils multilib toolchain-funcs user
-debug doc
-
-
-
-3
-
-configure install postinst
-
-
-
-
-
diff --git a/metadata/cache/net-ftp/pureadmin-0.3 b/metadata/cache/net-ftp/pureadmin-0.3
deleted file mode 100644
index 586da0308cd8..000000000000
--- a/metadata/cache/net-ftp/pureadmin-0.3
+++ /dev/null
@@ -1,22 +0,0 @@
-gnome-base/libglade:2.0 sys-libs/zlib virtual/fam x11-libs/gtk+:2 virtual/pkgconfig
-gnome-base/libglade:2.0 sys-libs/zlib virtual/fam x11-libs/gtk+:2
-0
-mirror://sourceforge/purify/pureadmin-0.3.tar.gz
-
-http://purify.sourceforge.net/
-GPL-2
-PureAdmin is a GUI tool used to make the management of Pure-FTPd a little easier.
-~amd64 ~ppc ~x86
-eutils multilib toolchain-funcs user
-debug doc
-
-
-
-3
-
-configure install postinst
-
-
-
-
-
diff --git a/metadata/cache/net-libs/axtls-1.4.6-r1 b/metadata/cache/net-libs/axtls-1.4.6-r1
index 3e7296a8a9b2..bb2bf6457a3b 100644
--- a/metadata/cache/net-libs/axtls-1.4.6-r1
+++ b/metadata/cache/net-libs/axtls-1.4.6-r1
@@ -4,7 +4,7 @@ httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
mirror://sourceforge/axtls/axTLS-1.4.6.tar.gz
http://axtls.sourceforge.net/
-BSD
+BSD GPL-2
Embedded client/server TLSv1 SSL library and small HTTP(S) server
amd64 hppa ~x86
eutils multilib portability savedconfig toolchain-funcs user
diff --git a/metadata/cache/net-libs/axtls-1.4.8 b/metadata/cache/net-libs/axtls-1.4.8
index faa60f719ff5..40ee081a47dd 100644
--- a/metadata/cache/net-libs/axtls-1.4.8
+++ b/metadata/cache/net-libs/axtls-1.4.8
@@ -4,7 +4,7 @@ httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
mirror://sourceforge/axtls/axTLS-1.4.8.tar.gz
http://axtls.sourceforge.net/
-BSD
+BSD GPL-2
Embedded client/server TLSv1 SSL library and small HTTP(S) server
~amd64 ~hppa ~x86
eutils multilib portability savedconfig toolchain-funcs user
diff --git a/metadata/cache/net-libs/c-client-2007f b/metadata/cache/net-libs/c-client-2007f-r2
similarity index 83%
rename from metadata/cache/net-libs/c-client-2007f
rename to metadata/cache/net-libs/c-client-2007f-r2
index 734d8adb5ad7..6778e9db24e5 100644
--- a/metadata/cache/net-libs/c-client-2007f
+++ b/metadata/cache/net-libs/c-client-2007f-r2
@@ -6,13 +6,13 @@ ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z
http://www.washington.edu/imap/
as-is
UW IMAP c-client library
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
eutils flag-o-matic libtool multilib toolchain-funcs user
-doc kernel_linux kernel_FreeBSD pam ssl
+doc kernel_linux kernel_FreeBSD pam ssl static-libs
-2
+4
compile install prepare
diff --git a/metadata/cache/net-libs/libbtbb-0.8-r1 b/metadata/cache/net-libs/libbtbb-0.8-r1
deleted file mode 100644
index 6b942863e541..000000000000
--- a/metadata/cache/net-libs/libbtbb-0.8-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-mirror://sourceforge/libbtbb/libbtbb-0.8.tar.gz
-
-http://libbtbb.sourceforge.net/
-GPL-2
-A library to decode Bluetooth baseband packets
-~amd64 ~arm ~x86
-multilib toolchain-funcs
-
-
-
-
-4
-
-install
-
-
-
-
-
diff --git a/metadata/cache/net-mail/uw-imap-2007f-r1 b/metadata/cache/net-mail/uw-imap-2007f-r1
new file mode 100644
index 000000000000..7ed9a1db9a5a
--- /dev/null
+++ b/metadata/cache/net-mail/uw-imap-2007f-r1
@@ -0,0 +1,22 @@
+!net-libs/c-client >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam] ssl? ( dev-libs/openssl ) kerberos? ( app-crypt/mit-krb5 ) ssl? ( dev-libs/openssl )
+!net-libs/c-client >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam] ssl? ( dev-libs/openssl ) kerberos? ( app-crypt/mit-krb5 ) >=net-mail/uw-mailutils-2007f sys-apps/xinetd !net-mail/dovecot !mail-mta/courier !net-mail/courier-imap !net-mail/cyrus-imapd
+0
+ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z
+
+http://www.washington.edu/imap/
+Apache-2.0
+UW server daemons for IMAP and POP network mail protocols.
+~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+eutils flag-o-matic multilib ssl-cert toolchain-funcs user
+ipv6 +ssl kerberos clearpasswd ssl
+!clearpasswd? ( ssl )
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/net-misc/iodine-0.6.0_rc1-r1 b/metadata/cache/net-misc/iodine-0.6.0_rc1-r1
index e3214a4ed3f5..8589ecdf67b0 100644
--- a/metadata/cache/net-misc/iodine-0.6.0_rc1-r1
+++ b/metadata/cache/net-misc/iodine-0.6.0_rc1-r1
@@ -4,7 +4,7 @@ sys-libs/zlib
http://code.kryo.se/iodine/iodine-0.6.0-rc1.tar.gz
http://code.kryo.se/iodine/
-ISC
+ISC GPL-2
IP over DNS tunnel
~amd64 ~x86
eutils linux-info multilib toolchain-funcs user versionator
diff --git a/metadata/cache/net-misc/nx-3.5.0.14 b/metadata/cache/net-misc/nx-3.5.0.14
deleted file mode 100644
index 8db057dd6ec0..000000000000
--- a/metadata/cache/net-misc/nx-3.5.0.14
+++ /dev/null
@@ -1,22 +0,0 @@
-elibc_glibc? ( || ( net-libs/libtirpc =media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-elibc_glibc? ( || ( net-libs/libtirpc =media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg
-0
-http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.14-full.tar.gz
-
-http://www.nomachine.com/developers.php http://www.x2go.org/doku.php/wiki:libs:nx-libs
-GPL-2
-NX compression technology core libraries
-~amd64 ~ppc ~x86
-autotools eutils libtool multilib multiprocessing toolchain-funcs user
-elibc_glibc
-
-
-
-4
-
-compile configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/net-misc/nx-3.5.0.14-r1 b/metadata/cache/net-misc/nx-3.5.0.14-r1
new file mode 100644
index 000000000000..6de3a15bf10f
--- /dev/null
+++ b/metadata/cache/net-misc/nx-3.5.0.14-r1
@@ -0,0 +1,22 @@
+elibc_glibc? ( || ( net-libs/libtirpc =media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+elibc_glibc? ( || ( net-libs/libtirpc =media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg
+0
+http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.14-full.tar.gz
+
+http://www.nomachine.com/developers.php http://www.x2go.org/doku.php/wiki:libs:nx-libs
+GPL-2
+NX compression technology core libraries
+~amd64 ~ppc ~x86
+autotools eutils libtool multilib multiprocessing toolchain-funcs user
+elibc_glibc
+
+
+
+4
+
+compile configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-misc/plowshare-20120609-r2 b/metadata/cache/net-misc/plowshare-20120609-r2
new file mode 100644
index 000000000000..657e0bb8c34b
--- /dev/null
+++ b/metadata/cache/net-misc/plowshare-20120609-r2
@@ -0,0 +1,22 @@
+
+javascript? ( dev-lang/spidermonkey ) perl? ( dev-lang/perl media-gfx/imagemagick[perl] ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) ) app-shells/bash || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) app-text/tesseract[tiff] || ( media-gfx/imagemagick[tiff] media-gfx/graphicsmagick[imagemagick,tiff] ) net-misc/curl sys-apps/util-linux
+0
+http://plowshare.googlecode.com/files/plowshare-snapshot-git20120609.tar.gz
+
+http://code.google.com/p/plowshare/
+GPL-3
+Command-line downloader and uploader for file-sharing websites
+~amd64 ~arm ~ppc ~x86
+bash-completion-r1
+bash-completion +javascript +perl scripts view-captcha
+
+
+
+2
+
+compile install postinst prepare test
+
+
+
+
+
diff --git a/metadata/cache/net-misc/sslh-1.13 b/metadata/cache/net-misc/sslh-1.13-r1
similarity index 100%
rename from metadata/cache/net-misc/sslh-1.13
rename to metadata/cache/net-misc/sslh-1.13-r1
diff --git a/metadata/cache/net-misc/tor-0.2.2.35 b/metadata/cache/net-misc/tor-0.2.2.35
index 3c8889ec718c..120e9ba57b52 100644
--- a/metadata/cache/net-misc/tor-0.2.2.35
+++ b/metadata/cache/net-misc/tor-0.2.2.35
@@ -4,7 +4,7 @@ dev-libs/openssl >=dev-libs/libevent-2.0
http://www.torproject.org/dist/tor-0.2.2.35.tar.gz
http://www.torproject.org/
-BSD
+BSD GPL-2
Anonymizing overlay network for TCP
amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd
autotools eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user
diff --git a/metadata/cache/net-misc/tor-0.2.2.35-r1 b/metadata/cache/net-misc/tor-0.2.2.35-r1
index 9122638f81e9..b64892239169 100644
--- a/metadata/cache/net-misc/tor-0.2.2.35-r1
+++ b/metadata/cache/net-misc/tor-0.2.2.35-r1
@@ -4,7 +4,7 @@ dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor )
https://archive.torproject.org/tor-package-archive/tor-0.2.2.35.tar.gz
http://www.torproject.org/
-BSD
+BSD GPL-2
Anonymizing overlay network for TCP
~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
autotools eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user
diff --git a/metadata/cache/net-misc/tor-0.2.2.36 b/metadata/cache/net-misc/tor-0.2.2.36
index 39cf2e5635de..65209e6baadf 100644
--- a/metadata/cache/net-misc/tor-0.2.2.36
+++ b/metadata/cache/net-misc/tor-0.2.2.36
@@ -4,7 +4,7 @@ dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor )
https://archive.torproject.org/tor-package-archive/tor-0.2.2.36.tar.gz
http://www.torproject.org/
-BSD
+BSD GPL-2
Anonymizing overlay network for TCP
~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
autotools eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user
diff --git a/metadata/cache/net-misc/tor-0.2.2.37 b/metadata/cache/net-misc/tor-0.2.2.37
index 9e4d399f470d..13b9e03aba07 100644
--- a/metadata/cache/net-misc/tor-0.2.2.37
+++ b/metadata/cache/net-misc/tor-0.2.2.37
@@ -4,7 +4,7 @@ dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor )
https://archive.torproject.org/tor-package-archive/tor-0.2.2.37.tar.gz
http://www.torproject.org/
-BSD
+BSD GPL-2
Anonymizing overlay network for TCP
~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
autotools eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user
diff --git a/metadata/cache/net-misc/tor-0.2.3.18_rc b/metadata/cache/net-misc/tor-0.2.3.18_rc
index 90485bdc6923..4bd277976c78 100644
--- a/metadata/cache/net-misc/tor-0.2.3.18_rc
+++ b/metadata/cache/net-misc/tor-0.2.3.18_rc
@@ -4,7 +4,7 @@ dev-libs/openssl sys-libs/zlib >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/li
https://archive.torproject.org/tor-package-archive/tor-0.2.3.18-rc.tar.gz
http://www.torproject.org/
-BSD
+BSD GPL-2
Anonymizing overlay network for TCP
~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
eutils flag-o-matic multilib toolchain-funcs user versionator
diff --git a/metadata/cache/net-misc/tor-0.2.3.19_rc b/metadata/cache/net-misc/tor-0.2.3.19_rc
index 36af49f36fc6..e2c062769b5a 100644
--- a/metadata/cache/net-misc/tor-0.2.3.19_rc
+++ b/metadata/cache/net-misc/tor-0.2.3.19_rc
@@ -4,7 +4,7 @@ dev-libs/openssl sys-libs/zlib >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/li
https://archive.torproject.org/tor-package-archive/tor-0.2.3.19-rc.tar.gz
http://www.torproject.org/
-BSD
+BSD GPL-2
Anonymizing overlay network for TCP
~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
eutils flag-o-matic multilib toolchain-funcs user versionator
diff --git a/metadata/cache/net-misc/vtun-3.0.2-r2 b/metadata/cache/net-misc/vtun-3.0.2-r2
index 986a15b1a929..bb59c6a8b1ea 100644
--- a/metadata/cache/net-misc/vtun-3.0.2-r2
+++ b/metadata/cache/net-misc/vtun-3.0.2-r2
@@ -6,7 +6,7 @@ mirror://sourceforge/vtun/vtun-3.0.2.tar.gz
http://vtun.sourceforge.net/
GPL-2
Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression.
-~alpha ~amd64 ~ppc ~sparc ~x86
+~alpha amd64 ~ppc ~sparc ~x86
eutils linux-info multilib toolchain-funcs user versionator
lzo socks5 ssl zlib
diff --git a/metadata/cache/net-nds/adtool-1.3.2 b/metadata/cache/net-nds/adtool-1.3.2
index 5a805202fcc2..115385a7a7f6 100644
--- a/metadata/cache/net-nds/adtool-1.3.2
+++ b/metadata/cache/net-nds/adtool-1.3.2
@@ -1,20 +1,20 @@
-net-nds/openldap ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-
+net-nds/openldap ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-nds/openldap ssl? ( dev-libs/openssl )
0
http://gp2x.org/adtool/adtool-1.3.2.tar.gz
http://gp2x.org/adtool/
GPL-2
-adtool is a Unix command line utility for Active Directory administration
+Utility for Active Directory administration
~amd64 ~ppc ~x86
-autotools eutils libtool multilib multiprocessing toolchain-funcs user
+autotools autotools-utils eutils libtool multilib multiprocessing toolchain-funcs user
ssl
+4
-
-install unpack
+compile configure install prepare test
diff --git a/metadata/cache/net-nds/adtool-1.3.3 b/metadata/cache/net-nds/adtool-1.3.3
new file mode 100644
index 000000000000..77192dd90eca
--- /dev/null
+++ b/metadata/cache/net-nds/adtool-1.3.3
@@ -0,0 +1,22 @@
+net-nds/openldap ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-nds/openldap ssl? ( dev-libs/openssl )
+0
+http://gp2x.org/adtool/adtool-1.3.3.tar.gz
+
+http://gp2x.org/adtool/
+GPL-2
+Utility for Active Directory administration
+~amd64 ~ppc ~x86
+autotools autotools-utils eutils libtool multilib multiprocessing toolchain-funcs user
+ssl
+
+
+
+4
+
+compile configure install prepare test
+
+
+
+
+
diff --git a/metadata/cache/net-p2p/bitcoind-0.4.7_rc3 b/metadata/cache/net-p2p/bitcoind-0.4.7_rc3
index 22995185810b..50ac3624203e 100644
--- a/metadata/cache/net-p2p/bitcoind-0.4.7_rc3
+++ b/metadata/cache/net-p2p/bitcoind-0.4.7_rc3
@@ -4,7 +4,7 @@
http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.4.7rc3 -> bitcoin-v0.4.7_rc3.tgz bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.4.7-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz ) eligius? ( !bip16? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.4.5rc1-eligius_sendfee.patch.xz ) )
http://bitcoin.org/
-MIT ISC
+MIT ISC GPL-2
Original Bitcoin crypto-currency wallet for automated services
~amd64 ~x86
db-use eutils multilib toolchain-funcs user versionator
diff --git a/metadata/cache/net-p2p/bitcoind-0.5.6_rc2 b/metadata/cache/net-p2p/bitcoind-0.5.6_rc2
index f6f26157dea3..d472e6c5734c 100644
--- a/metadata/cache/net-p2p/bitcoind-0.5.6_rc2
+++ b/metadata/cache/net-p2p/bitcoind-0.5.6_rc2
@@ -4,7 +4,7 @@
http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.5.6rc2 -> bitcoin-v0.5.6_rc2.tgz bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.5.6-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz ) eligius? ( !bip16? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.5.0.6rc1-eligius_sendfee.patch.xz ) )
http://bitcoin.org/
-MIT ISC
+MIT ISC GPL-2
Original Bitcoin crypto-currency wallet for automated services
amd64 ~arm x86
db-use eutils multilib toolchain-funcs user versionator
diff --git a/metadata/cache/net-p2p/bitcoind-0.5.6_rc3 b/metadata/cache/net-p2p/bitcoind-0.5.6_rc3
index 0aa39e718a83..710ede9b88a3 100644
--- a/metadata/cache/net-p2p/bitcoind-0.5.6_rc3
+++ b/metadata/cache/net-p2p/bitcoind-0.5.6_rc3
@@ -4,7 +4,7 @@
http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.5.6rc3 -> bitcoin-v0.5.6_rc3.tgz bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.5.6-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz ) eligius? ( !bip16? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.5.0.6rc1-eligius_sendfee.patch.xz ) )
http://bitcoin.org/
-MIT ISC
+MIT ISC GPL-2
Original Bitcoin crypto-currency wallet for automated services
~amd64 ~arm ~x86
db-use eutils multilib toolchain-funcs user versionator
diff --git a/metadata/cache/net-p2p/bitcoind-0.6.0.9_rc1 b/metadata/cache/net-p2p/bitcoind-0.6.0.9_rc1
index c153af0a254d..7f9e70ec396b 100644
--- a/metadata/cache/net-p2p/bitcoind-0.6.0.9_rc1
+++ b/metadata/cache/net-p2p/bitcoind-0.6.0.9_rc1
@@ -4,7 +4,7 @@
http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.6.0.9rc1 -> bitcoin-v0.6.0.9_rc1.tgz eligius? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.6.0-eligius_sendfee.patch.xz )
http://bitcoin.org/
-MIT ISC
+MIT ISC GPL-2
Original Bitcoin crypto-currency wallet for automated services
~amd64 ~arm ~x86
db-use eutils multilib toolchain-funcs user versionator
diff --git a/metadata/cache/net-p2p/bitcoind-0.6.3 b/metadata/cache/net-p2p/bitcoind-0.6.3
index d8ed4e6de021..f462050ac307 100644
--- a/metadata/cache/net-p2p/bitcoind-0.6.3
+++ b/metadata/cache/net-p2p/bitcoind-0.6.3
@@ -4,7 +4,7 @@
https://nodeload.github.com/bitcoin/bitcoin/tarball/v0.6.3 -> bitcoin-v0.6.3.tgz eligius? ( http://luke.dashjr.org/programs/bitcoin/files/bitcoind/eligius/sendfee/0.6.1-eligius_sendfee.patch.xz ) logrotate? ( https://github.com/bitcoin/bitcoin/commit/9af080c351c40a4f56d37174253d33a9f4ffdb69.diff -> 0.6.3-reopen_log_file.patch )
http://bitcoin.org/
-MIT ISC
+MIT ISC GPL-2
Original Bitcoin crypto-currency wallet for automated services
~amd64 ~arm ~x86
db-use eutils multilib toolchain-funcs user versionator
diff --git a/metadata/cache/net-p2p/bitflu-1.37 b/metadata/cache/net-p2p/bitflu-1.37
index 65e4200fb3c7..1e9fb08a9a14 100644
--- a/metadata/cache/net-p2p/bitflu-1.37
+++ b/metadata/cache/net-p2p/bitflu-1.37
@@ -4,7 +4,7 @@ dev-perl/Danga-Socket dev-perl/Sys-Syscall
http://bitflu.workaround.ch/bitflu/bitflu-1.37.tgz
http://bitflu.workaround.ch
-Artistic-2
+Artistic-2 GPL-2
Bitflu is a BitTorrent client, written in Perl and is designed to run as a daemon
amd64 x86
eutils multilib toolchain-funcs user
diff --git a/metadata/cache/net-p2p/bitflu-1.41 b/metadata/cache/net-p2p/bitflu-1.41
index e3b0378b16d3..bb2a06e751c6 100644
--- a/metadata/cache/net-p2p/bitflu-1.41
+++ b/metadata/cache/net-p2p/bitflu-1.41
@@ -4,7 +4,7 @@ dev-perl/Danga-Socket dev-perl/Sys-Syscall
http://bitflu.workaround.ch/bitflu/bitflu-1.41.tgz
http://bitflu.workaround.ch
-Artistic-2
+Artistic-2 GPL-2
Bitflu is a BitTorrent client, written in Perl and is designed to run as a daemon
amd64 x86
eutils multilib toolchain-funcs user
diff --git a/metadata/cache/net-p2p/bitflu-1.42 b/metadata/cache/net-p2p/bitflu-1.42
index 81863b613312..691c7be131e1 100644
--- a/metadata/cache/net-p2p/bitflu-1.42
+++ b/metadata/cache/net-p2p/bitflu-1.42
@@ -4,7 +4,7 @@ dev-perl/Danga-Socket dev-perl/Sys-Syscall
http://bitflu.workaround.ch/bitflu/bitflu-1.42.tgz
http://bitflu.workaround.ch
-Artistic-2
+Artistic-2 GPL-2
Bitflu is a BitTorrent client, written in Perl and is designed to run as a daemon
~amd64 ~x86
eutils multilib toolchain-funcs user
diff --git a/metadata/cache/net-p2p/bitflu-1.43 b/metadata/cache/net-p2p/bitflu-1.43
index eeca0e4ed92e..54c7306342e3 100644
--- a/metadata/cache/net-p2p/bitflu-1.43
+++ b/metadata/cache/net-p2p/bitflu-1.43
@@ -4,7 +4,7 @@ dev-perl/Danga-Socket dev-perl/Sys-Syscall
http://bitflu.workaround.ch/bitflu/bitflu-1.43.tgz
http://bitflu.workaround.ch
-Artistic-2
+Artistic-2 GPL-2
Bitflu is a BitTorrent client, written in Perl and is designed to run as a daemon
amd64 x86
eutils multilib toolchain-funcs user
diff --git a/metadata/cache/net-p2p/qbittorrent-3.0.0_rc4 b/metadata/cache/net-p2p/qbittorrent-3.0.0_rc5
similarity index 90%
rename from metadata/cache/net-p2p/qbittorrent-3.0.0_rc4
rename to metadata/cache/net-p2p/qbittorrent-3.0.0_rc5
index de35e27d1048..fa172480e1f5 100644
--- a/metadata/cache/net-p2p/qbittorrent-3.0.0_rc4
+++ b/metadata/cache/net-p2p/qbittorrent-3.0.0_rc5
@@ -1,7 +1,7 @@
net-libs/rb_libtorrent >=x11-libs/qt-core-4.6.1:4 X? ( >=x11-libs/qt-gui-4.6.1:4 ) dbus? ( >=x11-libs/qt-dbus-4.6.1:4 ) dev-libs/boost virtual/pkgconfig =dev-lang/python-2*
net-libs/rb_libtorrent >=x11-libs/qt-core-4.6.1:4 X? ( >=x11-libs/qt-gui-4.6.1:4 ) dbus? ( >=x11-libs/qt-dbus-4.6.1:4 ) dev-libs/boost geoip? ( dev-libs/geoip ) =dev-lang/python-2*
0
-mirror://sourceforge/qbittorrent/qbittorrent-3.0.0rc4.tar.gz
+mirror://sourceforge/qbittorrent/qbittorrent-3.0.0rc5.tar.gz
http://www.qbittorrent.org/
GPL-2
diff --git a/metadata/cache/sci-chemistry/coot-0.7_pre4266 b/metadata/cache/sci-chemistry/coot-0.7_pre4266
new file mode 100644
index 000000000000..79d628367634
--- /dev/null
+++ b/metadata/cache/sci-chemistry/coot-0.7_pre4266
@@ -0,0 +1,22 @@
+>=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm =dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn >=sys-devel/libtool-2.4-r2 dev-lang/swig sys-devel/bc test? ( dev-scheme/greg ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+>=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm =dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn =dev-lang/python-2*
+0
+http://dev.gentoo.org/~jlec/distfiles/coot-0.7_pre4266.tar.xz test? ( http://dev.gentoo.org/~jlec/distfiles/greg-data-0.7_pre4266.tar.gz )
+
+http://www.biop.ox.ac.uk/coot/
+GPL-3
+Crystallographic Object-Oriented Toolkit for model building, completion and validation
+~amd64 ~x86 ~amd64-linux ~x86-linux
+autotools autotools-utils eutils libtool multilib multiprocessing python toolchain-funcs user versionator
++openmp static-libs test
+
+
+
+4
+
+compile configure install prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/sci-electronics/xcircuit-3.7.40 b/metadata/cache/sci-electronics/xcircuit-3.7.40
index da0e3e6e28bd..fc149f31342a 100644
--- a/metadata/cache/sci-electronics/xcircuit-3.7.40
+++ b/metadata/cache/sci-electronics/xcircuit-3.7.40
@@ -1,5 +1,5 @@
-x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE sys-libs/zlib app-text/ghostscript-gpl dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE sys-libs/zlib app-text/ghostscript-gpl dev-lang/tcl dev-lang/tk
+app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE
0
http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.7.40.tgz
test
@@ -7,14 +7,14 @@ http://opencircuitdesign.com/xcircuit
GPL-2
Circuit drawing and schematic capture program.
~amd64 ~ppc ~x86
-autotools eutils libtool multilib multiprocessing toolchain-funcs user
+autotools autotools-utils eutils libtool multilib multiprocessing toolchain-funcs user
-2
+4
-compile configure install prepare
+compile configure install prepare test
diff --git a/metadata/cache/sci-electronics/xcircuit-3.8.24 b/metadata/cache/sci-electronics/xcircuit-3.8.24
index d8e97a50553e..a91b861e26e5 100644
--- a/metadata/cache/sci-electronics/xcircuit-3.8.24
+++ b/metadata/cache/sci-electronics/xcircuit-3.8.24
@@ -1,5 +1,5 @@
-x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE sys-libs/zlib app-text/ghostscript-gpl dev-lang/tcl dev-lang/tk =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool
-x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE sys-libs/zlib app-text/ghostscript-gpl dev-lang/tcl dev-lang/tk
+app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE
0
http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.8.24.tgz
test
@@ -7,14 +7,14 @@ http://opencircuitdesign.com/xcircuit
GPL-2
Circuit drawing and schematic capture program.
~amd64 ~ppc ~x86
-autotools eutils libtool multilib multiprocessing toolchain-funcs user
+autotools autotools-utils eutils libtool multilib multiprocessing toolchain-funcs user
-2
+4
-compile configure install prepare
+compile configure install prepare test
diff --git a/metadata/cache/sys-apps/chpax-0.7 b/metadata/cache/sys-apps/chpax-0.7
index c9a37e8d2167..28607dad9260 100644
--- a/metadata/cache/sys-apps/chpax-0.7
+++ b/metadata/cache/sys-apps/chpax-0.7
@@ -4,7 +4,7 @@
http://pax.grsecurity.net/chpax-0.7.tar.gz
http://pax.grsecurity.net/
-public-domain
+public-domain GPL-2
Manages various PaX related flags for ELF32, ELF64, and a.out binaries.
alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86
eutils flag-o-matic multilib toolchain-funcs user
diff --git a/metadata/cache/sys-apps/coreutils-8.17 b/metadata/cache/sys-apps/coreutils-8.17
index fcdaa8a47037..19afbf215877 100644
--- a/metadata/cache/sys-apps/coreutils-8.17
+++ b/metadata/cache/sys-apps/coreutils-8.17
@@ -1,14 +1,14 @@
-caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !app-misc/realpath !=sys-devel/gettext-0.15 ) !app-misc/realpath !=sys-devel/gettext-0.15 ) !app-misc/realpath !=sys-devel/gettext-0.15 ) !app-misc/realpath !=sys-apps/portage-2.1.9 sys-devel/gettext dev-util/intltool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+dev-db/sqlite[soundex] net-misc/rsync sys-apps/diffutils sys-apps/sandbox >=sys-apps/portage-2.1.9 sys-devel/gettext =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+0
+mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+
+http://www.sabayon.org
+GPL-2
+Entropy Package Manager foundation library
+~amd64 ~arm ~x86
+eutils multilib python toolchain-funcs user
+
+
+
+
+3
+
+compile install postinst postrm setup
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/entropy-server-1.0_rc124 b/metadata/cache/sys-apps/entropy-server-1.0_rc124
new file mode 100644
index 000000000000..a2d4fa157b8d
--- /dev/null
+++ b/metadata/cache/sys-apps/entropy-server-1.0_rc124
@@ -0,0 +1,22 @@
+app-text/asciidoc =dev-lang/python-2*
+~sys-apps/entropy-1.0_rc124 =dev-lang/python-2*
+0
+mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+
+http://www.sabayon.org
+GPL-2
+Entropy Package Manager server-side tools
+~amd64 ~arm ~x86
+bash-completion-r1 eutils multilib python toolchain-funcs user
+
+
+
+
+3
+
+compile install postinst postrm
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/magneto-core-1.0_rc124 b/metadata/cache/sys-apps/magneto-core-1.0_rc124
new file mode 100644
index 000000000000..9c0b4126d6fb
--- /dev/null
+++ b/metadata/cache/sys-apps/magneto-core-1.0_rc124
@@ -0,0 +1,22 @@
+~sys-apps/rigo-daemon-1.0_rc124 =dev-lang/python-2*
+~sys-apps/rigo-daemon-1.0_rc124 x11-misc/xdg-utils =dev-lang/python-2*
+0
+mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+
+http://www.sabayon.org
+GPL-2
+Entropy Package Manager notification applet library
+~amd64 ~arm ~x86
+eutils multilib python toolchain-funcs user
+
+
+
+
+3
+
+compile install postinst postrm
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/rigo-daemon-1.0_rc124 b/metadata/cache/sys-apps/rigo-daemon-1.0_rc124
new file mode 100644
index 000000000000..e6339692fee7
--- /dev/null
+++ b/metadata/cache/sys-apps/rigo-daemon-1.0_rc124
@@ -0,0 +1,22 @@
+=dev-lang/python-2*
+dev-python/dbus-python dev-python/pygobject:3 ~sys-apps/entropy-1.0_rc124 sys-auth/polkit[introspection] sys-devel/gettext =dev-lang/python-2*
+0
+mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+
+http://www.sabayon.org
+GPL-3
+Entropy Client DBus Services, aka RigoDaemon
+~amd64 ~arm ~x86
+eutils multilib python toolchain-funcs user
+
+
+
+
+3
+
+compile install postinst postrm preinst
+
+
+
+
+
diff --git a/metadata/cache/sys-block/cec-11 b/metadata/cache/sys-block/cec-11
new file mode 100644
index 000000000000..3c2d84d2478e
--- /dev/null
+++ b/metadata/cache/sys-block/cec-11
@@ -0,0 +1,22 @@
+
+
+0
+mirror://sourceforge/aoetools/cec-11.tgz
+
+http://sourceforge.net/projects/aoetools/
+GPL-2
+Coraid Ethernet Console client
+~amd64 ~x86
+multilib toolchain-funcs
+
+
+
+
+4
+
+compile install
+
+
+
+
+
diff --git a/metadata/cache/sys-fs/zfs-0.6.0_rc9 b/metadata/cache/sys-fs/zfs-0.6.0_rc9
deleted file mode 100644
index 803f5b20e0d9..000000000000
--- a/metadata/cache/sys-fs/zfs-0.6.0_rc9
+++ /dev/null
@@ -1,22 +0,0 @@
-=sys-kernel/spl-0.6.0_rc9* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] test? ( sys-fs/mdadm ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-=sys-kernel/spl-0.6.0_rc9* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !sys-fs/zfs-fuse !prefix? ( sys-fs/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils ) kernel_linux? ( virtual/modutils )
-0
-https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc9.tar.gz
-
-http://zfsonlinux.org/
-CDDL GPL-2 MIT
-Native ZFS for Linux
-~amd64
-autotools autotools-utils bash-completion-r1 eutils flag-o-matic libtool linux-info linux-mod multilib multiprocessing toolchain-funcs user versionator
-bash-completion custom-cflags debug dracut +rootfs test test-suite static-libs kernel_linux
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/zfs-0.6.0_rc9-r3 b/metadata/cache/sys-fs/zfs-0.6.0_rc9-r3
deleted file mode 100644
index 3b28d36ba43a..000000000000
--- a/metadata/cache/sys-fs/zfs-0.6.0_rc9-r3
+++ /dev/null
@@ -1,22 +0,0 @@
-=sys-kernel/spl-0.6.0_rc9* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] test? ( sys-fs/mdadm ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-=sys-kernel/spl-0.6.0_rc9* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !sys-fs/zfs-fuse !prefix? ( sys-fs/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils ) kernel_linux? ( virtual/modutils )
-0
-https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc9.tar.gz
-
-http://zfsonlinux.org/
-CDDL GPL-2 MIT
-Native ZFS for Linux
-~amd64
-autotools autotools-utils bash-completion-r1 eutils flag-o-matic libtool linux-info linux-mod multilib multiprocessing toolchain-funcs user versionator
-custom-cflags debug dracut +rootfs test test-suite static-libs kernel_linux
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/zfs-0.6.0_rc9-r4 b/metadata/cache/sys-fs/zfs-0.6.0_rc9-r5
similarity index 98%
rename from metadata/cache/sys-fs/zfs-0.6.0_rc9-r4
rename to metadata/cache/sys-fs/zfs-0.6.0_rc9-r5
index 3b28d36ba43a..c43649edda76 100644
--- a/metadata/cache/sys-fs/zfs-0.6.0_rc9-r4
+++ b/metadata/cache/sys-fs/zfs-0.6.0_rc9-r5
@@ -4,7 +4,7 @@
https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc9.tar.gz
http://zfsonlinux.org/
-CDDL GPL-2 MIT
+BSD-2 CDDL MIT
Native ZFS for Linux
~amd64
autotools autotools-utils bash-completion-r1 eutils flag-o-matic libtool linux-info linux-mod multilib multiprocessing toolchain-funcs user versionator
diff --git a/metadata/cache/sys-fs/zfs-9999 b/metadata/cache/sys-fs/zfs-9999
index e1a56dd41dac..670969b78cdd 100644
--- a/metadata/cache/sys-fs/zfs-9999
+++ b/metadata/cache/sys-fs/zfs-9999
@@ -4,11 +4,11 @@
http://zfsonlinux.org/
-CDDL GPL-2 MIT
+BSD-2 CDDL MIT
Native ZFS for Linux
autotools autotools-utils bash-completion-r1 eutils flag-o-matic git-2 libtool linux-info linux-mod multilib multiprocessing toolchain-funcs user versionator
-bash-completion custom-cflags debug dracut +rootfs test test-suite static-libs kernel_linux
+custom-cflags debug dracut +rootfs test test-suite static-libs kernel_linux
diff --git a/metadata/cache/sys-kernel/pf-sources-3.4.4 b/metadata/cache/sys-kernel/pf-sources-3.4.4
new file mode 100644
index 000000000000..09e6347e4afd
--- /dev/null
+++ b/metadata/cache/sys-kernel/pf-sources-3.4.4
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+3.4.4
+mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 http://pf.natalenko.name/sources/3.4/patch-3.4.4-pf.bz2
+binchecks strip
+http://pf.natalenko.name/
+GPL-2 freedist
+Linux kernel fork with new features, including the -ck patchset (BFS), BFQ, TuxOnIce and LinuxIMQ
+-* ~amd64 ~ppc ~ppc64 ~x86
+eutils kernel-2 multilib toolchain-funcs user versionator
+symlink build
+
+!build? ( virtual/dev-manager )
+
+2
+
+compile install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-libs/mtdev-1.1.2 b/metadata/cache/sys-libs/mtdev-1.1.2
index 2739e98717dc..3e1328e01034 100644
--- a/metadata/cache/sys-libs/mtdev-1.1.2
+++ b/metadata/cache/sys-libs/mtdev-1.1.2
@@ -6,7 +6,7 @@ http://bitmath.org/code/mtdev/mtdev-1.1.2.tar.bz2
http://bitmath.org/code/mtdev/
MIT
Multitouch Protocol Translation Library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86
static-libs
diff --git a/metadata/cache/virtual/httpd-php-5.3 b/metadata/cache/virtual/httpd-php-5.3
index a8942515788f..1923b50898aa 100644
--- a/metadata/cache/virtual/httpd-php-5.3
+++ b/metadata/cache/virtual/httpd-php-5.3
@@ -6,7 +6,7 @@
Virtual to provide PHP-enabled webservers
-alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
diff --git a/metadata/cache/virtual/httpd-php-5.4 b/metadata/cache/virtual/httpd-php-5.4
index 287e2f1b4f00..971c6beb17db 100644
--- a/metadata/cache/virtual/httpd-php-5.4
+++ b/metadata/cache/virtual/httpd-php-5.4
@@ -6,7 +6,7 @@
Virtual to provide PHP-enabled webservers
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
diff --git a/metadata/cache/www-apps/coppermine-1.4.27 b/metadata/cache/www-apps/coppermine-1.4.27
deleted file mode 100644
index a5c1c89cbe20..000000000000
--- a/metadata/cache/www-apps/coppermine-1.4.27
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/unzip || ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-imagemagick? ( media-gfx/imagemagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-1.4.27
-mirror://sourceforge/coppermine/cpg1.4.27.zip
-
-http://coppermine.sourceforge.net/
-GPL-2
-Web picture gallery written in PHP with a MySQL backend
-~amd64 ~sparc ~x86
-depend.php eutils multilib phpconfutils toolchain-funcs user versionator webapp
-imagemagick vhosts
-
-
-
-
-
-install postinst prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-apps/moodle-1.9.18 b/metadata/cache/www-apps/moodle-1.9.18
deleted file mode 100644
index 632cd8e79728..000000000000
--- a/metadata/cache/www-apps/moodle-1.9.18
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-admin/webapp-config-1.50.15
->=dev-lang/php-4.3.0[mysql?,postgres?,imap?,ldap?,odbc?,ctype,curl,gd,iconv,session,ssl,tokenizer,xml,xmlrpc,zlib] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-1.9.18
-http://download.moodle.org/stable19/moodle-1.9.18.tgz
-
-http://moodle.org
-GPL-2
-The Moodle Course Management System
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-eutils multilib toolchain-funcs user versionator webapp
-mysql postgres imap ldap odbc vhosts vhosts
-
-
-
-4
-
-install postinst prepare prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-apps/moodle-1.9.19 b/metadata/cache/www-apps/moodle-1.9.19
index 07ba7175c61c..8927d357e0cf 100644
--- a/metadata/cache/www-apps/moodle-1.9.19
+++ b/metadata/cache/www-apps/moodle-1.9.19
@@ -6,7 +6,7 @@ http://download.moodle.org/stable19/moodle-1.9.19.tgz
http://moodle.org
GPL-2
The Moodle Course Management System
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
eutils multilib toolchain-funcs user versionator webapp
mysql postgres imap ldap odbc vhosts vhosts
diff --git a/metadata/cache/www-apps/moodle-2.0.10 b/metadata/cache/www-apps/moodle-2.0.10
index fb54cbae8304..70fb9b51e5cc 100644
--- a/metadata/cache/www-apps/moodle-2.0.10
+++ b/metadata/cache/www-apps/moodle-2.0.10
@@ -6,7 +6,7 @@ http://download.moodle.org/stable20/moodle-2.0.10.tgz
http://moodle.org
GPL-2
The Moodle Course Management System
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
eutils multilib toolchain-funcs user versionator webapp
mysqli postgres imap ldap odbc vhosts vhosts
diff --git a/metadata/cache/www-apps/moodle-2.0.9 b/metadata/cache/www-apps/moodle-2.0.9
deleted file mode 100644
index 7e91569bbc5e..000000000000
--- a/metadata/cache/www-apps/moodle-2.0.9
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-admin/webapp-config-1.50.15
-=dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-2.0.9
-http://download.moodle.org/stable20/moodle-2.0.9.tgz
-
-http://moodle.org
-GPL-2
-The Moodle Course Management System
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils multilib toolchain-funcs user versionator webapp
-mysqli postgres imap ldap odbc vhosts vhosts
-
-
-
-4
-
-install postinst prepare prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-apps/moodle-2.1.6 b/metadata/cache/www-apps/moodle-2.1.6
deleted file mode 100644
index 208246eb3489..000000000000
--- a/metadata/cache/www-apps/moodle-2.1.6
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-admin/webapp-config-1.50.15
-=dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-2.1.6
-http://download.moodle.org/stable21/moodle-2.1.6.tgz
-
-http://moodle.org
-GPL-2
-The Moodle Course Management System
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils multilib toolchain-funcs user versionator webapp
-mysqli postgres imap ldap odbc vhosts vhosts
-
-
-
-4
-
-install postinst prepare prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-apps/moodle-2.1.7 b/metadata/cache/www-apps/moodle-2.1.7
index f23b292ea796..ced967b7fe22 100644
--- a/metadata/cache/www-apps/moodle-2.1.7
+++ b/metadata/cache/www-apps/moodle-2.1.7
@@ -6,7 +6,7 @@ http://download.moodle.org/stable21/moodle-2.1.7.tgz
http://moodle.org
GPL-2
The Moodle Course Management System
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
eutils multilib toolchain-funcs user versionator webapp
mysqli postgres imap ldap odbc vhosts vhosts
diff --git a/metadata/cache/www-apps/moodle-2.2.3 b/metadata/cache/www-apps/moodle-2.2.3
deleted file mode 100644
index cf4e2a9293a5..000000000000
--- a/metadata/cache/www-apps/moodle-2.2.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-admin/webapp-config-1.50.15
-=dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-2.2.3
-http://download.moodle.org/stable22/moodle-2.2.3.tgz
-
-http://moodle.org
-GPL-2
-The Moodle Course Management System
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils multilib toolchain-funcs user versionator webapp
-mysqli postgres imap ldap odbc vhosts vhosts
-
-
-
-4
-
-install postinst prepare prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-apps/moodle-2.2.4 b/metadata/cache/www-apps/moodle-2.2.4
index 94f1a165f357..44e692310842 100644
--- a/metadata/cache/www-apps/moodle-2.2.4
+++ b/metadata/cache/www-apps/moodle-2.2.4
@@ -6,7 +6,7 @@ http://download.moodle.org/stable22/moodle-2.2.4.tgz
http://moodle.org
GPL-2
The Moodle Course Management System
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
eutils multilib toolchain-funcs user versionator webapp
mysqli postgres imap ldap odbc vhosts vhosts
diff --git a/metadata/cache/www-apps/moodle-2.3 b/metadata/cache/www-apps/moodle-2.3
deleted file mode 100644
index fbf409c89881..000000000000
--- a/metadata/cache/www-apps/moodle-2.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-admin/webapp-config-1.50.15
-=dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-2.3
-http://download.moodle.org/stable23/moodle-2.3.tgz
-
-http://moodle.org
-GPL-2
-The Moodle Course Management System
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils multilib toolchain-funcs user versionator webapp
-mysqli postgres imap ldap odbc vhosts vhosts
-
-
-
-4
-
-install postinst prepare prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-apps/moodle-2.3.1 b/metadata/cache/www-apps/moodle-2.3.1
index 906ac48dcf11..c14f4ab89ee6 100644
--- a/metadata/cache/www-apps/moodle-2.3.1
+++ b/metadata/cache/www-apps/moodle-2.3.1
@@ -6,7 +6,7 @@ http://download.moodle.org/stable23/moodle-2.3.1.tgz
http://moodle.org
GPL-2
The Moodle Course Management System
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
eutils multilib toolchain-funcs user versionator webapp
mysqli postgres imap ldap odbc vhosts vhosts
diff --git a/metadata/cache/www-apps/mythweb-0.25.1 b/metadata/cache/www-apps/mythweb-0.25.1
new file mode 100644
index 000000000000..7296c1676ada
--- /dev/null
+++ b/metadata/cache/www-apps/mythweb-0.25.1
@@ -0,0 +1,22 @@
+dev-lang/php:5.3[json,mysql,session,posix] dev-perl/DBI dev-perl/DBD-mysql dev-perl/HTTP-Date dev-perl/Net-UPnP || ( virtual/httpd-cgi virtual/httpd-fastcgi ) =virtual/httpd-php-5* >=app-admin/webapp-config-1.50.15
+dev-lang/php:5.3[json,mysql,session,posix] dev-perl/DBI dev-perl/DBD-mysql dev-perl/HTTP-Date dev-perl/Net-UPnP =virtual/httpd-php-5* >=app-admin/webapp-config-1.50.15
+0.25.1
+ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.25.1.tar.bz2
+
+http://www.mythtv.org
+GPL-2
+PHP scripts intended to manage MythTV from a web browser.
+~amd64 ~ppc ~x86
+depend.php eutils multilib phpconfutils toolchain-funcs user webapp
+vhosts
+
+
+
+4
+
+compile configure install postinst prerm setup
+
+
+
+
+
diff --git a/metadata/cache/www-apps/phpsysinfo-3.0.18 b/metadata/cache/www-apps/phpsysinfo-3.0.18
new file mode 100644
index 000000000000..ec78c12eed54
--- /dev/null
+++ b/metadata/cache/www-apps/phpsysinfo-3.0.18
@@ -0,0 +1,22 @@
+|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+virtual/httpd-php dev-lang/php[simplexml,xml,xsl,unicode] >=app-admin/webapp-config-1.50.15
+3.0.18
+mirror://sourceforge/phpsysinfo/phpsysinfo-3.0.18.tar.gz
+
+http://phpsysinfo.sourceforge.net/
+GPL-2
+phpSysInfo is a nice package that will display your system stats via PHP.
+~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+webapp
+vhosts
+
+
+
+4
+
+install postinst prerm setup
+
+
+
+
+
diff --git a/metadata/cache/www-client/chromium-20.0.1132.57 b/metadata/cache/www-client/chromium-20.0.1132.57
new file mode 100644
index 000000000000..dceaeb396d13
--- /dev/null
+++ b/metadata/cache/www-client/chromium-20.0.1132.57
@@ -0,0 +1,22 @@
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+0
+http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.57.tar.bz2
+
+http://chromium.org/
+BSD
+Open-source version of Google Chrome web browser
+amd64 ~x86
+chromium eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib pax-utils portability python toolchain-funcs user versionator virtualx
+bindist cups gnome gnome-keyring kerberos pulseaudio selinux custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/www-client/fetch-1.0 b/metadata/cache/www-client/fetch-1.0
deleted file mode 100644
index b60e67780a39..000000000000
--- a/metadata/cache/www-client/fetch-1.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/http-fetcher-1.0.1
->=dev-libs/http-fetcher-1.0.1
-0
-mirror://sourceforge/fetch/fetch-1.0.tar.gz
-
-http://sourceforge.net/projects/fetch/
-LGPL-2.1
-Fetch is a simple, fast, and flexible HTTP download tool built on the HTTP Fetcher library.
-amd64 x86
-
-
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/www-client/google-chrome-20.0.1132.47_p144678-r1 b/metadata/cache/www-client/google-chrome-20.0.1132.57_p145807
similarity index 93%
rename from metadata/cache/www-client/google-chrome-20.0.1132.47_p144678-r1
rename to metadata/cache/www-client/google-chrome-20.0.1132.57_p145807
index 49b126ab16b1..da8659c3dc8a 100644
--- a/metadata/cache/www-client/google-chrome-20.0.1132.47_p144678-r1
+++ b/metadata/cache/www-client/google-chrome-20.0.1132.57_p145807
@@ -1,7 +1,7 @@
>=sys-apps/sed-4
media-libs/alsa-lib app-arch/bzip2 x11-libs/cairo net-print/cups sys-apps/dbus dev-libs/expat media-libs/fontconfig media-libs/freetype app-misc/ca-certificates gnome-base/gconf:2 dev-libs/libgcrypt x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-libs/glib:2 dev-libs/nspr dev-libs/nss x11-libs/pango media-libs/libpng:1.2 || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] ) sys-fs/udev x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXScrnSaver sys-libs/zlib x11-misc/xdg-utils net-misc/curl dev-libs/openssl:0.9.8 !www-client/google-chrome:0 !www-client/google-chrome:beta !www-client/google-chrome:unstable
stable
-amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_20.0.1132.47-r144678_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_20.0.1132.47-r144678_i386.deb )
+amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_20.0.1132.57-r145807_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_20.0.1132.57-r145807_i386.deb )
mirror strip
http://www.google.com/chrome
google-chrome
diff --git a/metadata/cache/www-servers/cherokee-1.2.101-r1 b/metadata/cache/www-servers/cherokee-1.2.101-r1
index 909fb2593452..89a9b484e0be 100644
--- a/metadata/cache/www-servers/cherokee-1.2.101-r1
+++ b/metadata/cache/www-servers/cherokee-1.2.101-r1
@@ -6,7 +6,7 @@ test
http://www.cherokee-project.com/
GPL-2
An extremely fast and tiny web server.
-~amd64 ~x86
+~amd64 ~mips ~x86
eutils flag-o-matic multilib pam python toolchain-funcs user versionator
admin coverpage ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php rrdtool ssl static static-libs
diff --git a/metadata/cache/www-servers/thttpd-2.25b-r7 b/metadata/cache/www-servers/thttpd-2.25b-r7
index 31401b2c192e..bad52970e1bd 100644
--- a/metadata/cache/www-servers/thttpd-2.25b-r7
+++ b/metadata/cache/www-servers/thttpd-2.25b-r7
@@ -4,7 +4,7 @@
http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz
http://www.acme.com/software/thttpd/
-BSD
+BSD GPL-2
Small and fast multiplexing webserver.
amd64 ~hppa ~mips ppc sparc x86 ~x86-fbsd
eutils flag-o-matic multilib toolchain-funcs user
diff --git a/metadata/cache/www-servers/thttpd-2.26.2 b/metadata/cache/www-servers/thttpd-2.26.2
index cc3b58371b61..c825da1b29bd 100644
--- a/metadata/cache/www-servers/thttpd-2.26.2
+++ b/metadata/cache/www-servers/thttpd-2.26.2
@@ -4,7 +4,7 @@
http://opensource.dyc.edu/pub/sthttpd/sthttpd-2.26.2.tar.gz
http://opensource.dyc.edu/sthttpd
-BSD
+BSD GPL-2
Fork of thttpd, a small, fast, multiplexing webserver.
amd64 ~hppa ~mips x86 ~amd64-linux ~x86-linux
eutils flag-o-matic multilib toolchain-funcs user
diff --git a/metadata/cache/www-servers/varnish-2.0.4-r1 b/metadata/cache/www-servers/varnish-2.0.4-r1
index 570799fba4c5..76be868b4091 100644
--- a/metadata/cache/www-servers/varnish-2.0.4-r1
+++ b/metadata/cache/www-servers/varnish-2.0.4-r1
@@ -4,7 +4,7 @@ sys-devel/gcc
mirror://sourceforge/varnish/varnish-2.0.4.tar.gz
test
http://varnish.projects.linpro.no/
-BSD-2
+BSD-2 GPL-2
Varnish is a state-of-the-art, high-performance HTTP accelerator.
amd64 x86
autotools eutils libtool multilib multiprocessing toolchain-funcs user
diff --git a/metadata/cache/www-servers/varnish-3.0.2-r1 b/metadata/cache/www-servers/varnish-3.0.2-r1
index 21c79da042d8..bf864f86eef6 100644
--- a/metadata/cache/www-servers/varnish-3.0.2-r1
+++ b/metadata/cache/www-servers/varnish-3.0.2-r1
@@ -4,9 +4,9 @@ dev-libs/libpcre libedit? ( dev-libs/libedit ) tools? ( sys-libs/ncurses ) sys-d
http://repo.varnish-cache.org/source/varnish-3.0.2.tar.gz
test
http://www.varnish-cache.org/
-BSD-2
+BSD-2 GPL-2
Varnish is a state-of-the-art, high-performance HTTP accelerator
-amd64 x86
+amd64 ~mips x86
autotools autotools-utils eutils libtool multilib multiprocessing toolchain-funcs user
doc libedit static-libs +tools
diff --git a/metadata/cache/x11-apps/bitmap-1.0.6 b/metadata/cache/x11-apps/bitmap-1.0.6
index 4a4a24971ec4..fb8f3b5c9c87 100644
--- a/metadata/cache/x11-apps/bitmap-1.0.6
+++ b/metadata/cache/x11-apps/bitmap-1.0.6
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.6.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org bitmap application
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/fonttosfnt-1.0.4-r1 b/metadata/cache/x11-apps/fonttosfnt-1.0.4-r1
index a9e07a13ccd9..f6f344ffffcc 100644
--- a/metadata/cache/x11-apps/fonttosfnt-1.0.4-r1
+++ b/metadata/cache/x11-apps/fonttosfnt-1.0.4-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.4.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org fonttosfnt application
-amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+amd64 arm ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/fslsfonts-1.0.4 b/metadata/cache/x11-apps/fslsfonts-1.0.4
index 9b30b4d292f4..af02de1bd178 100644
--- a/metadata/cache/x11-apps/fslsfonts-1.0.4
+++ b/metadata/cache/x11-apps/fslsfonts-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.4.tar.bz2
http://xorg.freedesktop.org/
MIT
list fonts served by X font server
-amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+amd64 arm ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/fstobdf-1.0.5 b/metadata/cache/x11-apps/fstobdf-1.0.5
index 090464a21e46..73a1760c4a50 100644
--- a/metadata/cache/x11-apps/fstobdf-1.0.5
+++ b/metadata/cache/x11-apps/fstobdf-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.5.tar.bz2
http://xorg.freedesktop.org/
MIT
generate BDF font from X font server
-amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+amd64 arm ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/listres-1.0.3 b/metadata/cache/x11-apps/listres-1.0.3
index 659cd491f11f..5afa667841de 100644
--- a/metadata/cache/x11-apps/listres-1.0.3
+++ b/metadata/cache/x11-apps/listres-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/listres-1.0.3.tar.bz2
http://xorg.freedesktop.org/
MIT
list resources in widgets
-amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/luit-1.1.1 b/metadata/cache/x11-apps/luit-1.1.1
index 7e1330e325af..b03474070471 100644
--- a/metadata/cache/x11-apps/luit-1.1.1
+++ b/metadata/cache/x11-apps/luit-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/luit-1.1.1.tar.bz2
http://xorg.freedesktop.org/
MIT
Locale and ISO 2022 support for Unicode terminals
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/mkfontdir-1.0.7 b/metadata/cache/x11-apps/mkfontdir-1.0.7
index d1e821ddad56..d7482ee18fd7 100644
--- a/metadata/cache/x11-apps/mkfontdir-1.0.7
+++ b/metadata/cache/x11-apps/mkfontdir-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.7.tar.bz2
http://xorg.freedesktop.org/
MIT
create an index of X font files in a directory
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/oclock-1.0.3 b/metadata/cache/x11-apps/oclock-1.0.3
index 1d95d39f2432..ed8558bd28fd 100644
--- a/metadata/cache/x11-apps/oclock-1.0.3
+++ b/metadata/cache/x11-apps/oclock-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/oclock-1.0.3.tar.bz2
http://xorg.freedesktop.org/
MIT
round X clock
-~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
+~alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/setxkbmap-1.3.0 b/metadata/cache/x11-apps/setxkbmap-1.3.0
index 821660d6ffaa..63b63b4fdb5a 100644
--- a/metadata/cache/x11-apps/setxkbmap-1.3.0
+++ b/metadata/cache/x11-apps/setxkbmap-1.3.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.3.0.tar.bz2
http://xorg.freedesktop.org/
MIT
Controls the keyboard layout of a running X server.
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xauth-1.0.7 b/metadata/cache/x11-apps/xauth-1.0.7
index 4a9d8dd2de32..3962bb25524e 100644
--- a/metadata/cache/x11-apps/xauth-1.0.7
+++ b/metadata/cache/x11-apps/xauth-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.7.tar.bz2
http://xorg.freedesktop.org/
MIT
X authority file utility
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
ipv6
diff --git a/metadata/cache/x11-apps/xclipboard-1.1.2 b/metadata/cache/x11-apps/xclipboard-1.1.2
index fb0866a4122a..eb3a02b08189 100644
--- a/metadata/cache/x11-apps/xclipboard-1.1.2
+++ b/metadata/cache/x11-apps/xclipboard-1.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.1.2.tar.bz2
http://xorg.freedesktop.org/
MIT
interchange between cut buffer and selection
-amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xclock-1.0.6 b/metadata/cache/x11-apps/xclock-1.0.6
index e8fa76f78d43..af5e47699a00 100644
--- a/metadata/cache/x11-apps/xclock-1.0.6
+++ b/metadata/cache/x11-apps/xclock-1.0.6
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.6.tar.bz2
http://xorg.freedesktop.org/
MIT
analog / digital clock for X
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xcmsdb-1.0.4 b/metadata/cache/x11-apps/xcmsdb-1.0.4
index 43919a89bed3..989f0aa9be81 100644
--- a/metadata/cache/x11-apps/xcmsdb-1.0.4
+++ b/metadata/cache/x11-apps/xcmsdb-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.4.tar.bz2
http://xorg.freedesktop.org/
MIT
Device Color Characterization utility for X Color Management System
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xcursorgen-1.0.5 b/metadata/cache/x11-apps/xcursorgen-1.0.5
index 38e19278efcc..7a9ffda1a420 100644
--- a/metadata/cache/x11-apps/xcursorgen-1.0.5
+++ b/metadata/cache/x11-apps/xcursorgen-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.5.tar.bz2
http://xorg.freedesktop.org/
MIT
create an X cursor file from a collection of PNG images
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xev-1.2.0 b/metadata/cache/x11-apps/xev-1.2.0
index 3fcf4a0f7391..9471e0b7e23c 100644
--- a/metadata/cache/x11-apps/xev-1.2.0
+++ b/metadata/cache/x11-apps/xev-1.2.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xev-1.2.0.tar.bz2
http://xorg.freedesktop.org/
MIT
print contents of X events
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xfd-1.1.1 b/metadata/cache/x11-apps/xfd-1.1.1
index 96d01a81c113..8bed816d539f 100644
--- a/metadata/cache/x11-apps/xfd-1.1.1
+++ b/metadata/cache/x11-apps/xfd-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xfd-1.1.1.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org xfd application
-amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xfontsel-1.0.4 b/metadata/cache/x11-apps/xfontsel-1.0.4
index b36153c59e7e..2e4d07ad8b7a 100644
--- a/metadata/cache/x11-apps/xfontsel-1.0.4
+++ b/metadata/cache/x11-apps/xfontsel-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xfontsel-1.0.4.tar.bz2
http://xorg.freedesktop.org/
MIT
point and click selection of X11 font names
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xgamma-1.0.5 b/metadata/cache/x11-apps/xgamma-1.0.5
index f5ffbd9458fa..5b48cd54606a 100644
--- a/metadata/cache/x11-apps/xgamma-1.0.5
+++ b/metadata/cache/x11-apps/xgamma-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.5.tar.bz2
http://xorg.freedesktop.org/
MIT
Alter a monitor's gamma correction through the X server
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xhost-1.0.5 b/metadata/cache/x11-apps/xhost-1.0.5
index 00e690986060..0a788304a9e9 100644
--- a/metadata/cache/x11-apps/xhost-1.0.5
+++ b/metadata/cache/x11-apps/xhost-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.5.tar.bz2
http://xorg.freedesktop.org/
MIT
Controls host and/or user access to a running X server.
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
ipv6
diff --git a/metadata/cache/x11-apps/xinit-1.3.2 b/metadata/cache/x11-apps/xinit-1.3.2
index adce75945ecd..60ea4d2cf3fc 100644
--- a/metadata/cache/x11-apps/xinit-1.3.2
+++ b/metadata/cache/x11-apps/xinit-1.3.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xinit-1.3.2.tar.bz2
http://xorg.freedesktop.org/
MIT GPL-2
X Window System initializer
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
+minimal
diff --git a/metadata/cache/x11-apps/xinput-1.6.0 b/metadata/cache/x11-apps/xinput-1.6.0
index cc4c77257b0e..7cf88cfd3c5c 100644
--- a/metadata/cache/x11-apps/xinput-1.6.0
+++ b/metadata/cache/x11-apps/xinput-1.6.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xinput-1.6.0.tar.bz2
http://xorg.freedesktop.org/
MIT
Utility to set XInput device parameters
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xkbevd-1.1.3 b/metadata/cache/x11-apps/xkbevd-1.1.3
index 02ec9ccd6030..b542769772b5 100644
--- a/metadata/cache/x11-apps/xkbevd-1.1.3
+++ b/metadata/cache/x11-apps/xkbevd-1.1.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.1.3.tar.bz2
http://xorg.freedesktop.org/
MIT
XKB event daemon
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xload-1.1.1 b/metadata/cache/x11-apps/xload-1.1.1
index f39aac62a25a..80080bdff51a 100644
--- a/metadata/cache/x11-apps/xload-1.1.1
+++ b/metadata/cache/x11-apps/xload-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xload-1.1.1.tar.bz2
http://xorg.freedesktop.org/
MIT
system load average display for X
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xlogo-1.0.4 b/metadata/cache/x11-apps/xlogo-1.0.4
index fe6a40ed9a17..f217381f932f 100644
--- a/metadata/cache/x11-apps/xlogo-1.0.4
+++ b/metadata/cache/x11-apps/xlogo-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.4.tar.bz2
http://xorg.freedesktop.org/
MIT
X Window System logo
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-interix
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xlsatoms-1.1.1 b/metadata/cache/x11-apps/xlsatoms-1.1.1
index 5916ca41fcd7..86a5e95022cb 100644
--- a/metadata/cache/x11-apps/xlsatoms-1.1.1
+++ b/metadata/cache/x11-apps/xlsatoms-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.1.1.tar.bz2
http://xorg.freedesktop.org/
MIT
list interned atoms defined on server
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xlsfonts-1.0.4 b/metadata/cache/x11-apps/xlsfonts-1.0.4
index 300bd8dc5f92..f8456cac274b 100644
--- a/metadata/cache/x11-apps/xlsfonts-1.0.4
+++ b/metadata/cache/x11-apps/xlsfonts-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xlsfonts-1.0.4.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org xlsfonts application
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xmodmap-1.0.7 b/metadata/cache/x11-apps/xmodmap-1.0.7
index f5c8d3239f05..2f19c7330606 100644
--- a/metadata/cache/x11-apps/xmodmap-1.0.7
+++ b/metadata/cache/x11-apps/xmodmap-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.7.tar.bz2
http://xorg.freedesktop.org/
MIT
utility for modifying keymaps and pointer button mappings in X
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xpr-1.0.4 b/metadata/cache/x11-apps/xpr-1.0.4
index ae19897bcd1f..480e1232dd60 100644
--- a/metadata/cache/x11-apps/xpr-1.0.4
+++ b/metadata/cache/x11-apps/xpr-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.4.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org xpr application
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xtrap-1.0.2-r1 b/metadata/cache/x11-apps/xtrap-1.0.2-r1
index 4fc5591373f3..14fad3471df9 100644
--- a/metadata/cache/x11-apps/xtrap-1.0.2-r1
+++ b/metadata/cache/x11-apps/xtrap-1.0.2-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xtrap-1.0.2.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org xtrap application
-amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xvidtune-1.0.2-r1 b/metadata/cache/x11-apps/xvidtune-1.0.2-r1
index fe1924c022da..e4d274cdc838 100644
--- a/metadata/cache/x11-apps/xvidtune-1.0.2-r1
+++ b/metadata/cache/x11-apps/xvidtune-1.0.2-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.2.tar.bz2
http://xorg.freedesktop.org/
MIT
video mode tuner for Xorg
-~alpha amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+~alpha amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xwarppointer-1 b/metadata/cache/x11-apps/xwarppointer-1
deleted file mode 100644
index 05a4eabe74d7..000000000000
--- a/metadata/cache/x11-apps/xwarppointer-1
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/libX11
-x11-libs/libX11
-0
-http://www.ishiboo.com/~nirva/Projects/xwarppointer/xwarppointer.tar.gz
-
-http://www.ishiboo.com/~nirva/Projects/xwarppointer/
-BSD
-Program to move the mouse cursor
-~amd64 ~ppc ~x86
-
-
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/x11-apps/xwd-1.0.5 b/metadata/cache/x11-apps/xwd-1.0.5
index dc1aa8c04676..f08e3c1febcf 100644
--- a/metadata/cache/x11-apps/xwd-1.0.5
+++ b/metadata/cache/x11-apps/xwd-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.5.tar.bz2
http://xorg.freedesktop.org/
MIT
dump an image of an X window
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-apps/xwud-1.0.4 b/metadata/cache/x11-apps/xwud-1.0.4
index 58e2baeb28d2..29061099d3dd 100644
--- a/metadata/cache/x11-apps/xwud-1.0.4
+++ b/metadata/cache/x11-apps/xwud-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.4.tar.bz2
http://xorg.freedesktop.org/
MIT
image displayer for X
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-base/xorg-drivers-1.12 b/metadata/cache/x11-base/xorg-drivers-1.12
index 6490e20a4e78..3cfaa54e1e7b 100644
--- a/metadata/cache/x11-base/xorg-drivers-1.12
+++ b/metadata/cache/x11-base/xorg-drivers-1.12
@@ -6,7 +6,7 @@
http://www.gentoo.org/
as-is
Meta package containing deps on all xorg drivers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
video_cards_apm video_cards_ark video_cards_ast video_cards_cirrus video_cards_dummy video_cards_epson video_cards_fbdev video_cards_geode video_cards_glint video_cards_i128 video_cards_i740 video_cards_intel video_cards_mach64 video_cards_mga video_cards_modesetting video_cards_neomagic video_cards_newport video_cards_nouveau video_cards_nv video_cards_omapfb video_cards_qxl video_cards_r128 video_cards_radeon video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sis video_cards_sunbw2 video_cards_suncg14 video_cards_suncg3 video_cards_suncg6 video_cards_sunffb video_cards_sunleo video_cards_suntcx video_cards_tdfx video_cards_tga video_cards_trident video_cards_v4l video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_fglrx video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
diff --git a/metadata/cache/x11-base/xorg-server-1.12.2 b/metadata/cache/x11-base/xorg-server-1.12.2
index 2c621c9195bd..d899a0a33bfd 100644
--- a/metadata/cache/x11-base/xorg-server-1.12.2
+++ b/metadata/cache/x11-base/xorg-server-1.12.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.12.2.tar.b
http://xorg.freedesktop.org/
MIT
X.Org X servers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user versionator xorg-2
dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux tslib +udev static-libs doc
!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
diff --git a/metadata/cache/x11-drivers/xf86-input-evdev-2.7.0 b/metadata/cache/x11-drivers/xf86-input-evdev-2.7.0
index cea0a8748ca6..c52b17bc35e5 100644
--- a/metadata/cache/x11-drivers/xf86-input-evdev-2.7.0
+++ b/metadata/cache/x11-drivers/xf86-input-evdev-2.7.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.0.ta
http://xorg.freedesktop.org/
MIT
Generic Linux input driver
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-drivers/xf86-input-joystick-1.6.1 b/metadata/cache/x11-drivers/xf86-input-joystick-1.6.1
index 7fc323134dcc..71228cd9fc95 100644
--- a/metadata/cache/x11-drivers/xf86-input-joystick-1.6.1
+++ b/metadata/cache/x11-drivers/xf86-input-joystick-1.6.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.6.1
http://xorg.freedesktop.org/
MIT
X.Org driver for joystick input devices
-~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-drivers/xf86-input-keyboard-1.6.1 b/metadata/cache/x11-drivers/xf86-input-keyboard-1.6.1
index 5ae2e0bfd6b0..51fa264dbe39 100644
--- a/metadata/cache/x11-drivers/xf86-input-keyboard-1.6.1
+++ b/metadata/cache/x11-drivers/xf86-input-keyboard-1.6.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.6.1
http://xorg.freedesktop.org/
MIT
Keyboard input driver
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-drivers/xf86-input-mouse-1.7.2 b/metadata/cache/x11-drivers/xf86-input-mouse-1.7.2
index 8b4f60ff1a82..29d79c56ff50 100644
--- a/metadata/cache/x11-drivers/xf86-input-mouse-1.7.2
+++ b/metadata/cache/x11-drivers/xf86-input-mouse-1.7.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.7.2.ta
http://xorg.freedesktop.org/
MIT
X.Org driver for mouse input devices
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-drivers/xf86-input-synaptics-1.6.2 b/metadata/cache/x11-drivers/xf86-input-synaptics-1.6.2
index de2a4a9c258a..5d9f41704468 100644
--- a/metadata/cache/x11-drivers/xf86-input-synaptics-1.6.2
+++ b/metadata/cache/x11-drivers/xf86-input-synaptics-1.6.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.6.
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/
MIT
Driver for Synaptics touchpads
-amd64 ~mips ~ppc ~ppc64 x86
+amd64 ~mips ~ppc ppc64 x86
autotools autotools-utils eutils flag-o-matic libtool linux-info multilib multiprocessing toolchain-funcs user versionator xorg-2
diff --git a/metadata/cache/x11-drivers/xf86-input-wacom-0.14.0 b/metadata/cache/x11-drivers/xf86-input-wacom-0.14.0
index 4cf0fcfc95d9..ad613590a79c 100644
--- a/metadata/cache/x11-drivers/xf86-input-wacom-0.14.0
+++ b/metadata/cache/x11-drivers/xf86-input-wacom-0.14.0
@@ -6,7 +6,7 @@ mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.14.0.tar.bz2
http://linuxwacom.sourceforge.net/
GPL-2
Driver for Wacom tablets and drawing devices
-amd64 ~ppc ~ppc64 x86
+amd64 ~ppc ppc64 x86
autotools autotools-utils eutils flag-o-matic libtool linux-info multilib multiprocessing toolchain-funcs user versionator xorg-2
debug
diff --git a/metadata/cache/x11-drivers/xf86-video-ati-6.14.4-r1 b/metadata/cache/x11-drivers/xf86-video-ati-6.14.4-r1
index b71d8aac6205..1eac4517150e 100644
--- a/metadata/cache/x11-drivers/xf86-video-ati-6.14.4-r1
+++ b/metadata/cache/x11-drivers/xf86-video-ati-6.14.4-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.4.tar
http://xorg.freedesktop.org/
MIT
ATI video driver
-~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-drivers/xf86-video-dummy-0.3.5-r1 b/metadata/cache/x11-drivers/xf86-video-dummy-0.3.5-r1
index d32c4f80ebe5..6c8e13cb0945 100644
--- a/metadata/cache/x11-drivers/xf86-video-dummy-0.3.5-r1
+++ b/metadata/cache/x11-drivers/xf86-video-dummy-0.3.5-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.5.ta
http://xorg.freedesktop.org/
MIT
X.Org driver for dummy cards
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
dga
diff --git a/metadata/cache/x11-drivers/xf86-video-mach64-6.9.1 b/metadata/cache/x11-drivers/xf86-video-mach64-6.9.1
index ff5ccce0ebfb..d0ceb929dfa5 100644
--- a/metadata/cache/x11-drivers/xf86-video-mach64-6.9.1
+++ b/metadata/cache/x11-drivers/xf86-video-mach64-6.9.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.9.1.t
http://xorg.freedesktop.org/
MIT
ATI Mach64 video driver
-~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
dri
diff --git a/metadata/cache/x11-drivers/xf86-video-mga-1.5.0 b/metadata/cache/x11-drivers/xf86-video-mga-1.5.0
index a6fe9d3fce0e..4b92ab383e1d 100644
--- a/metadata/cache/x11-drivers/xf86-video-mga-1.5.0
+++ b/metadata/cache/x11-drivers/xf86-video-mga-1.5.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.5.0.tar.
http://xorg.freedesktop.org/
MIT
Matrox video driver
-~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
dri dri
diff --git a/metadata/cache/x11-drivers/xf86-video-modesetting-0.3.0 b/metadata/cache/x11-drivers/xf86-video-modesetting-0.3.0
index 156ddc4684d3..ea45705bfacb 100644
--- a/metadata/cache/x11-drivers/xf86-video-modesetting-0.3.0
+++ b/metadata/cache/x11-drivers/xf86-video-modesetting-0.3.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-modesetting-0.
http://xorg.freedesktop.org/
MIT
Unaccelerated generic driver for kernel modesetting
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322 b/metadata/cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
index 50f3d3b92484..8bfcce1af675 100644
--- a/metadata/cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
+++ b/metadata/cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
@@ -6,7 +6,7 @@ mirror://gentoo/xf86-video-nouveau-0.0.16_pre20120322.tar.bz2
http://nouveau.freedesktop.org/
MIT
Accelerated Open Source driver for nVidia cards
-amd64 ~ppc ~ppc64 x86
+amd64 ~ppc ppc64 x86
autotools autotools-utils eutils flag-o-matic libtool linux-info multilib multiprocessing toolchain-funcs user versionator xorg-2
diff --git a/metadata/cache/x11-drivers/xf86-video-r128-6.8.2-r1 b/metadata/cache/x11-drivers/xf86-video-r128-6.8.2-r1
index a6bbe7b8ca6e..0f1277e68756 100644
--- a/metadata/cache/x11-drivers/xf86-video-r128-6.8.2-r1
+++ b/metadata/cache/x11-drivers/xf86-video-r128-6.8.2-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.2.tar
http://xorg.freedesktop.org/
MIT
ATI Rage128 video driver
-~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
dri dri
diff --git a/metadata/cache/x11-libs/libFS-1.0.4 b/metadata/cache/x11-libs/libFS-1.0.4
index 32004346b1a8..48221731ac0e 100644
--- a/metadata/cache/x11-libs/libFS-1.0.4
+++ b/metadata/cache/x11-libs/libFS-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.4.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org FS library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
ipv6 static-libs
diff --git a/metadata/cache/x11-libs/libICE-1.0.8 b/metadata/cache/x11-libs/libICE-1.0.8
index 8855a640e0b7..44022a7e7b17 100644
--- a/metadata/cache/x11-libs/libICE-1.0.8
+++ b/metadata/cache/x11-libs/libICE-1.0.8
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.8.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org ICE library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
ipv6 static-libs doc
diff --git a/metadata/cache/x11-libs/libSM-1.2.1 b/metadata/cache/x11-libs/libSM-1.2.1
index c168e164dd62..02686d5641c7 100644
--- a/metadata/cache/x11-libs/libSM-1.2.1
+++ b/metadata/cache/x11-libs/libSM-1.2.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.1.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org SM library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
doc ipv6 +uuid static-libs doc
diff --git a/metadata/cache/x11-libs/libX11-1.5.0 b/metadata/cache/x11-libs/libX11-1.5.0
index 9ec1608763e3..875045c7f645 100644
--- a/metadata/cache/x11-libs/libX11-1.5.0
+++ b/metadata/cache/x11-libs/libX11-1.5.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libX11-1.5.0.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org X11 library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
ipv6 test static-libs doc
diff --git a/metadata/cache/x11-libs/libXScrnSaver-1.2.2 b/metadata/cache/x11-libs/libXScrnSaver-1.2.2
index 0cdeca1465a1..bcd67918d7da 100644
--- a/metadata/cache/x11-libs/libXScrnSaver-1.2.2
+++ b/metadata/cache/x11-libs/libXScrnSaver-1.2.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.2.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org XScrnSaver library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXTrap-1.0.0-r1 b/metadata/cache/x11-libs/libXTrap-1.0.0-r1
index deab43960251..d3008d361992 100644
--- a/metadata/cache/x11-libs/libXTrap-1.0.0-r1
+++ b/metadata/cache/x11-libs/libXTrap-1.0.0-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXTrap-1.0.0.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org XTrap library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXau-1.0.7 b/metadata/cache/x11-libs/libXau-1.0.7
index 1c2cfe54d25d..c5f1fc5a90b3 100644
--- a/metadata/cache/x11-libs/libXau-1.0.7
+++ b/metadata/cache/x11-libs/libXau-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.7.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xau library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXaw-1.0.11 b/metadata/cache/x11-libs/libXaw-1.0.11
index 1cb90339e984..b4b51d035987 100644
--- a/metadata/cache/x11-libs/libXaw-1.0.11
+++ b/metadata/cache/x11-libs/libXaw-1.0.11
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.11.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xaw library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs doc
diff --git a/metadata/cache/x11-libs/libXcursor-1.1.13 b/metadata/cache/x11-libs/libXcursor-1.1.13
index de687a7efe2c..a5a5be751c82 100644
--- a/metadata/cache/x11-libs/libXcursor-1.1.13
+++ b/metadata/cache/x11-libs/libXcursor-1.1.13
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.13.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xcursor library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXdmcp-1.1.1 b/metadata/cache/x11-libs/libXdmcp-1.1.1
index fc2709c98ee5..eb54a8b6f484 100644
--- a/metadata/cache/x11-libs/libXdmcp-1.1.1
+++ b/metadata/cache/x11-libs/libXdmcp-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.1.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xdmcp library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs doc
diff --git a/metadata/cache/x11-libs/libXext-1.3.1 b/metadata/cache/x11-libs/libXext-1.3.1
index 397a2876aaab..eb77da3e0424 100644
--- a/metadata/cache/x11-libs/libXext-1.3.1
+++ b/metadata/cache/x11-libs/libXext-1.3.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.1.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xext library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs doc
diff --git a/metadata/cache/x11-libs/libXfont-1.4.5 b/metadata/cache/x11-libs/libXfont-1.4.5
index 0eb331f3660d..39ffd9535c16 100644
--- a/metadata/cache/x11-libs/libXfont-1.4.5
+++ b/metadata/cache/x11-libs/libXfont-1.4.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.5.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xfont library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
ipv6 static-libs doc
diff --git a/metadata/cache/x11-libs/libXfontcache-1.0.5-r1 b/metadata/cache/x11-libs/libXfontcache-1.0.5-r1
index db59acb3de49..28fe6fc99398 100644
--- a/metadata/cache/x11-libs/libXfontcache-1.0.5-r1
+++ b/metadata/cache/x11-libs/libXfontcache-1.0.5-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXfontcache-1.0.5.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xfontcache library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXft-2.3.1 b/metadata/cache/x11-libs/libXft-2.3.1
index 4a47bd1b0678..cef4a897d8ba 100644
--- a/metadata/cache/x11-libs/libXft-2.3.1
+++ b/metadata/cache/x11-libs/libXft-2.3.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.1.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xft library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXi-1.6.1 b/metadata/cache/x11-libs/libXi-1.6.1
index 44cebb1725d7..a40df0124004 100644
--- a/metadata/cache/x11-libs/libXi-1.6.1
+++ b/metadata/cache/x11-libs/libXi-1.6.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXi-1.6.1.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xi library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs doc
diff --git a/metadata/cache/x11-libs/libXinerama-1.1.2 b/metadata/cache/x11-libs/libXinerama-1.1.2
index a50626011150..feea6811b44d 100644
--- a/metadata/cache/x11-libs/libXinerama-1.1.2
+++ b/metadata/cache/x11-libs/libXinerama-1.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.2.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xinerama library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXmu-1.1.1 b/metadata/cache/x11-libs/libXmu-1.1.1
index 0d52b9df1bce..92531c43120f 100644
--- a/metadata/cache/x11-libs/libXmu-1.1.1
+++ b/metadata/cache/x11-libs/libXmu-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.1.1.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xmu library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
ipv6 static-libs doc
diff --git a/metadata/cache/x11-libs/libXpm-3.5.10 b/metadata/cache/x11-libs/libXpm-3.5.10
index 4435699ded1d..c7ca2603823f 100644
--- a/metadata/cache/x11-libs/libXpm-3.5.10
+++ b/metadata/cache/x11-libs/libXpm-3.5.10
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.10.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xpm library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXrender-0.9.7 b/metadata/cache/x11-libs/libXrender-0.9.7
index 1d0363d5d7a7..6590791d11f1 100644
--- a/metadata/cache/x11-libs/libXrender-0.9.7
+++ b/metadata/cache/x11-libs/libXrender-0.9.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.7.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xrender library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXres-1.0.6 b/metadata/cache/x11-libs/libXres-1.0.6
index 29297087a069..8d656cfddd91 100644
--- a/metadata/cache/x11-libs/libXres-1.0.6
+++ b/metadata/cache/x11-libs/libXres-1.0.6
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXres-1.0.6.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org XRes library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXt-1.1.3 b/metadata/cache/x11-libs/libXt-1.1.3
index 4a65c39fbb9b..f52ce757c382 100644
--- a/metadata/cache/x11-libs/libXt-1.1.3
+++ b/metadata/cache/x11-libs/libXt-1.1.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXt-1.1.3.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xt library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXtst-1.2.1 b/metadata/cache/x11-libs/libXtst-1.2.1
index f8fabe00eb76..669c171ef6e6 100644
--- a/metadata/cache/x11-libs/libXtst-1.2.1
+++ b/metadata/cache/x11-libs/libXtst-1.2.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.2.1.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xtst library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs doc
diff --git a/metadata/cache/x11-libs/libXv-1.0.7 b/metadata/cache/x11-libs/libXv-1.0.7
index 09ff7c87277c..0a37b0a5d9e9 100644
--- a/metadata/cache/x11-libs/libXv-1.0.7
+++ b/metadata/cache/x11-libs/libXv-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.7.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xv library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXvMC-1.0.7 b/metadata/cache/x11-libs/libXvMC-1.0.7
index 9839714b5364..d3c2200b8f6a 100644
--- a/metadata/cache/x11-libs/libXvMC-1.0.7
+++ b/metadata/cache/x11-libs/libXvMC-1.0.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.7.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org XvMC library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXxf86dga-1.1.3 b/metadata/cache/x11-libs/libXxf86dga-1.1.3
index 2d7d6ef8e5b5..ecdbac4bc683 100644
--- a/metadata/cache/x11-libs/libXxf86dga-1.1.3
+++ b/metadata/cache/x11-libs/libXxf86dga-1.1.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.1.3.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xxf86dga library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libXxf86vm-1.1.2 b/metadata/cache/x11-libs/libXxf86vm-1.1.2
index ba4ca7fab5cd..ca4681690287 100644
--- a/metadata/cache/x11-libs/libXxf86vm-1.1.2
+++ b/metadata/cache/x11-libs/libXxf86vm-1.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.2.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Xxf86vm library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libdmx-1.1.2 b/metadata/cache/x11-libs/libdmx-1.1.2
index fa106f3765ac..0de3a7bebea6 100644
--- a/metadata/cache/x11-libs/libdmx-1.1.2
+++ b/metadata/cache/x11-libs/libdmx-1.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libdmx-1.1.2.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org dmx library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libdrm-2.4.33 b/metadata/cache/x11-libs/libdrm-2.4.33
index e8a0b4514ee3..688a6f8879b1 100644
--- a/metadata/cache/x11-libs/libdrm-2.4.33
+++ b/metadata/cache/x11-libs/libdrm-2.4.33
@@ -6,7 +6,7 @@ test
http://dri.freedesktop.org/
MIT
X.Org libdrm library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
diff --git a/metadata/cache/x11-libs/libfontenc-1.1.1 b/metadata/cache/x11-libs/libfontenc-1.1.1
index 537ec010d8dc..19ee6cc0e96d 100644
--- a/metadata/cache/x11-libs/libfontenc-1.1.1
+++ b/metadata/cache/x11-libs/libfontenc-1.1.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libfontenc-1.1.1.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org fontenc library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libpciaccess-0.13.1 b/metadata/cache/x11-libs/libpciaccess-0.13.1
index 7fefc33883ce..22e1d4e778c3 100644
--- a/metadata/cache/x11-libs/libpciaccess-0.13.1
+++ b/metadata/cache/x11-libs/libpciaccess-0.13.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.13.1.tar.bz2
http://xorg.freedesktop.org/
MIT
Library providing generic access to the PCI bus and devices
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
minimal zlib static-libs
diff --git a/metadata/cache/x11-libs/libproplist-0.10.1-r3 b/metadata/cache/x11-libs/libproplist-0.10.1-r3
deleted file mode 100644
index d35e4f8f1645..000000000000
--- a/metadata/cache/x11-libs/libproplist-0.10.1-r3
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-ftp://ftp.windowmaker.org/pub/libs/libPropList-0.10.1.tar.gz
-
-http://www.windowmaker.org/
-LGPL-2
-libPropList
-amd64 ppc x86
-
-
-
-
-
-4
-
-compile configure install
-
-
-
-
-
diff --git a/metadata/cache/x11-libs/libxcb-1.8.1 b/metadata/cache/x11-libs/libxcb-1.8.1
index c3033a9eeb9d..d821b8187c6a 100644
--- a/metadata/cache/x11-libs/libxcb-1.8.1
+++ b/metadata/cache/x11-libs/libxcb-1.8.1
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist/libxcb-1.8.1.tar.bz2
http://xcb.freedesktop.org/
MIT
X C-language Bindings library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
selinux static-libs doc
diff --git a/metadata/cache/x11-libs/libxkbfile-1.0.8 b/metadata/cache/x11-libs/libxkbfile-1.0.8
index a679f7599837..2f6e000f4257 100644
--- a/metadata/cache/x11-libs/libxkbfile-1.0.8
+++ b/metadata/cache/x11-libs/libxkbfile-1.0.8
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.8.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org xkbfile library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/libxkbui-1.0.2-r1 b/metadata/cache/x11-libs/libxkbui-1.0.2-r1
index 7fdceb235521..a03a78c45516 100644
--- a/metadata/cache/x11-libs/libxkbui-1.0.2-r1
+++ b/metadata/cache/x11-libs/libxkbui-1.0.2-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/libxkbui-1.0.2.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org xkbui library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-libs/pixman-0.26.0 b/metadata/cache/x11-libs/pixman-0.26.0
index d97a003e1fa2..60b3727ea922 100644
--- a/metadata/cache/x11-libs/pixman-0.26.0
+++ b/metadata/cache/x11-libs/pixman-0.26.0
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/pixman-0.26.0.tar.bz2
http://xorg.freedesktop.org/
MIT
Low-level pixel manipulation routines
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user versionator xorg-2
altivec iwmmxt mmx neon sse2 test static-libs
diff --git a/metadata/cache/x11-libs/xcb-util-0.3.9 b/metadata/cache/x11-libs/xcb-util-0.3.9
index 8ee737219a67..3007d1b7758b 100644
--- a/metadata/cache/x11-libs/xcb-util-0.3.9
+++ b/metadata/cache/x11-libs/xcb-util-0.3.9
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist//xcb-util-0.3.9.tar.bz2
http://xcb.freedesktop.org/
MIT
X C-language Bindings sample implementations
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
test static-libs doc
diff --git a/metadata/cache/x11-libs/xcb-util-image-0.3.9 b/metadata/cache/x11-libs/xcb-util-image-0.3.9
index 1d486f94705f..97a39f1740a9 100644
--- a/metadata/cache/x11-libs/xcb-util-image-0.3.9
+++ b/metadata/cache/x11-libs/xcb-util-image-0.3.9
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist//xcb-util-image-0.3.9.tar.bz2
http://xcb.freedesktop.org/
MIT
X C-language Bindings sample implementations
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
test static-libs doc
diff --git a/metadata/cache/x11-libs/xcb-util-keysyms-0.3.9 b/metadata/cache/x11-libs/xcb-util-keysyms-0.3.9
index 3d941192bbea..fc9dc612b2fa 100644
--- a/metadata/cache/x11-libs/xcb-util-keysyms-0.3.9
+++ b/metadata/cache/x11-libs/xcb-util-keysyms-0.3.9
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist//xcb-util-keysyms-0.3.9.tar.bz2
http://xcb.freedesktop.org/
MIT
X C-language Bindings sample implementations
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
test static-libs doc
diff --git a/metadata/cache/x11-libs/xcb-util-wm-0.3.9 b/metadata/cache/x11-libs/xcb-util-wm-0.3.9
index 2cccff1516e0..e91bba46bb56 100644
--- a/metadata/cache/x11-libs/xcb-util-wm-0.3.9
+++ b/metadata/cache/x11-libs/xcb-util-wm-0.3.9
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist//xcb-util-wm-0.3.9.tar.bz2
http://xcb.freedesktop.org/
MIT
X C-language Bindings sample implementations
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
test static-libs doc
diff --git a/metadata/cache/x11-libs/xtrans-1.2.7 b/metadata/cache/x11-libs/xtrans-1.2.7
index cfc5c5367bce..7e80af8b7cb1 100644
--- a/metadata/cache/x11-libs/xtrans-1.2.7
+++ b/metadata/cache/x11-libs/xtrans-1.2.7
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.7.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org xtrans library
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
doc
diff --git a/metadata/cache/x11-misc/gccmakedep-1.0.2-r1 b/metadata/cache/x11-misc/gccmakedep-1.0.2-r1
index ef8f739ddf0b..95f80655e105 100644
--- a/metadata/cache/x11-misc/gccmakedep-1.0.2-r1
+++ b/metadata/cache/x11-misc/gccmakedep-1.0.2-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2
http://xorg.freedesktop.org/
MIT
create dependencies in makefiles using 'gcc -M'
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-misc/imake-1.0.5 b/metadata/cache/x11-misc/imake-1.0.5
index 1cfb9dbaa31d..60ce19c3b4bf 100644
--- a/metadata/cache/x11-misc/imake-1.0.5
+++ b/metadata/cache/x11-misc/imake-1.0.5
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/util/imake-1.0.5.tar.bz2
http://xorg.freedesktop.org/
MIT
C preprocessor interface to the make utility
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-misc/lndir-1.0.3 b/metadata/cache/x11-misc/lndir-1.0.3
index 3761f5dd0dd6..2a4104f80b1e 100644
--- a/metadata/cache/x11-misc/lndir-1.0.3
+++ b/metadata/cache/x11-misc/lndir-1.0.3
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2
http://xorg.freedesktop.org/
MIT
create a shadow directory of symbolic links to another directory tree
-amd64 ~ppc ~ppc64 ~sparc x86
+amd64 ~ppc ppc64 ~sparc x86
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-misc/magneto-gtk-1.0_rc124 b/metadata/cache/x11-misc/magneto-gtk-1.0_rc124
new file mode 100644
index 000000000000..999e005f9e5a
--- /dev/null
+++ b/metadata/cache/x11-misc/magneto-gtk-1.0_rc124
@@ -0,0 +1,22 @@
+=dev-lang/python-2*
+~app-misc/magneto-loader-1.0_rc124 dev-python/notify-python dev-python/pygtk:2 =dev-lang/python-2*
+0
+mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+
+http://www.sabayon.org
+GPL-2
+Entropy Package Manager notification applet GTK2 frontend
+~amd64 ~arm ~x86
+eutils multilib python toolchain-funcs user
+
+
+
+
+3
+
+compile install postinst postrm
+
+
+
+
+
diff --git a/metadata/cache/x11-misc/magneto-gtk3-1.0_rc124 b/metadata/cache/x11-misc/magneto-gtk3-1.0_rc124
new file mode 100644
index 000000000000..5118514c0d68
--- /dev/null
+++ b/metadata/cache/x11-misc/magneto-gtk3-1.0_rc124
@@ -0,0 +1,22 @@
+=dev-lang/python-2*
+~app-misc/magneto-loader-1.0_rc124 dev-libs/gobject-introspection x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] =dev-lang/python-2*
+0
+mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+
+http://www.sabayon.org
+GPL-2
+Entropy Package Manager notification applet GTK3 frontend
+~amd64 ~arm ~x86
+eutils multilib python toolchain-funcs user
+
+
+
+
+3
+
+compile install postinst postrm
+
+
+
+
+
diff --git a/metadata/cache/x11-misc/makedepend-1.0.4 b/metadata/cache/x11-misc/makedepend-1.0.4
index b393a14c34fc..a8d9bb52e52b 100644
--- a/metadata/cache/x11-misc/makedepend-1.0.4
+++ b/metadata/cache/x11-misc/makedepend-1.0.4
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.4.tar.bz2
http://xorg.freedesktop.org/
MIT
create dependencies in makefiles
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-misc/xcompmgr-1.1.6 b/metadata/cache/x11-misc/xcompmgr-1.1.6
index 96eeea1145ff..9e93efb43d5c 100644
--- a/metadata/cache/x11-misc/xcompmgr-1.1.6
+++ b/metadata/cache/x11-misc/xcompmgr-1.1.6
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/app/xcompmgr-1.1.6.tar.bz2
http://freedesktop.org/Software/xapps
BSD
X Compositing manager
-amd64 ~ppc ~ppc64 ~sparc x86
+amd64 ~ppc ppc64 ~sparc x86
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
static-libs
diff --git a/metadata/cache/x11-misc/xfractint-20.04_p12 b/metadata/cache/x11-misc/xfractint-20.04_p12
index ef06f6ec123a..08ef63a55ab6 100644
--- a/metadata/cache/x11-misc/xfractint-20.04_p12
+++ b/metadata/cache/x11-misc/xfractint-20.04_p12
@@ -6,7 +6,7 @@ http://www.fractint.org/ftp/current/linux/xfractint-20.04p12.tar.gz
http://www.fractint.org
freedist
A fractal generator
-~amd64 ~ppc ~sparc ~x86
+amd64 ~ppc ~sparc ~x86
eutils multilib toolchain-funcs user
diff --git a/metadata/cache/x11-misc/xkeyboard-config-2.6 b/metadata/cache/x11-misc/xkeyboard-config-2.6
index 63fc9d08e9ad..61cefbfb4921 100644
--- a/metadata/cache/x11-misc/xkeyboard-config-2.6
+++ b/metadata/cache/x11-misc/xkeyboard-config-2.6
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-
http://www.freedesktop.org/wiki/Software/XKeyboardConfig
MIT
X keyboard configuration database
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-plugins/fsviewer-0.2.5 b/metadata/cache/x11-plugins/fsviewer-0.2.5
index df9f561635eb..00c6ab9b0759 100644
--- a/metadata/cache/x11-plugins/fsviewer-0.2.5
+++ b/metadata/cache/x11-plugins/fsviewer-0.2.5
@@ -1,5 +1,5 @@
-dev-libs/expat media-libs/tiff:0 media-libs/giflib media-libs/libpng:0 media-libs/fontconfig media-libs/freetype sys-libs/zlib virtual/jpeg x11-libs/libproplist x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXrender x11-libs/libXt x11-proto/xextproto x11-proto/xproto x11-wm/windowmaker
-dev-libs/expat media-libs/tiff:0 media-libs/giflib media-libs/libpng:0 media-libs/fontconfig media-libs/freetype sys-libs/zlib virtual/jpeg x11-libs/libproplist x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXrender x11-libs/libXt x11-proto/xextproto x11-proto/xproto x11-wm/windowmaker
+dev-libs/expat media-libs/tiff:0 media-libs/giflib media-libs/libpng:0 media-libs/fontconfig media-libs/freetype sys-libs/zlib virtual/jpeg x11-libs/libproplist x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXrender x11-libs/libXt x11-proto/xextproto x11-proto/xproto =x11-wm/windowmaker-0.95.2 x11-libs/libXft x11-libs/libXpm x11-libs/libX11 x11-proto/xproto nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-wm/windowmaker-0.95.2 x11-libs/libXft x11-libs/libXpm x11-libs/libX11
0
http://www.bayernline.de/~gscholz/linux/fsviewer/fsviewer-app-0.2.6.tar.bz2
@@ -7,14 +7,14 @@ http://www.bayernline.de/~gscholz/linux/fsviewer/
GPL-2
A file system viewer for Window Maker
~amd64 ~ppc ~x86
-multilib toolchain-funcs
+autotools eutils libtool multilib multiprocessing toolchain-funcs user
nls
-2
+4
-configure install
+configure install prepare
diff --git a/metadata/cache/x11-proto/bigreqsproto-1.1.2 b/metadata/cache/x11-proto/bigreqsproto-1.1.2
index c5da5cdeecc5..9468eb859fb0 100644
--- a/metadata/cache/x11-proto/bigreqsproto-1.1.2
+++ b/metadata/cache/x11-proto/bigreqsproto-1.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.1.2.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org BigReqs protocol headers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
doc
diff --git a/metadata/cache/x11-proto/fontsproto-2.1.2 b/metadata/cache/x11-proto/fontsproto-2.1.2
index bb343172a244..e0b7d863076d 100644
--- a/metadata/cache/x11-proto/fontsproto-2.1.2
+++ b/metadata/cache/x11-proto/fontsproto-2.1.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.1.2.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Fonts protocol headers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
doc
diff --git a/metadata/cache/x11-proto/glproto-1.4.15 b/metadata/cache/x11-proto/glproto-1.4.15
index 8d5fc4896142..3b410a315bd2 100644
--- a/metadata/cache/x11-proto/glproto-1.4.15
+++ b/metadata/cache/x11-proto/glproto-1.4.15
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.15.tar.bz2
http://xorg.freedesktop.org/
SGI-B-2.0
X.Org GL protocol headers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-proto/inputproto-2.2 b/metadata/cache/x11-proto/inputproto-2.2
index ad80180387d7..565c315a6260 100644
--- a/metadata/cache/x11-proto/inputproto-2.2
+++ b/metadata/cache/x11-proto/inputproto-2.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.2.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Input protocol headers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-proto/kbproto-1.0.6 b/metadata/cache/x11-proto/kbproto-1.0.6
index 9faa7545fcda..7af26cea1348 100644
--- a/metadata/cache/x11-proto/kbproto-1.0.6
+++ b/metadata/cache/x11-proto/kbproto-1.0.6
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.6.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org KB protocol headers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-proto/recordproto-1.14.2 b/metadata/cache/x11-proto/recordproto-1.14.2
index 254065ed07a2..e0a4f820e08f 100644
--- a/metadata/cache/x11-proto/recordproto-1.14.2
+++ b/metadata/cache/x11-proto/recordproto-1.14.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.14.2.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org Record protocol headers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
doc
diff --git a/metadata/cache/x11-proto/scrnsaverproto-1.2.2 b/metadata/cache/x11-proto/scrnsaverproto-1.2.2
index 6de29a929eee..74d0bec5a2ed 100644
--- a/metadata/cache/x11-proto/scrnsaverproto-1.2.2
+++ b/metadata/cache/x11-proto/scrnsaverproto-1.2.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.2.2.tar.b
http://xorg.freedesktop.org/
MIT
X.Org ScrnSaver protocol headers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
doc
diff --git a/metadata/cache/x11-proto/xcb-proto-1.7.1 b/metadata/cache/x11-proto/xcb-proto-1.7.1
index 161c9fadffe6..f167ff7778fb 100644
--- a/metadata/cache/x11-proto/xcb-proto-1.7.1
+++ b/metadata/cache/x11-proto/xcb-proto-1.7.1
@@ -6,7 +6,7 @@ http://xcb.freedesktop.org/dist/xcb-proto-1.7.1.tar.bz2
http://xcb.freedesktop.org/
MIT
X C-language Bindings protocol headers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing python toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-proto/xcmiscproto-1.2.2 b/metadata/cache/x11-proto/xcmiscproto-1.2.2
index b4a3bbcadb61..a756bb01aaed 100644
--- a/metadata/cache/x11-proto/xcmiscproto-1.2.2
+++ b/metadata/cache/x11-proto/xcmiscproto-1.2.2
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-1.2.2.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org XCMisc protocol headers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
doc
diff --git a/metadata/cache/x11-proto/xextproto-7.2.1 b/metadata/cache/x11-proto/xextproto-7.2.1
index 2d432a4623bc..889eff780e35 100644
--- a/metadata/cache/x11-proto/xextproto-7.2.1
+++ b/metadata/cache/x11-proto/xextproto-7.2.1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.2.1.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org XExt protocol headers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
doc
diff --git a/metadata/cache/x11-proto/xf86dgaproto-2.1-r1 b/metadata/cache/x11-proto/xf86dgaproto-2.1-r1
index 7b8f3a2e6d47..884f4f370ffb 100644
--- a/metadata/cache/x11-proto/xf86dgaproto-2.1-r1
+++ b/metadata/cache/x11-proto/xf86dgaproto-2.1-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.1.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org XF86DGA protocol headers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-proto/xf86rushproto-1.1.2-r1 b/metadata/cache/x11-proto/xf86rushproto-1.1.2-r1
index 075d971191d4..b76e3b4f7475 100644
--- a/metadata/cache/x11-proto/xf86rushproto-1.1.2-r1
+++ b/metadata/cache/x11-proto/xf86rushproto-1.1.2-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/xf86rushproto-1.1.2.tar.bz
http://xorg.freedesktop.org/
MIT
X.Org XF86Rush protocol headers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
diff --git a/metadata/cache/x11-proto/xproto-7.0.23-r1 b/metadata/cache/x11-proto/xproto-7.0.23-r1
index ba58f3c1c1ea..393b1c22af9f 100644
--- a/metadata/cache/x11-proto/xproto-7.0.23-r1
+++ b/metadata/cache/x11-proto/xproto-7.0.23-r1
@@ -6,7 +6,7 @@ http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.23.tar.bz2
http://xorg.freedesktop.org/
MIT
X.Org xproto protocol headers
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
autotools autotools-utils eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user xorg-2
doc
diff --git a/metadata/cache/x11-terms/root-tail-1.2-r2 b/metadata/cache/x11-terms/root-tail-1.2-r2
deleted file mode 100644
index 96a7c0576af2..000000000000
--- a/metadata/cache/x11-terms/root-tail-1.2-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-misc/imake app-text/rman x11-misc/gccmakedep x11-libs/libX11 x11-proto/xproto
-x11-libs/libXext x11-libs/libX11
-0
-http://oldhome.schmorp.de/marc/data/root-tail-1.2.tar.gz
-
-http://oldhome.schmorp.de/marc/root-tail.html
-GPL-2
-Terminal to display (multiple) log files on the root window
-amd64 ppc ppc64 x86
-eutils flag-o-matic multilib toolchain-funcs user
-kde debug
-
-
-
-
-
-compile install unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-terms/xterm-279 b/metadata/cache/x11-terms/xterm-279
index cf7c99d4b2bb..60eda8f06e4d 100644
--- a/metadata/cache/x11-terms/xterm-279
+++ b/metadata/cache/x11-terms/xterm-279
@@ -6,7 +6,7 @@ ftp://invisible-island.net/xterm/xterm-279.tgz
http://dickey.his.com/xterm/
MIT
Terminal Emulator for X Windows
-~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
eutils multilib toolchain-funcs user
toolbar truetype unicode Xaw3d
diff --git a/metadata/cache/x11-wm/windowmaker-0.95.3-r1 b/metadata/cache/x11-wm/windowmaker-0.95.3-r1
new file mode 100644
index 000000000000..c6dfd9679260
--- /dev/null
+++ b/metadata/cache/x11-wm/windowmaker-0.95.3-r1
@@ -0,0 +1,22 @@
+media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 )
+0
+http://windowmaker.org/pub/source/release/WindowMaker-0.95.3.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
+
+http://www.windowmaker.org/
+GPL-2
+The fast and light GNUstep window manager
+~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+autotools eutils libtool multilib multiprocessing toolchain-funcs user
+gif jpeg nls png tiff modelock xinerama xrandr
+
+
+
+4
+
+compile configure install prepare
+
+
+
+
+
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7d7d7290632c..f0f8b50e10fc 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 11 Jul 2012 13:07:42 +0000
+Thu, 12 Jul 2012 04:07:39 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7d7d7290632c..f0f8b50e10fc 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 11 Jul 2012 13:07:42 +0000
+Thu, 12 Jul 2012 04:07:39 +0000
diff --git a/metadata/md5-cache/app-admin/389-console-1.1.6 b/metadata/md5-cache/app-admin/389-console-1.1.6
index fba423ba18a2..7f7ccb261340 100644
--- a/metadata/md5-cache/app-admin/389-console-1.1.6
+++ b/metadata/md5-cache/app-admin/389-console-1.1.6
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 app-admin/389-admin-console >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DEPEND=>=virtual/jdk-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
DESCRIPTION=A Java based console for remote management 389 server
EAPI=2
HOMEPAGE=http://port389.org/
IUSE=elibc_FreeBSD elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
-RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 app-admin/389-admin-console >=dev-java/java-config-2.1.9-r1
+RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=dev-java/java-config-2.1.9-r1
SLOT=1.1
SRC_URI=http://directory.fedoraproject.org/sources/389-console-1.1.6.tar.bz2 http://dev.gentoo.org/~lxnay/389-console/fedora.png
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-ant-2 05b1e5a708f4dd372a85c9c6424fecbe java-pkg-2 f12d7295133e77160a42c2f1ec69a43d java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=431ab1effce4261ce65e72a123d4a755
+_md5_=171a53bb855e14d49b25ef9ecf561698
diff --git a/metadata/md5-cache/app-admin/389-console-1.1.7 b/metadata/md5-cache/app-admin/389-console-1.1.7
index b7eff1b5e4a4..2285c1d5abc1 100644
--- a/metadata/md5-cache/app-admin/389-console-1.1.7
+++ b/metadata/md5-cache/app-admin/389-console-1.1.7
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 app-admin/389-admin-console >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DEPEND=>=virtual/jdk-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
DESCRIPTION=A Java based console for remote management 389 server
EAPI=2
HOMEPAGE=http://port389.org/
IUSE=elibc_FreeBSD elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
-RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 app-admin/389-admin-console >=dev-java/java-config-2.1.9-r1
+RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=dev-java/java-config-2.1.9-r1
SLOT=1.1
SRC_URI=http://directory.fedoraproject.org/sources/389-console-1.1.7.tar.bz2 http://dev.gentoo.org/~lxnay/389-console/fedora.png
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-ant-2 05b1e5a708f4dd372a85c9c6424fecbe java-pkg-2 f12d7295133e77160a42c2f1ec69a43d java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=8eb1e199363df9b9fa6eea4dff2ec82d
+_md5_=411adc380cc4be0c0286f93aaa08aa9d
diff --git a/metadata/md5-cache/app-admin/equo-1.0_rc124 b/metadata/md5-cache/app-admin/equo-1.0_rc124
new file mode 100644
index 000000000000..15dda906d8fc
--- /dev/null
+++ b/metadata/md5-cache/app-admin/equo-1.0_rc124
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=~sys-apps/entropy-1.0_rc124 =dev-lang/python-2*
+DESCRIPTION=Entropy Package Manager text-based client
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~sys-apps/entropy-1.0_rc124 sys-apps/file[python] =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+_eclasses_=bash-completion-r1 3480f8385cb9e31797e7b659e366e2d2 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3c1bcfa28b2c2c22ac679eb6a9d3e3dc
diff --git a/metadata/md5-cache/app-admin/eselect-opengl-1.2.5-r1 b/metadata/md5-cache/app-admin/eselect-opengl-1.2.5-r1
index 42ebd2e076a0..d48680f6aecd 100644
--- a/metadata/md5-cache/app-admin/eselect-opengl-1.2.5-r1
+++ b/metadata/md5-cache/app-admin/eselect-opengl-1.2.5-r1
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
DESCRIPTION=Utility to change the OpenGL interface being used
EAPI=4
HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=app-admin/eselect-1.2.4
SLOT=0
SRC_URI=http://dev.gentooexperimental.org/~scarabeus//glext.h.75.xz http://dev.gentooexperimental.org/~scarabeus//glxext.h.33.xz http://dev.gentoo.org/~lu_zero/distfiles/eselect-opengl-1.2.5.tar.xz
_eclasses_=multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856
-_md5_=099559d5a0ec99c6fbe7cf87d80c8a45
+_md5_=6fa48a98885f8bdad2ab8f46ba191249
diff --git a/metadata/md5-cache/app-admin/rigo-1.0_rc124 b/metadata/md5-cache/app-admin/rigo-1.0_rc124
new file mode 100644
index 000000000000..fa35b96b5a8b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rigo-1.0_rc124
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=>=sys-apps/sed-4 =dev-lang/python-2*
+DESCRIPTION=Rigo, the Sabayon Application Browser
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=|| ( dev-python/pygobject-cairo:3 dev-python/pygobject:3[cairo] ) ~sys-apps/entropy-1.0_rc124 ~sys-apps/rigo-daemon-1.0_rc124 sys-devel/gettext x11-libs/gtk+:3 x11-libs/vte:2.90 >=x11-misc/xdg-utils-1.1.0_rc1_p20120319 =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils e0a2e141b421d38788b23422dfbe4f82 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=772d0699064e0a82351a9b6d80a992ef
diff --git a/metadata/md5-cache/app-editors/jedit-4.5.2 b/metadata/md5-cache/app-editors/jedit-4.5.2
new file mode 100644
index 000000000000..8c147d8fbfd6
--- /dev/null
+++ b/metadata/md5-cache/app-editors/jedit-4.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=virtual/jdk-1.5 doc? ( virtual/jdk:1.6 =app-text/docbook-xml-dtd-4.3* >=app-text/docbook-xsl-stylesheets-1.65.1 dev-libs/libxslt ) dev-java/bsh >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps dev-java/ant-apache-bsf dev-java/ant-contrib >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Programmer's editor written in Java
+EAPI=4
+HOMEPAGE=http://www.jedit.org
+IUSE=elibc_FreeBSD doc elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
+SLOT=0
+SRC_URI=mirror://sourceforge/jedit/jedit4.5.2source.tar.bz2
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa java-ant-2 05b1e5a708f4dd372a85c9c6424fecbe java-pkg-2 f12d7295133e77160a42c2f1ec69a43d java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=a2eaa47088d3c703092279ac898f47dd
diff --git a/metadata/md5-cache/app-misc/magneto-loader-1.0_rc124 b/metadata/md5-cache/app-misc/magneto-loader-1.0_rc124
new file mode 100644
index 000000000000..0d76e5a1204b
--- /dev/null
+++ b/metadata/md5-cache/app-misc/magneto-loader-1.0_rc124
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=~sys-apps/magneto-core-1.0_rc124
+DESCRIPTION=Official Sabayon Linux Entropy Notification Applet Loader
+EAPI=2
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~sys-apps/magneto-core-1.0_rc124
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b530fb81dc6e924a0063ba994e572a49
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.6-r3 b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.6-r3
index fc0d8d721bca..d3d135bba5f0 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.6-r3
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.6-r3
@@ -3,10 +3,10 @@ DEPEND=sys-apps/portage dev-lang/python[xml] dev-lang/python
DESCRIPTION=Collection of administration scripts for Gentoo
EAPI=3
HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=sys-apps/portage >=dev-lang/python-2.6[xml] !>=dev-lang/python-2.6[-xml] !<=app-portage/gentoolkit-dev-0.2.7 dev-python/argparse || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep dev-lang/python[xml] dev-lang/python
SLOT=0
SRC_URI=mirror://gentoo/gentoolkit-0.3.0.6.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e7ee021a32a948a7b9bc1c470822e7bb
+_md5_=177501bd51526dfd602e379e4b950af8
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p36 b/metadata/md5-cache/app-shells/bash-4.2_p36
new file mode 100644
index 000000000000..6554d5f20179
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-4.2_p36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst preinst setup unpack
+DEPEND=>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl ) virtual/yacc
+DESCRIPTION=The standard GNU Bourne again shell
+EAPI=1
+HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
+IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl ) !=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1
+DESCRIPTION=A UNIX Shell with a simplified Scheme syntax
+EAPI=2
+HOMEPAGE=http://slon.ttk.ru/esh/
+IUSE=debug
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1
+SLOT=0
+SRC_URI=http://slon.ttk.ru/esh/esh-0.8.5.tar.gz
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0eed09f3488ba5141ee7efde6f3ffc69
diff --git a/metadata/md5-cache/app-text/barcode-0.98 b/metadata/md5-cache/app-text/barcode-0.98
deleted file mode 100644
index a693e40f1206..000000000000
--- a/metadata/md5-cache/app-text/barcode-0.98
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=barcode generator
-EAPI=3
-HOMEPAGE=http://www.gnu.org/software/barcode/
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gnu/barcode/barcode-0.98.tar.gz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f2e73c42391ddb9befb8db8072c02e29
diff --git a/metadata/md5-cache/dev-db/libiodbc-3.52.7-r1 b/metadata/md5-cache/dev-db/libiodbc-3.52.7-r1
index 8cfc46405b33..9520d12cdddd 100644
--- a/metadata/md5-cache/dev-db/libiodbc-3.52.7-r1
+++ b/metadata/md5-cache/dev-db/libiodbc-3.52.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=ODBC Interface for Linux.
EAPI=4
HOMEPAGE=http://www.iodbc.org/
IUSE=gtk static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=|| ( LGPL-2 BSD )
RDEPEND=>=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 gtk? ( x11-libs/gtk+:2 )
SLOT=0
SRC_URI=http://www.iodbc.org/downloads/iODBC/libiodbc-3.52.7.tar.gz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2f37eb3d396c4eb78b18f8069d966b56
+_md5_=96d1478678249fb0c7f5152e0f57ae89
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2
new file mode 100644
index 000000000000..4fc330062a69
--- /dev/null
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup unpack
+DEPEND=>=virtual/jre-1.4 ~dev-java/eclipse-ecj-4.2 >=dev-java/ant-core-1.7 app-arch/unzip >=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1
+DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
+EAPI=4
+HOMEPAGE=http://www.eclipse.org/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=EPL-1.0
+RDEPEND=>=virtual/jre-1.4 ~dev-java/eclipse-ecj-4.2 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.1.9-r1
+SLOT=4.2
+SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/ecjsrc-4.2.jar
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-pkg-2 f12d7295133e77160a42c2f1ec69a43d java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=e7304e210112d4b771f6521a0a966a1e
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.2-r1 b/metadata/md5-cache/dev-java/commons-fileupload-1.2-r1
deleted file mode 100644
index b3358524b5bd..000000000000
--- a/metadata/md5-cache/dev-java/commons-fileupload-1.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/ant-junit =dev-java/junit-3.8* ) >=dev-java/commons-io-1.3 =dev-java/portletapi-1* ~java-virtuals/servlet-api-2.3 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
-DESCRIPTION=A Java library for adding robust, high-performance, file upload capability to your servlets and web applications.
-HOMEPAGE=http://commons.apache.org/fileupload/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-io-1.3 =dev-java/portletapi-1* ~java-virtuals/servlet-api-2.3 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/jakarta/commons/fileupload/source/commons-fileupload-1.2-src.tar.gz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-ant-2 05b1e5a708f4dd372a85c9c6424fecbe java-pkg-2 f12d7295133e77160a42c2f1ec69a43d java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=56ffb342fba15326aaf21846ed657762
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.2.1 b/metadata/md5-cache/dev-java/commons-fileupload-1.2.1
deleted file mode 100644
index 96a6e9fe582c..000000000000
--- a/metadata/md5-cache/dev-java/commons-fileupload-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/ant-junit =dev-java/junit-3.8* ) >=dev-java/commons-io-1.3 =dev-java/portletapi-1* ~java-virtuals/servlet-api-2.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
-DESCRIPTION=A Java library for adding robust, high-performance, file upload capability to your servlets and web applications.
-HOMEPAGE=http://commons.apache.org/fileupload/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-io-1.3 =dev-java/portletapi-1* ~java-virtuals/servlet-api-2.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/fileupload/source/commons-fileupload-1.2.1-src.tar.gz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-ant-2 05b1e5a708f4dd372a85c9c6424fecbe java-pkg-2 f12d7295133e77160a42c2f1ec69a43d java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=a990353b4b510c0b51d350a46bc85b58
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.2.2 b/metadata/md5-cache/dev-java/commons-fileupload-1.2.2
new file mode 100644
index 000000000000..b03868c5dfbb
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-fileupload-1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5 >=virtual/jdk-1.4 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Add robust, high-performance, file upload capability to your servlets and web applications.
+EAPI=4
+HOMEPAGE=http://commons.apache.org/fileupload/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=Apache-2.0
+RDEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/commons/fileupload/source/commons-fileupload-1.2.2-src.tar.gz
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-ant-2 05b1e5a708f4dd372a85c9c6424fecbe java-pkg-2 f12d7295133e77160a42c2f1ec69a43d java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=fc09f75e49ce1b5e0cafb2d56a8b784a
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.2 b/metadata/md5-cache/dev-java/eclipse-ecj-4.2
new file mode 100644
index 000000000000..e527ccfc1d4f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=|| ( app-admin/eselect-java app-admin/eselect-ecj ) >=virtual/jdk-1.6 app-arch/unzip userland_GNU? ( sys-apps/findutils ) >=dev-java/java-config-2.1.9-r1
+DESCRIPTION=Eclipse Compiler for Java
+EAPI=4
+HOMEPAGE=http://www.eclipse.org/
+IUSE=+ant userland_GNU elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=EPL-1.0
+PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.2 )
+RDEPEND=|| ( app-admin/eselect-java app-admin/eselect-ecj ) >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
+SLOT=4.2
+SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/ecjsrc-4.2.jar
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-pkg-2 f12d7295133e77160a42c2f1ec69a43d java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=b4fd6f898e70f40d3509bf629aca4d6a
diff --git a/metadata/md5-cache/dev-lang/php-5.3.14 b/metadata/md5-cache/dev-lang/php-5.3.14
index ee2fc17d6a63..c0ff71b15be4 100644
--- a/metadata/md5-cache/dev-lang/php-5.3.14
+++ b/metadata/md5-cache/dev-lang/php-5.3.14
@@ -4,7 +4,7 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and
EAPI=4
HOMEPAGE=http://php.net/
IUSE=kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode +session sharedmem +simplexml snmp soap sockets spell sqlite sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib suhosin apache2
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd
LICENSE=PHP-3
PDEPEND=doc? ( app-doc/php-docs )
RDEPEND=!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta enchant? ( !dev-php5/pecl-enchant ) fileinfo? ( !=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta apache2? ( =www-servers/apache-2* )
@@ -12,4 +12,4 @@ REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib )
SLOT=5.4
SRC_URI=http://www.php.net/distributions/php-5.4.4.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-2.tar.bz2
_eclasses_=apache-module 1f60370f9dceba046ec036cd6bbb0c8b autotools 9d170f07df0e48055093b8c6a60d0fba db-use 2f5d6a2718559b90a51648d8ff58be83 depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=bea6625af93b53c14e76379d7439ade1
+_md5_=634956f645047502daff06187d49b07e
diff --git a/metadata/md5-cache/dev-lang/swig-2.0.7 b/metadata/md5-cache/dev-lang/swig-2.0.7
new file mode 100644
index 000000000000..55b7b114d1dd
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swig-2.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
+DESCRIPTION=Simplified Wrapper and Interface Generator
+EAPI=4
+HOMEPAGE=http://www.swig.org/
+IUSE=ccache doc pcre
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3 as-is
+RDEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/swig/swig-2.0.7.tar.gz
+_md5_=602cc2f79921a6584363756c5152cce6
diff --git a/metadata/md5-cache/dev-lang/v8-3.10.8.20 b/metadata/md5-cache/dev-lang/v8-3.10.8.20
new file mode 100644
index 000000000000..62a5a4f38386
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/v8-3.10.8.20
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup test
+DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DESCRIPTION=Google's open source JavaScript engine
+EAPI=4
+HOMEPAGE=http://code.google.com/p/v8
+KEYWORDS=amd64 ~x86 ~x86-fbsd ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+SLOT=0
+SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.10.8.20.tar.bz2
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab pax-utils 0ace932c4045349c7fc1af0fe7091acf python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=0aa25916b1fa396327f5d20b393c352a
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r3 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r3
new file mode 100644
index 000000000000..f34ef39c8b51
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer).
+EAPI=4
+HOMEPAGE=http://cyrusimap.web.cmu.edu/
+IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=as-is
+RDEPEND=authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+SLOT=2
+SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
+_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba db-use 2f5d6a2718559b90a51648d8ff58be83 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f java-pkg-opt-2 131dd2a697d663c0e33247611b9a1cd7 java-utils-2 2d9eb3508fa5d6759e39354b74545567 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 pam 3f746974e1cc47cabe3bd488c08cdc8e toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=e1c2cbbd3cf5ed4bcfb199b61e1c052d
diff --git a/metadata/md5-cache/dev-libs/libestr-0.1.3 b/metadata/md5-cache/dev-libs/libestr-0.1.3
new file mode 100644
index 000000000000..f44436518a09
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libestr-0.1.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Library for some string essentials
+EAPI=4
+HOMEPAGE=http://libestr.adiscon.com/
+IUSE=debug static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://libestr.adiscon.com/files/download/libestr-0.1.3.tar.gz
+_md5_=a1634373484f1d8600364cc1129c99d9
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.31 b/metadata/md5-cache/dev-libs/libpcre-8.31
new file mode 100644
index 000000000000..282a976b8c5c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpcre-8.31
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Perl-compatible regular expression library
+EAPI=4
+HOMEPAGE=http://www.pcre.org/
+IUSE=bzip2 +cxx +jit libedit pcre16 +readline +recursion-limit static-libs unicode zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline )
+REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
+SLOT=3
+SRC_URI=mirror://sourceforge/pcre/pcre-8.31.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.31.tar.bz2
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=88c477f8c10a9843f5e497d96a3c9b3e
diff --git a/metadata/md5-cache/dev-libs/mozldap-6.0.6-r2 b/metadata/md5-cache/dev-libs/mozldap-6.0.6-r2
index f1e6b2cf4e58..8af5b26bc59c 100644
--- a/metadata/md5-cache/dev-libs/mozldap-6.0.6-r2
+++ b/metadata/md5-cache/dev-libs/mozldap-6.0.6-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Mozilla LDAP C SDK
EAPI=2
HOMEPAGE=http://wiki.mozilla.org/LDAP_C_SDK
IUSE=ipv6 debug +sasl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=MPL-1.1 GPL-2 LGPL-2.1
RDEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl )
SLOT=0
SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.6/src/mozldap-6.0.6.tar.gz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=7eab72dc0803394b2f8b7811c656fb0d
+_md5_=83879dd291a5f421af774e3ad1a0042d
diff --git a/metadata/md5-cache/dev-libs/svrcore-4.0.4 b/metadata/md5-cache/dev-libs/svrcore-4.0.4
index adb3d60f6032..e0ea5e37aefe 100644
--- a/metadata/md5-cache/dev-libs/svrcore-4.0.4
+++ b/metadata/md5-cache/dev-libs/svrcore-4.0.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/nss-3.11 >=dev-libs/nspr-4.6 || ( >=sys-devel/automake-1.11.1:
DESCRIPTION=Mozilla LDAP C SDK
EAPI=2
HOMEPAGE=http://wiki.mozilla.org/LDAP_C_SDK
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=MPL-1.1 GPL-2 LGPL-2.1
RDEPEND=>=dev-libs/nss-3.11 >=dev-libs/nspr-4.6
SLOT=0
SRC_URI=http://ftp.mozilla.org/pub/mozilla.org/directory/svrcore/releases/4.0.4/src/svrcore-4.0.4.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=db81c8a968b3c85f1f0a92af1e9838f1
+_md5_=5b8d68044a0549ccfcee946c1af6265c
diff --git a/metadata/md5-cache/dev-php/ZendFramework-1.11.12 b/metadata/md5-cache/dev-php/ZendFramework-1.11.12
index d62e3ab60c29..502022baca97 100644
--- a/metadata/md5-cache/dev-php/ZendFramework-1.11.12
+++ b/metadata/md5-cache/dev-php/ZendFramework-1.11.12
@@ -4,10 +4,10 @@ DESCRIPTION=Zend Framework is a high quality and open source framework for devel
EAPI=2
HOMEPAGE=http://framework.zend.com/
IUSE=doc examples minimal cli
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 hppa ~ppc ~ppc64 x86
LICENSE=BSD
RDEPEND=cli? ( dev-lang/php[simplexml,tokenizer] ) dev-lang/php dev-lang/php
SLOT=0
SRC_URI=!minimal? ( http://framework.zend.com/releases/ZendFramework-1.11.12/ZendFramework-1.11.12.tar.gz ) minimal? ( http://framework.zend.com/releases/ZendFramework-1.11.12/ZendFramework-1.11.12-minimal.tar.gz ) doc? ( http://framework.zend.com/releases/ZendFramework-1.11.12/ZendFramework-1.11.12-apidoc.tar.gz http://framework.zend.com/releases/ZendFramework-1.11.12/ZendFramework-1.11.12-manual-en.tar.gz )
_eclasses_=depend.php df169a364e191b840b695604097e3c21 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab php-lib-r1 d7318e400ae0d443613d286980877fd4 phpconfutils e108303831029e5b8a9d24b991b1d62a toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a0dad4f0fe66512d769535ad622f34ef
+_md5_=5461dc9438866c1835b48b4a8375fa35
diff --git a/metadata/md5-cache/dev-php/pecl-apc-3.1.10 b/metadata/md5-cache/dev-php/pecl-apc-3.1.10
index 2f2bfe89b0ce..599d9562f010 100644
--- a/metadata/md5-cache/dev-php/pecl-apc-3.1.10
+++ b/metadata/md5-cache/dev-php/pecl-apc-3.1.10
@@ -4,11 +4,11 @@ DESCRIPTION=A free, open, and robust framework for caching and optimizing PHP co
EAPI=4
HOMEPAGE=http://pecl.php.net/APC
IUSE=mmap +lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore php_targets_php5-3 php_targets_php5-4
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
LICENSE=PHP-3.01
RDEPEND=!dev-php/eaccelerator !dev-php/xcache || ( =dev-php/pecl-apc-3.1.10[php_targets_php5-3] =dev-php/pecl-apc-3.1.10[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore )
SLOT=0
SRC_URI=http://pecl.php.net/get/APC-3.1.10.tgz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba confutils a80706bb5b9ddcf6bbd14365656d4985 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 php-ext-pecl-r2 de1308bcf4fef59a8ee8793efc7c3051 php-ext-source-r2 865acbfe8221bfac2bf4701aeb9f1ac3 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1008f0140b6b7cd3d4a72fe3e68db8be
+_md5_=29163b8eff2eb0be0e9c2fe9163a0b4f
diff --git a/metadata/md5-cache/dev-python/apiextractor-0.10.10 b/metadata/md5-cache/dev-python/apiextractor-0.10.10
deleted file mode 100644
index 7324e51ea2ba..000000000000
--- a/metadata/md5-cache/dev-python/apiextractor-0.10.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-xmlpatterns-4.7.0:4 test? ( >=x11-libs/qt-gui-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Library used to create an internal representation of an API in order to create Python bindings
-EAPI=4
-HOMEPAGE=http://www.pyside.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-xmlpatterns-4.7.0:4
-SLOT=0
-SRC_URI=http://www.pyside.org/files/apiextractor-0.10.10.tar.bz2
-_eclasses_=base d40e074a6349af3ea5e937210630bdc1 cmake-utils de2b6743eb0bffee798e01b913aec936 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2913eb34d2cf0ca14b3d1437af1ce87c
diff --git a/metadata/md5-cache/dev-python/generatorrunner-0.6.16 b/metadata/md5-cache/dev-python/generatorrunner-0.6.16
deleted file mode 100644
index 3d5a663be26a..000000000000
--- a/metadata/md5-cache/dev-python/generatorrunner-0.6.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/apiextractor-0.10.10 >=x11-libs/qt-core-4.7.0:4 test? ( >=x11-libs/qt-test-4.7.0:4 ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=A tool to control bindings generation
-EAPI=4
-HOMEPAGE=http://www.pyside.org/
-IUSE=debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/apiextractor-0.10.10 >=x11-libs/qt-core-4.7.0:4
-SLOT=0
-SRC_URI=http://www.pyside.org/files/generatorrunner-0.6.16.tar.bz2
-_eclasses_=base d40e074a6349af3ea5e937210630bdc1 cmake-utils de2b6743eb0bffee798e01b913aec936 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f69f9eb353b724cff6d91184282581bb
diff --git a/metadata/md5-cache/dev-python/psutil-0.5.1 b/metadata/md5-cache/dev-python/psutil-0.5.1
new file mode 100644
index 000000000000..c9bfc8833c5f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/psutil-0.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=dev-lang/python
+DESCRIPTION=Retrieve information on running processes and system utilization
+EAPI=4
+HOMEPAGE=http://code.google.com/p/psutil/ http://pypi.python.org/pypi/psutil
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/python
+RESTRICT=test
+SLOT=0
+SRC_URI=http://psutil.googlecode.com/files/psutil-0.5.1.tar.gz
+_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856
+_md5_=08853fdb4fb92b95770f95f999904b5a
diff --git a/metadata/md5-cache/dev-ruby/bcat-0.6.2 b/metadata/md5-cache/dev-ruby/bcat-0.6.2
index 1c72341cb202..36b71bc62fe8 100644
--- a/metadata/md5-cache/dev-ruby/bcat-0.6.2
+++ b/metadata/md5-cache/dev-ruby/bcat-0.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=A pipe to browser utility for use at the shell and within editors li
EAPI=4
HOMEPAGE=http://github.com/rtomayko/bcat
IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc test test
-KEYWORDS=~amd64 ~hppa ~x86-fbsd
+KEYWORDS=~amd64 ~hppa ~x86 ~x86-fbsd
LICENSE=MIT
RDEPEND=ruby_targets_ruby18? ( dev-ruby/rack[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/rack[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
SLOT=0
SRC_URI=mirror://rubygems/bcat-0.6.2.gem
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab ruby-fakegem 9348ccfdf65a1e1ccc9acc7f73a0bacd ruby-ng 9f370f4fc88a58204a8d375ce53fe08c toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=85c7d276a0ca5297ae1eb184bd4072da
+_md5_=f6b065405565200bea7cd61230f8801b
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.9.0 b/metadata/md5-cache/dev-ruby/capistrano-2.9.0
index d33800fab328..0853ad40a41e 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.9.0
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=A distributed application deployment system
EAPI=2
HOMEPAGE=http://capify.org/
IUSE=test elibc_FreeBSD ruby_targets_ruby18 test test
-KEYWORDS=amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby18] >=dev-ruby/net-sftp-2.0.2[ruby_targets_ruby18] >=dev-ruby/net-scp-1.0.2[ruby_targets_ruby18] >=dev-ruby/net-ssh-gateway-1.1.0[ruby_targets_ruby18] >=dev-ruby/highline-1.2.7[ruby_targets_ruby18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
SLOT=2
SRC_URI=mirror://rubygems/capistrano-2.9.0.gem
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab ruby-fakegem 9348ccfdf65a1e1ccc9acc7f73a0bacd ruby-ng 9f370f4fc88a58204a8d375ce53fe08c toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=89de0d6ecdc1b4c55a46f27dd69d7ff4
+_md5_=2d08e097e96841c5f6af8250cdb68676
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.7.3 b/metadata/md5-cache/dev-ruby/gherkin-2.7.3
index bd2f6fb9aca2..1e0bb50ba61e 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.7.3
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.7.3
@@ -4,11 +4,11 @@ DESCRIPTION=Fast Gherkin lexer and parser based on Ragel.
EAPI=4
HOMEPAGE=http://wiki.github.com/aslakhellesoy/cucumber/gherkin
IUSE=doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc doc test
-KEYWORDS=~amd64 ~hppa
+KEYWORDS=~amd64 ~hppa ~x86
LICENSE=MIT
RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/json-1.4.6[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/json-1.4.6[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/json-1.4.6[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
SLOT=0
SRC_URI=https://github.com/cucumber/gherkin/tarball/v2.7.3 -> gherkin-2.7.3.tgz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab ruby-fakegem 9348ccfdf65a1e1ccc9acc7f73a0bacd ruby-ng 9f370f4fc88a58204a8d375ce53fe08c toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=92541dd050f17894d42eca6f297ba210
+_md5_=c94108611fa01bdccb68cfb9d188ad71
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.1.0 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.1.0
index fdf19a13df45..1c936547feb3 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.1.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=A simple library to assist in enabling tunneled Net::SSH connections
EAPI=2
HOMEPAGE=http://net-ssh.rubyforge.org/gateway
IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test test
-KEYWORDS=amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/net-ssh-2.0.0[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/net-ssh-2.0.0[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
SLOT=2
SRC_URI=mirror://rubygems/net-ssh-gateway-1.1.0.gem
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab ruby-fakegem 9348ccfdf65a1e1ccc9acc7f73a0bacd ruby-ng 9f370f4fc88a58204a8d375ce53fe08c toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=5e4573c06655dc56b2a43a6f148dcee1
+_md5_=56e02c3b7b522f08afb5eee9ff67c2e3
diff --git a/metadata/md5-cache/dev-ruby/prawn-0.8.4-r1 b/metadata/md5-cache/dev-ruby/prawn-0.8.4-r1
index 9f4f5eb8a732..de97ca4fe695 100644
--- a/metadata/md5-cache/dev-ruby/prawn-0.8.4-r1
+++ b/metadata/md5-cache/dev-ruby/prawn-0.8.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Fast, Nimble PDF Generation For Ruby
EAPI=2
HOMEPAGE=http://prawn.majesticseacreature.com/
IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby ruby_targets_ruby19 test
-KEYWORDS=~amd64 ~hppa
+KEYWORDS=~amd64 ~hppa ~x86
LICENSE=|| ( GPL-2 Ruby )
RDEPEND=ruby_targets_ruby18? ( =dev-ruby/prawn-core-0.8*[ruby_targets_ruby18] =dev-ruby/prawn-layout-0.8*[ruby_targets_ruby18] =dev-ruby/prawn-security-0.8*[ruby_targets_ruby18] ) ruby_targets_ree18? ( =dev-ruby/prawn-core-0.8*[ruby_targets_ree18] =dev-ruby/prawn-layout-0.8*[ruby_targets_ree18] =dev-ruby/prawn-security-0.8*[ruby_targets_ree18] ) ruby_targets_jruby? ( =dev-ruby/prawn-core-0.8*[ruby_targets_jruby] =dev-ruby/prawn-layout-0.8*[ruby_targets_jruby] =dev-ruby/prawn-security-0.8*[ruby_targets_jruby] ) ruby_targets_ruby19? ( =dev-ruby/prawn-core-0.8*[ruby_targets_ruby19] =dev-ruby/prawn-layout-0.8*[ruby_targets_ruby19] =dev-ruby/prawn-security-0.8*[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
SLOT=0
SRC_URI=mirror://rubygems/prawn-0.8.4.gem
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab ruby-fakegem 9348ccfdf65a1e1ccc9acc7f73a0bacd ruby-ng 9f370f4fc88a58204a8d375ce53fe08c toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=107c79264fa7df76828ef1a775a30037
+_md5_=39c84f848978125c5ccb05e5e4c87753
diff --git a/metadata/md5-cache/dev-ruby/prawn-core-0.8.4-r2 b/metadata/md5-cache/dev-ruby/prawn-core-0.8.4-r2
index d346953b288d..7aaaf46252ea 100644
--- a/metadata/md5-cache/dev-ruby/prawn-core-0.8.4-r2
+++ b/metadata/md5-cache/dev-ruby/prawn-core-0.8.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Fast, Nimble PDF Generation For Ruby
EAPI=2
HOMEPAGE=http://prawn.majesticseacreature.com/
IUSE=examples elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
-KEYWORDS=~amd64 ~hppa ~x86-fbsd
+KEYWORDS=~amd64 ~hppa ~x86 ~x86-fbsd
LICENSE=|| ( GPL-2 Ruby )
RDEPEND=!=dev-ruby/prawn-core-0.8.4[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/prawn-core-0.8.4[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/prawn-core-0.8.4[ruby_targets_jruby] ) ruby_targets_ruby19? ( >=dev-ruby/prawn-core-0.8.4[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
SLOT=0
SRC_URI=mirror://rubygems/prawn-security-0.8.4.gem
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab ruby-fakegem 9348ccfdf65a1e1ccc9acc7f73a0bacd ruby-ng 9f370f4fc88a58204a8d375ce53fe08c toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=1b7b9191c935e768336cec46afb4b3e6
+_md5_=65e94d556944d0ead055bbf3eb38787e
diff --git a/metadata/md5-cache/dev-util/aruba-0.4.11 b/metadata/md5-cache/dev-util/aruba-0.4.11
index 0f34965912fd..bc3c41599cc3 100644
--- a/metadata/md5-cache/dev-util/aruba-0.4.11
+++ b/metadata/md5-cache/dev-util/aruba-0.4.11
@@ -4,11 +4,11 @@ DESCRIPTION=Cucumber steps for driving out command line applications.
EAPI=4
HOMEPAGE=https://github.com/cucumber/aruba
IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~hppa
+KEYWORDS=~amd64 ~hppa ~x86
LICENSE=MIT
RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/bcat-0.6.1[ruby_targets_ruby18] >=dev-ruby/childprocess-0.2.3[ruby_targets_ruby18] >=dev-ruby/rspec-2.6[ruby_targets_ruby18] >=dev-util/cucumber-1.1.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/bcat-0.6.1[ruby_targets_ruby19] >=dev-ruby/childprocess-0.2.3[ruby_targets_ruby19] >=dev-ruby/rspec-2.6[ruby_targets_ruby19] >=dev-util/cucumber-1.1.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/bcat-0.6.1[ruby_targets_ree18] >=dev-ruby/childprocess-0.2.3[ruby_targets_ree18] >=dev-ruby/rspec-2.6[ruby_targets_ree18] >=dev-util/cucumber-1.1.1[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
SLOT=0
SRC_URI=mirror://rubygems/aruba-0.4.11.gem
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab ruby-fakegem 9348ccfdf65a1e1ccc9acc7f73a0bacd ruby-ng 9f370f4fc88a58204a8d375ce53fe08c toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=fbe10dc28a3f62f799e78897c9c7373d
+_md5_=f39fe948428286d2839f1b11883aeef3
diff --git a/metadata/md5-cache/dev-util/cucumber-1.1.4 b/metadata/md5-cache/dev-util/cucumber-1.1.4
index b7b402a45bf6..48340c15a955 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.1.4
+++ b/metadata/md5-cache/dev-util/cucumber-1.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=Executable feature scenarios
EAPI=2
HOMEPAGE=https://github.com/cucumber/cucumber/wikis
IUSE=examples test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~hppa
+KEYWORDS=~amd64 ~hppa ~x86
LICENSE=Ruby
RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby18] >=dev-ruby/gherkin-2.6.7:0[ruby_targets_ruby18] >=dev-ruby/json-1.4.6[ruby_targets_ruby18] >=dev-ruby/term-ansicolor-1.0.6[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ruby19] >=dev-ruby/gherkin-2.6.7:0[ruby_targets_ruby19] >=dev-ruby/json-1.4.6[ruby_targets_ruby19] >=dev-ruby/term-ansicolor-1.0.6[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/builder-2.1.2[ruby_targets_ree18] >=dev-ruby/diff-lcs-1.1.2[ruby_targets_ree18] >=dev-ruby/gherkin-2.6.7:0[ruby_targets_ree18] >=dev-ruby/json-1.4.6[ruby_targets_ree18] >=dev-ruby/term-ansicolor-1.0.6[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
SLOT=0
SRC_URI=mirror://rubygems/cucumber-1.1.4.gem
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab ruby-fakegem 9348ccfdf65a1e1ccc9acc7f73a0bacd ruby-ng 9f370f4fc88a58204a8d375ce53fe08c toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=680f67553ccbb48939109991fc51eaab
+_md5_=a687ea587af6eb62e10f63e7e97c2644
diff --git a/metadata/md5-cache/dev-util/qt-creator-2.5.0 b/metadata/md5-cache/dev-util/qt-creator-2.5.0
index 2b79f65af5d2..0f791c7c882d 100644
--- a/metadata/md5-cache/dev-util/qt-creator-2.5.0
+++ b/metadata/md5-cache/dev-util/qt-creator-2.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight IDE for C++ development centering around Qt
EAPI=4
HOMEPAGE=http://qt.nokia.com/products/developer-tools
IUSE=+botan-bundled debug doc examples autotools bazaar cmake cvs fakevim git madde mercurial perforce subversion valgrind linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_ru linguas_sl linguas_uk linguas_zh_CN
-KEYWORDS=amd64 ~ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
LICENSE=LGPL-2.1
PDEPEND=autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) cmake? ( dev-util/cmake ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind )
RDEPEND=>=x11-libs/qt-assistant-4.7.4:4[doc?] >=x11-libs/qt-core-4.7.4:4[private-headers(+),ssl] >=x11-libs/qt-declarative-4.7.4:4[private-headers(+)] >=x11-libs/qt-gui-4.7.4:4[private-headers(+)] >=x11-libs/qt-script-4.7.4:4[private-headers(+)] >=x11-libs/qt-sql-4.7.4:4 >=x11-libs/qt-svg-4.7.4:4 debug? ( >=x11-libs/qt-test-4.7.4:4 ) !botan-bundled? ( =dev-libs/botan-1.8* ) >=sys-devel/gdb-7.2[python] examples? ( >=x11-libs/qt-demo-4.7.4:4 )
SLOT=0
SRC_URI=http://get.qt.nokia.com/qtcreator/qt-creator-2.5.0-src.tar.gz
_eclasses_=base d40e074a6349af3ea5e937210630bdc1 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab qt4-r2 2111bb601bba6402257079dab64c7310 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=87da1fef01987c8536ccb9433000d9c6
+_md5_=57725afee41fea8d403141309d61d738
diff --git a/metadata/md5-cache/games-board/openyahtzee-1.9.1 b/metadata/md5-cache/games-board/openyahtzee-1.9.1
new file mode 100644
index 000000000000..0c525023fea8
--- /dev/null
+++ b/metadata/md5-cache/games-board/openyahtzee-1.9.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=x11-libs/wxGTK:2.8[X] || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A full-featured wxWidgets version of the classic dice game Yahtzee
+EAPI=2
+HOMEPAGE=http://openyahtzee.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/wxGTK:2.8[X]
+SLOT=0
+SRC_URI=mirror://sourceforge/openyahtzee/openyahtzee-1.9.1.tar.bz2
+_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba base d40e074a6349af3ea5e937210630bdc1 eutils 327b713e2d6949c42cd96bc4898fd280 games 208d30509b917ca42d728b7d106acb73 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 wxwidgets fb1a306837717dfa2af841ecdf929565
+_md5_=a0b47c3bc45554cb74b8c7fbf1b3f732
diff --git a/metadata/md5-cache/games-fps/quake3-bin-1.32c-r1 b/metadata/md5-cache/games-fps/quake3-bin-1.32c-r1
index b8f199a15201..74880b30d984 100644
--- a/metadata/md5-cache/games-fps/quake3-bin-1.32c-r1
+++ b/metadata/md5-cache/games-fps/quake3-bin-1.32c-r1
@@ -5,10 +5,10 @@ EAPI=2
HOMEPAGE=http://www.idsoftware.com/
IUSE=cdinstall dedicated opengl teamarena
KEYWORDS=-* ~amd64 ~x86
-LICENSE=Q3AEULA
+LICENSE=Q3AEULA GPL-2
RDEPEND=sys-libs/glibc dedicated? ( app-misc/screen ) amd64? ( app-emulation/emul-linux-x86-baselibs ) opengl? ( virtual/opengl x86? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) amd64? ( app-emulation/emul-linux-x86-xlibs || ( >=app-emulation/emul-linux-x86-xlibs-7.0 x11-drivers/nvidia-drivers >=x11-drivers/ati-drivers-8.8.25-r1 ) ) ) cdinstall? ( games-fps/quake3-data[cdinstall] teamarena? ( games-fps/quake3-teamarena ) ) !dedicated? ( !opengl? ( virtual/opengl x86? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) amd64? ( app-emulation/emul-linux-x86-xlibs || ( >=app-emulation/emul-linux-x86-xlibs-7.0 x11-drivers/nvidia-drivers >=x11-drivers/ati-drivers-8.8.25-r1 ) ) ) )
RESTRICT=strip
SLOT=0
SRC_URI=mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.x86.run mirror://idsoftware/quake3/quake3-1.32c.zip
_eclasses_=base d40e074a6349af3ea5e937210630bdc1 eutils 327b713e2d6949c42cd96bc4898fd280 games 208d30509b917ca42d728b7d106acb73 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 unpacker e1b907c6a72dc4c9025109f3e84129c7 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=74a58967310d892748e650bfe947490d
+_md5_=7c4799b42cd28b35fa33bd8af9eea2a5
diff --git a/metadata/md5-cache/games-fps/rtcw-1.41b b/metadata/md5-cache/games-fps/rtcw-1.41b
index fc04a12ba009..74d0e012e28d 100644
--- a/metadata/md5-cache/games-fps/rtcw-1.41b
+++ b/metadata/md5-cache/games-fps/rtcw-1.41b
@@ -4,10 +4,10 @@ EAPI=2
HOMEPAGE=http://games.activision.com/games/wolfenstein/
IUSE=opengl dedicated
KEYWORDS=amd64 x86
-LICENSE=RTCW
+LICENSE=RTCW GPL-2
RDEPEND=sys-libs/glibc dedicated? ( app-misc/screen ) !dedicated? ( virtual/opengl x86? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp ) amd64? ( app-emulation/emul-linux-x86-xlibs ) ) opengl? ( virtual/opengl x86? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp ) amd64? ( app-emulation/emul-linux-x86-xlibs ) ) x86? ( sys-libs/lib-compat ) amd64? ( app-emulation/emul-linux-x86-compat )
RESTRICT=strip mirror
SLOT=0
SRC_URI=mirror://idsoftware/wolf/linux/wolf-linux-GOTY-maps.x86.run mirror://idsoftware/wolf/linux/wolf-linux-1.41b.x86.run
_eclasses_=base d40e074a6349af3ea5e937210630bdc1 eutils 327b713e2d6949c42cd96bc4898fd280 games 208d30509b917ca42d728b7d106acb73 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 unpacker e1b907c6a72dc4c9025109f3e84129c7 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a78316208cbbfbda21ff6b64e75bfd69
+_md5_=2dbff9518ec9a69a118dd4d358ce9854
diff --git a/metadata/md5-cache/games-fps/rtcwmp-demo-1.1 b/metadata/md5-cache/games-fps/rtcwmp-demo-1.1
index 48c1a64c7c57..57c7464598b8 100644
--- a/metadata/md5-cache/games-fps/rtcwmp-demo-1.1
+++ b/metadata/md5-cache/games-fps/rtcwmp-demo-1.1
@@ -3,10 +3,10 @@ DESCRIPTION=Return to Castle Wolfenstein - Multi-player demo
HOMEPAGE=http://games.activision.com/games/wolfenstein/
IUSE=dedicated opengl
KEYWORDS=-* amd64 x86
-LICENSE=RTCW
+LICENSE=RTCW GPL-2
RDEPEND=sys-libs/glibc dedicated? ( app-misc/screen ) !dedicated? ( virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp ) opengl? ( virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp ) amd64? ( app-emulation/emul-linux-x86-xlibs )
RESTRICT=strip mirror
SLOT=0
SRC_URI=mirror://idsoftware/wolf/linux/old/wolfmpdemo-linux-1.1-MP.x86.run mirror://3dgamers/returnwolfenstein/wolfmpdemo-linux-1.1-MP.x86.run
_eclasses_=base d40e074a6349af3ea5e937210630bdc1 eutils 327b713e2d6949c42cd96bc4898fd280 games 208d30509b917ca42d728b7d106acb73 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 unpacker e1b907c6a72dc4c9025109f3e84129c7 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=63feb708e2847b081c8993fca88fdcbe
+_md5_=ebdce42021988c58121f6fc6894e693e
diff --git a/metadata/md5-cache/games-server/halflife-steam-2.0 b/metadata/md5-cache/games-server/halflife-steam-2.0
index 342b91a7d3c5..7c7ffc4c67ea 100644
--- a/metadata/md5-cache/games-server/halflife-steam-2.0
+++ b/metadata/md5-cache/games-server/halflife-steam-2.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst preinst setup unpack
DESCRIPTION=client for Valve Software's Steam content delivery program
HOMEPAGE=http://www.steampowered.com/
KEYWORDS=-* x86
-LICENSE=ValveServer
+LICENSE=ValveServer GPL-2
RESTRICT=mirror
SLOT=0
SRC_URI=http://www.steampowered.com/download/hldsupdatetool.bin
_eclasses_=base d40e074a6349af3ea5e937210630bdc1 eutils 327b713e2d6949c42cd96bc4898fd280 games 208d30509b917ca42d728b7d106acb73 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 unpacker e1b907c6a72dc4c9025109f3e84129c7 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=07ca75d7f2b7d40059bf66e1794141a4
+_md5_=0789094c60f220c0857bc3ff0847aca8
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.10 b/metadata/md5-cache/games-strategy/wesnoth-1.10
deleted file mode 100644
index a65a68d17656..000000000000
--- a/metadata/md5-cache/games-strategy/wesnoth-1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=>=media-libs/libsdl-1.2.7[video,X] media-libs/sdl-net >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] !dedicated? ( dbus? ( sys-apps/dbus ) ) >=dev-libs/boost-1.36 sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig virtual/libintl virtual/pkgconfig sys-devel/gettext >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
-EAPI=2
-HOMEPAGE=http://www.wesnoth.org/
-IUSE=dbus dedicated doc nls server
-KEYWORDS=amd64 ppc ~ppc64 x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsdl-1.2.7[video,X] media-libs/sdl-net >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] !dedicated? ( dbus? ( sys-apps/dbus ) ) >=dev-libs/boost-1.36 sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig virtual/libintl
-SLOT=0
-SRC_URI=mirror://sourceforge/wesnoth/wesnoth-1.10.tar.bz2
-_eclasses_=base d40e074a6349af3ea5e937210630bdc1 cmake-utils de2b6743eb0bffee798e01b913aec936 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f games 208d30509b917ca42d728b7d106acb73 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cf10483ecb40ec3c0dc067d1cf2a0338
diff --git a/metadata/md5-cache/gnome-extra/gnome-screensaver-3.4.1 b/metadata/md5-cache/gnome-extra/gnome-screensaver-3.4.1
index e708b52203de..70d264f9d784 100644
--- a/metadata/md5-cache/gnome-extra/gnome-screensaver-3.4.1
+++ b/metadata/md5-cache/gnome-extra/gnome-screensaver-3.4.1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.25.6:2 >=x11-libs/gtk+-2.99.3:3 >=gnome-base/gnome-des
SLOT=0
SRC_URI=mirror://gnome/sources/gnome-screensaver/3.4/gnome-screensaver-3.4.1.tar.xz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 b6186c6d7990c0c8aafb64c553f3625b gnome2-utils e0a2e141b421d38788b23422dfbe4f82 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=69c20dc3d39a53c2e3457e0832765508
+_md5_=f1ae3c6eb59b512f553b61324f5658a2
diff --git a/metadata/md5-cache/gnome-extra/gnome-screensaver-3.4.2 b/metadata/md5-cache/gnome-extra/gnome-screensaver-3.4.2
index 3c4f71e5782c..da49a7e99776 100644
--- a/metadata/md5-cache/gnome-extra/gnome-screensaver-3.4.2
+++ b/metadata/md5-cache/gnome-extra/gnome-screensaver-3.4.2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.25.6:2 >=x11-libs/gtk+-2.99.3:3 >=gnome-base/gnome-des
SLOT=0
SRC_URI=mirror://gnome/sources/gnome-screensaver/3.4/gnome-screensaver-3.4.2.tar.xz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 b6186c6d7990c0c8aafb64c553f3625b gnome2-utils e0a2e141b421d38788b23422dfbe4f82 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=3a0fd5cc2513c298ab813dbe5f86a46b
+_md5_=fd6dfab7553ffe2027ac7e027d4e9c96
diff --git a/metadata/md5-cache/kde-misc/magneto-kde-1.0_rc124 b/metadata/md5-cache/kde-misc/magneto-kde-1.0_rc124
new file mode 100644
index 000000000000..f83b445ffd16
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/magneto-kde-1.0_rc124
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND==dev-lang/python-2*
+DESCRIPTION=Entropy Package Manager notification applet KDE frontend
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~app-misc/magneto-loader-1.0_rc124 kde-base/pykde4 dev-python/PyQt4[dbus] =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7dc1925e947d917d62dbc6a88e8593f2
diff --git a/metadata/md5-cache/media-fonts/font-util-1.3.0 b/metadata/md5-cache/media-fonts/font-util-1.3.0
index ede0de97953e..9b55f9e31f1f 100644
--- a/metadata/md5-cache/media-fonts/font-util-1.3.0
+++ b/metadata/md5-cache/media-fonts/font-util-1.3.0
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
DESCRIPTION=X.Org font utilities
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-util-1.3.0.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=7eada26f0935597f11203c42ab0f1955
+_md5_=8abd31a745dc9f6c54f253b424d3242b
diff --git a/metadata/md5-cache/media-gfx/gimp-2.6.12-r2 b/metadata/md5-cache/media-gfx/gimp-2.6.12-r2
index 56e0ba55e24f..1ed8d5ed6856 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.6.12-r2
+++ b/metadata/md5-cache/media-gfx/gimp-2.6.12-r2
@@ -4,10 +4,10 @@ DESCRIPTION=GNU Image Manipulation Program
EAPI=3
HOMEPAGE=http://www.gimp.org/
IUSE=alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf linguas_am linguas_ar linguas_ast linguas_az linguas_be linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_dz linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mk linguas_ml linguas_mr linguas_ms linguas_my linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_or linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_th linguas_tr linguas_tt linguas_uk linguas_vi linguas_xh linguas_yi linguas_zh_CN linguas_zh_HK linguas_zh_TW debug
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.18.1:2 dev-libs/libxml2 dev-libs/libxslt >=media-libs/fontconfig-2.2.0 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.0.22 =x11-libs/gtk+-2.12.5:2 x11-libs/libXpm >=x11-libs/pango-1.18.0 sys-libs/zlib x11-themes/hicolor-icon-theme aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) exif? ( >=media-libs/libexif-0.6.15 ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) lcms? ( =media-libs/lcms-1* ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.3-r3[cairo] ) png? ( >=media-libs/libpng-1.2.2:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) svg? ( >=gnome-base/librsvg-2.8.0:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) webkit? ( net-libs/webkit-gtk:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
SLOT=2
SRC_URI=http://dev.gentoo.org/~jlec/distfiles/gimp-2.6.11-underlinking.patch.xz mirror://gimp/v2.6/gimp-2.6.12.tar.bz2
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 b6186c6d7990c0c8aafb64c553f3625b gnome2-utils e0a2e141b421d38788b23422dfbe4f82 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=c8642df7a12d2493ded24a7103972b7f
+_md5_=56636a5edad99ace54439674f6202ac8
diff --git a/metadata/md5-cache/media-gfx/jhead-2.90 b/metadata/md5-cache/media-gfx/jhead-2.90
deleted file mode 100644
index 2ed598661880..000000000000
--- a/metadata/md5-cache/media-gfx/jhead-2.90
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Exif Jpeg camera setting parser and thumbnail remover
-EAPI=4
-HOMEPAGE=http://www.sentex.net/~mwandel/jhead
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.sentex.net/~mwandel/jhead/jhead-2.90.tar.gz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=379e2c68816fdedd80ab541e8dc0a213
diff --git a/metadata/md5-cache/media-gfx/jhead-2.94 b/metadata/md5-cache/media-gfx/jhead-2.94
deleted file mode 100644
index e9b4f3f8fb11..000000000000
--- a/metadata/md5-cache/media-gfx/jhead-2.94
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Exif Jpeg camera setting parser and thumbnail remover
-EAPI=4
-HOMEPAGE=http://www.sentex.net/~mwandel/jhead
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.sentex.net/~mwandel/jhead/jhead-2.94.tar.gz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4d7aadfdb7e9b97de396ad1e9e75a4b5
diff --git a/metadata/md5-cache/media-gfx/pngcrush-1.7.31 b/metadata/md5-cache/media-gfx/pngcrush-1.7.31
new file mode 100644
index 000000000000..464e16dd83ef
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/pngcrush-1.7.31
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=>=media-libs/libpng-1.4:0 sys-libs/zlib app-arch/xz-utils
+DESCRIPTION=Portable Network Graphics (PNG) optimizing utility
+EAPI=4
+HOMEPAGE=http://pmt.sourceforge.net/pngcrush/
+KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=as-is
+RDEPEND=>=media-libs/libpng-1.4:0 sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://sourceforge/pmt/pngcrush-1.7.31-nolib.tar.xz
+_eclasses_=multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856
+_md5_=671ca32378695f34b36d5cbb0af2fa8c
diff --git a/metadata/md5-cache/media-libs/libbs2b-3.0.0 b/metadata/md5-cache/media-libs/libbs2b-3.0.0
deleted file mode 100644
index 97189a7ece56..000000000000
--- a/metadata/md5-cache/media-libs/libbs2b-3.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=media-libs/libsndfile virtual/pkgconfig
-DESCRIPTION=Bauer stereophonic-to-binaural DSP library
-HOMEPAGE=http://bs2b.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=media-libs/libsndfile
-SLOT=0
-SRC_URI=mirror://sourceforge/bs2b/libbs2b-3.0.0.tar.bz2
-_eclasses_=base d40e074a6349af3ea5e937210630bdc1 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0ab1584227a9b8513d019527fff83452
diff --git a/metadata/md5-cache/media-libs/libcue-1.3.0 b/metadata/md5-cache/media-libs/libcue-1.3.0
deleted file mode 100644
index 054fccaecdee..000000000000
--- a/metadata/md5-cache/media-libs/libcue-1.3.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-devel/flex || ( dev-util/yacc sys-devel/bison )
-DESCRIPTION=CUE Sheet Parser Library
-EAPI=2
-HOMEPAGE=http://libcue.sourceforge.net
-KEYWORDS=alpha amd64 arm hppa ppc ppc64 sh sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/libcue/libcue-1.3.0.tar.bz2
-_md5_=b2da2fb4e156530e126103b4b02e6313
diff --git a/metadata/md5-cache/media-libs/libfishsound-0.9.1 b/metadata/md5-cache/media-libs/libfishsound-0.9.1
deleted file mode 100644
index 721bed3b1f75..000000000000
--- a/metadata/md5-cache/media-libs/libfishsound-0.9.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=vorbis? ( media-libs/libvorbis media-libs/libogg ) media-libs/speex doc? ( app-doc/doxygen virtual/latex-base )
-DESCRIPTION=Simple programming interface for decoding and encoding audio data using vorbis or speex
-HOMEPAGE=http://www.xiph.org/fishsound/
-IUSE=doc vorbis
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=vorbis? ( media-libs/libvorbis media-libs/libogg ) media-libs/speex
-SLOT=0
-SRC_URI=http://downloads.xiph.org/releases/libfishsound/libfishsound-0.9.1.tar.gz
-_md5_=f26fc8e4982359be5fef88df9578b849
diff --git a/metadata/md5-cache/media-libs/libfishsound-0.9.2 b/metadata/md5-cache/media-libs/libfishsound-0.9.2
deleted file mode 100644
index 1aa33ee71db9..000000000000
--- a/metadata/md5-cache/media-libs/libfishsound-0.9.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=media-libs/libvorbis media-libs/libogg speex? ( media-libs/speex ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base )
-DESCRIPTION=Simple programming interface for decoding and encoding audio data using vorbis or speex
-HOMEPAGE=http://www.xiph.org/fishsound/
-IUSE=doc speex
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=media-libs/libvorbis media-libs/libogg speex? ( media-libs/speex )
-SLOT=0
-SRC_URI=http://downloads.xiph.org/releases/libfishsound/libfishsound-0.9.2.tar.gz
-_md5_=712f1107f0886a7849a350c855157c95
diff --git a/metadata/md5-cache/media-libs/libpano13-2.9.14 b/metadata/md5-cache/media-libs/libpano13-2.9.14
deleted file mode 100644
index 5daf5fc7fb50..000000000000
--- a/metadata/md5-cache/media-libs/libpano13-2.9.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=media-libs/libpng media-libs/tiff sys-libs/zlib virtual/jpeg java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=Helmut Dersch's panorama toolbox library
-HOMEPAGE=http://panotools.sf.net
-IUSE=java elibc_FreeBSD java
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng media-libs/tiff sys-libs/zlib virtual/jpeg java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=0
-SRC_URI=mirror://sourceforge/panotools/libpano13-2.9.14.tar.gz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-pkg-opt-2 131dd2a697d663c0e33247611b9a1cd7 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=ef15bbb27cad6f1b1ef5aa69eb081d39
diff --git a/metadata/md5-cache/media-libs/libpano13-2.9.17 b/metadata/md5-cache/media-libs/libpano13-2.9.17
deleted file mode 100644
index 88de33f1d8af..000000000000
--- a/metadata/md5-cache/media-libs/libpano13-2.9.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=media-libs/libpng media-libs/tiff sys-libs/zlib virtual/jpeg java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=Helmut Dersch's panorama toolbox library
-EAPI=2
-HOMEPAGE=http://panotools.sourceforge.net/
-IUSE=java static-libs elibc_FreeBSD java
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng media-libs/tiff sys-libs/zlib virtual/jpeg java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=0
-SRC_URI=mirror://sourceforge/panotools/libpano13-2.9.17.tar.gz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 java-pkg-opt-2 131dd2a697d663c0e33247611b9a1cd7 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=73ccb2c1aa6326e88b191c5084a9a576
diff --git a/metadata/md5-cache/media-libs/libvorbis-1.3.1 b/metadata/md5-cache/media-libs/libvorbis-1.3.1
deleted file mode 100644
index 9e0bf076d149..000000000000
--- a/metadata/md5-cache/media-libs/libvorbis-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libogg virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=The Ogg Vorbis sound file format library
-EAPI=2
-HOMEPAGE=http://xiph.org/vorbis
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=media-libs/libogg
-SLOT=0
-SRC_URI=http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.1.tar.bz2
-_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856
-_md5_=ce9d82b0e9193a588add667c674792ba
diff --git a/metadata/md5-cache/media-libs/libvorbis-1.3.2 b/metadata/md5-cache/media-libs/libvorbis-1.3.2
deleted file mode 100644
index fcae29ebfc0f..000000000000
--- a/metadata/md5-cache/media-libs/libvorbis-1.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libogg app-arch/xz-utils virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=The Ogg Vorbis sound file format library
-EAPI=4
-HOMEPAGE=http://xiph.org/vorbis
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=media-libs/libogg
-SLOT=0
-SRC_URI=http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.xz
-_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856
-_md5_=9852eac47b8e609d9fcfbd6e33050310
diff --git a/metadata/md5-cache/media-libs/mesa-8.0.3 b/metadata/md5-cache/media-libs/mesa-8.0.3
index dfdc0d65c3ab..892e71a82e74 100644
--- a/metadata/md5-cache/media-libs/mesa-8.0.3
+++ b/metadata/md5-cache/media-libs/mesa-8.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=OpenGL-like graphic library for Linux
EAPI=4
HOMEPAGE=http://mesa3d.sourceforge.net/
IUSE=video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_nouveau video_cards_vmware bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xa xvmc kernel_FreeBSD
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT LGPL-3 SGI-B-2.0
RDEPEND=>=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !=app-admin/eselect-opengl-1.2.5 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.32[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( =x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.32[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.32[video_cards_radeon] )
REQUIRED_USE=d3d? ( gallium ) g3dvl? ( gallium ) llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) xa? ( gallium ) xvmc? ( g3dvl ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_vmware? ( gallium )
SLOT=0
SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/8.0.3/MesaLib-8.0.3.tar.bz2 mirror://gentoo/mesa-8.0.3-gentoo-patches-02.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba base d40e074a6349af3ea5e937210630bdc1 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=30a953e701dfd9a4e9df7a7f63c8126e
+_md5_=92da9a9cae790af0da1cd9949a73692a
diff --git a/metadata/md5-cache/media-plugins/mythplugins-0.25.1 b/metadata/md5-cache/media-plugins/mythplugins-0.25.1
index 27fca0e1da70..d45b0cc703dd 100644
--- a/metadata/md5-cache/media-plugins/mythplugins-0.25.1
+++ b/metadata/md5-cache/media-plugins/mythplugins-0.25.1
@@ -1,14 +1,14 @@
DEFINED_PHASES=configure install prepare setup
-DEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.25.1*[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/imaging media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff exif? ( >media-libs/libexif-0.6.9 ) opengl? ( virtual/opengl ) raw? ( media-gfx/dcraw ) ) mythmusic? ( dev-libs/libcdio media-gfx/dcraw >=media-libs/flac-1.1.2 >=media-libs/libmad-0.15.1b >=media-libs/libvorbis-1.0 >=media-libs/taglib-1.4 cdr? ( virtual/cdrtools ) fftw? ( sci-libs/fftw ) opengl? ( virtual/opengl ) projectm? ( >=media-libs/libsdl-1.2.5[opengl] =media-libs/libvisual-0.4* media-plugins/libvisual-projectm ) ) mythnetvision? ( dev-python/lxml dev-python/mysql-python dev-python/oauth dev-python/pycurl ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 dev-perl/ImageSize dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.25.1*[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/imaging media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff virtual/opengl exif? ( >media-libs/libexif-0.6.9 ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2 >=media-libs/libvorbis-1.0 >=media-libs/taglib-1.6 media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw ) ) mythnetvision? ( =dev-lang/python-2*[xml] dev-python/lxml dev-python/mysql-python dev-python/oauth dev-python/pycurl ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
DESCRIPTION=Official MythTV plugins
EAPI=4
HOMEPAGE=http://www.mythtv.org
-IUSE=mytharchive mythbrowser mythgallery mythgame mythmusic mythnetvision mythnews mythweather cdr exif fftw opengl projectm raw
+IUSE=mytharchive mythbrowser mythgallery mythgame mythmusic mythnetvision mythnews mythweather cdda cdr exif fftw raw
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.25.1*[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/imaging media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff exif? ( >media-libs/libexif-0.6.9 ) opengl? ( virtual/opengl ) raw? ( media-gfx/dcraw ) ) mythmusic? ( dev-libs/libcdio media-gfx/dcraw >=media-libs/flac-1.1.2 >=media-libs/libmad-0.15.1b >=media-libs/libvorbis-1.0 >=media-libs/taglib-1.4 cdr? ( virtual/cdrtools ) fftw? ( sci-libs/fftw ) opengl? ( virtual/opengl ) projectm? ( >=media-libs/libsdl-1.2.5[opengl] =media-libs/libvisual-0.4* media-plugins/libvisual-projectm ) ) mythnetvision? ( dev-python/lxml dev-python/mysql-python dev-python/oauth dev-python/pycurl ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 dev-perl/ImageSize dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-REQUIRED_USE=cdr? ( mythmusic ) exif? ( mythgallery ) fftw? ( mythmusic ) mythnews? ( mythbrowser ) opengl? ( || ( mythgallery mythmusic ) ) projectm? ( mythmusic ) raw? ( mythgallery )
+RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.25.1*[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/imaging media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff virtual/opengl exif? ( >media-libs/libexif-0.6.9 ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2 >=media-libs/libvorbis-1.0 >=media-libs/taglib-1.6 media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw ) ) mythnetvision? ( =dev-lang/python-2*[xml] dev-python/lxml dev-python/mysql-python dev-python/oauth dev-python/pycurl ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+REQUIRED_USE=cdda? ( mythmusic ) cdr? ( mythmusic cdda ) exif? ( mythgallery ) fftw? ( mythmusic ) mythnews? ( mythbrowser ) raw? ( mythgallery )
SLOT=0
SRC_URI=ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.25.1.tar.bz2
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=33e7f61e2596bdddf068f0c5628db767
+_md5_=1cbbb5924f81fcabe6faa9706d1681f0
diff --git a/metadata/md5-cache/media-sound/abcm2ps-7.0.10 b/metadata/md5-cache/media-sound/abcm2ps-6.6.18
similarity index 77%
rename from metadata/md5-cache/media-sound/abcm2ps-7.0.10
rename to metadata/md5-cache/media-sound/abcm2ps-6.6.18
index 9efc62b1f70a..5286fa559bd5 100644
--- a/metadata/md5-cache/media-sound/abcm2ps-7.0.10
+++ b/metadata/md5-cache/media-sound/abcm2ps-6.6.18
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=pango? ( x11-libs/pango media-libs/freetype:2 )
SLOT=0
-SRC_URI=http://moinejf.free.fr/abcm2ps-7.0.10.tar.gz http://moinejf.free.fr/transpose_abc.pl
-_md5_=6a248437ba36afa1adb5fbf04905bc0b
+SRC_URI=http://moinejf.free.fr/abcm2ps-6.6.18.tar.gz http://moinejf.free.fr/transpose_abc.pl
+_md5_=36c1225f322f18feeb66456467f4cc0e
diff --git a/metadata/md5-cache/media-sound/abcm2ps-6.6.9 b/metadata/md5-cache/media-sound/abcm2ps-6.6.9
deleted file mode 100644
index 3dbd3e6d62d2..000000000000
--- a/metadata/md5-cache/media-sound/abcm2ps-6.6.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=pango? ( x11-libs/pango media-libs/freetype:2 ) virtual/pkgconfig
-DESCRIPTION=A program to convert abc files to Postscript files
-EAPI=4
-HOMEPAGE=http://moinejf.free.fr/
-IUSE=examples pango
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=pango? ( x11-libs/pango media-libs/freetype:2 )
-SLOT=0
-SRC_URI=http://moinejf.free.fr/abcm2ps-6.6.9.tar.gz http://moinejf.free.fr/transpose_abc.pl
-_md5_=040773395381b651413af99c4f19e5e8
diff --git a/metadata/md5-cache/media-sound/abcm2ps-6.6.15 b/metadata/md5-cache/media-sound/abcm2ps-7.0.13
similarity index 77%
rename from metadata/md5-cache/media-sound/abcm2ps-6.6.15
rename to metadata/md5-cache/media-sound/abcm2ps-7.0.13
index 20ed11b3a679..2e6f70b73d57 100644
--- a/metadata/md5-cache/media-sound/abcm2ps-6.6.15
+++ b/metadata/md5-cache/media-sound/abcm2ps-7.0.13
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=pango? ( x11-libs/pango media-libs/freetype:2 )
SLOT=0
-SRC_URI=http://moinejf.free.fr/abcm2ps-6.6.15.tar.gz http://moinejf.free.fr/transpose_abc.pl
-_md5_=3214cf4090b3412c28180359324adbcc
+SRC_URI=http://moinejf.free.fr/abcm2ps-7.0.13.tar.gz http://moinejf.free.fr/transpose_abc.pl
+_md5_=903e05a18d5e49c9e707e4af606cbb0d
diff --git a/metadata/md5-cache/media-sound/abcmidi-2012.05.29 b/metadata/md5-cache/media-sound/abcmidi-2012.05.29
deleted file mode 100644
index 165cfbfbc102..000000000000
--- a/metadata/md5-cache/media-sound/abcmidi-2012.05.29
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Programs for processing ABC music notation files
-EAPI=4
-HOMEPAGE=http://abc.sourceforge.net/abcMIDI/
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2012-05-29.zip
-_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=205b053e32caef498f715eec8b256a73
diff --git a/metadata/md5-cache/media-sound/abcmidi-2012.04.15 b/metadata/md5-cache/media-sound/abcmidi-2012.07.04
similarity index 86%
rename from metadata/md5-cache/media-sound/abcmidi-2012.04.15
rename to metadata/md5-cache/media-sound/abcmidi-2012.07.04
index de078d7a9ed0..073c5ee887fc 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2012.04.15
+++ b/metadata/md5-cache/media-sound/abcmidi-2012.07.04
@@ -7,6 +7,6 @@ IUSE=examples
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
-SRC_URI=http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2012-04-15.zip
+SRC_URI=http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2012-07-04.zip
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=b3e6a33fa0ddec19f98a2bb30eabc22e
+_md5_=357d7324e319aef7dd8630f93eac33b2
diff --git a/metadata/md5-cache/media-sound/denemo-0.9.4 b/metadata/md5-cache/media-sound/denemo-0.9.4
new file mode 100644
index 000000000000..e0bc1ccbeb86
--- /dev/null
+++ b/metadata/md5-cache/media-sound/denemo-0.9.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=>=app-text/evince-3 dev-libs/libxml2:2 >=dev-scheme/guile-1.8 gnome-base/librsvg:2 >=media-libs/libsmf-1.3 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.102 ) fluidsynth? ( media-sound/fluidsynth ) portaudio? ( media-libs/portaudio media-libs/aubio sci-libs/fftw:3.0 media-libs/libsamplerate ) portmidi? ( media-libs/portmidi ) sys-devel/flex virtual/pkgconfig virtual/yacc nls? ( sys-devel/gettext )
+DESCRIPTION=A music notation editor
+EAPI=4
+HOMEPAGE=http://www.denemo.org/
+IUSE=alsa jack +fluidsynth nls +portaudio portmidi
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 OFL-1.1
+RDEPEND=>=app-text/evince-3 dev-libs/libxml2:2 >=dev-scheme/guile-1.8 gnome-base/librsvg:2 >=media-libs/libsmf-1.3 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.102 ) fluidsynth? ( media-sound/fluidsynth ) portaudio? ( media-libs/portaudio media-libs/aubio sci-libs/fftw:3.0 media-libs/libsamplerate ) portmidi? ( media-libs/portmidi ) media-sound/lilypond
+SLOT=0
+SRC_URI=mirror://gnu/denemo/denemo-0.9.4.tar.gz
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=cd4d18d3e5005c89627524c65e97964e
diff --git a/metadata/md5-cache/media-sound/mpd-0.17 b/metadata/md5-cache/media-sound/mpd-0.17
index c7d4a45a9eed..2452453ea646 100644
--- a/metadata/md5-cache/media-sound/mpd-0.17
+++ b/metadata/md5-cache/media-sound/mpd-0.17
@@ -1,14 +1,14 @@
DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=!=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) soup? ( net-libs/libsoup:2.4 ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) virtual/pkgconfig !=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) soup? ( net-libs/libsoup:2.4 ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) virtual/pkgconfig !=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) soup? ( net-libs/libsoup:2.4 ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib )
+RDEPEND=!=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) soup? ( net-libs/libsoup:2.4 ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib )
REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) lastfmradio? ( curl )
SLOT=0
SRC_URI=mirror://sourceforge/musicpd/mpd-0.17.tar.bz2
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f linux-info 0b7adf68a2edb4e5a32b07bb6e68121c multilib 5782800349f728f725f9378105c6a2ab systemd 70a153740015c3457222dbdd8e07c1f7 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=aef23f45cca027149ccbe986bb493f13
+_md5_=6cdbe42bf0635f8db8cdf4fce3764f4b
diff --git a/metadata/md5-cache/media-tv/mythtv-0.25.1_p20120708 b/metadata/md5-cache/media-tv/mythtv-0.25.1_p20120708
index dacaa205a8f1..c585e50510ad 100644
--- a/metadata/md5-cache/media-tv/mythtv-0.25.1_p20120708
+++ b/metadata/md5-cache/media-tv/mythtv-0.25.1_p20120708
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile config configure info install postinst postrm preinst prepare setup
+DEFINED_PHASES=config configure info install postinst postrm preinst prepare setup
DEPEND=>=media-libs/freetype-2.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm >=x11-libs/qt-core-4.7.2:4 >=x11-libs/qt-dbus-4.7.2 >=x11-libs/qt-gui-4.7.2:4 >=x11-libs/qt-sql-4.7.2:4[mysql] >=x11-libs/qt-opengl-4.7.2:4 >=x11-libs/qt-webkit-4.7.2:4 x11-misc/wmctrl virtual/mysql virtual/opengl virtual/glu alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio >=dev-libs/libxml2-2.6.0 media-libs/libbluray ) cec? ( dev-libs/libcec ) dvb? ( media-libs/libdvb virtual/linuxtv-dvb-headers ) dvd? ( dev-libs/libcdio ) fftw? ( sci-libs/fftw:3.0 ) hls? ( media-libs/faac media-libs/libvpx >=media-libs/x264-0.0.20110426 >=media-sound/lame-3.93.1 ) ieee1394? ( >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.3 >=media-libs/libiec61883-1.0.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11 ) lirc? ( app-misc/lirc ) perl? ( dev-perl/DBD-mysql dev-perl/Net-UPnP dev-perl/LWP-Protocol-https dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 >=dev-perl/libwww-perl-5 ) pulseaudio? ( media-sound/pulseaudio ) python? ( dev-python/mysql-python dev-python/lxml dev-python/urlgrabber ) raop? ( dev-libs/openssl net-dns/avahi[mdnsresponder-compat] ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) xvid? ( >=media-libs/xvid-1.1.0 ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes dev-lang/yasm x11-proto/xineramaproto x11-proto/xf86vidmodeproto python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
DESCRIPTION=Homebrew PVR project
EAPI=4
@@ -10,4 +10,4 @@ RDEPEND=>=media-libs/freetype-2.0 x11-libs/libX11 x11-libs/libXext x11-libs/libX
SLOT=0
SRC_URI=ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.25.1.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/mythtv-0.25.1-61e7a0e946.tar.xz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=af1e633ccafd59bcb1ed756c5d822e4d
+_md5_=5f392da90938ea16533582e8d4528c5b
diff --git a/metadata/md5-cache/media-video/xvideoservicethief-2.4.1-r2 b/metadata/md5-cache/media-video/xvideoservicethief-2.4.1-r2
new file mode 100644
index 000000000000..a26bbd123b8b
--- /dev/null
+++ b/metadata/md5-cache/media-video/xvideoservicethief-2.4.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=app-arch/unzip >=x11-libs/qt-gui-4.5.3:4 >=x11-libs/qt-webkit-4.5.3:4 doc? ( app-doc/doxygen )
+DESCRIPTION=Download (and convert) videos from various Web Video Services
+EAPI=2
+HOMEPAGE=http://xviservicethief.sourceforge.net/
+IUSE=debug doc linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_es linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_ko linguas_nl linguas_pl linguas_ro linguas_ru linguas_sv
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=x11-libs/qt-gui-4.5.3:4 virtual/ffmpeg media-video/flvstreamer
+SLOT=0
+SRC_URI=mirror://sourceforge/xviservicethief/xVST_2_4_1_src.zip
+_eclasses_=base d40e074a6349af3ea5e937210630bdc1 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab qt4-r2 2111bb601bba6402257079dab64c7310 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=ddc7f69757babfe46343d96a239f9b6c
diff --git a/metadata/md5-cache/net-analyzer/arping-2.12 b/metadata/md5-cache/net-analyzer/arping-2.12
new file mode 100644
index 000000000000..b8f4c8a9e444
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/arping-2.12
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=net-libs/libpcap net-libs/libnet:1.1
+DESCRIPTION=A utility to see if a specific IP address is taken and what MAC address owns it
+EAPI=4
+HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=arping
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap net-libs/libnet:1.1
+SLOT=2
+SRC_URI=http://www.habets.pp.se/synscan/files/arping-2.12.tar.gz
+_md5_=a0ed50f866166a87e445d54ac7841f94
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.3.6 b/metadata/md5-cache/net-dns/opendnssec-1.3.6
index 47a6bba46c1f..2c2b0799d9cd 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.3.6
+++ b/metadata/md5-cache/net-dns/opendnssec-1.3.6
@@ -5,10 +5,10 @@ EAPI=4
HOMEPAGE=http://www.opendnssec.org/
IUSE=auditor +curl debug doc eppclient mysql +signer +sqlite test +softhsm opensc external-hsm
KEYWORDS=~amd64 ~x86
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor? ( dev-lang/ruby[ssl] >=dev-ruby/dnsruby-1.53 ) curl? ( net-misc/curl ) mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm ) eppclient? ( curl )
SLOT=0
SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.3.6.tar.gz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba base d40e074a6349af3ea5e937210630bdc1 eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=342570731863611c3aa3ff2f46871bc9
+_md5_=ad39b209f86be1a006793e63c9cfcc39
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.3.7 b/metadata/md5-cache/net-dns/opendnssec-1.3.7
index 83ad4a96d9a8..703460403dac 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.3.7
+++ b/metadata/md5-cache/net-dns/opendnssec-1.3.7
@@ -5,10 +5,10 @@ EAPI=4
HOMEPAGE=http://www.opendnssec.org/
IUSE=auditor +curl debug doc eppclient mysql +signer +sqlite test +softhsm opensc external-hsm
KEYWORDS=~amd64 ~x86
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor? ( dev-lang/ruby[ssl] >=dev-ruby/dnsruby-1.53 ) curl? ( net-misc/curl ) mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm ) eppclient? ( curl )
SLOT=0
SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.3.7.tar.gz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba base d40e074a6349af3ea5e937210630bdc1 eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=eb1beba32ec2f13b433a4a5f70e81d4a
+_md5_=ed085f0707e4cc212f37229ad07b0b71
diff --git a/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3 b/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3
index f88931436b02..34eab12b2803 100644
--- a/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3
+++ b/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3
@@ -4,9 +4,9 @@ DESCRIPTION=A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementati
HOMEPAGE=http://ipsec-tools.sourceforge.net/
IUSE=hybrid iconv idea ipv6 kerberos ldap nat pam rc5 readline selinux
KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=!sparc? ( >=sys-kernel/linux-headers-2.6 ) readline? ( sys-libs/readline ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) >=dev-libs/openssl-0.9.8 iconv? ( virtual/libiconv ) selinux? ( sys-libs/libselinux ) selinux? ( sec-policy/selinux-ipsec )
SLOT=0
SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.7.3.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed linux-info 0b7adf68a2edb4e5a32b07bb6e68121c multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=74caa566f101ae518d1b50408cabeb4d
+_md5_=b3396ccb896acf2c4d2e2888014e1e8b
diff --git a/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3-r1 b/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3-r1
index c2f2be3a1271..fd5218229d69 100644
--- a/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3-r1
+++ b/metadata/md5-cache/net-firewall/ipsec-tools-0.7.3-r1
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://ipsec-tools.sourceforge.net/
IUSE=hybrid iconv idea ipv6 kerberos ldap nat pam rc5 readline selinux
KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=selinux? ( sys-libs/libselinux ) readline? ( sys-libs/readline ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) >=dev-libs/openssl-0.9.8 iconv? ( virtual/libiconv ) selinux? ( sec-policy/selinux-ipsec )
SLOT=0
SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.7.3.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed linux-info 0b7adf68a2edb4e5a32b07bb6e68121c multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=211aa75f7bda012eb9f5894d286c9b50
+_md5_=a5ac3283ac8ca72dc303841557b8f5db
diff --git a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r3 b/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r3
index 6be04934970a..bcdaa0f3d706 100644
--- a/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r3
+++ b/metadata/md5-cache/net-firewall/ipsec-tools-0.8.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementati
EAPI=4
HOMEPAGE=http://ipsec-tools.sourceforge.net/
IUSE=hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
+KEYWORDS=~amd64 ppc ppc64 ~x86
+LICENSE=BSD GPL-2
RDEPEND=dev-libs/openssl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline ) selinux? ( sys-libs/libselinux sec-policy/selinux-ipsec )
SLOT=0
SRC_URI=mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.0.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed linux-info 0b7adf68a2edb4e5a32b07bb6e68121c multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 pam 3f746974e1cc47cabe3bd488c08cdc8e toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=5295a3512841b7e810e2f63ab98b4882
+_md5_=be247391cf08cd81f723d4eae6786d5e
diff --git a/metadata/md5-cache/net-firewall/pglinux-2.2.1 b/metadata/md5-cache/net-firewall/pglinux-2.2.1
deleted file mode 100644
index 5655f11ff2bf..000000000000
--- a/metadata/md5-cache/net-firewall/pglinux-2.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst setup
-DEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 || ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss ) ) virtual/pkgconfig sys-devel/libtool:2 >=sys-apps/sed-4
-DESCRIPTION=Privacy oriented firewall application
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/peerguardian/
-IUSE=cron dbus logrotate networkmanager qt4 zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 || ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss ) ) net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) logrotate? ( app-admin/logrotate ) networkmanager? ( net-misc/networkmanager )
-REQUIRED_USE=qt4? ( dbus )
-SLOT=0
-SRC_URI=mirror://sourceforge/peerguardian/pgl-2.2.1.tar.gz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 gnome2-utils e0a2e141b421d38788b23422dfbe4f82 linux-info 0b7adf68a2edb4e5a32b07bb6e68121c multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=7d80548a393748530b41f818e9e591ba
diff --git a/metadata/md5-cache/net-firewall/pglinux-2.2.0 b/metadata/md5-cache/net-firewall/pglinux-2.2.1_p20120711
similarity index 91%
rename from metadata/md5-cache/net-firewall/pglinux-2.2.0
rename to metadata/md5-cache/net-firewall/pglinux-2.2.1_p20120711
index 17634f613cec..abd5095a0032 100644
--- a/metadata/md5-cache/net-firewall/pglinux-2.2.0
+++ b/metadata/md5-cache/net-firewall/pglinux-2.2.1_p20120711
@@ -9,6 +9,6 @@ LICENSE=GPL-3
RDEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus ) zlib? ( sys-libs/zlib ) qt4? ( sys-auth/polkit-qt x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 || ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss ) ) net-firewall/iptables sys-apps/sysvinit cron? ( virtual/cron ) logrotate? ( app-admin/logrotate ) networkmanager? ( net-misc/networkmanager )
REQUIRED_USE=qt4? ( dbus )
SLOT=0
-SRC_URI=mirror://sourceforge/peerguardian/pgl-2.2.0.tar.gz
+SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/pgl-2.2.1_p20120711.tar.xz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 gnome2-utils e0a2e141b421d38788b23422dfbe4f82 linux-info 0b7adf68a2edb4e5a32b07bb6e68121c multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=d04506c00afe237d80dc74453f30c6be
+_md5_=58f3e3b5a75be2cc039579cca28f26c9
diff --git a/metadata/md5-cache/net-ftp/pureadmin-0.2.2 b/metadata/md5-cache/net-ftp/pureadmin-0.2.2
deleted file mode 100644
index 7da6fe532e2b..000000000000
--- a/metadata/md5-cache/net-ftp/pureadmin-0.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=gnome-base/libglade:2.0 sys-libs/zlib virtual/fam x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=PureAdmin is a GUI tool used to make the management of Pure-FTPd a little easier.
-EAPI=3
-HOMEPAGE=http://purify.sourceforge.net/
-IUSE=debug doc
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=gnome-base/libglade:2.0 sys-libs/zlib virtual/fam x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/purify/pureadmin-0.2.2.tar.gz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bad7219a38ff2ee50f5db87a5f18746f
diff --git a/metadata/md5-cache/net-ftp/pureadmin-0.3 b/metadata/md5-cache/net-ftp/pureadmin-0.3
deleted file mode 100644
index c8d113a31ee7..000000000000
--- a/metadata/md5-cache/net-ftp/pureadmin-0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=gnome-base/libglade:2.0 sys-libs/zlib virtual/fam x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=PureAdmin is a GUI tool used to make the management of Pure-FTPd a little easier.
-EAPI=3
-HOMEPAGE=http://purify.sourceforge.net/
-IUSE=debug doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=gnome-base/libglade:2.0 sys-libs/zlib virtual/fam x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/purify/pureadmin-0.3.tar.gz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b8b0d7534fb25f6fc5da3560fe4c10cf
diff --git a/metadata/md5-cache/net-libs/axtls-1.4.6-r1 b/metadata/md5-cache/net-libs/axtls-1.4.6-r1
index 6156ef3d9b1f..6ed8eb3ae2fd 100644
--- a/metadata/md5-cache/net-libs/axtls-1.4.6-r1
+++ b/metadata/md5-cache/net-libs/axtls-1.4.6-r1
@@ -5,10 +5,10 @@ EAPI=4
HOMEPAGE=http://axtls.sourceforge.net/
IUSE=httpd cgi-lua cgi-php static static-libs doc savedconfig
KEYWORDS=amd64 hppa ~x86
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
SLOT=0
SRC_URI=mirror://sourceforge/axtls/axTLS-1.4.6.tar.gz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab portability 536c5e70c5fb252ed3b769e04aa3f05b savedconfig 973a6df1a0949eba28a185eac79de815 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=55d77152e96d6d5048010506b9e80a5c
+_md5_=731dd2670f14ac7d3055c2525fa25bb9
diff --git a/metadata/md5-cache/net-libs/axtls-1.4.8 b/metadata/md5-cache/net-libs/axtls-1.4.8
index 869341ec6d15..1149d9fb0c24 100644
--- a/metadata/md5-cache/net-libs/axtls-1.4.8
+++ b/metadata/md5-cache/net-libs/axtls-1.4.8
@@ -5,10 +5,10 @@ EAPI=4
HOMEPAGE=http://axtls.sourceforge.net/
IUSE=httpd cgi-lua cgi-php static static-libs doc savedconfig
KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
SLOT=0
SRC_URI=mirror://sourceforge/axtls/axTLS-1.4.8.tar.gz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab portability 536c5e70c5fb252ed3b769e04aa3f05b savedconfig 973a6df1a0949eba28a185eac79de815 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f0bdb4a922512011d0c5fb659c2648de
+_md5_=c5f30ce0c26a99c531c3a2b74536a794
diff --git a/metadata/md5-cache/net-libs/c-client-2007f b/metadata/md5-cache/net-libs/c-client-2007f-r2
similarity index 82%
rename from metadata/md5-cache/net-libs/c-client-2007f
rename to metadata/md5-cache/net-libs/c-client-2007f-r2
index e854184c36ce..eea7c1eed853 100644
--- a/metadata/md5-cache/net-libs/c-client-2007f
+++ b/metadata/md5-cache/net-libs/c-client-2007f-r2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install prepare
DEPEND=ssl? ( dev-libs/openssl ) !net-mail/uw-imap kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) )
DESCRIPTION=UW IMAP c-client library
-EAPI=2
+EAPI=4
HOMEPAGE=http://www.washington.edu/imap/
-IUSE=doc kernel_linux kernel_FreeBSD pam ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+IUSE=doc kernel_linux kernel_FreeBSD pam ssl static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
LICENSE=as-is
RDEPEND=ssl? ( dev-libs/openssl ) !net-mail/uw-imap
SLOT=0
SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ae3c9c9fce43671fbe577747b653342e
+_md5_=330fe7867a71b1e742b4985b55481fca
diff --git a/metadata/md5-cache/net-libs/libbtbb-0.8 b/metadata/md5-cache/net-libs/libbtbb-0.8
index a5f4950c4d1c..9f4107842489 100644
--- a/metadata/md5-cache/net-libs/libbtbb-0.8
+++ b/metadata/md5-cache/net-libs/libbtbb-0.8
@@ -7,4 +7,4 @@ LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/libbtbb/libbtbb-0.8.tar.gz
_eclasses_=multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856
-_md5_=c845947daeae8756fc9593395ad6d4c0
+_md5_=98e99fffdf434257f2d5d25df018f50d
diff --git a/metadata/md5-cache/net-libs/libbtbb-0.8-r1 b/metadata/md5-cache/net-libs/libbtbb-0.8-r1
deleted file mode 100644
index 98d7f1bfaf56..000000000000
--- a/metadata/md5-cache/net-libs/libbtbb-0.8-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A library to decode Bluetooth baseband packets
-EAPI=4
-HOMEPAGE=http://libbtbb.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/libbtbb/libbtbb-0.8.tar.gz
-_eclasses_=multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856
-_md5_=a7e6309e8420473c0555cff0ed3b9c8b
diff --git a/metadata/md5-cache/net-libs/libbtbb-9999 b/metadata/md5-cache/net-libs/libbtbb-9999
index 164612c8ebde..3f0e5bc9d15e 100644
--- a/metadata/md5-cache/net-libs/libbtbb-9999
+++ b/metadata/md5-cache/net-libs/libbtbb-9999
@@ -6,4 +6,4 @@ HOMEPAGE=http://libbtbb.sourceforge.net/
LICENSE=GPL-2
SLOT=0
_eclasses_=git-2 15733ab6a6feb34af9837b41623c2bad multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856
-_md5_=d37bb98d406645a8a3b520168916a355
+_md5_=cc00101d79404708b9da77d1878d4981
diff --git a/metadata/md5-cache/net-mail/uw-imap-2007f-r1 b/metadata/md5-cache/net-mail/uw-imap-2007f-r1
new file mode 100644
index 000000000000..4ceebe289509
--- /dev/null
+++ b/metadata/md5-cache/net-mail/uw-imap-2007f-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=!net-libs/c-client >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam] ssl? ( dev-libs/openssl ) kerberos? ( app-crypt/mit-krb5 ) ssl? ( dev-libs/openssl )
+DESCRIPTION=UW server daemons for IMAP and POP network mail protocols.
+EAPI=4
+HOMEPAGE=http://www.washington.edu/imap/
+IUSE=ipv6 +ssl kerberos clearpasswd ssl
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=!net-libs/c-client >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[pam] ssl? ( dev-libs/openssl ) kerberos? ( app-crypt/mit-krb5 ) >=net-mail/uw-mailutils-2007f sys-apps/xinetd !net-mail/dovecot !mail-mta/courier !net-mail/courier-imap !net-mail/cyrus-imapd
+REQUIRED_USE=!clearpasswd? ( ssl )
+SLOT=0
+SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab ssl-cert 7f678cd359743d336ecf3a6cc4ce1521 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=153f00e705f55473b84ff4d72918265a
diff --git a/metadata/md5-cache/net-misc/iodine-0.6.0_rc1-r1 b/metadata/md5-cache/net-misc/iodine-0.6.0_rc1-r1
index ab47015c9eb1..0f452f283e09 100644
--- a/metadata/md5-cache/net-misc/iodine-0.6.0_rc1-r1
+++ b/metadata/md5-cache/net-misc/iodine-0.6.0_rc1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=IP over DNS tunnel
HOMEPAGE=http://code.kryo.se/iodine/
IUSE=test
KEYWORDS=~amd64 ~x86
-LICENSE=ISC
+LICENSE=ISC GPL-2
RDEPEND=sys-libs/zlib
SLOT=0
SRC_URI=http://code.kryo.se/iodine/iodine-0.6.0-rc1.tar.gz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 linux-info 0b7adf68a2edb4e5a32b07bb6e68121c multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=e0746e39b7880c40b3ac4b5e962d2a64
+_md5_=4241640d115c83747e96c58f14782393
diff --git a/metadata/md5-cache/net-misc/nx-3.5.0.14 b/metadata/md5-cache/net-misc/nx-3.5.0.14-r1
similarity index 56%
rename from metadata/md5-cache/net-misc/nx-3.5.0.14
rename to metadata/md5-cache/net-misc/nx-3.5.0.14-r1
index 63ff8de4b5a7..248a04291f95 100644
--- a/metadata/md5-cache/net-misc/nx-3.5.0.14
+++ b/metadata/md5-cache/net-misc/nx-3.5.0.14-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare
-DEPEND=elibc_glibc? ( || ( net-libs/libtirpc =media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=elibc_glibc? ( || ( net-libs/libtirpc =media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=NX compression technology core libraries
EAPI=4
HOMEPAGE=http://www.nomachine.com/developers.php http://www.x2go.org/doku.php/wiki:libs:nx-libs
IUSE=elibc_glibc
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
-RDEPEND=elibc_glibc? ( || ( net-libs/libtirpc =media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg
+RDEPEND=elibc_glibc? ( || ( net-libs/libtirpc =media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg
SLOT=0
SRC_URI=http://code.x2go.org/releases/source/nx-libs/nx-libs-3.5.0.14-full.tar.gz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1fe04835f2d08168ec664131a331fb02
+_md5_=14e82c96e936525662829325c239e49a
diff --git a/metadata/md5-cache/net-misc/plowshare-20120609-r2 b/metadata/md5-cache/net-misc/plowshare-20120609-r2
new file mode 100644
index 000000000000..cdc998e63228
--- /dev/null
+++ b/metadata/md5-cache/net-misc/plowshare-20120609-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare test
+DESCRIPTION=Command-line downloader and uploader for file-sharing websites
+EAPI=2
+HOMEPAGE=http://code.google.com/p/plowshare/
+IUSE=bash-completion +javascript +perl scripts view-captcha
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=javascript? ( dev-lang/spidermonkey ) perl? ( dev-lang/perl media-gfx/imagemagick[perl] ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) ) app-shells/bash || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) app-text/tesseract[tiff] || ( media-gfx/imagemagick[tiff] media-gfx/graphicsmagick[imagemagick,tiff] ) net-misc/curl sys-apps/util-linux
+SLOT=0
+SRC_URI=http://plowshare.googlecode.com/files/plowshare-snapshot-git20120609.tar.gz
+_eclasses_=bash-completion-r1 3480f8385cb9e31797e7b659e366e2d2
+_md5_=f6405836d1698b4ece000f1908eb85d8
diff --git a/metadata/md5-cache/net-misc/sslh-1.13 b/metadata/md5-cache/net-misc/sslh-1.13-r1
similarity index 93%
rename from metadata/md5-cache/net-misc/sslh-1.13
rename to metadata/md5-cache/net-misc/sslh-1.13-r1
index 2222454c5e37..948138a3c5d7 100644
--- a/metadata/md5-cache/net-misc/sslh-1.13
+++ b/metadata/md5-cache/net-misc/sslh-1.13-r1
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://www.rutschle.net/tech/sslh-1.13b.tar.gz
_eclasses_=multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856
-_md5_=8840b4a5c31dedf8a4349d08e7a47834
+_md5_=b68c5f4562880475f63540d7fa2a123c
diff --git a/metadata/md5-cache/net-misc/tor-0.2.2.35 b/metadata/md5-cache/net-misc/tor-0.2.2.35
index 1cc0a59f99ec..1afaea93aac2 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.2.35
+++ b/metadata/md5-cache/net-misc/tor-0.2.2.35
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://www.torproject.org/
IUSE=doc tor-hardening +transparent-proxy threads
KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=dev-libs/openssl >=dev-libs/libevent-2.0
SLOT=0
SRC_URI=http://www.torproject.org/dist/tor-0.2.2.35.tar.gz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=36b56406773cbf600388d67e7b3aef00
+_md5_=2e253cb11bc9b4687ce0428457ab1291
diff --git a/metadata/md5-cache/net-misc/tor-0.2.2.35-r1 b/metadata/md5-cache/net-misc/tor-0.2.2.35-r1
index 552846f1743e..8303c85e7589 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.2.35-r1
+++ b/metadata/md5-cache/net-misc/tor-0.2.2.35-r1
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://www.torproject.org/
IUSE=tor-hardening +transparent-proxy threads selinux
KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor )
SLOT=0
SRC_URI=https://archive.torproject.org/tor-package-archive/tor-0.2.2.35.tar.gz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f547c7894ee5bec780bcffaa19cfabb5
+_md5_=292584dcb99e1091b99baef2edc8bfb9
diff --git a/metadata/md5-cache/net-misc/tor-0.2.2.36 b/metadata/md5-cache/net-misc/tor-0.2.2.36
index daf447dea592..8b5be5a0129c 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.2.36
+++ b/metadata/md5-cache/net-misc/tor-0.2.2.36
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://www.torproject.org/
IUSE=tor-hardening +transparent-proxy threads selinux
KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor )
SLOT=0
SRC_URI=https://archive.torproject.org/tor-package-archive/tor-0.2.2.36.tar.gz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=45ca818f7e5261ec568bef4c3f0532ac
+_md5_=7a0aa0656fb67d169ad149d8062036a5
diff --git a/metadata/md5-cache/net-misc/tor-0.2.2.37 b/metadata/md5-cache/net-misc/tor-0.2.2.37
index f89a18f2d60a..48853bd070ac 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.2.37
+++ b/metadata/md5-cache/net-misc/tor-0.2.2.37
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://www.torproject.org/
IUSE=tor-hardening +transparent-proxy threads selinux
KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor )
SLOT=0
SRC_URI=https://archive.torproject.org/tor-package-archive/tor-0.2.2.37.tar.gz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f057ba34a2071d9e02dd7ca1e31d657b
+_md5_=58ef8fa5c847ed9f7c836be258ed6b74
diff --git a/metadata/md5-cache/net-misc/tor-0.2.3.18_rc b/metadata/md5-cache/net-misc/tor-0.2.3.18_rc
index 1219db0aa0b8..5ae381677571 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.3.18_rc
+++ b/metadata/md5-cache/net-misc/tor-0.2.3.18_rc
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://www.torproject.org/
IUSE=+bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux web
KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=dev-libs/openssl sys-libs/zlib >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
SLOT=0
SRC_URI=https://archive.torproject.org/tor-package-archive/tor-0.2.3.18-rc.tar.gz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=0c4de81e8a6590604fd7919863ec36ca
+_md5_=932f8ada43e73404b6fc5eb3d33b0676
diff --git a/metadata/md5-cache/net-misc/tor-0.2.3.19_rc b/metadata/md5-cache/net-misc/tor-0.2.3.19_rc
index 84906d7a18b0..e45c8d7458f4 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.3.19_rc
+++ b/metadata/md5-cache/net-misc/tor-0.2.3.19_rc
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://www.torproject.org/
IUSE=+bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux web
KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
+LICENSE=BSD GPL-2
RDEPEND=dev-libs/openssl sys-libs/zlib >=dev-libs/libevent-2.0.14 nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
SLOT=0
SRC_URI=https://archive.torproject.org/tor-package-archive/tor-0.2.3.19-rc.tar.gz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=015ff9526f4980a3e5f2b1301c057075
+_md5_=21ca89ea4ffb78dd92d9899b17918561
diff --git a/metadata/md5-cache/net-misc/vtun-3.0.2-r2 b/metadata/md5-cache/net-misc/vtun-3.0.2-r2
index 4c1441f49f4d..70d6f3c1e3c7 100644
--- a/metadata/md5-cache/net-misc/vtun-3.0.2-r2
+++ b/metadata/md5-cache/net-misc/vtun-3.0.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Create virtual tunnels over TCP/IP networks with traffic shaping, en
EAPI=4
HOMEPAGE=http://vtun.sourceforge.net/
IUSE=lzo socks5 ssl zlib
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
RDEPEND=ssl? ( dev-libs/openssl ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante )
SLOT=0
SRC_URI=mirror://sourceforge/vtun/vtun-3.0.2.tar.gz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 linux-info 0b7adf68a2edb4e5a32b07bb6e68121c multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=e4e15ec7a20ac36f5c7ecb8d08895f2c
+_md5_=dcc7fc2fb95d319bc75e28812e5329bb
diff --git a/metadata/md5-cache/net-nds/adtool-1.3.2 b/metadata/md5-cache/net-nds/adtool-1.3.2
index 060e96bca1ee..674998075a10 100644
--- a/metadata/md5-cache/net-nds/adtool-1.3.2
+++ b/metadata/md5-cache/net-nds/adtool-1.3.2
@@ -1,11 +1,13 @@
-DEFINED_PHASES=install unpack
-DEPEND=net-nds/openldap ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 >=sys-devel/automake-1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=adtool is a Unix command line utility for Active Directory administration
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-nds/openldap ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Utility for Active Directory administration
+EAPI=4
HOMEPAGE=http://gp2x.org/adtool/
IUSE=ssl
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
+RDEPEND=net-nds/openldap ssl? ( dev-libs/openssl )
SLOT=0
SRC_URI=http://gp2x.org/adtool/adtool-1.3.2.tar.gz
-_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f2bd947861e99dbc70df652a39cca94d
+_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b8b9ae0a82a2e87046ec42c501d28b97
diff --git a/metadata/md5-cache/net-nds/adtool-1.3.3 b/metadata/md5-cache/net-nds/adtool-1.3.3
new file mode 100644
index 000000000000..7b714d3432e0
--- /dev/null
+++ b/metadata/md5-cache/net-nds/adtool-1.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-nds/openldap ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Utility for Active Directory administration
+EAPI=4
+HOMEPAGE=http://gp2x.org/adtool/
+IUSE=ssl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=net-nds/openldap ssl? ( dev-libs/openssl )
+SLOT=0
+SRC_URI=http://gp2x.org/adtool/adtool-1.3.3.tar.gz
+_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=00c9b15f052a9cd3b3ba906d728b50d7
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.4.7_rc3 b/metadata/md5-cache/net-p2p/bitcoind-0.4.7_rc3
index 6a416d4a9d52..bb6f827be2ad 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.4.7_rc3
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.4.7_rc3
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://bitcoin.org/
IUSE=+bip16 +eligius logrotate ssl upnp
KEYWORDS=~amd64 ~x86
-LICENSE=MIT ISC
+LICENSE=MIT ISC GPL-2
RDEPEND=>=dev-libs/boost-1.41.0 dev-libs/crypto++ dev-libs/openssl[-bindist] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx]
SLOT=0
SRC_URI=http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.4.7rc3 -> bitcoin-v0.4.7_rc3.tgz bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.4.7-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz ) eligius? ( !bip16? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.4.5rc1-eligius_sendfee.patch.xz ) )
_eclasses_=db-use 2f5d6a2718559b90a51648d8ff58be83 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=cd99b79f2fef914f875fc66c309d3847
+_md5_=1abb527e68efb88b4f86ba6606bbe25f
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.5.6_rc2 b/metadata/md5-cache/net-p2p/bitcoind-0.5.6_rc2
index a66530cae7cc..e37b441d5485 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.5.6_rc2
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.5.6_rc2
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://bitcoin.org/
IUSE=+bip16 +eligius examples logrotate ssl upnp
KEYWORDS=amd64 ~arm x86
-LICENSE=MIT ISC
+LICENSE=MIT ISC GPL-2
RDEPEND=>=dev-libs/boost-1.41.0 dev-libs/openssl[-bindist] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx]
SLOT=0
SRC_URI=http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.5.6rc2 -> bitcoin-v0.5.6_rc2.tgz bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.5.6-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz ) eligius? ( !bip16? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.5.0.6rc1-eligius_sendfee.patch.xz ) )
_eclasses_=db-use 2f5d6a2718559b90a51648d8ff58be83 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=ec670ba3e1f7772d8e3c9f263a02fdc8
+_md5_=f0127f92d3bd13f8b3fcfe8c1194f7d1
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.5.6_rc3 b/metadata/md5-cache/net-p2p/bitcoind-0.5.6_rc3
index 5837fe7188a8..c07df98d1d2f 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.5.6_rc3
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.5.6_rc3
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://bitcoin.org/
IUSE=+bip16 +eligius examples logrotate ssl upnp
KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT ISC
+LICENSE=MIT ISC GPL-2
RDEPEND=>=dev-libs/boost-1.41.0 dev-libs/openssl[-bindist] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx]
SLOT=0
SRC_URI=http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.5.6rc3 -> bitcoin-v0.5.6_rc3.tgz bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.5.6-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz ) eligius? ( !bip16? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.5.0.6rc1-eligius_sendfee.patch.xz ) )
_eclasses_=db-use 2f5d6a2718559b90a51648d8ff58be83 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=7215aefcd87f0d964d03b1baffb53402
+_md5_=4fe6b0ac097e95d77fa63aa0ca20c472
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.6.0.9_rc1 b/metadata/md5-cache/net-p2p/bitcoind-0.6.0.9_rc1
index f6861e97056b..7db5a0e0f748 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.6.0.9_rc1
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.6.0.9_rc1
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://bitcoin.org/
IUSE=+eligius examples logrotate ssl upnp
KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT ISC
+LICENSE=MIT ISC GPL-2
RDEPEND=>=dev-libs/boost-1.41.0 dev-libs/openssl[-bindist] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx]
SLOT=0
SRC_URI=http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.6.0.9rc1 -> bitcoin-v0.6.0.9_rc1.tgz eligius? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.6.0-eligius_sendfee.patch.xz )
_eclasses_=db-use 2f5d6a2718559b90a51648d8ff58be83 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=d60099f3d421bfdb6fbdd34751a9b169
+_md5_=ff32b88b5d949de4a9ba531a02ec2c7a
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.6.3 b/metadata/md5-cache/net-p2p/bitcoind-0.6.3
index ad4b7ec164e2..9f1ea4f30a1d 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.6.3
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.6.3
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://bitcoin.org/
IUSE=+eligius examples logrotate upnp
KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT ISC
+LICENSE=MIT ISC GPL-2
RDEPEND=>=dev-libs/boost-1.41.0 dev-libs/openssl[-bindist] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx]
SLOT=0
SRC_URI=https://nodeload.github.com/bitcoin/bitcoin/tarball/v0.6.3 -> bitcoin-v0.6.3.tgz eligius? ( http://luke.dashjr.org/programs/bitcoin/files/bitcoind/eligius/sendfee/0.6.1-eligius_sendfee.patch.xz ) logrotate? ( https://github.com/bitcoin/bitcoin/commit/9af080c351c40a4f56d37174253d33a9f4ffdb69.diff -> 0.6.3-reopen_log_file.patch )
_eclasses_=db-use 2f5d6a2718559b90a51648d8ff58be83 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=005d30a7131a826ab84cec7ac21ca4c1
+_md5_=7c36dcd7aa83e24ff363dd345adae87d
diff --git a/metadata/md5-cache/net-p2p/bitflu-1.37 b/metadata/md5-cache/net-p2p/bitflu-1.37
index 778fe2b94fd8..202cb3718911 100644
--- a/metadata/md5-cache/net-p2p/bitflu-1.37
+++ b/metadata/md5-cache/net-p2p/bitflu-1.37
@@ -4,9 +4,9 @@ DESCRIPTION=Bitflu is a BitTorrent client, written in Perl and is designed to ru
EAPI=3
HOMEPAGE=http://bitflu.workaround.ch
KEYWORDS=amd64 x86
-LICENSE=Artistic-2
+LICENSE=Artistic-2 GPL-2
RDEPEND=dev-perl/Danga-Socket dev-perl/Sys-Syscall
SLOT=0
SRC_URI=http://bitflu.workaround.ch/bitflu/bitflu-1.37.tgz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a8c675ccdbb19ac640657680460ab44b
+_md5_=c12f660d21710403b89498cb8962ff02
diff --git a/metadata/md5-cache/net-p2p/bitflu-1.41 b/metadata/md5-cache/net-p2p/bitflu-1.41
index eded32cbc239..49b466eee034 100644
--- a/metadata/md5-cache/net-p2p/bitflu-1.41
+++ b/metadata/md5-cache/net-p2p/bitflu-1.41
@@ -4,9 +4,9 @@ DESCRIPTION=Bitflu is a BitTorrent client, written in Perl and is designed to ru
EAPI=4
HOMEPAGE=http://bitflu.workaround.ch
KEYWORDS=amd64 x86
-LICENSE=Artistic-2
+LICENSE=Artistic-2 GPL-2
RDEPEND=dev-perl/Danga-Socket dev-perl/Sys-Syscall
SLOT=0
SRC_URI=http://bitflu.workaround.ch/bitflu/bitflu-1.41.tgz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3d5f28d457186c530378afce14ccb325
+_md5_=de48b789bb197fed5d262818d093a5dd
diff --git a/metadata/md5-cache/net-p2p/bitflu-1.42 b/metadata/md5-cache/net-p2p/bitflu-1.42
index adebb5f1eb3d..3af54a659ae4 100644
--- a/metadata/md5-cache/net-p2p/bitflu-1.42
+++ b/metadata/md5-cache/net-p2p/bitflu-1.42
@@ -4,9 +4,9 @@ DESCRIPTION=Bitflu is a BitTorrent client, written in Perl and is designed to ru
EAPI=4
HOMEPAGE=http://bitflu.workaround.ch
KEYWORDS=~amd64 ~x86
-LICENSE=Artistic-2
+LICENSE=Artistic-2 GPL-2
RDEPEND=dev-perl/Danga-Socket dev-perl/Sys-Syscall
SLOT=0
SRC_URI=http://bitflu.workaround.ch/bitflu/bitflu-1.42.tgz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f692f3a28ad7c8bdb819cde294233733
+_md5_=64d79ec2be14d0cbd070ada682e93646
diff --git a/metadata/md5-cache/net-p2p/bitflu-1.43 b/metadata/md5-cache/net-p2p/bitflu-1.43
index c0ce46dc164c..ad9be66b5452 100644
--- a/metadata/md5-cache/net-p2p/bitflu-1.43
+++ b/metadata/md5-cache/net-p2p/bitflu-1.43
@@ -4,9 +4,9 @@ DESCRIPTION=Bitflu is a BitTorrent client, written in Perl and is designed to ru
EAPI=4
HOMEPAGE=http://bitflu.workaround.ch
KEYWORDS=amd64 x86
-LICENSE=Artistic-2
+LICENSE=Artistic-2 GPL-2
RDEPEND=dev-perl/Danga-Socket dev-perl/Sys-Syscall
SLOT=0
SRC_URI=http://bitflu.workaround.ch/bitflu/bitflu-1.43.tgz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0567dce75bcad4dcc3096a646006011e
+_md5_=d328cebe9934ec875e06e28001ed82ef
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-3.0.0_rc4 b/metadata/md5-cache/net-p2p/qbittorrent-3.0.0_rc5
similarity index 90%
rename from metadata/md5-cache/net-p2p/qbittorrent-3.0.0_rc4
rename to metadata/md5-cache/net-p2p/qbittorrent-3.0.0_rc5
index 92384f47c1a6..dd8a812d4cfa 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-3.0.0_rc4
+++ b/metadata/md5-cache/net-p2p/qbittorrent-3.0.0_rc5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=net-libs/rb_libtorrent >=x11-libs/qt-core-4.6.1:4 X? ( >=x11-libs/qt-gui-4.6.1:4 ) dbus? ( >=x11-libs/qt-dbus-4.6.1:4 ) dev-libs/boost geoip? ( dev-libs/geoip ) =dev-lang/python-2*
SLOT=0
-SRC_URI=mirror://sourceforge/qbittorrent/qbittorrent-3.0.0rc4.tar.gz
+SRC_URI=mirror://sourceforge/qbittorrent/qbittorrent-3.0.0rc5.tar.gz
_eclasses_=base d40e074a6349af3ea5e937210630bdc1 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 qt4-r2 2111bb601bba6402257079dab64c7310 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=6f97d63b6f04d121367f5bb12e53da03
+_md5_=3ce53c293cdfe18a33d15f4b3b8f6776
diff --git a/metadata/md5-cache/sci-chemistry/coot-0.7_pre4266 b/metadata/md5-cache/sci-chemistry/coot-0.7_pre4266
new file mode 100644
index 000000000000..0745edeb58e2
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/coot-0.7_pre4266
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm =dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn >=sys-devel/libtool-2.4-r2 dev-lang/swig sys-devel/bc test? ( dev-scheme/greg ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+DESCRIPTION=Crystallographic Object-Oriented Toolkit for model building, completion and validation
+EAPI=4
+HOMEPAGE=http://www.biop.ox.ac.uk/coot/
+IUSE=+openmp static-libs test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=>=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm =dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn =dev-lang/python-2*
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/coot-0.7_pre4266.tar.xz test? ( http://dev.gentoo.org/~jlec/distfiles/greg-data-0.7_pre4266.tar.gz )
+_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=77aa80b0b0105c7a1b8a640ef77b81e5
diff --git a/metadata/md5-cache/sci-electronics/xcircuit-3.7.40 b/metadata/md5-cache/sci-electronics/xcircuit-3.7.40
index 4f46a899900d..a00a7f2a4749 100644
--- a/metadata/md5-cache/sci-electronics/xcircuit-3.7.40
+++ b/metadata/md5-cache/sci-electronics/xcircuit-3.7.40
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE sys-libs/zlib app-text/ghostscript-gpl dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Circuit drawing and schematic capture program.
-EAPI=2
+EAPI=4
HOMEPAGE=http://opencircuitdesign.com/xcircuit
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE sys-libs/zlib app-text/ghostscript-gpl dev-lang/tcl dev-lang/tk
+RDEPEND=app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE
RESTRICT=test
SLOT=0
SRC_URI=http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.7.40.tgz
-_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f8a4d65ebd120bc220593f1b0f04dd11
+_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d3f09199d27139967ad1b5409ebf60b6
diff --git a/metadata/md5-cache/sci-electronics/xcircuit-3.8.24 b/metadata/md5-cache/sci-electronics/xcircuit-3.8.24
index da03f08a96b6..d6118c566087 100644
--- a/metadata/md5-cache/sci-electronics/xcircuit-3.8.24
+++ b/metadata/md5-cache/sci-electronics/xcircuit-3.8.24
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE sys-libs/zlib app-text/ghostscript-gpl dev-lang/tcl dev-lang/tk =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=Circuit drawing and schematic capture program.
-EAPI=2
+EAPI=4
HOMEPAGE=http://opencircuitdesign.com/xcircuit
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE sys-libs/zlib app-text/ghostscript-gpl dev-lang/tcl dev-lang/tk
+RDEPEND=app-text/ghostscript-gpl dev-lang/tk sys-libs/zlib x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE
RESTRICT=test
SLOT=0
SRC_URI=http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.8.24.tgz
-_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d594500318985293809db001c876b8f0
+_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=14b62a9e0fb7c230eebd4c63f512c013
diff --git a/metadata/md5-cache/sci-libs/cfitsio-3.300-r1 b/metadata/md5-cache/sci-libs/cfitsio-3.300-r1
index a4b734460701..936a9d14de5d 100644
--- a/metadata/md5-cache/sci-libs/cfitsio-3.300-r1
+++ b/metadata/md5-cache/sci-libs/cfitsio-3.300-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib
SLOT=0
SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/cfitsio-3.300.tar.gz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=42c02e1144bee57bbc8244ab3b412511
+_md5_=9046677d0dcf9357f9ce7b65dcbec29a
diff --git a/metadata/md5-cache/sci-physics/geant-python-4.9.5 b/metadata/md5-cache/sci-physics/geant-python-4.9.5
index 4c050259edd7..e5238790abab 100644
--- a/metadata/md5-cache/sci-physics/geant-python-4.9.5
+++ b/metadata/md5-cache/sci-physics/geant-python-4.9.5
@@ -10,4 +10,4 @@ RDEPEND==sci-physics/geant-4.9.5* dev-libs/boost[python]
SLOT=0
SRC_URI=http://geant4.cern.ch/support/source/geant4.9.5.tar.gz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=ef2ccef0de29661c24dec620ae723dce
+_md5_=6d8f84ebf732f267cd03103c175e24ea
diff --git a/metadata/md5-cache/sys-apps/chpax-0.7 b/metadata/md5-cache/sys-apps/chpax-0.7
index 7fce8b416671..df12c7c14977 100644
--- a/metadata/md5-cache/sys-apps/chpax-0.7
+++ b/metadata/md5-cache/sys-apps/chpax-0.7
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=Manages various PaX related flags for ELF32, ELF64, and a.out binaries.
HOMEPAGE=http://pax.grsecurity.net/
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=public-domain
+LICENSE=public-domain GPL-2
SLOT=0
SRC_URI=http://pax.grsecurity.net/chpax-0.7.tar.gz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=815bbbf95b6edb8d230008383af2c604
+_md5_=b5f36ba7797b862e66790c5d360add15
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.17 b/metadata/md5-cache/sys-apps/coreutils-8.17
index 0efcbecee3f5..f3cedcd37ab7 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.17
+++ b/metadata/md5-cache/sys-apps/coreutils-8.17
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst prepare test
-DEPEND=caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) selinux? ( sys-libs/libselinux ) acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.15 ) !app-misc/realpath !=sys-devel/gettext-0.15 ) !app-misc/realpath !=sys-devel/gettext-0.15 ) !app-misc/realpath !=sys-devel/gettext-0.15 ) !app-misc/realpath !=sys-apps/portage-2.1.9 sys-devel/gettext dev-util/intltool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+DESCRIPTION=Entropy Package Manager foundation library
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite[soundex] net-misc/rsync sys-apps/diffutils sys-apps/sandbox >=sys-apps/portage-2.1.9 sys-devel/gettext =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8148acba3d2f1ebd24cba1b864cd868e
diff --git a/metadata/md5-cache/sys-apps/entropy-server-1.0_rc124 b/metadata/md5-cache/sys-apps/entropy-server-1.0_rc124
new file mode 100644
index 000000000000..ae3025bade0e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/entropy-server-1.0_rc124
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=app-text/asciidoc =dev-lang/python-2*
+DESCRIPTION=Entropy Package Manager server-side tools
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~sys-apps/entropy-1.0_rc124 =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+_eclasses_=bash-completion-r1 3480f8385cb9e31797e7b659e366e2d2 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=cb02f64b75f9d12aa9acd86c62020e59
diff --git a/metadata/md5-cache/sys-apps/magneto-core-1.0_rc124 b/metadata/md5-cache/sys-apps/magneto-core-1.0_rc124
new file mode 100644
index 000000000000..7d232ff2a2e1
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/magneto-core-1.0_rc124
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=~sys-apps/rigo-daemon-1.0_rc124 =dev-lang/python-2*
+DESCRIPTION=Entropy Package Manager notification applet library
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~sys-apps/rigo-daemon-1.0_rc124 x11-misc/xdg-utils =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=50839aefe0e74defefb846bf6c8633e5
diff --git a/metadata/md5-cache/sys-apps/rigo-daemon-1.0_rc124 b/metadata/md5-cache/sys-apps/rigo-daemon-1.0_rc124
new file mode 100644
index 000000000000..d49e2e0e4f48
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/rigo-daemon-1.0_rc124
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst
+DEPEND==dev-lang/python-2*
+DESCRIPTION=Entropy Client DBus Services, aka RigoDaemon
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/dbus-python dev-python/pygobject:3 ~sys-apps/entropy-1.0_rc124 sys-auth/polkit[introspection] sys-devel/gettext =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=151200516ecabfefa793624962c7e3b4
diff --git a/metadata/md5-cache/sys-block/cec-11 b/metadata/md5-cache/sys-block/cec-11
new file mode 100644
index 000000000000..0eb86fd38b2c
--- /dev/null
+++ b/metadata/md5-cache/sys-block/cec-11
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Coraid Ethernet Console client
+EAPI=4
+HOMEPAGE=http://sourceforge.net/projects/aoetools/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/aoetools/cec-11.tgz
+_eclasses_=multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856
+_md5_=bcece941a833ef132bab0f309be94d9d
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.0.12 b/metadata/md5-cache/sys-cluster/pacemaker-1.0.12
index 377a4e40da4c..892854c66e05 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.0.12
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.0.12
@@ -10,4 +10,4 @@ RDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-gl
SLOT=0
SRC_URI=https://github.com/ClusterLabs/pacemaker-1.0/tarball/Pacemaker-1.0.12 -> pacemaker-1.0.12.tar.gz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba base d40e074a6349af3ea5e937210630bdc1 eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a7ad613199672110f5345e6d520d04bd
+_md5_=3242b721de0e1d046bd073fbf93c3a4c
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9 b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9
deleted file mode 100644
index a67959f541e9..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc9* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] test? ( sys-fs/mdadm ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Native ZFS for Linux
-EAPI=4
-HOMEPAGE=http://zfsonlinux.org/
-IUSE=bash-completion custom-cflags debug dracut +rootfs test test-suite static-libs kernel_linux
-KEYWORDS=~amd64
-LICENSE=CDDL GPL-2 MIT
-RDEPEND==sys-kernel/spl-0.6.0_rc9* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !sys-fs/zfs-fuse !prefix? ( sys-fs/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils ) kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc9.tar.gz
-_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c bash-completion-r1 3480f8385cb9e31797e7b659e366e2d2 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed linux-info 0b7adf68a2edb4e5a32b07bb6e68121c linux-mod cba6b1240fca7886fe5c7297106aea80 multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=55160833d755d412d3a47a704dec9039
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9-r4 b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9-r4
deleted file mode 100644
index 4e1c655928a1..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.6.0_rc9* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] test? ( sys-fs/mdadm ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Native ZFS for Linux
-EAPI=4
-HOMEPAGE=http://zfsonlinux.org/
-IUSE=custom-cflags debug dracut +rootfs test test-suite static-libs kernel_linux
-KEYWORDS=~amd64
-LICENSE=CDDL GPL-2 MIT
-RDEPEND==sys-kernel/spl-0.6.0_rc9* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !sys-fs/zfs-fuse !prefix? ( sys-fs/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils ) kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc9.tar.gz
-_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c bash-completion-r1 3480f8385cb9e31797e7b659e366e2d2 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed linux-info 0b7adf68a2edb4e5a32b07bb6e68121c linux-mod cba6b1240fca7886fe5c7297106aea80 multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=b4174c5475c7f46f5c8232133ba99975
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9-r3 b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9-r5
similarity index 96%
rename from metadata/md5-cache/sys-fs/zfs-0.6.0_rc9-r3
rename to metadata/md5-cache/sys-fs/zfs-0.6.0_rc9-r5
index aa428dda07b5..791effcf0f37 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9-r3
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.0_rc9-r5
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug dracut +rootfs test test-suite static-libs kernel_linux
KEYWORDS=~amd64
-LICENSE=CDDL GPL-2 MIT
+LICENSE=BSD-2 CDDL MIT
RDEPEND==sys-kernel/spl-0.6.0_rc9* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !sys-fs/zfs-fuse !prefix? ( sys-fs/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils ) kernel_linux? ( virtual/modutils )
SLOT=0
SRC_URI=https://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc9.tar.gz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c bash-completion-r1 3480f8385cb9e31797e7b659e366e2d2 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed linux-info 0b7adf68a2edb4e5a32b07bb6e68121c linux-mod cba6b1240fca7886fe5c7297106aea80 multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=f113ee209b24cbec0d9ddf8e9aedfb71
+_md5_=fee871ea171a8de6463dc2212a35e3d0
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index e6eb30eced5f..a6d805596cde 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -3,9 +3,9 @@ DEPEND==sys-kernel/spl-9999* sys-apps/util-linux[static-libs?] sys-libs/zlib[sta
DESCRIPTION=Native ZFS for Linux
EAPI=4
HOMEPAGE=http://zfsonlinux.org/
-IUSE=bash-completion custom-cflags debug dracut +rootfs test test-suite static-libs kernel_linux
-LICENSE=CDDL GPL-2 MIT
+IUSE=custom-cflags debug dracut +rootfs test test-suite static-libs kernel_linux
+LICENSE=BSD-2 CDDL MIT
RDEPEND==sys-kernel/spl-9999* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] !sys-fs/zfs-fuse !prefix? ( sys-fs/udev ) test-suite? ( sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils ) kernel_linux? ( virtual/modutils )
SLOT=0
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c bash-completion-r1 3480f8385cb9e31797e7b659e366e2d2 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f git-2 15733ab6a6feb34af9837b41623c2bad libtool 46e19fa7553f66c48ebc7cf025acd3ed linux-info 0b7adf68a2edb4e5a32b07bb6e68121c linux-mod cba6b1240fca7886fe5c7297106aea80 multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=cef6d7b623b997fc8a288c0fc38a6571
+_md5_=16340c7f91b6de8d2879d92be1931b0d
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.4.4 b/metadata/md5-cache/sys-kernel/pf-sources-3.4.4
new file mode 100644
index 000000000000..f0476ce34f60
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.4.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux kernel fork with new features, including the -ck patchset (BFS), BFQ, TuxOnIce and LinuxIMQ
+EAPI=2
+HOMEPAGE=http://pf.natalenko.name/
+IUSE=symlink build
+KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+RESTRICT=binchecks strip
+SLOT=3.4.4
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 http://pf.natalenko.name/sources/3.4/patch-3.4.4-pf.bz2
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 kernel-2 dd451098928ff900df7c254820871c00 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=38171bc24a62a826306b7bbe4c3f9f7b
diff --git a/metadata/md5-cache/sys-libs/mtdev-1.1.2 b/metadata/md5-cache/sys-libs/mtdev-1.1.2
index 3ea985914e7e..2dfdb0f297a6 100644
--- a/metadata/md5-cache/sys-libs/mtdev-1.1.2
+++ b/metadata/md5-cache/sys-libs/mtdev-1.1.2
@@ -4,8 +4,8 @@ DESCRIPTION=Multitouch Protocol Translation Library
EAPI=4
HOMEPAGE=http://bitmath.org/code/mtdev/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86
LICENSE=MIT
SLOT=0
SRC_URI=http://bitmath.org/code/mtdev/mtdev-1.1.2.tar.bz2
-_md5_=3d7785026cc61e8a87a3c891b6e9fd5a
+_md5_=ee44854aa330bf09c6bbf5e9bd5cbc49
diff --git a/metadata/md5-cache/virtual/httpd-php-5.3 b/metadata/md5-cache/virtual/httpd-php-5.3
index 0b3b76e2e5d8..25337a97940a 100644
--- a/metadata/md5-cache/virtual/httpd-php-5.3
+++ b/metadata/md5-cache/virtual/httpd-php-5.3
@@ -1,7 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual to provide PHP-enabled webservers
EAPI=2
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
RDEPEND=|| ( =dev-lang/php-5.3*[apache2] =dev-lang/php-5.3*[cgi] =dev-lang/php-5.3*[fpm] )
SLOT=5.3
-_md5_=59baca8405c22f832936b4d64759a608
+_md5_=22d003c47db13e14aaf1ed79ce40ae06
diff --git a/metadata/md5-cache/virtual/httpd-php-5.4 b/metadata/md5-cache/virtual/httpd-php-5.4
index 7616307a8670..8c95658aca7e 100644
--- a/metadata/md5-cache/virtual/httpd-php-5.4
+++ b/metadata/md5-cache/virtual/httpd-php-5.4
@@ -1,7 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual to provide PHP-enabled webservers
EAPI=2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
RDEPEND=|| ( =dev-lang/php-5.4*[apache2] =dev-lang/php-5.4*[cgi] =dev-lang/php-5.4*[fpm] )
SLOT=5.3
-_md5_=4e94d4a5f7d9dc04b305198236cc78fd
+_md5_=d793974be4780c15ca09df60f89c4b7d
diff --git a/metadata/md5-cache/www-apps/coppermine-1.4.27 b/metadata/md5-cache/www-apps/coppermine-1.4.27
deleted file mode 100644
index ee7a34894b78..000000000000
--- a/metadata/md5-cache/www-apps/coppermine-1.4.27
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=app-arch/unzip || ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web picture gallery written in PHP with a MySQL backend
-HOMEPAGE=http://coppermine.sourceforge.net/
-IUSE=imagemagick vhosts
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=imagemagick? ( media-gfx/imagemagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=1.4.27
-SRC_URI=mirror://sourceforge/coppermine/cpg1.4.27.zip
-_eclasses_=depend.php df169a364e191b840b695604097e3c21 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab phpconfutils e108303831029e5b8a9d24b991b1d62a toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 webapp 30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=20e70355a42a2426f7235e7e106f83e9
diff --git a/metadata/md5-cache/www-apps/moodle-1.9.18 b/metadata/md5-cache/www-apps/moodle-1.9.18
deleted file mode 100644
index 4dd81e0c7318..000000000000
--- a/metadata/md5-cache/www-apps/moodle-1.9.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=4
-HOMEPAGE=http://moodle.org
-IUSE=mysql postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/php-4.3.0[mysql?,postgres?,imap?,ldap?,odbc?,ctype,curl,gd,iconv,session,ssl,tokenizer,xml,xmlrpc,zlib] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-SLOT=1.9.18
-SRC_URI=http://download.moodle.org/stable19/moodle-1.9.18.tgz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 webapp 30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=587e5596d69f44f4ceb5d661a77edcd6
diff --git a/metadata/md5-cache/www-apps/moodle-1.9.19 b/metadata/md5-cache/www-apps/moodle-1.9.19
index 807aa88c7e00..f1436d918120 100644
--- a/metadata/md5-cache/www-apps/moodle-1.9.19
+++ b/metadata/md5-cache/www-apps/moodle-1.9.19
@@ -4,10 +4,10 @@ DESCRIPTION=The Moodle Course Management System
EAPI=4
HOMEPAGE=http://moodle.org
IUSE=mysql postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=dev-lang/php-4.3.0[mysql?,postgres?,imap?,ldap?,odbc?,ctype,curl,gd,iconv,session,ssl,tokenizer,xml,xmlrpc,zlib] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
SLOT=1.9.19
SRC_URI=http://download.moodle.org/stable19/moodle-1.9.19.tgz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 webapp 30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=e166c0facc9e525c0d7cf898ae681d72
+_md5_=f90316c9e442ccd192e481af8afab2c9
diff --git a/metadata/md5-cache/www-apps/moodle-2.0.10 b/metadata/md5-cache/www-apps/moodle-2.0.10
index 192d57d8d821..03a4fafebca4 100644
--- a/metadata/md5-cache/www-apps/moodle-2.0.10
+++ b/metadata/md5-cache/www-apps/moodle-2.0.10
@@ -4,10 +4,10 @@ DESCRIPTION=The Moodle Course Management System
EAPI=4
HOMEPAGE=http://moodle.org
IUSE=mysqli postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND==dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
SLOT=2.0.10
SRC_URI=http://download.moodle.org/stable20/moodle-2.0.10.tgz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 webapp 30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=89caf7f2b9d3e251f35bd9cf68638691
+_md5_=e61d09c1094f1951f73d73b9782832bd
diff --git a/metadata/md5-cache/www-apps/moodle-2.0.9 b/metadata/md5-cache/www-apps/moodle-2.0.9
deleted file mode 100644
index 62f317c13319..000000000000
--- a/metadata/md5-cache/www-apps/moodle-2.0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=4
-HOMEPAGE=http://moodle.org
-IUSE=mysqli postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-SLOT=2.0.9
-SRC_URI=http://download.moodle.org/stable20/moodle-2.0.9.tgz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 webapp 30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=2ae4cb1156998eb779d7f0c2dafa5c6d
diff --git a/metadata/md5-cache/www-apps/moodle-2.1.6 b/metadata/md5-cache/www-apps/moodle-2.1.6
deleted file mode 100644
index 382e831c2530..000000000000
--- a/metadata/md5-cache/www-apps/moodle-2.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=4
-HOMEPAGE=http://moodle.org
-IUSE=mysqli postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-SLOT=2.1.6
-SRC_URI=http://download.moodle.org/stable21/moodle-2.1.6.tgz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 webapp 30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=7e7ec982b6072a13116c32b877291d2e
diff --git a/metadata/md5-cache/www-apps/moodle-2.1.7 b/metadata/md5-cache/www-apps/moodle-2.1.7
index b6019fb55f8e..156f59fbee18 100644
--- a/metadata/md5-cache/www-apps/moodle-2.1.7
+++ b/metadata/md5-cache/www-apps/moodle-2.1.7
@@ -4,10 +4,10 @@ DESCRIPTION=The Moodle Course Management System
EAPI=4
HOMEPAGE=http://moodle.org
IUSE=mysqli postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND==dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
SLOT=2.1.7
SRC_URI=http://download.moodle.org/stable21/moodle-2.1.7.tgz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 webapp 30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=a6e0c4464555e11a2dc637397d29dc39
+_md5_=5f5eee0f1f2c0fc43908ca1dab4df119
diff --git a/metadata/md5-cache/www-apps/moodle-2.2.3 b/metadata/md5-cache/www-apps/moodle-2.2.3
deleted file mode 100644
index 516adb379ac6..000000000000
--- a/metadata/md5-cache/www-apps/moodle-2.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=4
-HOMEPAGE=http://moodle.org
-IUSE=mysqli postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-SLOT=2.2.3
-SRC_URI=http://download.moodle.org/stable22/moodle-2.2.3.tgz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 webapp 30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=1a3c1acc9335e69f0d3b58fb9ba417f7
diff --git a/metadata/md5-cache/www-apps/moodle-2.2.4 b/metadata/md5-cache/www-apps/moodle-2.2.4
index 67ba77d8ba89..1eeef73126f9 100644
--- a/metadata/md5-cache/www-apps/moodle-2.2.4
+++ b/metadata/md5-cache/www-apps/moodle-2.2.4
@@ -4,10 +4,10 @@ DESCRIPTION=The Moodle Course Management System
EAPI=4
HOMEPAGE=http://moodle.org
IUSE=mysqli postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND==dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
SLOT=2.2.4
SRC_URI=http://download.moodle.org/stable22/moodle-2.2.4.tgz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 webapp 30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=6fef6debc8e48aec5ba1e74bddd860fc
+_md5_=392692e4449f66b2d429ba13699673b1
diff --git a/metadata/md5-cache/www-apps/moodle-2.3 b/metadata/md5-cache/www-apps/moodle-2.3
deleted file mode 100644
index f8aeaefd74be..000000000000
--- a/metadata/md5-cache/www-apps/moodle-2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=4
-HOMEPAGE=http://moodle.org
-IUSE=mysqli postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-SLOT=2.3
-SRC_URI=http://download.moodle.org/stable23/moodle-2.3.tgz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 webapp 30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=339b2670607bf07ca639c7e290c518bb
diff --git a/metadata/md5-cache/www-apps/moodle-2.3.1 b/metadata/md5-cache/www-apps/moodle-2.3.1
index e3d6d0700c25..f8d49dc09135 100644
--- a/metadata/md5-cache/www-apps/moodle-2.3.1
+++ b/metadata/md5-cache/www-apps/moodle-2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=The Moodle Course Management System
EAPI=4
HOMEPAGE=http://moodle.org
IUSE=mysqli postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND==dev-lang/php-5.3*[mysqli?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
SLOT=2.3.1
SRC_URI=http://download.moodle.org/stable23/moodle-2.3.1.tgz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 webapp 30d951d5c98c4f31c7999ab4ba4806d1
-_md5_=0c5ddd00beba9c93ec3bb2b00234932b
+_md5_=59e4d96c9c3fa0238c7c34ea788a2512
diff --git a/metadata/md5-cache/www-apps/mythweb-0.25.1 b/metadata/md5-cache/www-apps/mythweb-0.25.1
new file mode 100644
index 000000000000..de1853d0f430
--- /dev/null
+++ b/metadata/md5-cache/www-apps/mythweb-0.25.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prerm setup
+DEPEND=dev-lang/php:5.3[json,mysql,session,posix] dev-perl/DBI dev-perl/DBD-mysql dev-perl/HTTP-Date dev-perl/Net-UPnP || ( virtual/httpd-cgi virtual/httpd-fastcgi ) =virtual/httpd-php-5* >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP scripts intended to manage MythTV from a web browser.
+EAPI=4
+HOMEPAGE=http://www.mythtv.org
+IUSE=vhosts
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php:5.3[json,mysql,session,posix] dev-perl/DBI dev-perl/DBD-mysql dev-perl/HTTP-Date dev-perl/Net-UPnP =virtual/httpd-php-5* >=app-admin/webapp-config-1.50.15
+SLOT=0.25.1
+SRC_URI=ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.25.1.tar.bz2
+_eclasses_=depend.php df169a364e191b840b695604097e3c21 eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab phpconfutils e108303831029e5b8a9d24b991b1d62a toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 webapp 30d951d5c98c4f31c7999ab4ba4806d1
+_md5_=e3f3039b1537f4aa90403d90b43001f2
diff --git a/metadata/md5-cache/www-apps/phpsysinfo-3.0.18 b/metadata/md5-cache/www-apps/phpsysinfo-3.0.18
new file mode 100644
index 000000000000..8db54cf13d8b
--- /dev/null
+++ b/metadata/md5-cache/www-apps/phpsysinfo-3.0.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=phpSysInfo is a nice package that will display your system stats via PHP.
+EAPI=4
+HOMEPAGE=http://phpsysinfo.sourceforge.net/
+IUSE=vhosts
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=virtual/httpd-php dev-lang/php[simplexml,xml,xsl,unicode] >=app-admin/webapp-config-1.50.15
+SLOT=3.0.18
+SRC_URI=mirror://sourceforge/phpsysinfo/phpsysinfo-3.0.18.tar.gz
+_eclasses_=webapp 30d951d5c98c4f31c7999ab4ba4806d1
+_md5_=bc262e07bc7e1b3c5da8f11def166286
diff --git a/metadata/md5-cache/www-client/chromium-20.0.1132.57 b/metadata/md5-cache/www-client/chromium-20.0.1132.57
new file mode 100644
index 000000000000..2f49eae30886
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-20.0.1132.57
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=4
+HOMEPAGE=http://chromium.org/
+IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
+KEYWORDS=amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+SLOT=0
+SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.57.tar.bz2
+_eclasses_=chromium 38bf05640d6ba5bcb0dbf332f070008b eutils 327b713e2d6949c42cd96bc4898fd280 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f gnome2-utils e0a2e141b421d38788b23422dfbe4f82 linux-info 0b7adf68a2edb4e5a32b07bb6e68121c multilib 5782800349f728f725f9378105c6a2ab pax-utils 0ace932c4045349c7fc1af0fe7091acf portability 536c5e70c5fb252ed3b769e04aa3f05b python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 0c41ff55e46b959d9457dde69e7a09d9
+_md5_=a5a2ef1759b64cac4e4dcb4024332d26
diff --git a/metadata/md5-cache/www-client/fetch-1.0 b/metadata/md5-cache/www-client/fetch-1.0
deleted file mode 100644
index 8fa728255dab..000000000000
--- a/metadata/md5-cache/www-client/fetch-1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-libs/http-fetcher-1.0.1
-DESCRIPTION=Fetch is a simple, fast, and flexible HTTP download tool built on the HTTP Fetcher library.
-HOMEPAGE=http://sourceforge.net/projects/fetch/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/http-fetcher-1.0.1
-SLOT=0
-SRC_URI=mirror://sourceforge/fetch/fetch-1.0.tar.gz
-_md5_=796777422e8c760b20d4a201ad3d82ad
diff --git a/metadata/md5-cache/www-client/google-chrome-20.0.1132.47_p144678-r1 b/metadata/md5-cache/www-client/google-chrome-20.0.1132.57_p145807
similarity index 89%
rename from metadata/md5-cache/www-client/google-chrome-20.0.1132.47_p144678-r1
rename to metadata/md5-cache/www-client/google-chrome-20.0.1132.57_p145807
index 316b7c0e998a..9b571d0450f7 100644
--- a/metadata/md5-cache/www-client/google-chrome-20.0.1132.47_p144678-r1
+++ b/metadata/md5-cache/www-client/google-chrome-20.0.1132.57_p145807
@@ -9,6 +9,6 @@ LICENSE=google-chrome
RDEPEND=media-libs/alsa-lib app-arch/bzip2 x11-libs/cairo net-print/cups sys-apps/dbus dev-libs/expat media-libs/fontconfig media-libs/freetype app-misc/ca-certificates gnome-base/gconf:2 dev-libs/libgcrypt x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-libs/glib:2 dev-libs/nspr dev-libs/nss x11-libs/pango media-libs/libpng:1.2 || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] ) sys-fs/udev x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXScrnSaver sys-libs/zlib x11-misc/xdg-utils net-misc/curl dev-libs/openssl:0.9.8 !www-client/google-chrome:0 !www-client/google-chrome:beta !www-client/google-chrome:unstable
RESTRICT=mirror strip
SLOT=stable
-SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_20.0.1132.47-r144678_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_20.0.1132.47-r144678_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_20.0.1132.57-r145807_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_20.0.1132.57-r145807_i386.deb )
_eclasses_=chromium 38bf05640d6ba5bcb0dbf332f070008b eutils 327b713e2d6949c42cd96bc4898fd280 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils e0a2e141b421d38788b23422dfbe4f82 linux-info 0b7adf68a2edb4e5a32b07bb6e68121c multilib 5782800349f728f725f9378105c6a2ab pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs e575dd4d4682fc3539829c52d8382856 unpacker e1b907c6a72dc4c9025109f3e84129c7 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=e834c5cd829b6e49713b762b5dc00bcb
+_md5_=54c5f9cde8af5ab59df26421519227b5
diff --git a/metadata/md5-cache/www-servers/cherokee-1.2.101-r1 b/metadata/md5-cache/www-servers/cherokee-1.2.101-r1
index c9f429be772a..9685165e9a38 100644
--- a/metadata/md5-cache/www-servers/cherokee-1.2.101-r1
+++ b/metadata/md5-cache/www-servers/cherokee-1.2.101-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An extremely fast and tiny web server.
EAPI=4
HOMEPAGE=http://www.cherokee-project.com/
IUSE=admin coverpage ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php rrdtool ssl static static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~mips ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/libpcre >=sys-libs/zlib-1.1.4-r1 ffmpeg? ( virtual/ffmpeg ) geoip? ( dev-libs/geoip ) ldap? ( net-nds/openldap ) mysql? ( >=virtual/mysql-5 ) nls? ( virtual/libintl ) pam? ( virtual/pam ) php? ( || ( dev-lang/php[fpm] dev-lang/php[cgi] ) ) ssl? ( dev-libs/openssl ) rrdtool? ( net-analyzer/rrdtool ) admin? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
RESTRICT=test
SLOT=0
SRC_URI=http://www.cherokee-project.com/download/1.2/1.2.101/cherokee-1.2.101.tar.gz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab pam 3f746974e1cc47cabe3bd488c08cdc8e python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=0912be0beafaab7c8235431c3b49b00e
+_md5_=4582569d0d01b44346637341834225fc
diff --git a/metadata/md5-cache/www-servers/thttpd-2.25b-r7 b/metadata/md5-cache/www-servers/thttpd-2.25b-r7
index 50373da16bfa..96ccd34dcb37 100644
--- a/metadata/md5-cache/www-servers/thttpd-2.25b-r7
+++ b/metadata/md5-cache/www-servers/thttpd-2.25b-r7
@@ -3,8 +3,8 @@ DESCRIPTION=Small and fast multiplexing webserver.
HOMEPAGE=http://www.acme.com/software/thttpd/
IUSE=static
KEYWORDS=amd64 ~hppa ~mips ppc sparc x86 ~x86-fbsd
-LICENSE=BSD
+LICENSE=BSD GPL-2
SLOT=0
SRC_URI=http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9296521c5f30eae5e157f8810647d081
+_md5_=16b3995a51ead1c7df3f02354d1e74a0
diff --git a/metadata/md5-cache/www-servers/thttpd-2.26.2 b/metadata/md5-cache/www-servers/thttpd-2.26.2
index 52938b88de37..4cc56997e3d8 100644
--- a/metadata/md5-cache/www-servers/thttpd-2.26.2
+++ b/metadata/md5-cache/www-servers/thttpd-2.26.2
@@ -3,8 +3,8 @@ DESCRIPTION=Fork of thttpd, a small, fast, multiplexing webserver.
EAPI=4
HOMEPAGE=http://opensource.dyc.edu/sthttpd
KEYWORDS=amd64 ~hppa ~mips x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
+LICENSE=BSD GPL-2
SLOT=0
SRC_URI=http://opensource.dyc.edu/pub/sthttpd/sthttpd-2.26.2.tar.gz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4e5b764c185d24f4fa87f131d0285517
+_md5_=68a5f58a5006ee6c1c8ef1fa4c8dc3ae
diff --git a/metadata/md5-cache/www-servers/varnish-2.0.4-r1 b/metadata/md5-cache/www-servers/varnish-2.0.4-r1
index 20a28c19ff12..6cee679fb2e2 100644
--- a/metadata/md5-cache/www-servers/varnish-2.0.4-r1
+++ b/metadata/md5-cache/www-servers/varnish-2.0.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator.
EAPI=2
HOMEPAGE=http://varnish.projects.linpro.no/
KEYWORDS=amd64 x86
-LICENSE=BSD-2
+LICENSE=BSD-2 GPL-2
RDEPEND=sys-devel/gcc
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/varnish/varnish-2.0.4.tar.gz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b266104fff3892b8cd762fc86c351524
+_md5_=420679b9b0a8c01588ba303f40611b0c
diff --git a/metadata/md5-cache/www-servers/varnish-3.0.2-r1 b/metadata/md5-cache/www-servers/varnish-3.0.2-r1
index 5830747c3b6a..096f24d56d8b 100644
--- a/metadata/md5-cache/www-servers/varnish-3.0.2-r1
+++ b/metadata/md5-cache/www-servers/varnish-3.0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
EAPI=4
HOMEPAGE=http://www.varnish-cache.org/
IUSE=doc libedit static-libs +tools
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
+KEYWORDS=amd64 ~mips x86
+LICENSE=BSD-2 GPL-2
RDEPEND=dev-libs/libpcre libedit? ( dev-libs/libedit ) tools? ( sys-libs/ncurses ) sys-devel/gcc
RESTRICT=test
SLOT=0
SRC_URI=http://repo.varnish-cache.org/source/varnish-3.0.2.tar.gz
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9f270a0042757f61c59fc958a5d7db0d
+_md5_=a79b45da978cd9044e4df39961916ec8
diff --git a/metadata/md5-cache/x11-apps/bitmap-1.0.6 b/metadata/md5-cache/x11-apps/bitmap-1.0.6
index 551623c935bc..4499bc377c61 100644
--- a/metadata/md5-cache/x11-apps/bitmap-1.0.6
+++ b/metadata/md5-cache/x11-apps/bitmap-1.0.6
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/x
DESCRIPTION=X.Org bitmap application
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXaw x11-libs/libXt x11-misc/xbitmaps
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.6.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=a6b552807ce194588290a4d688046e39
+_md5_=26daf21637dab18d5c675b310aaf6b8e
diff --git a/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4-r1 b/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4-r1
index e650f6443d7e..51b4ff11eabe 100644
--- a/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4-r1
+++ b/metadata/md5-cache/x11-apps/fonttosfnt-1.0.4-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 =media-libs/freetype-2* x11-libs/libfontenc || ( >=sys-de
DESCRIPTION=X.Org fonttosfnt application
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=amd64 arm ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
LICENSE=MIT
RDEPEND=x11-libs/libX11 =media-libs/freetype-2* x11-libs/libfontenc
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.4.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=1399499ec1db238a49b9a3ebfd90db3a
+_md5_=f224162539d431cffd7196e972b02aa6
diff --git a/metadata/md5-cache/x11-apps/fslsfonts-1.0.4 b/metadata/md5-cache/x11-apps/fslsfonts-1.0.4
index cd66564c0362..91f0556374dd 100644
--- a/metadata/md5-cache/x11-apps/fslsfonts-1.0.4
+++ b/metadata/md5-cache/x11-apps/fslsfonts-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-proto/xproto x11-libs/libFS || ( >=sys-devel/automake-1.11.1:1.11 >=s
DESCRIPTION=list fonts served by X font server
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-proto/xproto x11-libs/libFS
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fslsfonts-1.0.4.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=21ee3bada4ac85d7bcc4fb945c5346ab
+_md5_=c1707e4e5632dc2f1cbb820a05be55e4
diff --git a/metadata/md5-cache/x11-apps/fstobdf-1.0.5 b/metadata/md5-cache/x11-apps/fstobdf-1.0.5
index 1b88ad4642f8..dc31b82e466a 100644
--- a/metadata/md5-cache/x11-apps/fstobdf-1.0.5
+++ b/metadata/md5-cache/x11-apps/fstobdf-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libFS || ( >=sys-devel/automake-1.11.1:1.11 >=sy
DESCRIPTION=generate BDF font from X font server
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libFS
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/fstobdf-1.0.5.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=1afd1a8e7ac13ee6a8380bbec4cf72f2
+_md5_=9e72a5222fc46a25df7c836404822454
diff --git a/metadata/md5-cache/x11-apps/listres-1.0.3 b/metadata/md5-cache/x11-apps/listres-1.0.3
index 337c1fcaa75b..6b0e305e6f85 100644
--- a/metadata/md5-cache/x11-apps/listres-1.0.3
+++ b/metadata/md5-cache/x11-apps/listres-1.0.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw || ( >=sys
DESCRIPTION=list resources in widgets
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/listres-1.0.3.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=0410848fcd2b2080e94d1d848a98f096
+_md5_=e88bb6618a80d6351bba12bab170ccaf
diff --git a/metadata/md5-cache/x11-apps/luit-1.1.1 b/metadata/md5-cache/x11-apps/luit-1.1.1
index ba8fccd07f38..521dcf8855c9 100644
--- a/metadata/md5-cache/x11-apps/luit-1.1.1
+++ b/metadata/md5-cache/x11-apps/luit-1.1.1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libfontenc || ( >=sys-devel/automa
DESCRIPTION=Locale and ISO 2022 support for Unicode terminals
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libfontenc
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/luit-1.1.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=5d082d8aa443a057da79fa260b160b93
+_md5_=600aaeacb346d77eddddde9e0e7af716
diff --git a/metadata/md5-cache/x11-apps/mkfontdir-1.0.7 b/metadata/md5-cache/x11-apps/mkfontdir-1.0.7
index a987a307f256..ef85fdefc6bc 100644
--- a/metadata/md5-cache/x11-apps/mkfontdir-1.0.7
+++ b/metadata/md5-cache/x11-apps/mkfontdir-1.0.7
@@ -3,10 +3,10 @@ DEPEND=x11-apps/mkfontscale || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/au
DESCRIPTION=create an index of X font files in a directory
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-apps/mkfontscale
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.7.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=b39e357df23b29c7ab50bd7ef7db1f36
+_md5_=db0e40f71b5f47c0bbc93711a392debf
diff --git a/metadata/md5-cache/x11-apps/oclock-1.0.3 b/metadata/md5-cache/x11-apps/oclock-1.0.3
index 397f99856387..fe32dfb80c99 100644
--- a/metadata/md5-cache/x11-apps/oclock-1.0.3
+++ b/metadata/md5-cache/x11-apps/oclock-1.0.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/
DESCRIPTION=round X clock
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/oclock-1.0.3.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=f7957a5649dd3af473bf15e3bff9e56f
+_md5_=08e75c5eccf67c705bb369b9fccb8561
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.3.0 b/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
index e47ddc78d238..f4fc8546d0f0 100644
--- a/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
+++ b/metadata/md5-cache/x11-apps/setxkbmap-1.3.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libxkbfile x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11
DESCRIPTION=Controls the keyboard layout of a running X server.
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=x11-libs/libxkbfile x11-libs/libX11
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.3.0.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=31b288faf26769e105b982f3a7c00bd8
+_md5_=d56d4820c60dec41ee605a4614b167c1
diff --git a/metadata/md5-cache/x11-apps/xauth-1.0.7 b/metadata/md5-cache/x11-apps/xauth-1.0.7
index 2705e06b01fd..a4f280854db0 100644
--- a/metadata/md5-cache/x11-apps/xauth-1.0.7
+++ b/metadata/md5-cache/x11-apps/xauth-1.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=X authority file utility
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=ipv6
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.7.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=05b4d76f6496e2af19defde662f4eacf
+_md5_=eca4c43dcbf20f86aaf1212e06b612aa
diff --git a/metadata/md5-cache/x11-apps/xclipboard-1.1.2 b/metadata/md5-cache/x11-apps/xclipboard-1.1.2
index 6bd624bc64e8..f788ee32d25d 100644
--- a/metadata/md5-cache/x11-apps/xclipboard-1.1.2
+++ b/metadata/md5-cache/x11-apps/xclipboard-1.1.2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1
DESCRIPTION=interchange between cut buffer and selection
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
LICENSE=MIT
RDEPEND=x11-libs/libXaw x11-libs/libxkbfile x11-libs/libXmu >=x11-libs/libXt-1.1 x11-libs/libX11
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.1.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=d2d933f98b3de8f9bb52c28a2482e8d3
+_md5_=92a00e64b3260085a3a980701b3942fb
diff --git a/metadata/md5-cache/x11-apps/xclock-1.0.6 b/metadata/md5-cache/x11-apps/xclock-1.0.6
index 38dab1d4d965..82672bd4b4a3 100644
--- a/metadata/md5-cache/x11-apps/xclock-1.0.6
+++ b/metadata/md5-cache/x11-apps/xclock-1.0.6
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-l
DESCRIPTION=analog / digital clock for X
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.6.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=16565f353c407c1ae5c13ba4580333e2
+_md5_=450e3a0ebe582cb92c7b627e151bb8ba
diff --git a/metadata/md5-cache/x11-apps/xcmsdb-1.0.4 b/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
index 960b59a36b6f..b7cf85a05b94 100644
--- a/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
+++ b/metadata/md5-cache/x11-apps/xcmsdb-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automak
DESCRIPTION=Device Color Characterization utility for X Color Management System
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.4.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=ff782cb107f2a9758c630198c52327fc
+_md5_=9a69d9fbee9d92cc8fb8a1531d490f35
diff --git a/metadata/md5-cache/x11-apps/xcursorgen-1.0.5 b/metadata/md5-cache/x11-apps/xcursorgen-1.0.5
index 989956d11411..a2bbec870783 100644
--- a/metadata/md5-cache/x11-apps/xcursorgen-1.0.5
+++ b/metadata/md5-cache/x11-apps/xcursorgen-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0 || ( >=sys-devel/
DESCRIPTION=create an X cursor file from a collection of PNG images
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.5.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=d315021802019239de6779c7b4959484
+_md5_=1683802029f8a195d518bece7d2c3b00
diff --git a/metadata/md5-cache/x11-apps/xev-1.2.0 b/metadata/md5-cache/x11-apps/xev-1.2.0
index 1c0aaf99f45c..189d169263f9 100644
--- a/metadata/md5-cache/x11-apps/xev-1.2.0
+++ b/metadata/md5-cache/x11-apps/xev-1.2.0
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-proto/xproto || ( >=sys-devel/auto
DESCRIPTION=print contents of X events
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXrandr
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xev-1.2.0.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=6e75730207cef362c2974b1f000cfcd6
+_md5_=acfbbf57bd2435d2d158e13c6d8358da
diff --git a/metadata/md5-cache/x11-apps/xfd-1.1.1 b/metadata/md5-cache/x11-apps/xfd-1.1.1
index f518da8e298d..1d841f1dbde8 100644
--- a/metadata/md5-cache/x11-apps/xfd-1.1.1
+++ b/metadata/md5-cache/x11-apps/xfd-1.1.1
@@ -3,10 +3,10 @@ DEPEND=media-libs/freetype:2 media-libs/fontconfig x11-libs/libXft x11-libs/libX
DESCRIPTION=X.Org xfd application
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
LICENSE=MIT
RDEPEND=media-libs/freetype:2 media-libs/fontconfig x11-libs/libXft x11-libs/libXt x11-libs/libXmu x11-libs/libXrender x11-libs/libXaw
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xfd-1.1.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=8d5c87f831d8d8ca43f2f54ed22e4276
+_md5_=c6f95945d96ca2dec60d2f3905d56cc3
diff --git a/metadata/md5-cache/x11-apps/xfontsel-1.0.4 b/metadata/md5-cache/x11-apps/xfontsel-1.0.4
index c2cf32ff9b3c..43e29810649a 100644
--- a/metadata/md5-cache/x11-apps/xfontsel-1.0.4
+++ b/metadata/md5-cache/x11-apps/xfontsel-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 || ( >=sys
DESCRIPTION=point and click selection of X11 font names
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xfontsel-1.0.4.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=66fcabe9dd3d7960a1d8b3418dbd336b
+_md5_=04a87dc903c3f726269fc469d2c72942
diff --git a/metadata/md5-cache/x11-apps/xgamma-1.0.5 b/metadata/md5-cache/x11-apps/xgamma-1.0.5
index 94a8fc05e26c..d25c05bdc8b7 100644
--- a/metadata/md5-cache/x11-apps/xgamma-1.0.5
+++ b/metadata/md5-cache/x11-apps/xgamma-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXxf86vm x11-libs/libX11 x11-proto/xf86vidmodeproto || ( >=sys
DESCRIPTION=Alter a monitor's gamma correction through the X server
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-libs/libXxf86vm x11-libs/libX11
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xgamma-1.0.5.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=20dd55e3889162d7e487b708c310b970
+_md5_=958a6bc082b3eacb258695ec6b0aca57
diff --git a/metadata/md5-cache/x11-apps/xhost-1.0.5 b/metadata/md5-cache/x11-apps/xhost-1.0.5
index f4b9c9caeaba..b06902ee4404 100644
--- a/metadata/md5-cache/x11-apps/xhost-1.0.5
+++ b/metadata/md5-cache/x11-apps/xhost-1.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Controls host and/or user access to a running X server.
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=ipv6
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXau
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.5.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=28ed24ab9a412f55bb2a663e709652da
+_md5_=49c1a9d912b9b95aadb44711928bbbab
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.2 b/metadata/md5-cache/x11-apps/xinit-1.3.2
index 56d14a47351c..16909641871e 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.3.2
+++ b/metadata/md5-cache/x11-apps/xinit-1.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=X Window System initializer
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=+minimal
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT GPL-2
PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm )
RDEPEND=!=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.5.99.1 x11-libs
DESCRIPTION=Utility to set XInput device parameters
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.5.99.1 x11-libs/libXinerama
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinput-1.6.0.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=1d65d1468ade3279051405762a656d72
+_md5_=2e62519d8cd418d23efef71c73972611
diff --git a/metadata/md5-cache/x11-apps/xkbevd-1.1.3 b/metadata/md5-cache/x11-apps/xkbevd-1.1.3
index fdec55fde571..706edfc5c330 100644
--- a/metadata/md5-cache/x11-apps/xkbevd-1.1.3
+++ b/metadata/md5-cache/x11-apps/xkbevd-1.1.3
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libxkbfile sys-devel/bison || ( >=sys-devel/auto
DESCRIPTION=XKB event daemon
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libxkbfile
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xkbevd-1.1.3.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=8163a1cc6df98d017091cbc44e1c50a1
+_md5_=134033bca7181912607fe841d3f72a95
diff --git a/metadata/md5-cache/x11-apps/xload-1.1.1 b/metadata/md5-cache/x11-apps/xload-1.1.1
index f387fe3ab560..5f6ce0fd9454 100644
--- a/metadata/md5-cache/x11-apps/xload-1.1.1
+++ b/metadata/md5-cache/x11-apps/xload-1.1.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 sys-devel/
DESCRIPTION=system load average display for X
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
LICENSE=MIT
RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xload-1.1.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=3dcbf7bcfd78bac9c3a64663a3ecb46d
+_md5_=689ea45b6aff6da84b707b5d518b5a1c
diff --git a/metadata/md5-cache/x11-apps/xlogo-1.0.4 b/metadata/md5-cache/x11-apps/xlogo-1.0.4
index 6573c686c968..0277459f70ae 100644
--- a/metadata/md5-cache/x11-apps/xlogo-1.0.4
+++ b/metadata/md5-cache/x11-apps/xlogo-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXrender x11-libs/libXext x11-libs/libXt x11-libs/libXft x11-l
DESCRIPTION=X Window System logo
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-interix
LICENSE=MIT
RDEPEND=x11-libs/libXrender x11-libs/libXext x11-libs/libXt x11-libs/libXft x11-libs/libXaw x11-libs/libSM x11-libs/libXmu x11-libs/libX11
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.4.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=3ac3820254e217dd772848414f06ca42
+_md5_=ffe7ea50f06f0d12ce53024a0623514e
diff --git a/metadata/md5-cache/x11-apps/xlsatoms-1.1.1 b/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
index 4c997ee2c0b8..593c4df71e66 100644
--- a/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
+++ b/metadata/md5-cache/x11-apps/xlsatoms-1.1.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libxcb || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automak
DESCRIPTION=list interned atoms defined on server
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-libs/libxcb
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsatoms-1.1.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=04859e7cc314ffc781d2a4c38d74042c
+_md5_=314bde4417a4a3b26b8e01676ff06204
diff --git a/metadata/md5-cache/x11-apps/xlsfonts-1.0.4 b/metadata/md5-cache/x11-apps/xlsfonts-1.0.4
index 886cf6b290f5..15918c848e94 100644
--- a/metadata/md5-cache/x11-apps/xlsfonts-1.0.4
+++ b/metadata/md5-cache/x11-apps/xlsfonts-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automak
DESCRIPTION=X.Org xlsfonts application
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xlsfonts-1.0.4.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=d24e399625aa7e13d629c1da86778bc8
+_md5_=bc3a2548d0c1b3734bc95b6e91a476d5
diff --git a/metadata/md5-cache/x11-apps/xmodmap-1.0.7 b/metadata/md5-cache/x11-apps/xmodmap-1.0.7
index 08f3ae004eca..0a9177795077 100644
--- a/metadata/md5-cache/x11-apps/xmodmap-1.0.7
+++ b/metadata/md5-cache/x11-apps/xmodmap-1.0.7
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automak
DESCRIPTION=utility for modifying keymaps and pointer button mappings in X
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.7.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=de71a45d35bde470144e74cb5351d6ae
+_md5_=dde2e46504b9ccb0ffee32ffe7cca016
diff --git a/metadata/md5-cache/x11-apps/xpr-1.0.4 b/metadata/md5-cache/x11-apps/xpr-1.0.4
index ce767e2efe6a..3e073e39dc42 100644
--- a/metadata/md5-cache/x11-apps/xpr-1.0.4
+++ b/metadata/md5-cache/x11-apps/xpr-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXmu x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 >=s
DESCRIPTION=X.Org xpr application
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-libs/libXmu x11-libs/libX11
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xpr-1.0.4.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=2f321d8c0fab56b319f48e21918d7e6a
+_md5_=eae1ae81f7a895fe016bebd0d06d3250
diff --git a/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1 b/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1
index 60e759950229..29a03c61c86a 100644
--- a/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1
+++ b/metadata/md5-cache/x11-apps/xtrap-1.0.2-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXTrap x11-proto/trapproto || ( >=sys-devel/au
DESCRIPTION=X.Org xtrap application
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXTrap
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xtrap-1.0.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=0cef98d5a0916affe078a955be133db9
+_md5_=ee42c8f6c063d26635003ea62f5873bd
diff --git a/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1 b/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1
index dc109dc229e0..73dff47b81d1 100644
--- a/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1
+++ b/metadata/md5-cache/x11-apps/xvidtune-1.0.2-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/l
DESCRIPTION=video mode tuner for Xorg
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
LICENSE=MIT
RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXxf86vm
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e50bad73fc046ae96a44970f9396505b
+_md5_=7e2da4c99f87acee2e0ee6bcd85f011b
diff --git a/metadata/md5-cache/x11-apps/xwarppointer-1 b/metadata/md5-cache/x11-apps/xwarppointer-1
deleted file mode 100644
index a69e5b4f64a7..000000000000
--- a/metadata/md5-cache/x11-apps/xwarppointer-1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11
-DESCRIPTION=Program to move the mouse cursor
-HOMEPAGE=http://www.ishiboo.com/~nirva/Projects/xwarppointer/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=http://www.ishiboo.com/~nirva/Projects/xwarppointer/xwarppointer.tar.gz
-_md5_=dfcbe865c3b43195231fe9dd7e2f830b
diff --git a/metadata/md5-cache/x11-apps/xwd-1.0.5 b/metadata/md5-cache/x11-apps/xwd-1.0.5
index 52ddb146bc83..be65039be48e 100644
--- a/metadata/md5-cache/x11-apps/xwd-1.0.5
+++ b/metadata/md5-cache/x11-apps/xwd-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libxkbfile x11-proto/xproto || (
DESCRIPTION=dump an image of an X window
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.5.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=f70a302db95c1daa2b03715dfb910fe4
+_md5_=7da4081412cae287f3ff37036c1e50bb
diff --git a/metadata/md5-cache/x11-apps/xwud-1.0.4 b/metadata/md5-cache/x11-apps/xwud-1.0.4
index 722766edd975..d9b1d429368a 100644
--- a/metadata/md5-cache/x11-apps/xwud-1.0.4
+++ b/metadata/md5-cache/x11-apps/xwud-1.0.4
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automak
DESCRIPTION=image displayer for X
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xwud-1.0.4.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=7716cdbe8e361ba99776867df6550f2a
+_md5_=08f264ce792a7eb5e92a53b293748223
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-1.12 b/metadata/md5-cache/x11-base/xorg-drivers-1.12
index 81cae7364f3e..c2179b0c2d99 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-1.12
+++ b/metadata/md5-cache/x11-base/xorg-drivers-1.12
@@ -3,8 +3,8 @@ DESCRIPTION=Meta package containing deps on all xorg drivers
EAPI=4
HOMEPAGE=http://www.gentoo.org/
IUSE=video_cards_apm video_cards_ark video_cards_ast video_cards_cirrus video_cards_dummy video_cards_epson video_cards_fbdev video_cards_geode video_cards_glint video_cards_i128 video_cards_i740 video_cards_intel video_cards_mach64 video_cards_mga video_cards_modesetting video_cards_neomagic video_cards_newport video_cards_nouveau video_cards_nv video_cards_omapfb video_cards_qxl video_cards_r128 video_cards_radeon video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sis video_cards_sunbw2 video_cards_suncg14 video_cards_suncg3 video_cards_suncg6 video_cards_sunffb video_cards_sunleo video_cards_suntcx video_cards_tdfx video_cards_tga video_cards_trident video_cards_v4l video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_voodoo video_cards_fglrx video_cards_nvidia input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_tslib input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=as-is
PDEPEND=input_devices_acecad? ( x11-drivers/xf86-input-acecad ) input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( x11-drivers/xf86-input-evdev ) input_devices_fpit? ( x11-drivers/xf86-input-fpit ) input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) input_devices_joystick? ( x11-drivers/xf86-input-joystick ) input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) input_devices_mouse? ( x11-drivers/xf86-input-mouse ) input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) input_devices_penmount? ( x11-drivers/xf86-input-penmount ) input_devices_tslib? ( x11-drivers/xf86-input-tslib ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( x11-drivers/xf86-input-wacom ) video_cards_apm? ( x11-drivers/xf86-video-apm ) video_cards_ark? ( x11-drivers/xf86-video-ark ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( x11-drivers/xf86-video-glint ) video_cards_i128? ( x11-drivers/xf86-video-i128 ) video_cards_i740? ( x11-drivers/xf86-video-i740 ) video_cards_intel? ( x11-drivers/xf86-video-intel ) video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) video_cards_mga? ( x11-drivers/xf86-video-mga ) video_cards_modesetting? ( x11-drivers/xf86-video-modesetting ) video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) video_cards_newport? ( x11-drivers/xf86-video-newport ) video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) video_cards_nv? ( x11-drivers/xf86-video-nv ) video_cards_omapfb? ( x11-drivers/xf86-video-omapfb ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_fglrx? ( x11-drivers/ati-drivers ) video_cards_r128? ( x11-drivers/xf86-video-r128 ) video_cards_radeon? ( x11-drivers/xf86-video-ati ) video_cards_s3? ( x11-drivers/xf86-video-s3 ) video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) video_cards_savage? ( x11-drivers/xf86-video-savage ) video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) video_cards_sis? ( x11-drivers/xf86-video-sis ) video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) video_cards_tga? ( x11-drivers/xf86-video-tga ) video_cards_trident? ( x11-drivers/xf86-video-trident ) video_cards_v4l? ( x11-drivers/xf86-video-v4l ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) video_cards_vmware? ( x11-drivers/xf86-video-vmware ) video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) !x11-drivers/xf86-input-citron !<=x11-drivers/xf86-video-chips-1.2.4 !x11-drivers/xf86-video-cyrix !x11-drivers/xf86-video-impact !x11-drivers/xf86-video-nsc !<=x11-drivers/xf86-video-rendition-4.2.4 !<=x11-drivers/xf86-video-sisusb-0.9.4 !x11-drivers/xf86-video-sunbw2 !<=x11-drivers/xf86-video-tseng-1.2.4
SLOT=0
-_md5_=8431abcd45f41603289d6692411456f4
+_md5_=bf625eb38fc1ed05b33b604c8ef13589
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.12.2 b/metadata/md5-cache/x11-base/xorg-server-1.12.2
index 1e45d5dce68d..71e5eff482d5 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.12.2
+++ b/metadata/md5-cache/x11-base/xorg-server-1.12.2
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux tslib +udev static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.12 )
RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.12.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=22ad1227cd6c8eec3cef4642638bbdee
+_md5_=f98ae71002a717c2fbacffb7984a8e70
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.0 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.0
index ee911a624943..164b53b4d0d7 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.0
@@ -3,10 +3,10 @@ DEPEND=x11-base/xorg-server[udev] sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3
DESCRIPTION=Generic Linux input driver
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86
LICENSE=MIT
RDEPEND=x11-base/xorg-server[udev] sys-libs/mtdev x11-base/xorg-server[xorg]
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.7.0.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=711de184993b29fe9566c6a1b8a9b3b8
+_md5_=8ce2f3caa2864c287d8739fda417419d
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.1 b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.1
index 632fb4360547..28aa5b122d12 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.1
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.10 x11-proto/inputproto x11-proto/kbproto || ( >
DESCRIPTION=X.Org driver for joystick input devices
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=>=x11-base/xorg-server-1.10 x11-base/xorg-server[xorg]
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.6.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=4bd6dbd52c437cb057bd2f3b18ef150e
+_md5_=b528f0efef5c2e12b6d94e3b4a03a019
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.1 b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.1
index 9cbcf42f10ae..41f078c4a524 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.6.1
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.6.3 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-
DESCRIPTION=Keyboard input driver
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=>=x11-base/xorg-server-1.6.3 x11-base/xorg-server[xorg]
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.6.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=243ced129c5b2409b35fe46465e4316a
+_md5_=4c45605abf92527aa51885791c900e18
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.2 b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.2
index 0cc348a1cb3a..8233a653c3df 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mouse-1.7.2
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.5.99.901 || ( >=sys-devel/automake-1.11.1:1.11 >
DESCRIPTION=X.Org driver for mouse input devices
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=>=x11-base/xorg-server-1.5.99.901 x11-base/xorg-server[xorg]
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.7.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=7f7957fb88a88751349eeb21524f043e
+_md5_=e312dba65e649e05cb41aa83dbccd57a
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.2 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.2
index 83da0881193a..945f5c2cbb11 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.6.2
@@ -3,10 +3,10 @@ DEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs
DESCRIPTION=Driver for Synaptics touchpads
EAPI=4
HOMEPAGE=http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/
-KEYWORDS=amd64 ~mips ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~mips ~ppc ppc64 x86
LICENSE=MIT
RDEPEND=sys-libs/mtdev >=x11-base/xorg-server-1.8 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 x11-base/xorg-server[xorg]
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed linux-info 0b7adf68a2edb4e5a32b07bb6e68121c multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=5b021cdf214d2c6f2715f5a45581c003
+_md5_=dd71ad4fcdef3ef2d2e3cc02a86bf422
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.14.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.14.0
index fab30bab458d..750ed1d97dc3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.14.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.14.0
@@ -4,10 +4,10 @@ DESCRIPTION=Driver for Wacom tablets and drawing devices
EAPI=4
HOMEPAGE=http://linuxwacom.sourceforge.net/
IUSE=debug
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=>=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server[xorg]
SLOT=0
SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.14.0.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed linux-info 0b7adf68a2edb4e5a32b07bb6e68121c multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=451c4f811c56c9599025b4651b9acb71
+_md5_=f4a7737ef4eb64abc167bbb6deb250c7
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.4-r1 b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.4-r1
index 3b8ae94ef0c0..cd03711d5c12 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.4-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.4-r1
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libdrm-2.4.33[video_cards_radeon] || ( >=sys-devel/automake-1.
DESCRIPTION=ATI video driver
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=>=x11-libs/libdrm-2.4.33[video_cards_radeon] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.4.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=f5b24b681309fb284a2a06f088db7354
+_md5_=da20fca77eba03f77eada76f54b1c29c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.5-r1 b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.5-r1
index 36297e5cf882..3047f4978c7f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.5-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org driver for dummy cards
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=dga
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server[xorg] x11-libs/libpciaccess
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.5.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=f83dbf796faecca3d185072a17d904e5
+_md5_=436f22133b7fd63ef55f7f9a6b3a869c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.1 b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.1
index 3e6329ffb395..7a8990f1c2d8 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mach64-6.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=ATI Mach64 video driver
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=dri
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=>=x11-base/xorg-server-1.10 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.9.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=4da5d4b85111e360c4aea50feeeeaf18
+_md5_=21a524810a56b821a4e41f57e0a340ff
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.5.0 b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.5.0
index 90bcc10913d6..fbf498cc7bf2 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-mga-1.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-mga-1.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=Matrox video driver
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=dri dri
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=>=x11-base/xorg-server-1.4 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.5.0.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=2ad1f42e0311e6470961f04df6914661
+_md5_=d0ed0dc15a0633ec23d2a8239dfaa2f5
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.3.0 b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.3.0
index 54c710649285..46a25e925841 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.3.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-modesetting-0.3.0
@@ -3,10 +3,10 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
DESCRIPTION=Unaccelerated generic driver for kernel modesetting
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-base/xorg-server[xorg] x11-libs/libpciaccess
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-modesetting-0.3.0.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=9db63f6f0a42121598ad3b22e7bc3758
+_md5_=8617e9d2bf8632741ae40422d8f17d4c
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322 b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
index 3594e9d692e2..d8dca1e7cdb9 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
+++ b/metadata/md5-cache/x11-drivers/xf86-video-nouveau-0.0.16_pre20120322
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libdrm-2.4.24[video_cards_nouveau] =x11-libs/libdrm-2.4.24[video_cards_nouveau] =x11-base/xorg-server-1.2 dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) x11-base/xorg-server[xorg] x11-libs/libpciaccess
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=2e635a6ccde62b7ab5e4af76806e8e6d
+_md5_=acc273d794ea24f882ea5f663dd80038
diff --git a/metadata/md5-cache/x11-libs/libFS-1.0.4 b/metadata/md5-cache/x11-libs/libFS-1.0.4
index 2441f4534892..89aac4fc91dc 100644
--- a/metadata/md5-cache/x11-libs/libFS-1.0.4
+++ b/metadata/md5-cache/x11-libs/libFS-1.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org FS library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=ipv6 static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-libs/xtrans x11-proto/xproto x11-proto/fontsproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.4.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=4cef43031ac63528153d4c3bfdd38945
+_md5_=0b8d25226adafb2a05fd1db4b3a4c5d4
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.8 b/metadata/md5-cache/x11-libs/libICE-1.0.8
index 1ef57d3f820d..0128e4b1e6ff 100644
--- a/metadata/md5-cache/x11-libs/libICE-1.0.8
+++ b/metadata/md5-cache/x11-libs/libICE-1.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org ICE library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=ipv6 static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=x11-libs/xtrans x11-proto/xproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.8.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=70b763ac788bcd811c6b52f319d7e488
+_md5_=6c6817572b1940195aa5d518ef30f2d8
diff --git a/metadata/md5-cache/x11-libs/libSM-1.2.1 b/metadata/md5-cache/x11-libs/libSM-1.2.1
index d7874f4bba19..4a6defbb13d2 100644
--- a/metadata/md5-cache/x11-libs/libSM-1.2.1
+++ b/metadata/md5-cache/x11-libs/libSM-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org SM library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=doc ipv6 +uuid static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=>=x11-libs/libICE-1.0.5 x11-libs/xtrans x11-proto/xproto !elibc_FreeBSD? ( !elibc_SunOS? ( uuid? ( >=sys-apps/util-linux-2.16 ) ) )
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=218d73668d7f1704c1c359a397f51800
+_md5_=463f11966625dd958481f48b1dfe3f53
diff --git a/metadata/md5-cache/x11-libs/libX11-1.5.0 b/metadata/md5-cache/x11-libs/libX11-1.5.0
index 476a6555f476..a92268e98151 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.5.0
+++ b/metadata/md5-cache/x11-libs/libX11-1.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org X11 library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=ipv6 test static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=>=x11-libs/libxcb-1.8.1 x11-libs/xtrans >=x11-proto/xproto-7.0.17 x11-proto/xf86bigfontproto x11-proto/inputproto x11-proto/kbproto x11-proto/xextproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.5.0.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=187ce4b37aaeb0ba6ca64ed12329eeb7
+_md5_=342f63e2010ca047c61e6db995db7509
diff --git a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2 b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2
index c864c18c3587..a80597fe4c98 100644
--- a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2
+++ b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org XScrnSaver library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/scrnsaverproto-1.2
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=f87289189c21821cab5ab222e80b4a41
+_md5_=f7121ece480db42d21e0ff1c7a1fe9c8
diff --git a/metadata/md5-cache/x11-libs/libXTrap-1.0.0-r1 b/metadata/md5-cache/x11-libs/libXTrap-1.0.0-r1
index ec4cd5edf021..025a785d46be 100644
--- a/metadata/md5-cache/x11-libs/libXTrap-1.0.0-r1
+++ b/metadata/md5-cache/x11-libs/libXTrap-1.0.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org XTrap library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/trapproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXTrap-1.0.0.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=aa646d41dd9511bad99eed8ee154ac09
+_md5_=58db1e9e7c4762147632e88e2080b53b
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.7 b/metadata/md5-cache/x11-libs/libXau-1.0.7
index 3520fd144798..2cc49e313f8d 100644
--- a/metadata/md5-cache/x11-libs/libXau-1.0.7
+++ b/metadata/md5-cache/x11-libs/libXau-1.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xau library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=x11-proto/xproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.7.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=18fa62d19118cdf9c3b0d8f2ae38f367
+_md5_=6b4c58a5191d8c3c75d3f4e6f17d4d88
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.11 b/metadata/md5-cache/x11-libs/libXaw-1.0.11
index 120620f35489..6ae6beb46073 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.11
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.11
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xaw library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-proto/xproto x11-proto/xextproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.11.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=ff4a9d54db074ea1f86d6f99e04501e3
+_md5_=d60135315a503c8ae5c4941d7734c699
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.1.13 b/metadata/md5-cache/x11-libs/libXcursor-1.1.13
index 12c32f13499e..4e2b98223183 100644
--- a/metadata/md5-cache/x11-libs/libXcursor-1.1.13
+++ b/metadata/md5-cache/x11-libs/libXcursor-1.1.13
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xcursor library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libXfixes x11-libs/libX11
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.13.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=13267bfd42a4fea58dd9512a8afc1597
+_md5_=0037e6170dcd50e239e0d0759b49308a
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.1 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.1
index 3b6e3abf7b06..3a7cc0642293 100644
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xdmcp library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=x11-proto/xproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e89a7c2fdf70444abfb0f8d87744d60a
+_md5_=c08843759d62a53a70fe3d5a748b832b
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.1 b/metadata/md5-cache/x11-libs/libXext-1.3.1
index 56f2bb688fe0..b53ad1457d39 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.3.1
+++ b/metadata/md5-cache/x11-libs/libXext-1.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xext library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=>=x11-libs/libX11-1.2 >=x11-proto/xextproto-7.1.99
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=2a39c4e24a0078585281b451246f4a4e
+_md5_=421c30e94a3ec8ae18da54fc54a76f31
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.4.5 b/metadata/md5-cache/x11-libs/libXfont-1.4.5
index 4e3196a0fd8c..1c6a6b8b01d7 100644
--- a/metadata/md5-cache/x11-libs/libXfont-1.4.5
+++ b/metadata/md5-cache/x11-libs/libXfont-1.4.5
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xfont library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=ipv6 static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.5.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=396f81f7c11e8e87673fa583d7dd09de
+_md5_=9863aeba5e70cb5ea120d1dcbbe111b0
diff --git a/metadata/md5-cache/x11-libs/libXfontcache-1.0.5-r1 b/metadata/md5-cache/x11-libs/libXfontcache-1.0.5-r1
index 74bc7d1bd9b0..6f86d65b0c33 100644
--- a/metadata/md5-cache/x11-libs/libXfontcache-1.0.5-r1
+++ b/metadata/md5-cache/x11-libs/libXfontcache-1.0.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xfontcache library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/fontcacheproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfontcache-1.0.5.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=d8b5acf9f14b167b968f424b2e45c5df
+_md5_=2bfa38da49e083e971fd54cd31f8ead6
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.1 b/metadata/md5-cache/x11-libs/libXft-2.3.1
index 1fa20500b026..b1ab1a5a0a97 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.1
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xft library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto virtual/ttf-fonts
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=865422a7ac705b9e92a5bf8887ba7a0a
+_md5_=bf32ac497adcac30a25de0c41352e266
diff --git a/metadata/md5-cache/x11-libs/libXi-1.6.1 b/metadata/md5-cache/x11-libs/libXi-1.6.1
index 1ff06f2b64db..858909897a0c 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.6.1
+++ b/metadata/md5-cache/x11-libs/libXi-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xi library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.6.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=293757aa56ed835859adc9e1eedcaf8c
+_md5_=6900a97164faf9d8fed70d43893b9799
diff --git a/metadata/md5-cache/x11-libs/libXinerama-1.1.2 b/metadata/md5-cache/x11-libs/libXinerama-1.1.2
index 644bd6ce090f..ce34da4463d0 100644
--- a/metadata/md5-cache/x11-libs/libXinerama-1.1.2
+++ b/metadata/md5-cache/x11-libs/libXinerama-1.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xinerama library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto >=x11-proto/xineramaproto-1.2
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e8f9d9821d51507d1df749e814c88728
+_md5_=902ce0758d85454744af2095bfa00db3
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.1 b/metadata/md5-cache/x11-libs/libXmu-1.1.1
index 9afac66ea3c4..0ebb1473b087 100644
--- a/metadata/md5-cache/x11-libs/libXmu-1.1.1
+++ b/metadata/md5-cache/x11-libs/libXmu-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xmu library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=ipv6 static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-proto/xextproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.1.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=f231bd10c9200e355148ab6bcf4f6d8c
+_md5_=029d8b6c42ad41842ad00aec64651fd6
diff --git a/metadata/md5-cache/x11-libs/libXpm-3.5.10 b/metadata/md5-cache/x11-libs/libXpm-3.5.10
index ceae78b63eb3..6f50d1b332ca 100644
--- a/metadata/md5-cache/x11-libs/libXpm-3.5.10
+++ b/metadata/md5-cache/x11-libs/libXpm-3.5.10
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xpm library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-proto/xextproto x11-proto/xproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.10.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=5d93a58f5bdb154eaea33051f227bfff
+_md5_=7617e21b3949a0b3dce5d8ac5d8672bd
diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.7 b/metadata/md5-cache/x11-libs/libXrender-0.9.7
index 5bf0ca297e91..0900858a90ed 100644
--- a/metadata/md5-cache/x11-libs/libXrender-0.9.7
+++ b/metadata/md5-cache/x11-libs/libXrender-0.9.7
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xrender library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=x11-libs/libX11 >=x11-proto/renderproto-0.9.3 x11-proto/xproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.7.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=90a6d8e6453cc354e9e968106ca58138
+_md5_=b6a3aa7ff3d97e37009e4975f5e58e50
diff --git a/metadata/md5-cache/x11-libs/libXres-1.0.6 b/metadata/md5-cache/x11-libs/libXres-1.0.6
index 222397db502e..b63534b47bfd 100644
--- a/metadata/md5-cache/x11-libs/libXres-1.0.6
+++ b/metadata/md5-cache/x11-libs/libXres-1.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org XRes library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/resourceproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXres-1.0.6.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=6a940474915d7c42d23982b17071ab5f
+_md5_=54f27451e32a17313e469cb34e7f3e66
diff --git a/metadata/md5-cache/x11-libs/libXt-1.1.3 b/metadata/md5-cache/x11-libs/libXt-1.1.3
index 1696255e659f..ca6255c92f7f 100644
--- a/metadata/md5-cache/x11-libs/libXt-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXt-1.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xt library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXt-1.1.3.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=3e4ff56a555c33042a5589415cbb57f9
+_md5_=6c93e44db7e43ae55eebedaea1b104c3
diff --git a/metadata/md5-cache/x11-libs/libXtst-1.2.1 b/metadata/md5-cache/x11-libs/libXtst-1.2.1
index 94725cde3102..27d7e2ba4ee2 100644
--- a/metadata/md5-cache/x11-libs/libXtst-1.2.1
+++ b/metadata/md5-cache/x11-libs/libXtst-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xtst library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=x11-libs/libX11 >=x11-libs/libXext-1.0.99.4 x11-libs/libXi >=x11-proto/recordproto-1.13.99.1 >=x11-proto/xextproto-7.0.99.3 x11-proto/inputproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.2.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=d8924e3c91ac0bacf66e2e79123e36cc
+_md5_=77e23b1f484092a470568acc8b866483
diff --git a/metadata/md5-cache/x11-libs/libXv-1.0.7 b/metadata/md5-cache/x11-libs/libXv-1.0.7
index e7807e3a2705..cc04e8e5bfeb 100644
--- a/metadata/md5-cache/x11-libs/libXv-1.0.7
+++ b/metadata/md5-cache/x11-libs/libXv-1.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xv library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/videoproto x11-proto/xproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.7.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=99f21997b7c182d9ea62a9b1ea492b53
+_md5_=059c57677984b554b370b2a3a0984182
diff --git a/metadata/md5-cache/x11-libs/libXvMC-1.0.7 b/metadata/md5-cache/x11-libs/libXvMC-1.0.7
index cc02d065f627..91c535289eee 100644
--- a/metadata/md5-cache/x11-libs/libXvMC-1.0.7
+++ b/metadata/md5-cache/x11-libs/libXvMC-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org XvMC library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=MIT
PDEPEND=app-admin/eselect-xvmc
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-proto/videoproto x11-proto/xproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.7.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=5da8e3d297b0d409b390263862f69358
+_md5_=5d3fe60eade37d69252c3597c9948cd4
diff --git a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3 b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3
index a5d3a54c9a62..95e021143295 100644
--- a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xxf86dga library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xextproto x11-proto/xproto >=x11-proto/xf86dgaproto-2.0.99.2
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.1.3.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=47d6ac3661df155e86e4c73e70f257e0
+_md5_=af8437bff83c6f17dfb12ec820e6bc99
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2
index d1637449b895..458b5379190f 100644
--- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2
+++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xxf86vm library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/xf86vidmodeproto-2.3 x11-proto/xextproto x11-proto/xproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=9de8bd2b18dd377952324c701e7356be
+_md5_=f4943aeaa7dcab17f3151d02b0e2328a
diff --git a/metadata/md5-cache/x11-libs/libdmx-1.1.2 b/metadata/md5-cache/x11-libs/libdmx-1.1.2
index 2f82007cf43f..8fde81ede5a2 100644
--- a/metadata/md5-cache/x11-libs/libdmx-1.1.2
+++ b/metadata/md5-cache/x11-libs/libdmx-1.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org dmx library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-proto/dmxproto-2.3 x11-proto/xextproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libdmx-1.1.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=6f9798424ca4a9e9ab13f813042b58f0
+_md5_=c853e7fdf4f4b1934d7a703053dbc105
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.33 b/metadata/md5-cache/x11-libs/libdrm-2.4.33
index 7703181a5318..40f0038165c0 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.33
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.33
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org libdrm library
EAPI=4
HOMEPAGE=http://dri.freedesktop.org/
IUSE=video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )
RESTRICT=test
SLOT=0
SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.33.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=95db72d1f1727ee398700637fc67f7ae
+_md5_=9c70a47178d731fe3d5c364e0a5cdfc3
diff --git a/metadata/md5-cache/x11-libs/libfontenc-1.1.1 b/metadata/md5-cache/x11-libs/libfontenc-1.1.1
index 1a156af29cac..21c3aed532c7 100644
--- a/metadata/md5-cache/x11-libs/libfontenc-1.1.1
+++ b/metadata/md5-cache/x11-libs/libfontenc-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org fontenc library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=sys-libs/zlib x11-proto/xproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libfontenc-1.1.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=0d8b3eafacdc128a1c2a63a3e86fcbd4
+_md5_=10b331cbcff63cc7d5c92f4b43f638d5
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.13.1 b/metadata/md5-cache/x11-libs/libpciaccess-0.13.1
index caf120a65aba..d6b52a8da111 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.13.1
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.13.1
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing generic access to the PCI bus and devices
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=minimal zlib static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=!=x11-libs/libxkbfile-1.0.3 x11-proto/kbproto
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxkbui-1.0.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=178ce22a6c22903a1db8a7d65929a488
+_md5_=64b93b40531b86d171353658ff6b38a9
diff --git a/metadata/md5-cache/x11-libs/pixman-0.26.0 b/metadata/md5-cache/x11-libs/pixman-0.26.0
index 600a1e3136cf..7f3c1b628d9e 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.26.0
+++ b/metadata/md5-cache/x11-libs/pixman-0.26.0
@@ -4,9 +4,9 @@ DESCRIPTION=Low-level pixel manipulation routines
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=altivec iwmmxt mmx neon sse2 test static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.26.0.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e3e8f40a958102fb4989d0a35f3b3812
+_md5_=c80e17089e4051fd35413078cdd93a87
diff --git a/metadata/md5-cache/x11-libs/xcb-util-0.3.9 b/metadata/md5-cache/x11-libs/xcb-util-0.3.9
index a4082cb81c97..a1a9389397ca 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-0.3.9
+++ b/metadata/md5-cache/x11-libs/xcb-util-0.3.9
@@ -4,11 +4,11 @@ DESCRIPTION=X C-language Bindings sample implementations
EAPI=4
HOMEPAGE=http://xcb.freedesktop.org/
IUSE=test static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
LICENSE=MIT
PDEPEND=>=x11-libs/xcb-util-image-0.3.9 >=x11-libs/xcb-util-keysyms-0.3.9 >=x11-libs/xcb-util-renderutil-0.3.8 >=x11-libs/xcb-util-wm-0.3.9
RDEPEND=>=x11-libs/libxcb-1.7 x11-proto/xproto
SLOT=0
SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-0.3.9.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=8345c9ea34840f808cd0da5e7a470ecb
+_md5_=8e77bfb39981261860c46805de21d2c8
diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9 b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9
index 477fbabc1ac7..464a60822c87 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9
+++ b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
EAPI=4
HOMEPAGE=http://xcb.freedesktop.org/
IUSE=test static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
LICENSE=MIT
RDEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xproto
SLOT=0
SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-image-0.3.9.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=87af387c41bc46ac205e144a83c2b9a4
+_md5_=c3b288b39ffe6afbd730f5b90a318559
diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9
index 2c11b09fc594..a973e55d4937 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9
+++ b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
EAPI=4
HOMEPAGE=http://xcb.freedesktop.org/
IUSE=test static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
LICENSE=MIT
RDEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xproto
SLOT=0
SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-keysyms-0.3.9.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=1e843b88480e672da7a65e2908e97334
+_md5_=dc40947dab56496466d38b2eeb92995b
diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.9 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.9
index fda3bdbecd08..dc3fb39e00f8 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.9
+++ b/metadata/md5-cache/x11-libs/xcb-util-wm-0.3.9
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
EAPI=4
HOMEPAGE=http://xcb.freedesktop.org/
IUSE=test static-libs doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
LICENSE=MIT
RDEPEND=>=x11-libs/xcb-util-0.3.9 x11-proto/xcb-proto x11-proto/xproto
SLOT=0
SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-wm-0.3.9.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=93522499b34e2b8511ee51095420e8bb
+_md5_=adb749aab14f543005d014933829728c
diff --git a/metadata/md5-cache/x11-libs/xtrans-1.2.7 b/metadata/md5-cache/x11-libs/xtrans-1.2.7
index 7d3b6e2b3e6e..18814ba1300c 100644
--- a/metadata/md5-cache/x11-libs/xtrans-1.2.7
+++ b/metadata/md5-cache/x11-libs/xtrans-1.2.7
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org xtrans library
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.7.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=025352e0c26bb4a9476d7bce86047fd4
+_md5_=42f9d7e0b6fcba1326a18f2798159fcf
diff --git a/metadata/md5-cache/x11-misc/gccmakedep-1.0.2-r1 b/metadata/md5-cache/x11-misc/gccmakedep-1.0.2-r1
index 02ce0acaefa1..2c4a07d4f1d3 100644
--- a/metadata/md5-cache/x11-misc/gccmakedep-1.0.2-r1
+++ b/metadata/md5-cache/x11-misc/gccmakedep-1.0.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=create dependencies in makefiles using 'gcc -M'
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=f467965667c4bff67826440718db9725
+_md5_=a697c36fa909eadda721965fa6d70858
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.5 b/metadata/md5-cache/x11-misc/imake-1.0.5
index f31cf39f3add..7634c9b9d8e8 100644
--- a/metadata/md5-cache/x11-misc/imake-1.0.5
+++ b/metadata/md5-cache/x11-misc/imake-1.0.5
@@ -3,10 +3,10 @@ DEPEND=x11-misc/xorg-cf-files x11-proto/xproto || ( >=sys-devel/automake-1.11.1:
DESCRIPTION=C preprocessor interface to the make utility
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=x11-misc/xorg-cf-files
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/util/imake-1.0.5.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=cb462cfc79080bd3d37c1082e526084d
+_md5_=3a060f5efbe8691df5c270f528f4b197
diff --git a/metadata/md5-cache/x11-misc/lndir-1.0.3 b/metadata/md5-cache/x11-misc/lndir-1.0.3
index 147ffb571a34..5fda48df8b92 100644
--- a/metadata/md5-cache/x11-misc/lndir-1.0.3
+++ b/metadata/md5-cache/x11-misc/lndir-1.0.3
@@ -3,9 +3,9 @@ DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automa
DESCRIPTION=create a shadow directory of symbolic links to another directory tree
EAPI=3
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~ppc ppc64 ~sparc x86
LICENSE=MIT
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=d86ce3945356eaf027b92cd30a730633
+_md5_=2989237d34108dbab00215aba2b86420
diff --git a/metadata/md5-cache/x11-misc/magneto-gtk-1.0_rc124 b/metadata/md5-cache/x11-misc/magneto-gtk-1.0_rc124
new file mode 100644
index 000000000000..d075b981726c
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/magneto-gtk-1.0_rc124
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND==dev-lang/python-2*
+DESCRIPTION=Entropy Package Manager notification applet GTK2 frontend
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~app-misc/magneto-loader-1.0_rc124 dev-python/notify-python dev-python/pygtk:2 =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4aa40910e0bbcd0a2b99be7d5cba2d3f
diff --git a/metadata/md5-cache/x11-misc/magneto-gtk3-1.0_rc124 b/metadata/md5-cache/x11-misc/magneto-gtk3-1.0_rc124
new file mode 100644
index 000000000000..3ac50c3ca9ab
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/magneto-gtk3-1.0_rc124
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND==dev-lang/python-2*
+DESCRIPTION=Entropy Package Manager notification applet GTK3 frontend
+EAPI=3
+HOMEPAGE=http://www.sabayon.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~app-misc/magneto-loader-1.0_rc124 dev-libs/gobject-introspection x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-1.0_rc124.tar.bz2
+_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4f77ad93dab1b401bbac3d15b6860d6a
diff --git a/metadata/md5-cache/x11-misc/makedepend-1.0.4 b/metadata/md5-cache/x11-misc/makedepend-1.0.4
index 54b431886330..948fd66aa9c0 100644
--- a/metadata/md5-cache/x11-misc/makedepend-1.0.4
+++ b/metadata/md5-cache/x11-misc/makedepend-1.0.4
@@ -3,9 +3,9 @@ DEPEND=x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automa
DESCRIPTION=create dependencies in makefiles
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.4.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e08112bbcd0b3b24a6446fc823cc2c64
+_md5_=5b5318d04ff37a28f09bff8892d417e4
diff --git a/metadata/md5-cache/x11-misc/xcompmgr-1.1.6 b/metadata/md5-cache/x11-misc/xcompmgr-1.1.6
index e2708b455c00..fa79c9a3be9f 100644
--- a/metadata/md5-cache/x11-misc/xcompmgr-1.1.6
+++ b/metadata/md5-cache/x11-misc/xcompmgr-1.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=X Compositing manager
EAPI=4
HOMEPAGE=http://freedesktop.org/Software/xapps
IUSE=static-libs
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~ppc ppc64 ~sparc x86
LICENSE=BSD
RDEPEND=x11-libs/libXrender x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXcomposite
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xcompmgr-1.1.6.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e72d760804ac09911864699f6fd36018
+_md5_=00dca0d94ee44d7d34fb39c1e62221b3
diff --git a/metadata/md5-cache/x11-misc/xfractint-20.04_p12 b/metadata/md5-cache/x11-misc/xfractint-20.04_p12
index 213ed9f48678..fe41415734f1 100644
--- a/metadata/md5-cache/x11-misc/xfractint-20.04_p12
+++ b/metadata/md5-cache/x11-misc/xfractint-20.04_p12
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11
DESCRIPTION=A fractal generator
EAPI=4
HOMEPAGE=http://www.fractint.org
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc ~x86
LICENSE=freedist
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=http://www.fractint.org/ftp/current/linux/xfractint-20.04p12.tar.gz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=813e28a0aa47162f78ff98da32a8fb94
+_md5_=b0913cec90d1a2d5c2c1a6eb38d9bb30
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.6 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.6
index 96f7cbd409fc..50234b53534b 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.6
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.6
@@ -3,10 +3,10 @@ DEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3 dev-util/intltool >=x11-
DESCRIPTION=X keyboard configuration database
EAPI=4
HOMEPAGE=http://www.freedesktop.org/wiki/Software/XKeyboardConfig
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=>=x11-apps/xkbcomp-1.2.3 >=x11-libs/libX11-1.4.3
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.6.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=c4108cb91ea32980e9ac2dc24b29875a
+_md5_=adc458258099321fd1b35462f4b83f01
diff --git a/metadata/md5-cache/x11-plugins/fsviewer-0.2.5 b/metadata/md5-cache/x11-plugins/fsviewer-0.2.5
index 9ab1a403d45f..826a574b57f3 100644
--- a/metadata/md5-cache/x11-plugins/fsviewer-0.2.5
+++ b/metadata/md5-cache/x11-plugins/fsviewer-0.2.5
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/expat media-libs/tiff:0 media-libs/giflib media-libs/libpng:0 media-libs/fontconfig media-libs/freetype sys-libs/zlib virtual/jpeg x11-libs/libproplist x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXrender x11-libs/libXt x11-proto/xextproto x11-proto/xproto x11-wm/windowmaker
+DEPEND=dev-libs/expat media-libs/tiff:0 media-libs/giflib media-libs/libpng:0 media-libs/fontconfig media-libs/freetype sys-libs/zlib virtual/jpeg x11-libs/libproplist x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXrender x11-libs/libXt x11-proto/xextproto x11-proto/xproto =x11-wm/windowmaker-0.95.2 x11-libs/libXft x11-libs/libXpm x11-libs/libX11 x11-proto/xproto nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=A file system viewer for Window Maker
-EAPI=2
+EAPI=4
HOMEPAGE=http://www.bayernline.de/~gscholz/linux/fsviewer/
IUSE=nls
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
-RDEPEND=x11-wm/windowmaker x11-libs/libXft x11-libs/libXpm x11-libs/libX11
+RDEPEND=>=x11-wm/windowmaker-0.95.2 x11-libs/libXft x11-libs/libXpm x11-libs/libX11
SLOT=0
SRC_URI=http://www.bayernline.de/~gscholz/linux/fsviewer/fsviewer-app-0.2.6.tar.bz2
-_eclasses_=multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856
-_md5_=e5944f2716186bb7739d46adb9dc8b69
+_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=229bea87786ca7edfad03abe2b365a32
diff --git a/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2 b/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2
index 392c10337ffd..43bfef51169c 100644
--- a/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2
+++ b/metadata/md5-cache/x11-proto/bigreqsproto-1.1.2
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org BigReqs protocol headers
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.1.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=6c1af4bfce1e77ee527c39f70c6c1917
+_md5_=930ceb22feef5589794cc67f62344cae
diff --git a/metadata/md5-cache/x11-proto/fontsproto-2.1.2 b/metadata/md5-cache/x11-proto/fontsproto-2.1.2
index 96a3eb19789b..f109df293318 100644
--- a/metadata/md5-cache/x11-proto/fontsproto-2.1.2
+++ b/metadata/md5-cache/x11-proto/fontsproto-2.1.2
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org Fonts protocol headers
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.1.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=aa1ece855a548b44cc8b635665ce0bbd
+_md5_=c015ac8e5da3bc2d2f2d8a4f956ef070
diff --git a/metadata/md5-cache/x11-proto/glproto-1.4.15 b/metadata/md5-cache/x11-proto/glproto-1.4.15
index 15c0acae2013..96d52386a403 100644
--- a/metadata/md5-cache/x11-proto/glproto-1.4.15
+++ b/metadata/md5-cache/x11-proto/glproto-1.4.15
@@ -3,10 +3,10 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
DESCRIPTION=X.Org GL protocol headers
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=SGI-B-2.0
RDEPEND=>=app-admin/eselect-opengl-1.2.3
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.15.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=166078e74273c0d46833e466834b17e8
+_md5_=78d3480d63c2d69f49733bd7c4a9258e
diff --git a/metadata/md5-cache/x11-proto/inputproto-2.2 b/metadata/md5-cache/x11-proto/inputproto-2.2
index def59ae7e3a5..3487f28522e5 100644
--- a/metadata/md5-cache/x11-proto/inputproto-2.2
+++ b/metadata/md5-cache/x11-proto/inputproto-2.2
@@ -3,9 +3,9 @@ DEPEND=!=sys-devel/automake-1.11.1:1.11 >=sys-devel
DESCRIPTION=X.Org Input protocol headers
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=615ec01df889e03dc5d31e0b64237640
+_md5_=a1fcb6bdf8795f32f49abecd679c977e
diff --git a/metadata/md5-cache/x11-proto/kbproto-1.0.6 b/metadata/md5-cache/x11-proto/kbproto-1.0.6
index b8335186cb77..c06d32d3d567 100644
--- a/metadata/md5-cache/x11-proto/kbproto-1.0.6
+++ b/metadata/md5-cache/x11-proto/kbproto-1.0.6
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
DESCRIPTION=X.Org KB protocol headers
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.6.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=5ebe9d51b14e98f250bc4c9977961a34
+_md5_=b41082d25d810c994e37b73efbfb6da1
diff --git a/metadata/md5-cache/x11-proto/recordproto-1.14.2 b/metadata/md5-cache/x11-proto/recordproto-1.14.2
index f54e889035c3..b167624fbeb5 100644
--- a/metadata/md5-cache/x11-proto/recordproto-1.14.2
+++ b/metadata/md5-cache/x11-proto/recordproto-1.14.2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Record protocol headers
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=!=sys-devel/automake-1.11.1:1.11 >=
DESCRIPTION=X C-language Bindings protocol headers
EAPI=4
HOMEPAGE=http://xcb.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=dev-lang/python
SLOT=0
SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.7.1.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 python 4152846e243ec207de8a1b02a36f1461 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=e365980a0e022a90a78f8bd88b285d3c
+_md5_=f92445c735874fa83e502650f51e149a
diff --git a/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2 b/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2
index 79b248697d06..6b36165600af 100644
--- a/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2
+++ b/metadata/md5-cache/x11-proto/xcmiscproto-1.2.2
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org XCMisc protocol headers
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-1.2.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=320d0c5f7a589bacb21680c896d6d2d8
+_md5_=bac4d7dd0378567c619ee4658dea9c42
diff --git a/metadata/md5-cache/x11-proto/xextproto-7.2.1 b/metadata/md5-cache/x11-proto/xextproto-7.2.1
index 73b3b3b8feca..9d86df27f9e5 100644
--- a/metadata/md5-cache/x11-proto/xextproto-7.2.1
+++ b/metadata/md5-cache/x11-proto/xextproto-7.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org XExt protocol headers
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=!=sys-devel/automake-1.11.1:1.11 >=s
DESCRIPTION=X.Org XF86DGA protocol headers
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
LICENSE=MIT
RDEPEND=!=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
DESCRIPTION=X.Org XF86Rush protocol headers
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
LICENSE=MIT
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86rushproto-1.1.2.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=7e5bc40e6ff5a678788a8339d34ae09f
+_md5_=6c9fb9ca0cbb73d5c421f58bc537aa6e
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.23-r1 b/metadata/md5-cache/x11-proto/xproto-7.0.23-r1
index 8cebb89d9747..bac6ac265de2 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.23-r1
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.23-r1
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org xproto protocol headers
EAPI=4
HOMEPAGE=http://xorg.freedesktop.org/
IUSE=doc
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.23.tar.bz2
_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba autotools-utils cfb1126efe81254030227216aa71f32c eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 a9d5d03f7ca287dd4440d241ec9214f1
-_md5_=0a6904f0786972417f4d853f8267212b
+_md5_=9ea77dc1de47b2bfad1217c8f9c18c5f
diff --git a/metadata/md5-cache/x11-terms/root-tail-1.2-r2 b/metadata/md5-cache/x11-terms/root-tail-1.2-r2
deleted file mode 100644
index 59a34f98af39..000000000000
--- a/metadata/md5-cache/x11-terms/root-tail-1.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-misc/imake app-text/rman x11-misc/gccmakedep x11-libs/libX11 x11-proto/xproto
-DESCRIPTION=Terminal to display (multiple) log files on the root window
-HOMEPAGE=http://oldhome.schmorp.de/marc/root-tail.html
-IUSE=kde debug
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXext x11-libs/libX11
-SLOT=0
-SRC_URI=http://oldhome.schmorp.de/marc/data/root-tail-1.2.tar.gz
-_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6c80bce2ea69d62c92098256e6cd64d3
diff --git a/metadata/md5-cache/x11-terms/xterm-279 b/metadata/md5-cache/x11-terms/xterm-279
index 68611d152616..53eed9cb3877 100644
--- a/metadata/md5-cache/x11-terms/xterm-279
+++ b/metadata/md5-cache/x11-terms/xterm-279
@@ -4,10 +4,10 @@ DESCRIPTION=Terminal Emulator for X Windows
EAPI=4
HOMEPAGE=http://dickey.his.com/xterm/
IUSE=toolbar truetype unicode Xaw3d
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7 x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) media-fonts/font-misc-misc
SLOT=0
SRC_URI=ftp://invisible-island.net/xterm/xterm-279.tgz
_eclasses_=eutils 327b713e2d6949c42cd96bc4898fd280 multilib 5782800349f728f725f9378105c6a2ab toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=59915c44a752d8abbbee8dd081888b78
+_md5_=bd40b751861602cd202727c57fe86182
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.3-r1 b/metadata/md5-cache/x11-wm/windowmaker-0.95.3-r1
new file mode 100644
index 000000000000..9bdb6fe1f92e
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.95.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=The fast and light GNUstep window manager
+EAPI=4
+HOMEPAGE=http://www.windowmaker.org/
+IUSE=gif jpeg nls png tiff modelock xinerama xrandr
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 )
+SLOT=0
+SRC_URI=http://windowmaker.org/pub/source/release/WindowMaker-0.95.3.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
+_eclasses_=autotools 9d170f07df0e48055093b8c6a60d0fba eutils 327b713e2d6949c42cd96bc4898fd280 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5782800349f728f725f9378105c6a2ab multiprocessing 1512bdfe7004902b8cd2c466fc3df772 toolchain-funcs e575dd4d4682fc3539829c52d8382856 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=294093d2bdc47033a23116a5af14b297
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c7c10b0b7bf2..213a6f476fe3 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 11 Jul 2012 13:07:44 +0000
+Thu, 12 Jul 2012 04:07:41 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 86bbae4fd708..9bf01dc58a01 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jul 11 13:07:42 UTC 2012
+Thu Jul 12 04:07:39 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 216bda640625..5ab0a155eb8c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 11 Jul 2012 13:30:01 +0000
+Thu, 12 Jul 2012 04:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6e6c2970d774..8c462b6b10b2 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1342011901 Wed Jul 11 13:05:01 2012 UTC
+1342065901 Thu Jul 12 04:05:01 2012 UTC
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index b2ac9519f6ad..a2642c99fb06 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -1,3 +1,4 @@
-DIST arping-2.06.tar.gz 34372 RMD160 01d2318183a6e1a85bf2f90a3ebba86cd93bfeed SHA1 0bbe4daf6d52ca88f006ec7bce3b5073bdbc2069 SHA256 269eae074c994da4673fc59987080221d1bb6f99f180200c51100343addf27b0
-DIST arping-2.09.tar.gz 132797 RMD160 e00eb0cd7422e7dcabbe5a880cb959b0dcd73e70 SHA1 afa870eaad3bac47a8b627bc3fbdc1471b6cfd72 SHA256 1b3b9df72c6717ebd2dc7cd9bfc6aab0a7c413f9b5a5c5bdadb3c9e0deb6ec46
-DIST arping-2.11.tar.gz 140744 RMD160 0e109e2e850a4fde4d49bb0b53fb5e8588a6ebed SHA1 06063025ecf858d4435cd0fbe4e8e2266595f1e2 SHA256 32e33c9d44c900c47f260d3ab5757466d8a7d3c282b3b35fb98e0fd068f25cb1
+DIST arping-2.06.tar.gz 34372 SHA256 269eae074c994da4673fc59987080221d1bb6f99f180200c51100343addf27b0
+DIST arping-2.09.tar.gz 132797 SHA256 1b3b9df72c6717ebd2dc7cd9bfc6aab0a7c413f9b5a5c5bdadb3c9e0deb6ec46
+DIST arping-2.11.tar.gz 140744 SHA256 32e33c9d44c900c47f260d3ab5757466d8a7d3c282b3b35fb98e0fd068f25cb1 SHA512 4bad0d8334f6793fceab5899986b040af6d8e95e30f8e643af717ff4daae4de2b2572c5d2255f097e1977c6ed143f9631d25b23ea1599a79393dd181091509c3 WHIRLPOOL 970df90db4f0d9a04314f1f8a2d7f0dbb19319c4742cd7211410840748492a5c517c3fc3b002b0edf0136b05b11ed2bb08c365c7ac95d8944b5ca57b03999266
+DIST arping-2.12.tar.gz 141108 SHA256 fade0c3ff1522cf19d2581f5ba0055a9df9c5e8b6a6c1f176535871b1612634e SHA512 5013e0bd4d8ab428fd899c534d5b52121a426e62c684730cd78e649df1e98fa357e57979fdd78c1d0d2a9b88a71208d555179108e01992fc7b8ecd4fa5ecaa4f WHIRLPOOL 60df4aef3857cb89df212b4c0db8974a502e5189a01cefeeeb02d6028fe39a2b078078825c5186315105077b872617506344312a7591daff97b0d214786330ac
diff --git a/net-analyzer/arping/arping-2.12.ebuild b/net-analyzer/arping/arping-2.12.ebuild
new file mode 100644
index 000000000000..da6f6f04214f
--- /dev/null
+++ b/net-analyzer/arping/arping-2.12.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arping/arping-2.12.ebuild,v 1.1 2012/07/11 21:11:37 radhermit Exp $
+
+EAPI="4"
+
+DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it"
+HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
+SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND="net-libs/libpcap
+ net-libs/libnet:1.1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ rm -f Makefile
+ # since we install as arping2, use arping2 in the man page
+ sed \
+ -e "s|\(${PN}\)|\12|g" \
+ -e "s|\(${PN}\)\(\W\)|\12\2|g" \
+ -e "s|${PN}2-|${PN}-|g" \
+ -e "s|(${PN}2 2.*\.x only)||g" \
+ -i doc/${PN}.8 || die "sed ${PN}.8 failed"
+ sed \
+ -e "s|\(${PN}\) |\12 |g" \
+ -i extra/${PN}-scan-net.sh || die "sed ${PN}-scan-net.sh failed"
+}
+
+src_install() {
+ # since we install as arping2, we cannot use emake install
+ newsbin src/${PN} ${PN}2
+ newman doc/${PN}.8 ${PN}2.8
+ dodoc README extra/arping-scan-net.sh
+}
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index 3ce7ed894294..ec903490d07e 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1,2 +1,2 @@
-DIST opendnssec-1.3.6.tar.gz 1087060 RMD160 a7ffeb80766040c0a6326b54031bfa5ae2653605 SHA1 930211352d2408f8f8f7be524c9f22754f938dc5 SHA256 6fe62d4bf4a3c8bf9e4c7ed816c37d582a9d3ea9677d28a3cb027b81f13e7bad
-DIST opendnssec-1.3.7.tar.gz 1085010 RMD160 99810b4bc21f2f75ccb97af5b31ed6d4ee6a992d SHA1 2542541da1fe466f40b55f6bfee53c9b202ee014 SHA256 04893a8a92537c9e7b52fb2d6e84e724aa31df7cf8194922248fa46886d0afd1
+DIST opendnssec-1.3.6.tar.gz 1087060 SHA256 6fe62d4bf4a3c8bf9e4c7ed816c37d582a9d3ea9677d28a3cb027b81f13e7bad
+DIST opendnssec-1.3.7.tar.gz 1085010 SHA256 04893a8a92537c9e7b52fb2d6e84e724aa31df7cf8194922248fa46886d0afd1 SHA512 52960ba82af2c871460eeb4afdc8381e70ded33d694e48e3330ee097818310b26331e93a1858ffb362128f7aa64374b5c49127290b4e54a1e1905d5eb1057324 WHIRLPOOL cf041a8b4e7f060b408b527b5e09770022aaa84feb46befb7d7cf702ac53b8fd6f73cb9c731837ee507fb6618d534400e74a9a7377a850f7840eba57e4c0aea4
diff --git a/net-dns/opendnssec/opendnssec-1.3.6.ebuild b/net-dns/opendnssec/opendnssec-1.3.6.ebuild
index 7f3ed065cef0..1b09638433f1 100644
--- a/net-dns/opendnssec/opendnssec-1.3.6.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.3.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.3.6.ebuild,v 1.2 2012/06/14 02:15:19 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.3.6.ebuild,v 1.3 2012/07/11 23:44:53 mschiff Exp $
EAPI=4
@@ -12,7 +12,7 @@ DESCRIPTION="An open-source turn-key solution for DNSSEC"
HOMEPAGE="http://www.opendnssec.org/"
SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="auditor +curl debug doc eppclient mysql +signer +sqlite test ${PKCS11_IUSE}"
diff --git a/net-dns/opendnssec/opendnssec-1.3.7.ebuild b/net-dns/opendnssec/opendnssec-1.3.7.ebuild
index f52b47df5f15..1bf900619453 100644
--- a/net-dns/opendnssec/opendnssec-1.3.7.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.3.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.3.7.ebuild,v 1.2 2012/06/14 02:15:19 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.3.7.ebuild,v 1.3 2012/07/11 23:44:53 mschiff Exp $
EAPI=4
@@ -12,7 +12,7 @@ DESCRIPTION="An open-source turn-key solution for DNSSEC"
HOMEPAGE="http://www.opendnssec.org/"
SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="auditor +curl debug doc eppclient mysql +signer +sqlite test ${PKCS11_IUSE}"
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.7.3-r1.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.7.3-r1.ebuild
index 9c529ee08bd9..833fe63d42a3 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.7.3-r1.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.7.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.7.3-r1.ebuild,v 1.7 2012/05/13 11:01:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.7.3-r1.ebuild,v 1.8 2012/07/12 00:11:13 blueness Exp $
EAPI="4"
@@ -10,7 +10,7 @@ DESCRIPTION="A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementat
HOMEPAGE="http://ipsec-tools.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="hybrid iconv idea ipv6 kerberos ldap nat pam rc5 readline selinux"
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.7.3.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.7.3.ebuild
index d737a387fa48..c43dcf156445 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.7.3.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.7.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.7.3.ebuild,v 1.5 2012/05/13 11:01:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.7.3.ebuild,v 1.6 2012/07/12 00:11:13 blueness Exp $
inherit eutils flag-o-matic autotools linux-info
@@ -8,7 +8,7 @@ DESCRIPTION="A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementat
HOMEPAGE="http://ipsec-tools.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="hybrid iconv idea ipv6 kerberos ldap nat pam rc5 readline selinux"
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
index c6495ef1d457..547a5554ba95 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild,v 1.4 2012/05/13 11:01:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild,v 1.6 2012/07/12 02:33:57 blueness Exp $
EAPI="4"
@@ -10,9 +10,9 @@ DESCRIPTION="A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementat
HOMEPAGE="http://ipsec-tools.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
RDEPEND="
diff --git a/net-firewall/pglinux/Manifest b/net-firewall/pglinux/Manifest
index 3f54abbdb234..559160cb85ec 100644
--- a/net-firewall/pglinux/Manifest
+++ b/net-firewall/pglinux/Manifest
@@ -1,2 +1 @@
-DIST pgl-2.2.0.tar.gz 584773 RMD160 648b57d461184d10e5300dc05bf18b744c1b6933 SHA1 fd595813dc3f2fd3b3bbf65b4bc6c45dfefc2815 SHA256 e31d4274def8ec2acec0acb80b111f83f415440c20f24d4e26851f0e65326f3a
-DIST pgl-2.2.1.tar.gz 588619 RMD160 bfa532861a3981946c9ecf62165ead00a64c4a5e SHA1 f6448d284d5a078619943b912aca111a00472d17 SHA256 2b61333055be126bcf8eccfa8c532487f8fd36ea80fe9bcb63475148979aaacb
+DIST pgl-2.2.1_p20120711.tar.xz 412840 SHA256 cc32046e4ae6b4441b5135a951091c5dc9603a6b89f8f16721f60200a600a434 SHA512 bbde8d990253db97093969aeddc0466e3c0a0c3b008a67f9779ae2a47436be939751522710a69bd7a7d7c299235a60c886f8a36e99ea8bffcfa319d697e0c20f WHIRLPOOL 6abe0f35b647890ea6cff8368060954b2e6fa52ff7d58e5976eecbde495c4e5e7695fe3a025ce357e7b4b68b437a37949046293e50f60e610b9265dca8b6db0f
diff --git a/net-firewall/pglinux/pglinux-2.2.0.ebuild b/net-firewall/pglinux/pglinux-2.2.0.ebuild
deleted file mode 100644
index e6a7cd56313d..000000000000
--- a/net-firewall/pglinux/pglinux-2.2.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/pglinux/pglinux-2.2.0.ebuild,v 1.1 2012/06/12 22:22:24 hasufell Exp $
-
-EAPI=4
-
-inherit gnome2-utils linux-info
-
-MY_P="pgl-${PV}"
-
-DESCRIPTION="Privacy oriented firewall application"
-HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
-SRC_URI="mirror://sourceforge/peerguardian/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="cron dbus logrotate networkmanager qt4 zlib"
-
-COMMON_DEPEND="
- net-libs/libnetfilter_queue
- net-libs/libnfnetlink
- dbus? ( sys-apps/dbus )
- zlib? ( sys-libs/zlib )
- qt4? ( sys-auth/polkit-qt
- x11-libs/qt-core:4
- x11-libs/qt-dbus:4
- x11-libs/qt-gui:4
- || ( kde-base/kdesu x11-libs/gksu x11-misc/ktsuss )
- )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- sys-devel/libtool:2"
-RDEPEND="${COMMON_DEPEND}
- net-firewall/iptables
- sys-apps/sysvinit
- cron? ( virtual/cron )
- logrotate? ( app-admin/logrotate )
- networkmanager? ( net-misc/networkmanager )"
-
-REQUIRED_USE="qt4? ( dbus )"
-
-CONFIG_CHECK="~NETFILTER_NETLINK
- ~NETFILTER_NETLINK_QUEUE
- ~NETFILTER_XTABLES
- ~NETFILTER_XT_TARGET_NFQUEUE
- ~NETFILTER_XT_MATCH_IPRANGE
- ~NETFILTER_XT_MARK
- ~NETFILTER_XT_MATCH_MULTIPORT
- ~NETFILTER_XT_MATCH_STATE
- ~NF_CONNTRACK
- ~NF_CONNTRACK_IPV4
- ~NF_DEFRAG_IPV4
- ~IP_NF_FILTER
- ~IP_NF_IPTABLES
- ~IP_NF_TARGET_REJECT"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- econf \
- --localstatedir=/var \
- --docdir=/usr/share/doc/${PF} \
- $(use_enable logrotate) \
- $(use_enable cron) \
- $(use_enable networkmanager) \
- $(use_enable zlib) \
- $(use_enable dbus) \
- --disable-lowmem \
- --with-iconsdir=/usr/share/icons/hicolor/128x128/apps \
- $(use_with qt4)
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- elog "optional dependencies:"
- elog " app-arch/p7zip (needed for blocklists packed as .7z)"
- elog " app-arch/unzip (needed for blocklists packed as .zip)"
- elog " virtual/mta (needed to send informational (blocklist updates) and"
- elog " warning mails (if pglcmd.wd detects a problem.))"
-
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/net-firewall/pglinux/pglinux-2.2.1.ebuild b/net-firewall/pglinux/pglinux-2.2.1_p20120711.ebuild
similarity index 93%
rename from net-firewall/pglinux/pglinux-2.2.1.ebuild
rename to net-firewall/pglinux/pglinux-2.2.1_p20120711.ebuild
index 2f329703e980..621c20803bb5 100644
--- a/net-firewall/pglinux/pglinux-2.2.1.ebuild
+++ b/net-firewall/pglinux/pglinux-2.2.1_p20120711.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/pglinux/pglinux-2.2.1.ebuild,v 1.1 2012/06/26 22:54:52 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/pglinux/pglinux-2.2.1_p20120711.ebuild,v 1.1 2012/07/11 14:13:31 hasufell Exp $
EAPI=4
@@ -10,7 +10,7 @@ MY_P="pgl-${PV}"
DESCRIPTION="Privacy oriented firewall application"
HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
-SRC_URI="mirror://sourceforge/peerguardian/${MY_P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${MY_P}.tar.xz"
LICENSE="GPL-3"
KEYWORDS="~amd64 ~x86"
@@ -68,6 +68,7 @@ src_configure() {
$(use_enable dbus) \
--disable-lowmem \
--with-iconsdir=/usr/share/icons/hicolor/128x128/apps \
+ --with-gentoo-init \
$(use_with qt4)
}
diff --git a/net-ftp/pureadmin/Manifest b/net-ftp/pureadmin/Manifest
index 430e29e78aaa..eef203eb5901 100644
--- a/net-ftp/pureadmin/Manifest
+++ b/net-ftp/pureadmin/Manifest
@@ -1,3 +1 @@
-DIST pureadmin-0.2.2.tar.gz 274465 RMD160 dac8915c292372444b3afef9c100170ea039fc5e SHA1 5ab5b349da2d712d305f33a48473e3c638435a70 SHA256 518db8c0805657fa955bdcc74d7d42887d73dba5c36187927e6495a987ab9de1
-DIST pureadmin-0.3.tar.gz 298177 RMD160 80a81b75051d4d2ff29222883109d42f78bb2cf8 SHA1 44c19f16f5e2a4c5204c56a5feeeca52ef255ce2 SHA256 cec867194ee8c2e647dedf0d3d152c033a1bcdfaf3b1e83869b3ada8d9d3e866
-DIST pureadmin-0.4.tar.gz 386739 RMD160 6ce197bba054afa35c459818e92a553480d26821 SHA1 2ba6260bd13c03eecf7ef919fe826ffa5c256b3f SHA256 d7a43da0eb16ad5d57ac4ffe045004977186b2bacb244cb8c5239e2e0b3a2112
+DIST pureadmin-0.4.tar.gz 386739 SHA256 d7a43da0eb16ad5d57ac4ffe045004977186b2bacb244cb8c5239e2e0b3a2112 SHA512 46fd4caff0d6c123412478690411409038d5590cc7388993eed35fc33a34302b8310ae1ede971ed31cbf29ba4ef3b4c21ce5b8c9b225659b3110c6abcd1e78c6 WHIRLPOOL 3168c872ac6c3c6d54dac0ff4dee9ac2f9878f20911b9f1f570d7be3c3201293441aaf05b8d6fcb2c43f7389320670588033e73a597b1d48228e0c58b27ebbf1
diff --git a/net-ftp/pureadmin/pureadmin-0.2.2.ebuild b/net-ftp/pureadmin/pureadmin-0.2.2.ebuild
deleted file mode 100644
index db85d2c1857a..000000000000
--- a/net-ftp/pureadmin/pureadmin-0.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pureadmin/pureadmin-0.2.2.ebuild,v 1.7 2012/05/03 05:37:18 jdhore Exp $
-
-EAPI=3
-inherit eutils
-
-DESCRIPTION="PureAdmin is a GUI tool used to make the management of Pure-FTPd a little easier."
-HOMEPAGE="http://purify.sourceforge.net/"
-SRC_URI="mirror://sourceforge/purify/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug doc"
-
-RDEPEND="gnome-base/libglade:2.0
- sys-libs/zlib
- virtual/fam
- x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_configure() {
- local myconf=""
-
- use debug && myconf="${myconf} --enable-debug"
-
- econf ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # Move the docs to the correct location, if we want the docs
- if use doc ; then
- dodoc "${D}/usr/share/doc/pureadmin/*.txt"
- fi
- rm -Rf "${D}/usr/share/doc/pureadmin"
-
- make_desktop_entry pureadmin "Pure-FTPd menu config" pureadmin
-}
-
-pkg_postinst() {
- ewarn "PureAdmin is at a beta-stage right now and it may break your"
- ewarn "configuration. DO NOT use it for safety critical system"
- ewarn "or production use!"
- echo
- elog "You need root-privileges to be able to use PureAdmin."
- elog "This will probably change in the future."
- echo
-}
diff --git a/net-ftp/pureadmin/pureadmin-0.3.ebuild b/net-ftp/pureadmin/pureadmin-0.3.ebuild
deleted file mode 100644
index 317fd620d633..000000000000
--- a/net-ftp/pureadmin/pureadmin-0.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pureadmin/pureadmin-0.3.ebuild,v 1.6 2012/05/03 05:37:18 jdhore Exp $
-
-EAPI=3
-inherit eutils
-
-DESCRIPTION="PureAdmin is a GUI tool used to make the management of Pure-FTPd a little easier."
-HOMEPAGE="http://purify.sourceforge.net/"
-SRC_URI="mirror://sourceforge/purify/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc"
-
-RDEPEND="gnome-base/libglade:2.0
- sys-libs/zlib
- virtual/fam
- x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_configure() {
- local myconf=""
-
- use debug && myconf="${myconf} --enable-debug"
-
- econf ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # Move the docs to the correct location, if we want the docs
- if use doc ; then
- dodoc "${D}/usr/share/doc/pureadmin/*.txt"
- fi
- rm -Rf "${D}/usr/share/doc/pureadmin"
-
- make_desktop_entry pureadmin "Pure-FTPd menu config" pureadmin
-}
-
-pkg_postinst() {
- ewarn "PureAdmin is at a beta-stage right now and it may break your"
- ewarn "configuration. DO NOT use it for safety critical system"
- ewarn "or production use!"
- echo
- elog "You need root-privileges to be able to use PureAdmin."
- elog "This will probably change in the future."
- echo
-}
diff --git a/net-libs/axtls/axtls-1.4.6-r1.ebuild b/net-libs/axtls/axtls-1.4.6-r1.ebuild
index 06718f4d03bb..cddb8dd55742 100644
--- a/net-libs/axtls/axtls-1.4.6-r1.ebuild
+++ b/net-libs/axtls/axtls-1.4.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.4.6-r1.ebuild,v 1.4 2012/06/21 15:03:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.4.6-r1.ebuild,v 1.5 2012/07/11 23:59:40 blueness Exp $
EAPI="4"
@@ -39,7 +39,7 @@ HOMEPAGE="http://axtls.sourceforge.net/"
SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
S="${WORKDIR}/${MY_PN}"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="amd64 hppa ~x86"
IUSE="httpd cgi-lua cgi-php static static-libs doc"
diff --git a/net-libs/axtls/axtls-1.4.8.ebuild b/net-libs/axtls/axtls-1.4.8.ebuild
index 69f7e1c63a9b..f1488178aff9 100644
--- a/net-libs/axtls/axtls-1.4.8.ebuild
+++ b/net-libs/axtls/axtls-1.4.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.4.8.ebuild,v 1.1 2012/07/01 13:47:46 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.4.8.ebuild,v 1.2 2012/07/11 23:59:40 blueness Exp $
EAPI="4"
@@ -39,7 +39,7 @@ HOMEPAGE="http://axtls.sourceforge.net/"
SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
S="${WORKDIR}/${MY_PN}"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
IUSE="httpd cgi-lua cgi-php static static-libs doc"
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 7124a5403815..dbbe53e7bae3 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -1,2 +1,2 @@
DIST imap-2007e.tar.Z 2789469 SHA256 be648d0e1aa62d564d9dbe04b77ea948116ee96ed687cb5d169c99ae28286e59 SHA512 5fee39fb3408afef7721d28384259ef6f0fb26b7e0b1cadd5cb7539bb5c486e28dc8467dc7db8450eb14f258108fd793dbb0bd3bb0e26e525778bf9da3051b14 WHIRLPOOL 5bdec146c8f023ccbc878804e37dce6d525eb95ed8a5d896d7706abc31c325a227c8e42d8ae1a92d6ac31638008540fc0a37ee15253fb7452866b73b98228fcf
-DIST imap-2007f.tar.Z 2793529 SHA256 870e95f6bd19265832a88fd89b77c54c841c59022fd21e69254050c8b1005e3c
+DIST imap-2007f.tar.Z 2793529 SHA256 870e95f6bd19265832a88fd89b77c54c841c59022fd21e69254050c8b1005e3c SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae WHIRLPOOL 655536d61a178940363241ad8c94a28be75e90abf3b8c585eb61364a6394ff49bb5fd5dc6de4bec5f992f03b592e583df04f0103e8f3c167aa68a476c574c4ec
diff --git a/net-libs/c-client/c-client-2007f.ebuild b/net-libs/c-client/c-client-2007f-r2.ebuild
similarity index 73%
rename from net-libs/c-client/c-client-2007f.ebuild
rename to net-libs/c-client/c-client-2007f-r2.ebuild
index f5df7ef3ef40..c540efe4aee3 100644
--- a/net-libs/c-client/c-client-2007f.ebuild
+++ b/net-libs/c-client/c-client-2007f-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2007f.ebuild,v 1.1 2011/11/20 20:20:10 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2007f-r2.ebuild,v 1.1 2012/07/11 18:58:14 eras Exp $
-EAPI="2"
+EAPI=4
-inherit flag-o-matic eutils libtool toolchain-funcs
+inherit flag-o-matic eutils libtool toolchain-funcs multilib
MY_PN=imap
MY_P="${MY_PN}-${PV}"
@@ -16,8 +16,8 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc kernel_linux kernel_FreeBSD pam ssl"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc kernel_linux kernel_FreeBSD pam ssl static-libs"
RDEPEND="ssl? ( dev-libs/openssl )
!net-mail/uw-imap"
@@ -39,19 +39,25 @@ src_prepare() {
-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
+ # Make the build system more multilib aware
+ sed \
+ -e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \
+ -e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \
+ -i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
+
# Targets should use the Gentoo (ie linux) fs
sed -e '/^bsf:/,/^$/ s:ACTIVEFILE=.*:ACTIVEFILE=/var/lib/news/active:g' \
-i src/osdep/unix/Makefile || die "Makefile sex fixing failed for FreeBSD"
# Apply a patch to only build the stuff we need for c-client
- epatch "${FILESDIR}"/${PN}-2006k_GENTOO_Makefile.patch || die "epatch failed"
+ epatch "${FILESDIR}"/${PN}-2006k_GENTOO_Makefile.patch
# Apply patch to add the compilation of a .so for PHP
# This was previously conditional, but is more widely useful.
epatch "${FILESDIR}"/${PN}-2006k_GENTOO_amd64-so-fix.patch
# Remove the pesky checks about SSL stuff
- sed -e '/read.*exit/d' -i Makefile
+ sed -e '/read.*exit/d' -i Makefile || die
# Respect LDFLAGS
epatch "${FILESDIR}"/${PN}-2007e-ldflags.patch
@@ -72,26 +78,29 @@ src_compile() {
target=bsf
fi
# no parallel builds supported!
- emake -j1 SSLTYPE=${ssltype} $target EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}" || die "make failed"
+ emake -j1 SSLTYPE=${ssltype} $target EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}"
}
src_install() {
- # Library binary
- dolib.a c-client/c-client.a || die
- dosym c-client.a /usr/$(get_libdir)/libc-client.a
+ if use static-libs; then
+ # Library binary
+ dolib.a c-client/c-client.a
+ dosym c-client.a /usr/$(get_libdir)/libc-client.a
+ fi
# Now the shared library
- dolib.so c-client/libc-client.so.1.0.0 || die
+ dolib.so c-client/libc-client.so.1.0.0
dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
# Headers
insinto /usr/include/imap
- doins c-client/*.h
+ doins src/osdep/unix/*.h
+ doins src/c-client/*.h
+ doins c-client/linkage.h
doins c-client/linkage.c
- #exclude these dupes (can't do it before now due to symlink hell)
- rm "${D}"/usr/include/imap/os_*.h
+ doins c-client/osdep.h
# Docs
dodoc README docs/*.txt docs/BUILD docs/CONFIG docs/RELNOTES docs/SSLBUILD
diff --git a/net-libs/libbtbb/files/wireshark-1.8-btbb.patch b/net-libs/libbtbb/files/wireshark-1.8-btbb.patch
deleted file mode 100644
index a5403e4e037c..000000000000
--- a/net-libs/libbtbb/files/wireshark-1.8-btbb.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -urN wireshark-1.8.0.orig//CMakeLists.txt wireshark-1.8.0/CMakeLists.txt
---- wireshark-1.8.0.orig//CMakeLists.txt 2012-06-06 00:33:43.000000000 +0800
-+++ wireshark-1.8.0/CMakeLists.txt 2012-06-25 21:48:57.997186003 +0800
-@@ -409,6 +409,7 @@
- set(PLUGIN_DIR="${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}")
- set(PLUGIN_SRC_DIRS
- plugins/asn1
-+ plugins/btbb
- plugins/docsis
- plugins/ethercat
- plugins/gryphon
-diff -urN wireshark-1.8.0.orig//Makefile.am wireshark-1.8.0/Makefile.am
---- wireshark-1.8.0.orig//Makefile.am 2012-06-20 01:47:22.000000000 +0800
-+++ wireshark-1.8.0/Makefile.am 2012-06-25 21:50:00.721186002 +0800
-@@ -273,6 +273,7 @@
- -include plugins/Custom.make
- plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
- -dlopen plugins/asn1/asn1.la \
-+ -dlopen plugins/btbb/btbb.la \
- -dlopen plugins/docsis/docsis.la \
- -dlopen plugins/ethercat/ethercat.la \
- -dlopen plugins/gryphon/gryphon.la \
-diff -urN wireshark-1.8.0.orig//configure.in wireshark-1.8.0/configure.in
---- wireshark-1.8.0.orig//configure.in 2012-06-22 02:21:10.000000000 +0800
-+++ wireshark-1.8.0/configure.in 2012-06-25 21:51:10.925186002 +0800
-@@ -2096,6 +2096,7 @@
- packaging/svr4/pkginfo
- plugins/Makefile
- plugins/asn1/Makefile
-+ plugins/btbb/Makefile
- plugins/docsis/Makefile
- plugins/ethercat/Makefile
- plugins/gryphon/Makefile
-diff -urN wireshark-1.8.0.orig//epan/Makefile.am wireshark-1.8.0/epan/Makefile.am
---- wireshark-1.8.0.orig//epan/Makefile.am 2012-06-09 08:46:54.000000000 +0800
-+++ wireshark-1.8.0/epan/Makefile.am 2012-06-25 21:51:55.394186002 +0800
-@@ -209,6 +209,8 @@
- -include ../plugins/Custom.make
- plugin_src = \
- ../plugins/asn1/packet-asn1.c \
-+ ../plugins/btbb/packet-btbb.c \
-+ ../plugins/btbb/packet-btlmp.c \
- ../plugins/docsis/packet-bintrngreq.c \
- ../plugins/docsis/packet-bpkmattr.c \
- ../plugins/docsis/packet-bpkmreq.c \
-diff -urN wireshark-1.8.0.orig//packaging/nsis/Makefile.nmake wireshark-1.8.0/packaging/nsis/Makefile.nmake
---- wireshark-1.8.0.orig//packaging/nsis/Makefile.nmake 2012-06-20 01:47:22.000000000 +0800
-+++ wireshark-1.8.0/packaging/nsis/Makefile.nmake 2012-06-25 21:52:34.248186002 +0800
-@@ -46,6 +46,7 @@
-
- PLUGINS= \
- ../../plugins/asn1/asn1.dll \
-+ ../../plugins/btbb/btbb.dll \
- ../../plugins/docsis/docsis.dll \
- ../../plugins/ethercat/ethercat.dll \
- ../../plugins/gryphon/gryphon.dll \
-diff -urN wireshark-1.8.0.orig//packaging/nsis/wireshark.nsi wireshark-1.8.0/packaging/nsis/wireshark.nsi
---- wireshark-1.8.0.orig//packaging/nsis/wireshark.nsi 2012-06-20 01:47:22.000000000 +0800
-+++ wireshark-1.8.0/packaging/nsis/wireshark.nsi 2012-06-25 21:54:50.288185993 +0800
-@@ -806,6 +806,7 @@
- ;-------------------------------------------
- SetOutPath '$INSTDIR\plugins\${VERSION}'
- File "${STAGING_DIR}\plugins\${VERSION}\asn1.dll"
-+File "${STAGING_DIR}\plugins\${VERSION}\btbb.dll"
- File "${STAGING_DIR}\plugins\${VERSION}\docsis.dll"
- File "${STAGING_DIR}\plugins\${VERSION}\ethercat.dll"
- File "${STAGING_DIR}\plugins\${VERSION}\gryphon.dll"
-diff -urN wireshark-1.8.0.orig//plugins/Makefile.am wireshark-1.8.0/plugins/Makefile.am
---- wireshark-1.8.0.orig//plugins/Makefile.am 2012-06-06 00:33:17.000000000 +0800
-+++ wireshark-1.8.0/plugins/Makefile.am 2012-06-25 21:55:15.766186001 +0800
-@@ -24,6 +24,7 @@
- -include Custom.make
- SUBDIRS = $(_CUSTOM_SUBDIRS_) \
- asn1 \
-+ btbb \
- docsis \
- ethercat \
- gryphon \
-diff -urN wireshark-1.8.0.orig//plugins/Makefile.nmake wireshark-1.8.0/plugins/Makefile.nmake
---- wireshark-1.8.0.orig//plugins/Makefile.nmake 2012-06-06 00:33:17.000000000 +0800
-+++ wireshark-1.8.0/plugins/Makefile.nmake 2012-06-25 21:55:32.469186000 +0800
-@@ -8,6 +8,7 @@
-
- PLUGIN_LIST = \
- asn1 \
-+ btbb \
- docsis \
- ethercat \
- gryphon \
diff --git a/net-libs/libbtbb/libbtbb-0.8-r1.ebuild b/net-libs/libbtbb/libbtbb-0.8-r1.ebuild
deleted file mode 100644
index 4d6ed4af524d..000000000000
--- a/net-libs/libbtbb/libbtbb-0.8-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-0.8-r1.ebuild,v 1.1 2012/07/09 19:02:02 zerochaos Exp $
-
-EAPI=4
-
-inherit multilib
-
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="http://git.code.sf.net/p/libbtbb/code"
- inherit git-2
- KEYWORDS=""
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-src_install() {
- insinto /usr/share/${PN}
- doins -r wireshark
- insinto /usr/share/${PN}/wireshark/plugins/btbb/
- doins "${FILESDIR}"/wireshark-1.8-btbb.patch
-
- dodir /usr/$(get_libdir)
- dodir /usr/include
- emake LDCONFIG=true DESTDIR="${D}" INSTALL_DIR="${ED}/usr/$(get_libdir)" INCLUDE_DIR="${ED}/usr/include" install
-}
diff --git a/net-libs/libbtbb/libbtbb-0.8.ebuild b/net-libs/libbtbb/libbtbb-0.8.ebuild
index 34e575b522b3..701d779ebad8 100644
--- a/net-libs/libbtbb/libbtbb-0.8.ebuild
+++ b/net-libs/libbtbb/libbtbb-0.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-0.8.ebuild,v 1.1 2012/07/05 23:12:15 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-0.8.ebuild,v 1.2 2012/07/11 21:42:13 zerochaos Exp $
EAPI=4
@@ -11,6 +11,7 @@ HOMEPAGE="http://libbtbb.sourceforge.net/"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="http://git.code.sf.net/p/libbtbb/code"
+ SRC_URI=""
inherit git-2
KEYWORDS=""
else
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 1f77a9d66136..a005f4d1d448 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v 1.5 2012/07/09 19:02:02 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libbtbb/libbtbb-9999.ebuild,v 1.6 2012/07/11 21:42:13 zerochaos Exp $
EAPI=4
@@ -24,8 +24,6 @@ SLOT="0"
IUSE=""
src_install() {
- insinto /usr/share/${PN}
- doins -r wireshark
dodir /usr/$(get_libdir)
dodir /usr/include
emake LDCONFIG=true DESTDIR="${D}" INSTALL_DIR="${ED}/usr/$(get_libdir)" INCLUDE_DIR="${ED}/usr/include" install
diff --git a/net-mail/uw-imap/Manifest b/net-mail/uw-imap/Manifest
index 8f818127d767..4d4f40291cef 100644
--- a/net-mail/uw-imap/Manifest
+++ b/net-mail/uw-imap/Manifest
@@ -1 +1 @@
-DIST imap-2007f.tar.Z 2793529 RMD160 14f40284e9e164c0ed7677f1e5d8e3309c7c58c1 SHA1 1c9935e5a261baec85dadcbc0c514b66fa3ce0a5 SHA256 870e95f6bd19265832a88fd89b77c54c841c59022fd21e69254050c8b1005e3c
+DIST imap-2007f.tar.Z 2793529 SHA256 870e95f6bd19265832a88fd89b77c54c841c59022fd21e69254050c8b1005e3c SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae WHIRLPOOL 655536d61a178940363241ad8c94a28be75e90abf3b8c585eb61364a6394ff49bb5fd5dc6de4bec5f992f03b592e583df04f0103e8f3c167aa68a476c574c4ec
diff --git a/net-mail/uw-imap/uw-imap-2007f-r1.ebuild b/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
new file mode 100644
index 000000000000..ac093f32b3d5
--- /dev/null
+++ b/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2007f-r1.ebuild,v 1.1 2012/07/11 19:17:27 eras Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic ssl-cert multilib
+
+MY_P="imap-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
+HOMEPAGE="http://www.washington.edu/imap/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 +ssl kerberos clearpasswd"
+
+DEPEND="!net-libs/c-client
+ >=sys-libs/pam-0.72
+ >=net-mail/mailbase-0.00-r8[pam]
+ ssl? ( dev-libs/openssl )
+ kerberos? ( app-crypt/mit-krb5 )"
+
+RDEPEND="${DEPEND}
+ >=net-mail/uw-mailutils-${PV}
+ sys-apps/xinetd"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+ !net-mail/dovecot
+ !mail-mta/courier
+ !net-mail/courier-imap
+ !net-mail/cyrus-imapd"
+
+REQUIRED_USE="!clearpasswd? ( ssl )"
+
+src_unpack() {
+ unpack ${A}
+ # Tarball packed with bad file perms
+ chmod -R ug+w "${S}"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2004c-amd64-so-fix.patch
+ epatch "${FILESDIR}/${PN}-ldflags.patch"
+
+ # no interactive build
+ sed -i -e "/read x; case/s/^/#/" Makefile || die
+ sed -i -e "/make noip6/s/.*/\t@echo/" Makefile || die
+
+ # Now we must make all the individual Makefiles use different CFLAGS,
+ # otherwise they would all use -fPIC
+ sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
+ src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
+ src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
+ || die "sed failed patching Makefile FLAGS."
+
+ # Now there is only c-client left, which should be built with -fPIC
+ append-flags -fPIC
+
+ sed -i \
+ -e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
+ -e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
+ -e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+ src/osdep/unix/Makefile || die
+
+ sed -i \
+ -e "s/CC=cc/CC=$(tc-getCC)/" \
+ -e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
+ -e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
+ src/osdep/unix/Makefile || die
+
+ sed -i -e "s,GSSDIR=/usr/local,GSSDIR=/usr,g" \
+ src/osdep/unix/Makefile.gss || die
+
+ # Make the build system more multilib aware
+ sed \
+ -e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \
+ -e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \
+ -i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
+}
+
+src_compile() {
+ local mymake ipver ssltype target
+ ipver="IP=4"
+ target=lnp
+ use ipv6 && ipver="IP=6"
+ use kerberos && mymake="EXTRAAUTHENTICATORS=gss"
+ use kernel_FreeBSD && target=bsf
+ if use ssl ; then
+ if use clearpasswd ; then
+ ssltype=unix
+ else
+ ssltype=unix.nopwd
+ fi
+ else
+ ssltype=none
+ fi
+
+ emake -j1 SSLTYPE=${ssltype} ${target} ${mymake} ${ipver} EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
+ dobin mlock/mlock
+
+ dolib.so c-client/libc-client.so.1.0.0
+ dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
+ dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
+
+ insinto /usr/include/imap
+ doins src/c-client/{c-client,flstring,mail,imap4r1,rfc822,misc,smtp,nntp,utf8,utf8aux}.h
+ doins src/c-client/{env,fs,ftl,nl,tcp}.h
+ doins src/osdep/unix/env_unix.h
+ doins c-client/linkage.{c,h}
+
+ dolib.a c-client/c-client.a
+ dosym c-client.a /usr/$(get_libdir)/libc-client.a
+
+ doman src/ipopd/ipopd.8 src/imapd/imapd.8
+ doman src/dmail/dmail.1 src/tmail/tmail.1
+ dodoc README docs/*.txt docs/CONFIG docs/RELNOTES
+
+ docinto rfc
+ dodoc docs/rfc/*.txt
+
+ # install headers - bug #375393
+ cp c-client/*.h "${D}"/usr/include/imap/ || die
+ cp c-client/linkage.c "${D}"/usr/include/imap/ || die
+ #exclude these dupes (can't do it before now due to symlink hell)
+ rm "${D}"/usr/include/imap/os_*.h
+
+ # gentoo config stuff
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/uw-imap.xinetd imap
+ newins "${FILESDIR}"/uw-ipop2.xinetd ipop2
+ newins "${FILESDIR}"/uw-ipop3.xinetd ipop3
+ newins "${FILESDIR}"/uw-ipop3s.xinetd ipop3s
+ newins "${FILESDIR}"/uw-imaps.xinetd imaps
+}
+
+pkg_postinst() {
+ if use ssl; then
+ # Let's not make a new certificate if we already have one
+ if ! [[ -e "${ROOT}"/etc/ssl/certs/imapd.pem && \
+ -e "${ROOT}"/etc/ssl/certs/imapd.key ]]; then
+ einfo "Creating SSL certificate for IMAP"
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-IMAP Server}"
+ install_cert /etc/ssl/certs/imapd
+ fi
+ if ! [[ -e "${ROOT}"/etc/ssl/certs/ipop3d.pem && \
+ -e "${ROOT}"/etc/ssl/certs/ipop3d.key ]]; then
+ einfo "Creating SSL certificate for POP3"
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-POP3 Server}"
+ install_cert /etc/ssl/certs/ipop3d
+ fi
+ fi
+}
diff --git a/net-misc/iodine/iodine-0.6.0_rc1-r1.ebuild b/net-misc/iodine/iodine-0.6.0_rc1-r1.ebuild
index c9ccae40e18b..386b5a3e8cd8 100644
--- a/net-misc/iodine/iodine-0.6.0_rc1-r1.ebuild
+++ b/net-misc/iodine/iodine-0.6.0_rc1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/iodine-0.6.0_rc1-r1.ebuild,v 1.1 2012/06/07 19:53:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/iodine-0.6.0_rc1-r1.ebuild,v 1.2 2012/07/11 18:03:38 vostorga Exp $
inherit linux-info eutils
@@ -12,7 +12,7 @@ SRC_URI="http://code.kryo.se/${PN}/${MY_P}.tar.gz"
CONFIG_CHECK="~TUN"
-LICENSE="ISC"
+LICENSE="ISC GPL-2" #GPL-2 for init script bug #426060
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
diff --git a/net-misc/nx/nx-3.5.0.14.ebuild b/net-misc/nx/nx-3.5.0.14-r1.ebuild
similarity index 87%
rename from net-misc/nx/nx-3.5.0.14.ebuild
rename to net-misc/nx/nx-3.5.0.14-r1.ebuild
index bd73bae6e518..4280f4b05e37 100644
--- a/net-misc/nx/nx-3.5.0.14.ebuild
+++ b/net-misc/nx/nx-3.5.0.14-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.14.ebuild,v 1.1 2012/07/11 11:49:04 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.14-r1.ebuild,v 1.1 2012/07/11 14:38:29 voyageur Exp $
EAPI=4
inherit autotools eutils multilib
@@ -17,13 +17,6 @@ KEYWORDS="~amd64 ~ppc ~x86"
IUSE="elibc_glibc"
RDEPEND="elibc_glibc? ( || ( net-libs/libtirpc =media-libs/libpng-1.2.8
>=sys-libs/zlib-1.2.3
virtual/jpeg"
@@ -91,7 +84,7 @@ src_install() {
dobin "${S}"/nx-X11/programs/nxauth/nxauth
dobin "${S}"/nxproxy/nxproxy
- for lib in X11 Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm Xrandr Xrender Xtst;
+ for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm Xrandr Xrender Xtst;
do
dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so*
done
diff --git a/net-misc/plowshare/plowshare-20120609-r2.ebuild b/net-misc/plowshare/plowshare-20120609-r2.ebuild
new file mode 100644
index 000000000000..626d1ed534a9
--- /dev/null
+++ b/net-misc/plowshare/plowshare-20120609-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/plowshare/plowshare-20120609-r2.ebuild,v 1.1 2012/07/11 15:35:41 volkmar Exp $
+
+EAPI="2"
+
+inherit bash-completion-r1
+
+MY_P="${PN}-snapshot-git${PV}"
+
+DESCRIPTION="Command-line downloader and uploader for file-sharing websites"
+HOMEPAGE="http://code.google.com/p/plowshare/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="bash-completion +javascript +perl scripts view-captcha"
+
+RDEPEND="
+ javascript? ( dev-lang/spidermonkey )
+ perl? ( dev-lang/perl
+ media-gfx/imagemagick[perl] )
+ view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
+ app-shells/bash
+ || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
+ app-text/tesseract[tiff]
+ || ( media-gfx/imagemagick[tiff] media-gfx/graphicsmagick[imagemagick,tiff] )
+ net-misc/curl
+ sys-apps/util-linux"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+# NOTES:
+# spidermonkey dep should be any javascript interpreter using /usr/bin/js
+
+# TODO:
+# dev-java/rhino could probably be an alternative for spidermonkey
+
+src_prepare() {
+ if ! use javascript; then
+ sed -i -e 's:^mediafire.*::' \
+ -e 's:^badongo.*::' \
+ -e 's:^dataport_cz.*::' \
+ -e 's:^1fichier.*::' \
+ -e 's:^turbobit.*::' \
+ src/modules/config || die "sed failed"
+ rm src/modules/{mediafire,badongo,dataport_cz,1fichier,turbobit}.sh || die "rm failed"
+ fi
+ if ! use perl; then
+ sed -i -e 's:^netload_in.*::' \
+ -e 's:^badongo.*::' \
+ src/modules/config || die "sed failed"
+ rm src/modules/netload_in.sh || die "rm failed"
+ if use javascript; then
+ rm src/modules/badongo.sh || die "rm failed"
+ fi
+
+ # Don't install perl file helpers.
+ sed -i -e 's:\(.*src/core.sh\).*:\1:' Makefile || die "sed failed"
+ fi
+
+ # Don't let 'make install' install docs.
+ sed -i -e "/INSTALL.*DOCDIR/d" Makefile || die "sed failed"
+
+ if use bash-completion; then
+ sed -i -e \
+ 's:CDIR=/usr/local/share/plowshare/modules/config:CDIR=/usr/share/plowshare/modules/config:' \
+ etc/plowshare.completion || die "sed failed"
+ fi
+}
+
+src_compile() {
+ # There is a Makefile but it's not compiling anything, let's not try.
+ :
+}
+
+src_test() {
+ # Disable tests because all of them need a working Internet connection.
+ :
+}
+
+src_install() {
+ DESTDIR="${D}" PREFIX="/usr" emake install || die "emake install failed"
+
+ dodoc AUTHORS CHANGELOG README || die "dodoc failed"
+
+ if use scripts; then
+ exeinto /usr/bin/
+ doexe contrib/{caturl,plowdown_{add_remote_loop,loop,parallel}}.sh \
+ || die "doins failed"
+ fi
+
+ if use bash-completion; then
+ newbashcomp etc/${PN}.completion ${PN} || die "newbashcomp failed"
+ fi
+}
+
+pkg_postinst() {
+ if ! use javascript; then
+ ewarn "Without javascript you will not be able to use:"
+ ewarn " mediafire, badongo, dataport_cz, 1fichier and turbobit."
+ fi
+ if ! use perl; then
+ ewarn "Without perl you will not be able to use:"
+ ewarn " netload.in and badongo."
+ fi
+}
diff --git a/net-misc/sslh/files/sslh.init.d-2 b/net-misc/sslh/files/sslh.init.d-2
index a00b0f26b778..612290329b05 100755
--- a/net-misc/sslh/files/sslh.init.d-2
+++ b/net-misc/sslh/files/sslh.init.d-2
@@ -1,19 +1,21 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sslh/files/sslh.init.d-2,v 1.1 2012/07/06 18:16:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslh/files/sslh.init.d-2,v 1.2 2012/07/11 15:47:57 kensington Exp $
start() {
ebegin "Starting ${SVCNAME}"
start-stop-daemon --start \
- --exec /usr/bin/sslh -- ${OPTIONS} \
- --pidfile /var/run/sslh.pid
+ --pidfile /var/run/${SVCNAME}.pid \
+ --exec /usr/sbin/sslh -- \
+ ${OPTIONS} \
+ --pidfile /var/run/${SVCNAME}.pid
eend $?
}
stop() {
ebegin "Stopping ${SVCNAME}"
start-stop-daemon --stop --quiet --retry 20 \
- --pidfile /var/run/sslh.pid
+ --pidfile /var/run/${SVCNAME}.pid
eend $?
}
diff --git a/net-misc/sslh/sslh-1.13.ebuild b/net-misc/sslh/sslh-1.13-r1.ebuild
similarity index 89%
rename from net-misc/sslh/sslh-1.13.ebuild
rename to net-misc/sslh/sslh-1.13-r1.ebuild
index be49c0a625e4..baefb1889aba 100644
--- a/net-misc/sslh/sslh-1.13.ebuild
+++ b/net-misc/sslh/sslh-1.13-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sslh/sslh-1.13.ebuild,v 1.1 2012/07/06 18:16:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslh/sslh-1.13-r1.ebuild,v 1.1 2012/07/11 15:47:57 kensington Exp $
EAPI=4
diff --git a/net-misc/tor/tor-0.2.2.35-r1.ebuild b/net-misc/tor/tor-0.2.2.35-r1.ebuild
index a52ba3fec73a..657e434604b3 100644
--- a/net-misc/tor/tor-0.2.2.35-r1.ebuild
+++ b/net-misc/tor/tor-0.2.2.35-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.35-r1.ebuild,v 1.4 2012/05/21 21:37:15 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.35-r1.ebuild,v 1.5 2012/07/11 23:53:39 blueness Exp $
EAPI="4"
@@ -10,7 +10,7 @@ DESCRIPTION="Anonymizing overlay network for TCP"
HOMEPAGE="http://www.torproject.org/"
SRC_URI="https://archive.torproject.org/tor-package-archive/${PN}-${PV}.tar.gz"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="tor-hardening +transparent-proxy threads selinux"
diff --git a/net-misc/tor/tor-0.2.2.35.ebuild b/net-misc/tor/tor-0.2.2.35.ebuild
index 82af8f8d0ed1..b60ea90b84e7 100644
--- a/net-misc/tor/tor-0.2.2.35.ebuild
+++ b/net-misc/tor/tor-0.2.2.35.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.35.ebuild,v 1.8 2012/05/21 21:37:15 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.35.ebuild,v 1.9 2012/07/11 23:53:39 blueness Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="Anonymizing overlay network for TCP"
HOMEPAGE="http://www.torproject.org/"
SRC_URI="http://www.torproject.org/dist/${PN}-${PV}.tar.gz"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="doc tor-hardening +transparent-proxy threads"
diff --git a/net-misc/tor/tor-0.2.2.36.ebuild b/net-misc/tor/tor-0.2.2.36.ebuild
index ac95f64b72ae..ac0e8df82695 100644
--- a/net-misc/tor/tor-0.2.2.36.ebuild
+++ b/net-misc/tor/tor-0.2.2.36.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.36.ebuild,v 1.1 2012/05/25 13:18:15 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.36.ebuild,v 1.2 2012/07/11 23:53:39 blueness Exp $
EAPI="4"
@@ -10,7 +10,7 @@ DESCRIPTION="Anonymizing overlay network for TCP"
HOMEPAGE="http://www.torproject.org/"
SRC_URI="https://archive.torproject.org/tor-package-archive/${PN}-${PV}.tar.gz"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="tor-hardening +transparent-proxy threads selinux"
diff --git a/net-misc/tor/tor-0.2.2.37.ebuild b/net-misc/tor/tor-0.2.2.37.ebuild
index 37a8c2ed60d3..39216ebf9d69 100644
--- a/net-misc/tor/tor-0.2.2.37.ebuild
+++ b/net-misc/tor/tor-0.2.2.37.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.37.ebuild,v 1.1 2012/06/13 15:00:27 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.2.37.ebuild,v 1.2 2012/07/11 23:53:39 blueness Exp $
EAPI="4"
@@ -10,7 +10,7 @@ DESCRIPTION="Anonymizing overlay network for TCP"
HOMEPAGE="http://www.torproject.org/"
SRC_URI="https://archive.torproject.org/tor-package-archive/${PN}-${PV}.tar.gz"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="tor-hardening +transparent-proxy threads selinux"
diff --git a/net-misc/tor/tor-0.2.3.18_rc.ebuild b/net-misc/tor/tor-0.2.3.18_rc.ebuild
index fd16ed44ad63..00adad6f2ac6 100644
--- a/net-misc/tor/tor-0.2.3.18_rc.ebuild
+++ b/net-misc/tor/tor-0.2.3.18_rc.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.18_rc.ebuild,v 1.1 2012/06/30 15:17:15 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.18_rc.ebuild,v 1.2 2012/07/11 23:53:39 blueness Exp $
EAPI="4"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.torproject.org/"
SRC_URI="https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
S="${WORKDIR}/${MY_PF}"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="+bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux web"
diff --git a/net-misc/tor/tor-0.2.3.19_rc.ebuild b/net-misc/tor/tor-0.2.3.19_rc.ebuild
index c01d3cb44793..b79f0b8821f3 100644
--- a/net-misc/tor/tor-0.2.3.19_rc.ebuild
+++ b/net-misc/tor/tor-0.2.3.19_rc.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.19_rc.ebuild,v 1.1 2012/07/07 14:05:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.19_rc.ebuild,v 1.2 2012/07/11 23:53:39 blueness Exp $
EAPI="4"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.torproject.org/"
SRC_URI="https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
S="${WORKDIR}/${MY_PF}"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="+bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux web"
diff --git a/net-misc/vtun/Manifest b/net-misc/vtun/Manifest
index 3d6c09a10068..45506ac69e68 100644
--- a/net-misc/vtun/Manifest
+++ b/net-misc/vtun/Manifest
@@ -1 +1 @@
-DIST vtun-3.0.2.tar.gz 125777 RMD160 6592251871f7e6b9a7e12b7e07ab0a700d816f57 SHA1 6e2da196c70475e5d3750903b2dad032a7b1e8ac SHA256 db26d4dbc35a2b3d65519f68b8ae55c80d7ec4e6569aeec7a432aa82f24c56d6
+DIST vtun-3.0.2.tar.gz 125777 SHA256 db26d4dbc35a2b3d65519f68b8ae55c80d7ec4e6569aeec7a432aa82f24c56d6 SHA512 1cf15ca7856c74318f921d9a6c4b47b10fd1aa69e12a223d41c6c41e570333beb825d37d3aea4217d305bb37f53c5beff70081079516d809068f8024dc8a039f WHIRLPOOL ee72023902f2e4688ac84c0e1d9c5a3ad6982fb847dcf162ecd2f12efac0abeaeb11344b0a34322a4ad6f0adabcd986dff9546f98174a7f201c9b87e5ccb5c72
diff --git a/net-misc/vtun/vtun-3.0.2-r2.ebuild b/net-misc/vtun/vtun-3.0.2-r2.ebuild
index 2b5b19786a97..6b458f5b2dcd 100644
--- a/net-misc/vtun/vtun-3.0.2-r2.ebuild
+++ b/net-misc/vtun/vtun-3.0.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.2-r2.ebuild,v 1.1 2012/06/12 12:13:18 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.2-r2.ebuild,v 1.2 2012/07/11 15:19:23 ago Exp $
EAPI=4
@@ -12,7 +12,7 @@ HOMEPAGE="http://vtun.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
IUSE="lzo socks5 ssl zlib"
RDEPEND="ssl? ( dev-libs/openssl )
diff --git a/net-nds/adtool/Manifest b/net-nds/adtool/Manifest
index f2d1e59ad1d0..c116956bacb9 100644
--- a/net-nds/adtool/Manifest
+++ b/net-nds/adtool/Manifest
@@ -1 +1,2 @@
-DIST adtool-1.3.2.tar.gz 334370 RMD160 27a9899f11615a490972e3aee99508ba1c8deacf SHA1 f2aef0c55d8951c94e91f1f01a1e0942edc9ea38 SHA256 cc9d0adbacac4cac94ab970702382746c8b0ed96074580ef79d2e9adac203b8e
+DIST adtool-1.3.2.tar.gz 334370 SHA256 cc9d0adbacac4cac94ab970702382746c8b0ed96074580ef79d2e9adac203b8e SHA512 5a460e48bb222eeb1fb7e2c370910326aa06d94b08c84aa0ba2c98ad21853514f8581e53256ba6ffd4f5baf5344b6132a645a7ef3439b20d49f431bdb0994808 WHIRLPOOL 9deb19e820d7e1d6db7f22c165415021446ebe0e2848ada2990491ad0ed76139601a95875756e3e8ca582cfd461ec7de2cc7332f7cba82fcb0264a957388c4bb
+DIST adtool-1.3.3.tar.gz 334767 SHA256 9658ed2a4869304a094b0dc73d994940271f7ff64e481093893bf25c95bc95ab SHA512 800a9fd19481b2c986991c27674e24b40bd6f4d58d7cbcf94532acb88f6c36de1f18d4165d6a2dcffd7d5baeac86aaf6f0ff1ef1b46d93ffc28b826b3d857251 WHIRLPOOL f5d36bf4cd62abfe2488b27b9cc08d439d199d3b9e81693c517334ef9937de362f235c9d0c1604bbcc08c54d223de24282ef508d7e615f47be3f3508e1ae1e59
diff --git a/net-nds/adtool/adtool-1.3.2.ebuild b/net-nds/adtool/adtool-1.3.2.ebuild
index d4739446ab41..bba9482b4d30 100644
--- a/net-nds/adtool/adtool-1.3.2.ebuild
+++ b/net-nds/adtool/adtool-1.3.2.ebuild
@@ -1,30 +1,36 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/adtool/adtool-1.3.2.ebuild,v 1.2 2010/12/03 01:01:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/adtool/adtool-1.3.2.ebuild,v 1.3 2012/07/11 13:08:58 jlec Exp $
-inherit eutils autotools
+EAPI=4
-DESCRIPTION="adtool is a Unix command line utility for Active Directory administration"
-SRC_URI="http://gp2x.org/adtool/${P}.tar.gz"
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Utility for Active Directory administration"
HOMEPAGE="http://gp2x.org/adtool/"
+SRC_URI="http://gp2x.org/adtool/${P}.tar.gz"
KEYWORDS="~amd64 ~ppc ~x86"
SLOT="0"
LICENSE="GPL-2"
IUSE="ssl"
-DEPEND="net-nds/openldap
- ssl? ( dev-libs/openssl )"
-RDEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/adtool-1.3-10-asneeded.patch"
+DEPEND="
+ net-nds/openldap
+ ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
- eautoreconf
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-asneeded.patch
+ "${FILESDIR}"/${PN}-1.3.3-bfr-overflow.patch )
-src_install() {
- einstall || die "einstall failed"
+src_prepare() {
+ # automake-1.13
+ mv configure.{in,ac} || die
+ sed \
+ -e '/libactive_directory.a/s:@top_srcdir@:@top_builddir@:' \
+ -i src/tools/Makefile.am || die
+ autotools-utils_src_prepare
}
diff --git a/net-nds/adtool/adtool-1.3.3.ebuild b/net-nds/adtool/adtool-1.3.3.ebuild
new file mode 100644
index 000000000000..2d29fc402232
--- /dev/null
+++ b/net-nds/adtool/adtool-1.3.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/adtool/adtool-1.3.3.ebuild,v 1.1 2012/07/11 13:08:58 jlec Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Utility for Active Directory administration"
+HOMEPAGE="http://gp2x.org/adtool/"
+SRC_URI="http://gp2x.org/adtool/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ssl"
+
+DEPEND="
+ net-nds/openldap
+ ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-bfr-overflow.patch )
+
+src_prepare() {
+ # automake-1.13
+ mv configure.{in,ac} || die
+ sed \
+ -e '/libactive_directory.a/s:@top_srcdir@:@top_builddir@:' \
+ -i src/tools/Makefile.am || die
+ autotools-utils_src_prepare
+}
diff --git a/net-nds/adtool/files/adtool-1.3-10-asneeded.patch b/net-nds/adtool/files/adtool-1.3.2-asneeded.patch
similarity index 69%
rename from net-nds/adtool/files/adtool-1.3-10-asneeded.patch
rename to net-nds/adtool/files/adtool-1.3.2-asneeded.patch
index 8ff7334e3173..38880b1170e0 100644
--- a/net-nds/adtool/files/adtool-1.3-10-asneeded.patch
+++ b/net-nds/adtool/files/adtool-1.3.2-asneeded.patch
@@ -10,6 +10,6 @@ Index: adtool-1.3/src/tools/Makefile.am
bin_PROGRAMS = adtool
--LDADD = @top_srcdir@/src/lib/libactive_directory.a
-+adtool_LDADD = @top_srcdir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv
+-LDADD = @top_builddir@/src/lib/libactive_directory.a
++adtool_LDADD = @top_builddir@/src/lib/libactive_directory.a -lldap -llber -lldap_r -lpthread -lresolv
diff --git a/net-nds/adtool/files/adtool-1.3.3-bfr-overflow.patch b/net-nds/adtool/files/adtool-1.3.3-bfr-overflow.patch
new file mode 100644
index 000000000000..f4e7ef0be88b
--- /dev/null
+++ b/net-nds/adtool/files/adtool-1.3.3-bfr-overflow.patch
@@ -0,0 +1,18 @@
+ src/lib/active_directory.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/active_directory.c b/src/lib/active_directory.c
+index 1eacf5f..d4e1ca6 100644
+--- a/src/lib/active_directory.c
++++ b/src/lib/active_directory.c
+@@ -172,8 +172,8 @@ char *dn2domain(char *dn) {
+ exp_dn=ldap_explode_dn(dn, 0);
+ for(i=0; exp_dn[i]!=NULL; i++) {
+ if(!strncasecmp("dc=", exp_dn[i], 3)) {
+- strncat(dc, exp_dn[i]+3, 1024);
+- strncat(dc, ".", 1024);
++ strncat(dc, exp_dn[i]+3, 1024 - 1);
++ strncat(dc, ".", 1024 - 1);
+ }
+ }
+ ldap_value_free(exp_dn);
diff --git a/net-nds/adtool/metadata.xml b/net-nds/adtool/metadata.xml
index c85a66418186..25e348aacfc8 100644
--- a/net-nds/adtool/metadata.xml
+++ b/net-nds/adtool/metadata.xml
@@ -1,10 +1,10 @@
-
- maintainer-needed@gentoo.org
-
-
+
+ maintainer-needed@gentoo.org
+
+
adtool is a unix command line utility for Active Directory administration, through ldap repository management.
diff --git a/net-p2p/bitcoind/bitcoind-0.4.7_rc3.ebuild b/net-p2p/bitcoind/bitcoind-0.4.7_rc3.ebuild
index 2cd98008eda4..70b280dbbb70 100644
--- a/net-p2p/bitcoind/bitcoind-0.4.7_rc3.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.4.7_rc3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.4.7_rc3.ebuild,v 1.1 2012/06/26 02:34:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.4.7_rc3.ebuild,v 1.2 2012/07/11 23:46:37 blueness Exp $
EAPI=4
@@ -17,7 +17,7 @@ SRC_URI="http://gitorious.org/bitcoin/${PN}-stable/archive-tarball/v${PV/_/} ->
)
"
-LICENSE="MIT ISC"
+LICENSE="MIT ISC GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+bip16 +eligius logrotate ssl upnp"
diff --git a/net-p2p/bitcoind/bitcoind-0.5.6_rc2.ebuild b/net-p2p/bitcoind/bitcoind-0.5.6_rc2.ebuild
index 0dcb4200cdd6..f3e26b7044bf 100644
--- a/net-p2p/bitcoind/bitcoind-0.5.6_rc2.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.5.6_rc2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.5.6_rc2.ebuild,v 1.3 2012/06/21 00:23:07 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.5.6_rc2.ebuild,v 1.4 2012/07/11 23:46:37 blueness Exp $
EAPI="4"
@@ -17,7 +17,7 @@ SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v${PV/_/}
)
"
-LICENSE="MIT ISC"
+LICENSE="MIT ISC GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm x86"
IUSE="+bip16 +eligius examples logrotate ssl upnp"
diff --git a/net-p2p/bitcoind/bitcoind-0.5.6_rc3.ebuild b/net-p2p/bitcoind/bitcoind-0.5.6_rc3.ebuild
index db15d5ade407..256d6a3f8371 100644
--- a/net-p2p/bitcoind/bitcoind-0.5.6_rc3.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.5.6_rc3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.5.6_rc3.ebuild,v 1.1 2012/06/26 02:34:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.5.6_rc3.ebuild,v 1.2 2012/07/11 23:46:37 blueness Exp $
EAPI="4"
@@ -17,7 +17,7 @@ SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v${PV/_/}
)
"
-LICENSE="MIT ISC"
+LICENSE="MIT ISC GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="+bip16 +eligius examples logrotate ssl upnp"
diff --git a/net-p2p/bitcoind/bitcoind-0.6.0.9_rc1.ebuild b/net-p2p/bitcoind/bitcoind-0.6.0.9_rc1.ebuild
index ae1228a09736..5c7f528af611 100644
--- a/net-p2p/bitcoind/bitcoind-0.6.0.9_rc1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.6.0.9_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.6.0.9_rc1.ebuild,v 1.1 2012/06/26 02:34:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.6.0.9_rc1.ebuild,v 1.2 2012/07/11 23:46:37 blueness Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v${PV/_/}
eligius? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.6.0-eligius_sendfee.patch.xz )
"
-LICENSE="MIT ISC"
+LICENSE="MIT ISC GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="+eligius examples logrotate ssl upnp"
diff --git a/net-p2p/bitcoind/bitcoind-0.6.3.ebuild b/net-p2p/bitcoind/bitcoind-0.6.3.ebuild
index 7100de12c804..18e2abe5132b 100644
--- a/net-p2p/bitcoind/bitcoind-0.6.3.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.6.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.6.3.ebuild,v 1.1 2012/06/26 03:02:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.6.3.ebuild,v 1.2 2012/07/11 23:46:37 blueness Exp $
EAPI="4"
@@ -15,7 +15,7 @@ SRC_URI="https://nodeload.github.com/bitcoin/bitcoin/tarball/v${PV/_/} -> bitcoi
logrotate? ( https://github.com/bitcoin/bitcoin/commit/9af080c351c40a4f56d37174253d33a9f4ffdb69.diff -> 0.6.3-reopen_log_file.patch )
"
-LICENSE="MIT ISC"
+LICENSE="MIT ISC GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="+eligius examples logrotate upnp"
diff --git a/net-p2p/bitflu/bitflu-1.37.ebuild b/net-p2p/bitflu/bitflu-1.37.ebuild
index 57f8721234c9..cb0384ee7e63 100644
--- a/net-p2p/bitflu/bitflu-1.37.ebuild
+++ b/net-p2p/bitflu/bitflu-1.37.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitflu/bitflu-1.37.ebuild,v 1.4 2011/09/04 10:13:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitflu/bitflu-1.37.ebuild,v 1.5 2012/07/12 01:41:55 blueness Exp $
EAPI=3
@@ -10,7 +10,7 @@ DESCRIPTION="Bitflu is a BitTorrent client, written in Perl and is designed to r
HOMEPAGE="http://bitflu.workaround.ch"
SRC_URI="http://bitflu.workaround.ch/bitflu/${P}.tgz"
-LICENSE="Artistic-2"
+LICENSE="Artistic-2 GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
diff --git a/net-p2p/bitflu/bitflu-1.41.ebuild b/net-p2p/bitflu/bitflu-1.41.ebuild
index e7b9361abdc9..15ad2c75035a 100644
--- a/net-p2p/bitflu/bitflu-1.41.ebuild
+++ b/net-p2p/bitflu/bitflu-1.41.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitflu/bitflu-1.41.ebuild,v 1.3 2012/04/10 06:04:22 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitflu/bitflu-1.41.ebuild,v 1.4 2012/07/12 01:41:55 blueness Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="Bitflu is a BitTorrent client, written in Perl and is designed to r
HOMEPAGE="http://bitflu.workaround.ch"
SRC_URI="http://bitflu.workaround.ch/bitflu/${P}.tgz"
-LICENSE="Artistic-2"
+LICENSE="Artistic-2 GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
diff --git a/net-p2p/bitflu/bitflu-1.42.ebuild b/net-p2p/bitflu/bitflu-1.42.ebuild
index ee412eabdf36..35838c23e8ab 100644
--- a/net-p2p/bitflu/bitflu-1.42.ebuild
+++ b/net-p2p/bitflu/bitflu-1.42.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitflu/bitflu-1.42.ebuild,v 1.1 2012/04/09 12:43:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitflu/bitflu-1.42.ebuild,v 1.2 2012/07/12 01:41:55 blueness Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="Bitflu is a BitTorrent client, written in Perl and is designed to r
HOMEPAGE="http://bitflu.workaround.ch"
SRC_URI="http://bitflu.workaround.ch/bitflu/${P}.tgz"
-LICENSE="Artistic-2"
+LICENSE="Artistic-2 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
diff --git a/net-p2p/bitflu/bitflu-1.43.ebuild b/net-p2p/bitflu/bitflu-1.43.ebuild
index 5171f9aa1877..4791700e084e 100644
--- a/net-p2p/bitflu/bitflu-1.43.ebuild
+++ b/net-p2p/bitflu/bitflu-1.43.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitflu/bitflu-1.43.ebuild,v 1.3 2012/06/20 07:11:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitflu/bitflu-1.43.ebuild,v 1.4 2012/07/12 01:41:55 blueness Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="Bitflu is a BitTorrent client, written in Perl and is designed to r
HOMEPAGE="http://bitflu.workaround.ch"
SRC_URI="http://bitflu.workaround.ch/bitflu/${P}.tgz"
-LICENSE="Artistic-2"
+LICENSE="Artistic-2 GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index eed44a80a21b..99410ef521c7 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,3 +1,3 @@
DIST qbittorrent-2.9.11.tar.gz 3571306 SHA256 3d090ff576f19074dc8acbfe64cdec23c430183d6593b82bdaf2fb691e41c222 SHA512 603e4d6fadbd20da2015f5b6d4e219ca31b2aabd509903c0db6e75bb95f561d2860b3445369261760d847b936d1df7b1b35143edf957cadb08d852c44c88d14b WHIRLPOOL 8f7a1b52743fdd384eb9da4f6913e07763f2899c767e8197ddd843439beb2f774372f147104fe010ecaea0a12d400f54b127329696c113220948dfccc070d877
DIST qbittorrent-2.9.7.tar.gz 3606781 SHA256 d706a8aff16cc6977379f5b25b842194dceef3b20efd0ca949300728c5a6a190 SHA512 bbc29781664432f7ebe42bb386c5cfd5c4eb5784f36620bf86a15a3e66f6cf3fe3a45831a4b552d5b48d5d1613591d208e6732e2a1a44ef269fd33fac9bf9cca WHIRLPOOL 5129c392345a371c18dc8a226e1c98ded5833019e1fd99a131f28e08ef310e3a4874930c8d2750742ff8f4cba0fdb5d9b926226e87b6911830ee67614ad361c1
-DIST qbittorrent-3.0.0rc4.tar.gz 3614732 SHA256 6450d7f9ba1679870898ae14f20b473393e5dc431429161fae219c7dad665d21 SHA512 d42bd7c3981ccbffc4554a56a3afb151730d2e7893e5d5b5699c27a5c8491c4eb1ad812ec883a0cac6a91a03c4b0e7ff9a3f17311a2053d31bc5a96ddd80e275 WHIRLPOOL 198f0c5389985dd9ea09056af887a41f804779542e1535b1cf375ad78fef8ad8e75bc5bb788c39e180422528ae423e8ba7914885378e02cdb42fd21ab31fdf8e
+DIST qbittorrent-3.0.0rc5.tar.gz 3621245 SHA256 ce20478379699ea7eaee1eaea0af5766c5cfcfad6fd5a8a5c4092b58f89f021b SHA512 eb925d570bd70955f4657721a3fc1c2301a576ae6355f814290b60fad1baa64d894a967de723ad4366c0c73ac4d9ee36c3a53d8aa181e7a4377c013364e15a19 WHIRLPOOL 861c3c4d2f217da68507e5439314ac630231cc781a58ad225b17c2d55c18c3965365f6c988988db506ce92bc5c047d171f058afb7eaddcc5399da3501e242d9c
diff --git a/net-p2p/qbittorrent/qbittorrent-3.0.0_rc4.ebuild b/net-p2p/qbittorrent/qbittorrent-3.0.0_rc5.ebuild
similarity index 96%
rename from net-p2p/qbittorrent/qbittorrent-3.0.0_rc4.ebuild
rename to net-p2p/qbittorrent/qbittorrent-3.0.0_rc5.ebuild
index 84b511be01d9..85381de1da1b 100644
--- a/net-p2p/qbittorrent/qbittorrent-3.0.0_rc4.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-3.0.0_rc5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.0.0_rc4.ebuild,v 1.1 2012/07/09 17:19:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.0.0_rc5.ebuild,v 1.1 2012/07/11 18:29:19 hwoarang Exp $
EAPI="2"
PYTHON_DEPEND="2"
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index f9479004f0a3..8007d33991c8 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -1,5 +1,8 @@
# PPC Specific use flags
#
+# Masking out llvm
+llvm
+
# These flags should only be used for ppc
-ppcsha1
-pbbuttonsd
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 418aeaa02be7..3e8d7497c97c 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.109 2012/07/09 14:21:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.111 2012/07/11 14:10:26 pesa Exp $
# Raúl Porcel (08 Jul 2012)
# x11-libs/qt-webkit doesn't seem to work
@@ -144,10 +144,6 @@ sci-libs/gdal ecwj2k
# uses games-board/ggz-gtk-client
games-strategy/freeciv ggz
-# Ben de Groot (18 Jan 2010)
-# newer qt-webkit is not keyworded (bug #235685)
->=dev-python/PyQt4-4.7.2 webkit
-
# Raúl Porcel (02 Mar 2010)
# needs dev-python/mako which depends on
# dev-python/beaker which sigbuses
@@ -174,10 +170,6 @@ media-libs/libxspf doc
# >=networkmanager-0.7.0 is not keyworded.
gnome-base/gnome-applets networkmanager
-# Raúl Porcel (09 Jun 2009)
-# Needs qt-assistant
-dev-python/PyQt4 assistant
-
# Raúl Porcel
# Depends on dev-java/fop which requires java...
sci-geosciences/gpsbabel doc
diff --git a/profiles/license_groups b/profiles/license_groups
index cc23db6e00bd..568ade2409cf 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.114 2012/07/09 21:38:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.115 2012/07/11 18:28:33 a3li Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -11,7 +11,7 @@
# http://www.gnu.org/licenses/license-list.html
# GPL or LGPL with various exceptions are also included here, because
# they are more permissive than the licenses they are based on.
-GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CC0-1.0-Universal CeCILL-2 Clarified-Artistic DB FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-2 GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-3 GPL-3-with-font-exception ISC LGPL-2 LGPL-2.1 LGPL-2.1-with-linking-exception LGPL-3 LGPL-3-with-linking-exception libgcc libstdc++ MIT MPL-2.0 OPENLDAP OracleDB PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby SGI-B-2.0 tanuki-community unicode Unlicense UoI-NCSA vim W3C WTFPL-2 ZLIB ZPL
+GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CC0-1.0-Universal CeCILL-2 Clarified-Artistic DB FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-2 GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-3 GPL-3-with-font-exception ISC LGPL-2 LGPL-2.1 LGPL-2.1-with-linking-exception LGPL-3 LGPL-3-with-linking-exception libgcc libstdc++ MIT MPL-2.0 OPENLDAP OracleDB PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 tanuki-community unicode Unlicense UoI-NCSA vim W3C WTFPL-2 ZLIB ZPL
FSF-APPROVED @GPL-COMPATIBLE AFL-2.0 AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL CNRI CPL-1.0 EPL-1.0 EUPL-1.1 IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL QPL-1.0 SPL
diff --git a/profiles/package.mask b/profiles/package.mask
index ba10c1c14d7d..be5377e035fe 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13950 2012/07/11 12:24:42 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13955 2012/07/12 02:38:27 cardoe Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,14 @@
#--- END OF EXAMPLES ---
+# Doug Goldstein (11 Jul 2012)
+# Results in many people's machines not having a usable screen
+# once the screen locks requiring the X server to be killed
+# which is a clear data loss. I asked the GNOME team today
+# about this and they told me it was already masked but there's no
+# mask, so here it is. bug #425070
+=gnome-extra/gnome-screensaver-3.4.2
+
# Tony Vroon (11 Jul 2012)
# This segfaults repeatedly in actual use for me, and I can not in good
# conscience allow this to surprise others. Unmask only to help trace
@@ -43,10 +51,6 @@
>=www-client/chromium-22
>=www-client/google-chrome-22
-# Doug Goldstein (08 Jul 2012)
-# Under dev
-=media-plugins/mythplugins-0.25.1
-
# Diego Elio Pettenò (08 Jul 2012)
# Dead upstream (domain is gone as well), very bad code.
# If possible use net-ftp/tftp-hpa; if that is not possible, we're
@@ -95,10 +99,6 @@ dev-python/sexy-python
# dead on upstream, fails on gcc-4.7
=media-plugins/vdr-cdda-0.1.0-r1
-# Richard Yao (29 Jun 2012)
-# Patch introduced regressions
-=sys-fs/zfs-0.6.0_rc9-r3
-
# Mike Gilbert (29 Jun 2012)
# Mask v8 versions used for www-client/chromium dev channel releases.
>=dev-lang/v8-3.12
@@ -132,10 +132,6 @@ x11-misc/transset-df
# Replaced by eGroupware, removal on 23th Jul 2012
www-apps/phpgroupware
-# Doug Goldstein (21 Jun 2012)
-# A stab at a MythTV 0.25 series ebuild
-=media-tv/mythtv-0.25.1_p20120708
-
# Maxim Koltsov (21 Jun 2012)
# It's not what it's called now, mask it not protect people
=dev-util/febootstrap-3*
@@ -308,12 +304,6 @@ app-shells/pdksh
>=sci-libs/arpack-96
>=sci-chemistry/dssp-070831
-# Davide Pesavento (12 Jun 2012)
-# Both have been merged into >=dev-python/shiboken-1.1.1.
-# Removal in 30 days.
-dev-python/apiextractor
-dev-python/generatorrunner
-
# Alexis Ballier (10 Jun 2012)
# Beta release, mask until rev. deps are fixed
>=dev-lang/ocaml-4.00.0_alpha
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index acc9d45feae3..4a46a0e040a5 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2764,8 +2764,6 @@ media-plugins/mythplugins:mythmusic - Adds the ability for MythTV to act as a mu
media-plugins/mythplugins:mythnetvision - Adds the ability to view netvision devices within MythTV
media-plugins/mythplugins:mythnews - Adds a news viewer within MythTV
media-plugins/mythplugins:mythweather - Adds weather information within MythTV
-media-plugins/mythplugins:opengl - Adds OpenGL visualizations to MythMusic and transition support to MythGallery
-media-plugins/mythplugins:projectm - Adds additional visualizations from Project M to MythMusic
media-plugins/mythplugins:raw - Allows MythGallery to view photos saved in RAW format
media-plugins/mythvideo:jamu - Use and configure the Just Another Metadata Utility by default
media-plugins/vdr-burn:dvdarchive - DMH DVD - Archive
@@ -2867,6 +2865,7 @@ media-sound/darkice:twolame - Build with twolame support
media-sound/decibel-audio-player:gnome - Adds Gnome media keys support, so you can control Decibel using hotkeys.
media-sound/decibel-audio-player:gnome-keyring - Adds support for storing your Last.fm password using gnome-keyring.
media-sound/denemo:fluidsynth - Enable Fluidsynth MIDI software synthesis
+media-sound/denemo:portmidi - Enable support for the portmidi backend
media-sound/dir2ogg:mac - Add support for decoding Monkey's Audio files
media-sound/dir2ogg:wma - Add support for wma files through mplayer
media-sound/ecasound:lv2 - Add support for Ladspa V2
@@ -2924,6 +2923,7 @@ media-sound/mpd:recorder - Enables output plugin for recording radio streams
media-sound/mpd:sid - Build with SID (Commodore 64 Audio) support
media-sound/mpd:soundcloud - Build plugin to access soundcloud
media-sound/mpd:soup - Use net-libs/libsoup for HTTP streaming
+media-sound/mpd:systemd - Enable support for systemd socket activation
media-sound/mpd:twolame - Support twolame MPEG-2 encoding
media-sound/mpd:wildmidi - Enable MIDI support via wildmidi
media-sound/mpd:zip - Support for ZIP files
diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index 0ac24d1d365e..baa468b677bd 100644
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -1,4 +1,6 @@
-DIST coot-0.6.2.tar.gz 13597123 RMD160 707eb3df47681a011f42874210b940329a748bc7 SHA1 46b663125cef4c01387330d144e49acb0b0b5709 SHA256 d2f55db4f75c721d120ea33a4ca42c1abf246dff29a75b7f189e604e32709e78
-DIST coot-0.7_pre4040.tar.xz 12318188 RMD160 cb92e4192ce8ede97b38791cd05e958205fca363 SHA1 b3b8c5260b6d67d401085756b0532dc76df0ffe6 SHA256 c1ca06199da2b1531cdff7ecc08b336b8d50d265b3c8ed9d37da656f6c4abf8a
-DIST greg-data-0.6.2.tar.gz 8044588 RMD160 065acee98384540d0c2ffaf2511dfd1aa400b11c SHA1 92cec24dab594d8024f41047af2bf6760e9e7d00 SHA256 c9fedf6e1fa60fda178753bbfb539671c274f64d4daca2b63ab49c59bd4c5856
-DIST greg-data-0.7_pre4040.tar.gz 8046573 RMD160 66219ccad8edf27088959a4d5e5a4d3d74452524 SHA1 2c9cf8edde7eaf3b623758022ccc1c29bcc9c1fc SHA256 c343ef4a5e4d70c5f1e5af70a7d26d8b66f579c11b208019256bf6478ddb309c
+DIST coot-0.6.2.tar.gz 13597123 SHA256 d2f55db4f75c721d120ea33a4ca42c1abf246dff29a75b7f189e604e32709e78 SHA512 d19357a446c0654be286410d33a96aa961f53a3ed87745fe4454a601662ca58463e5f7eb782bf5bc5540c681abccf205c265351cb64a64f851f5e41fad0c433c WHIRLPOOL c4f57d8235f9bfa3db50ef9616424c8eb041c6fca136572e775339436e3f188763df12014cd484ebb32697a3962c456f05b6a99d79478344c34844444b37f097
+DIST coot-0.7_pre4040.tar.xz 12318188 SHA256 c1ca06199da2b1531cdff7ecc08b336b8d50d265b3c8ed9d37da656f6c4abf8a SHA512 34d8bd1b010b40a21fe6fa36efe9a0f01fed714a57dfc21785c4fc7842ec248049f372a8d501cd40e6ec8eec5ca414c90dd948636d05ed7143a87e7384b1ddcb WHIRLPOOL d65892a03f25bea03d493e42dd451aa97752684882fd4ecb93dce16d863e376d2356a7af528174bc504e8b6c53b30a8fff29da4b4d283a7497166b9d7484afb9
+DIST coot-0.7_pre4266.tar.xz 13011656 SHA256 a240fd3492bcde56e224aa637c2f1d7de24b979e56ed8c5c7cd46fbbd8217ae7 SHA512 2684163645070d61f0baa5707483ce8e5708fe435a61b037466ad72c2afcbae6afa72951e655ee6bda018a419c5130dd42fbf6ec2ee1919d9a0802a0e0fed3ae WHIRLPOOL 6ab3e007a8e44cc395115a8285db54ab490e5cb3413bbd640393fad3919d6eae344bb7e03faf78b4ab8e5853466d8b91b74dadad10d402e73ea44e8723811d8a
+DIST greg-data-0.6.2.tar.gz 8044588 SHA256 c9fedf6e1fa60fda178753bbfb539671c274f64d4daca2b63ab49c59bd4c5856
+DIST greg-data-0.7_pre4040.tar.gz 8046573 SHA256 c343ef4a5e4d70c5f1e5af70a7d26d8b66f579c11b208019256bf6478ddb309c
+DIST greg-data-0.7_pre4266.tar.gz 8046574 SHA256 6dd7b701b55dbdf406067449d0586fbb5a855316a9a4e012c17576af1e75eee8 SHA512 43cd57e146281f4b4e30f9c3d5ece0c689f222aa9672f0922052af56423607f86bf33e20e86a5435791a0109f5bfe6bf144d709905a6a28b0e15c9f8a63697cb WHIRLPOOL 1727ac06c09662f37f5cd416b13e22e749621ef8691fd1c121699d5ab049074e5ba2f7bd5e301504ea12f898f6346eec1bc8541bd63fb6bffcf9cca611b7366b
diff --git a/sci-chemistry/coot/coot-0.7_pre4266.ebuild b/sci-chemistry/coot/coot-0.7_pre4266.ebuild
new file mode 100644
index 000000000000..6d331ba735e8
--- /dev/null
+++ b/sci-chemistry/coot/coot-0.7_pre4266.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.7_pre4266.ebuild,v 1.1 2012/07/11 20:38:49 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+AUTOTOOLS_AUTORECONF="true"
+
+inherit autotools-utils python toolchain-funcs versionator
+
+MY_S2_PV=$(replace_version_separator 2 - ${PV})
+MY_S2_P=${PN}-${MY_S2_PV/pre1/pre-1}
+MY_S_P=${MY_S2_P}-${PR/r/revision-}
+MY_PV=${PV}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
+HOMEPAGE="http://www.biop.ox.ac.uk/coot/"
+SRC_URI="
+ http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz
+ test? ( http://dev.gentoo.org/~jlec/distfiles/greg-data-${PV}.tar.gz )"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+openmp static-libs test"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+SCIDEPS="
+ >=sci-libs/ccp4-libs-6.1
+ >=sci-libs/clipper-20090520
+ >=sci-libs/coot-data-2
+ >=sci-libs/gsl-1.3
+ >=sci-libs/mmdb-1.23
+ sci-libs/ssm
+ =dev-scheme/guile-lib-0.1.6
+ dev-scheme/guile-www
+ >=x11-libs/guile-gtk-2.1"
+
+RDEPEND="
+ ${SCIDEPS}
+ ${XDEPS}
+ ${SCHEMEDEPS}
+ dev-python/pygtk:2
+ >=dev-libs/gmp-4.2.2-r2
+ >=net-misc/curl-7.19.6
+ net-dns/libidn"
+DEPEND="${RDEPEND}
+ >=sys-devel/libtool-2.4-r2
+ dev-lang/swig
+ sys-devel/bc
+ test? ( dev-scheme/greg )"
+
+pkg_setup() {
+ if use openmp; then
+ tc-has-openmp || die "Please use an OPENMP capable compiler"
+ fi
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-clipper-config.patch
+ "${FILESDIR}"/${P}-goocanvas.patch
+ "${FILESDIR}"/${P}-mmdb-config.patch
+ "${FILESDIR}"/${P}-ssm.patch
+ )
+
+src_prepare() {
+ sed \
+ -e "s:AM_COOT_SYS_BUILD_TYPE:COOT_SYS_BUILD_TYPE=Gentoo-Linux-$(PYTHON)-gtk2 ; AC_MSG_RESULT([\$COOT_SYS_BUILD_TYPE]); AC_SUBST(COOT_SYS_BUILD_TYPE):g" \
+ -i configure.in || die
+
+ autotools-utils_src_prepare
+
+ cat >> src/svn-revision.cc <<- EOF
+ extern "C" {
+ int svn_revision() {
+ return ${ESVN_WC_REVISION:-0};
+ }
+ }
+ EOF
+}
+
+src_configure() {
+ # All the --with's are used to activate various parts.
+ # Yes, this is broken behavior.
+ local myeconfargs=(
+ --includedir='${prefix}/include/coot'
+ --with-goocanvas-prefix="${EPREFIX}/usr"
+ --with-guile
+ --with-python="${EPREFIX}/usr"
+ --with-guile-gtk
+ --with-gtk2
+ --with-pygtk
+ $(use_enable openmp)
+ )
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+ python_convert_shebangs $(python_get_version) "${S}"/src/coot_gtk2.py
+ cp "${S}"/src/coot_gtk2.py python/coot.py || die
+}
+
+src_test() {
+ source "${EPREFIX}/etc/profile.d/40ccp4.setup.sh"
+ mkdir "${T}"/coot_test
+
+ export COOT_STANDARD_RESIDUES="${S}/standard-residues.pdb"
+ export COOT_SCHEME_DIR="${S}/scheme/"
+ export COOT_RESOURCES_FILE="${S}/cootrc"
+ export COOT_PIXMAPS_DIR="${S}/pixmaps/"
+ export COOT_DATA_DIR="${S}/"
+ export COOT_PYTHON_DIR="${S}/python/"
+ export PYTHONPATH="${COOT_PYTHON_DIR}:${PYTHONPATH}"
+ export PYTHONHOME="${EPREFIX}"/usr/
+ export CCP4_SCR="${T}"/coot_test/
+ export CLIBD_MON="${EPREFIX}/usr/share/ccp4/data/monomers/"
+ export SYMINFO="${S}/syminfo.lib"
+
+ export COOT_TEST_DATA_DIR="${WORKDIR}"/data/greg-data
+
+ cat > command-line-greg.scm <<- EOF
+ (use-modules (ice-9 greg))
+ (set! greg-tools (list "greg-tests"))
+ (set! greg-debug #t)
+ (set! greg-verbose 5)
+ (let ((r (greg-test-run)))
+ (if r
+ (coot-real-exit 0)
+ (coot-real-exit 1)))
+ EOF
+
+ einfo "Running test with following paths ..."
+ einfo "COOT_STANDARD_RESIDUES $COOT_STANDARD_RESIDUES"
+ einfo "COOT_SCHEME_DIR $COOT_SCHEME_DIR"
+ einfo "COOT_RESOURCES_FILE $COOT_RESOURCES_FILE"
+ einfo "COOT_PIXMAPS_DIR $COOT_PIXMAPS_DIR"
+ einfo "COOT_DATA_DIR $COOT_DATA_DIR"
+ einfo "COOT_PYTHON_DIR $COOT_PYTHON_DIR"
+ einfo "PYTHONPATH $PYTHONPATH"
+ einfo "PYTHONHOME $PYTHONHOME"
+ einfo "CCP4_SCR ${CCP4_SCR}"
+ einfo "CLIBD_MON ${CLIBD_MON}"
+ einfo "SYMINFO ${SYMINFO}"
+
+ "${S}"/src/coot-real --no-graphics --script command-line-greg.scm || die
+ "${S}"/src/coot-real --no-graphics --script python-tests/coot_unittest.py || die
+}
diff --git a/sci-chemistry/coot/files/coot-0.7_pre4266-clipper-config.patch b/sci-chemistry/coot/files/coot-0.7_pre4266-clipper-config.patch
new file mode 100644
index 000000000000..311b5e88d84e
--- /dev/null
+++ b/sci-chemistry/coot/files/coot-0.7_pre4266-clipper-config.patch
@@ -0,0 +1,17 @@
+ macros/clipper.m4 | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/macros/clipper.m4 b/macros/clipper.m4
+index 0bf087a..d0e8b6b 100644
+--- a/macros/clipper.m4
++++ b/macros/clipper.m4
+@@ -98,6 +98,9 @@ case $ac_cv_build_alias in
+ ;;
+ esac
+
++CLIPPER_CXXFLAGS=`clipper-config --cflags`
++CLIPPER_LDOPTS=`clipper-config --libs`
++
+ AC_MSG_CHECKING([for Clipper])
+
+ LIBS="$save_LIBS $CLIPPER_LDOPTS"
diff --git a/sci-chemistry/coot/files/coot-0.7_pre4266-goocanvas.patch b/sci-chemistry/coot/files/coot-0.7_pre4266-goocanvas.patch
new file mode 100644
index 000000000000..ce0d4a00abba
--- /dev/null
+++ b/sci-chemistry/coot/files/coot-0.7_pre4266-goocanvas.patch
@@ -0,0 +1,25 @@
+Index: macros/goo-canvas.m4
+===================================================================
+--- macros/goo-canvas.m4 (revision 3307)
++++ macros/goo-canvas.m4 (working copy)
+@@ -56,9 +56,9 @@
+ fi
+ fi
+
+-AC_MSG_CHECKING([for Goocanvas])
++PKG_CHECK_MODULES(GOOCANVAS, goocanvas)
+
+-LIBS="$saved_LIBS $GOOCANVAS_LDOPTS $GTK_LIBS"
++LIBS="$saved_LIBS $GOOCANVAS_LIBS $GTK_LIBS"
+ CXXFLAGS="$saved_CXXFLAGS $GOOCANVAS_CFLAGS $GTK_CFLAGS"
+ #
+ # AC_TRY_LINK uses the c compiler (set by AC_LANG), so we will
+@@ -76,7 +76,7 @@
+ if test x$have_goocanvas = xyes; then
+
+ GOOCANVAS_CFLAGS="$GOOCANVAS_CFLAGS"
+- GOOCANVAS_LIBS="$GOOCANVAS_LDOPTS"
++ GOOCANVAS_LIBS="$GOOCANVAS_LIBS"
+
+ ifelse([$1], , :, [$1])
+
diff --git a/sci-chemistry/coot/files/coot-0.7_pre4266-mmdb-config.patch b/sci-chemistry/coot/files/coot-0.7_pre4266-mmdb-config.patch
new file mode 100644
index 000000000000..b3b66ab65786
--- /dev/null
+++ b/sci-chemistry/coot/files/coot-0.7_pre4266-mmdb-config.patch
@@ -0,0 +1,18 @@
+Index: macros/mmdb.m4
+===================================================================
+--- macros/mmdb.m4 (revision 3579)
++++ macros/mmdb.m4 (working copy)
+@@ -86,8 +86,12 @@
+ ac_MMDB_LDOPTS="-lmmdb -lm"
+ fi
+
+-AC_MSG_CHECKING([for MMDB])
++PKG_CHECK_MODULES([MMDB],[mmdb >= 1.2])
++ac_MMDB_LDOPTS="${MMDB_LIBS}"
++ac_MMDB_CXXFLAGS="${MMDB_CFLAGS}"
+
++AC_MSG_CHECKING([for CISPEP in MMDB])
++
+ LIBS="$save_LIBS $ac_MMDB_LDOPTS"
+ CXXFLAGS="$save_CXXFLAGS $ac_MMDB_CXXFLAGS"
+ #
diff --git a/sci-chemistry/coot/files/coot-0.7_pre4266-ssm.patch b/sci-chemistry/coot/files/coot-0.7_pre4266-ssm.patch
new file mode 100644
index 000000000000..c801da72410a
--- /dev/null
+++ b/sci-chemistry/coot/files/coot-0.7_pre4266-ssm.patch
@@ -0,0 +1,56 @@
+ macros/mmdb-ssm.m4 | 42 +-----------------------------------------
+ 1 files changed, 1 insertions(+), 41 deletions(-)
+
+diff --git a/macros/mmdb-ssm.m4 b/macros/mmdb-ssm.m4
+index 1937a16..6ef547c 100644
+--- a/macros/mmdb-ssm.m4
++++ b/macros/mmdb-ssm.m4
+@@ -22,47 +22,7 @@
+ AC_DEFUN([AM_WITH_MMDBSSM],
+ [AC_PROVIDE([AM_USE_MMDBSSM])
+
+-
+-AC_ARG_WITH(ssmlib-prefix,
+- AC_HELP_STRING( [--with-ssmlib-prefix=PFX], [Prefix where SSMLib has been installed] ),
+- [ with_ssmlib_prefix="$withval" ],
+- with_ssmlib_prefix="")
+-
+-AC_MSG_CHECKING([for SSMLib])
+-
+-if test x$with_ssmlib_prefix != x; then
+-
+- MMDBSSM_CXXFLAGS="-DHAVE_SSMLIB"
+- MMDBSSM_LIBS="-L$with_ssmlib_prefix/$acl_libdirstem -lssm"
+-
+-ac_mmdb_dirs='
+-.
+-include
+-include/ssm
+-include/mmdb
+-lib
+-src
+-lib/src
+-lib/src/mmdb'
+-
+- for ac_dir in $ac_mmdb_dirs; do
+- if test -r "$with_ssmlib_prefix/$ac_dir/ssm_superpose.h"; then
+- ac_MMDBSSM_CXXFLAGS="-I$with_ssmlib_prefix/$ac_dir"
+- break
+- fi
+- done
+-
+- MMDBSSM_CXXFLAGS="$MMDBSSM_CXXFLAGS $ac_MMDBSSM_CXXFLAGS"
+-
+-else
+-
+- MMDBSSM_CXXFLAGS=""
+- MMDBSSM_LIBS=""
+- with_ssmlib_prefix=no
+-
+-fi
+-
+-AC_MSG_RESULT([$with_ssmlib_prefix])
++PKG_CHECK_MODULES([MMDBSSM],[ssm])
+
+ AC_SUBST(MMDBSSM_CXXFLAGS)
+ AC_SUBST(MMDBSSM_LIBS)
diff --git a/sci-electronics/xcircuit/Manifest b/sci-electronics/xcircuit/Manifest
index 559fcf9b7c1b..5c9768be996e 100644
--- a/sci-electronics/xcircuit/Manifest
+++ b/sci-electronics/xcircuit/Manifest
@@ -1,5 +1,5 @@
-DIST xcircuit-3.4.30.tgz 1055721 RMD160 fc6006336d698c49f5e12f4dd889b2c523ad68dd SHA1 778d903f3daf2642be36d6a2c9a93dee8278b13d SHA256 67b58e86f5c69dfe14872b00e743b21150804df60ad33da30533e0fd18e828d8
-DIST xcircuit-3.6.165.tgz 1458622 RMD160 f3234741de5624223ea03a86065c9a0cc31dc948 SHA1 659503dcc0d12460fffc7f281a045db0945b6d77 SHA256 8910859834f1d18b50382c67580867e254a5b0ab3e128d1ddd9bfbf82dfd8c9f
-DIST xcircuit-3.7.39.tgz 1507600 RMD160 38fa6ba7ea756aa1938f795d52bcb83138cbd2a7 SHA1 2e252907402253cf92de2814c6e96e641e07c119 SHA256 e351dfe0ab8f55b78e4db41ade03b8f27059d01d620d44b6353ad223d84e1af3
-DIST xcircuit-3.7.40.tgz 1507559 RMD160 29b538e113d5ff9910a80f7bb20245f9749b9eb6 SHA1 3562060049044467a896700ac9438e6359e78443 SHA256 4a69da977b13426c62d65eb6d49ec7c6863b4a1c84b58bf26d45b346599d9414
-DIST xcircuit-3.8.24.tgz 1516039 RMD160 7b94185b904b9717ff46d5ac288e084074a70e6d SHA1 a93b72314c59c3b93e92fb9960757c26c3b9d219 SHA256 05963b59f2ffffd3fa360ad0bee828dacf9dc160739735ebb222b8321bd500b3
+DIST xcircuit-3.4.30.tgz 1055721 SHA256 67b58e86f5c69dfe14872b00e743b21150804df60ad33da30533e0fd18e828d8
+DIST xcircuit-3.6.165.tgz 1458622 SHA256 8910859834f1d18b50382c67580867e254a5b0ab3e128d1ddd9bfbf82dfd8c9f
+DIST xcircuit-3.7.39.tgz 1507600 SHA256 e351dfe0ab8f55b78e4db41ade03b8f27059d01d620d44b6353ad223d84e1af3
+DIST xcircuit-3.7.40.tgz 1507559 SHA256 4a69da977b13426c62d65eb6d49ec7c6863b4a1c84b58bf26d45b346599d9414 SHA512 1baae93b627f9f1bc2c6ac2ca17dd2a1b7d900ee1990bb84e4778f008c9128ebac01bcedeaba5e36ca9b94e444a696d5e5003440fcaff3c1b10f52cf355d7652 WHIRLPOOL d937d85dcab200927f8ad46f6a6197e8e82706e58e123d7abc8af596aa924f1e9426c1c090dcde2a794b1cac4dd0154b5aa24e93972c4cacef5ff935f129b06c
+DIST xcircuit-3.8.24.tgz 1516039 SHA256 05963b59f2ffffd3fa360ad0bee828dacf9dc160739735ebb222b8321bd500b3 SHA512 c3970e6adb05b1ef00f17f898447cbca0a940241000c96491d86d9073878d72492d5e7260b4b5cb015b87f5c3664a17d7a42d5ad753b1b065b27c62d9d3866f7 WHIRLPOOL 01aa765a228acb57606e423df237fbbcdb686e4d94f5952965754eb207ce7e310297642880581758c17ce1e1098c2728dc5fa2e9319c1f7d6ee841206b494d31
diff --git a/sci-electronics/xcircuit/metadata.xml b/sci-electronics/xcircuit/metadata.xml
index 466ac69c04dd..feb3585e3d7a 100644
--- a/sci-electronics/xcircuit/metadata.xml
+++ b/sci-electronics/xcircuit/metadata.xml
@@ -1,8 +1,8 @@
- sci-electronics
-
+ sci-electronics
+
XCircuit is a UNIX/X11 program for drawing publishable-quality electrical
circuit schematic diagrams and related figures, and produce circuit netlists
through schematic capture. XCircuit regards circuits as inherently
diff --git a/sci-electronics/xcircuit/xcircuit-3.7.40.ebuild b/sci-electronics/xcircuit/xcircuit-3.7.40.ebuild
index 3c0e4fa29526..0bf43da35bd1 100644
--- a/sci-electronics/xcircuit/xcircuit-3.7.40.ebuild
+++ b/sci-electronics/xcircuit/xcircuit-3.7.40.ebuild
@@ -1,9 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.7.40.ebuild,v 1.1 2012/06/13 13:10:02 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.7.40.ebuild,v 1.2 2012/07/11 18:24:21 jlec Exp $
-EAPI=2
-inherit autotools eutils multilib
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib
DESCRIPTION="Circuit drawing and schematic capture program."
SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
@@ -14,37 +17,47 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
-DEPEND="x11-libs/libX11
+DEPEND="
+ app-text/ghostscript-gpl
+ dev-lang/tk
+ sys-libs/zlib
+ x11-libs/libX11
x11-libs/libXt
x11-libs/libXpm
x11-libs/libSM
- x11-libs/libICE
- sys-libs/zlib
- app-text/ghostscript-gpl
- dev-lang/tcl
- dev-lang/tk"
+ x11-libs/libICE"
RDEPEND=${DEPEND}
RESTRICT="test" #131024
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
src_prepare() {
- eautoreconf # avoid QA-warning wrt automaintainer mode
+ # automake-1.12
+ sed \
+ -e '/AM_C_PROTOTYPES/d' \
+ -i configure.in || die
+ # automake-1.13
+ mv configure.{in,ac} || die
+ autotools-utils_src_prepare
}
src_configure() {
export loader_run_path="/usr/$(get_libdir)"
- econf \
- --disable-dependency-tracking \
- --with-tcl \
+ local myeconfargs=(
+ --disable-dependency-tracking
+ --with-tcl
--with-ngspice
+ )
+ autotools-utils_src_configure
}
src_compile() {
- emake appdefaultsdir="/usr/share/X11/app-defaults" || die
+ autotools-utils_src_compile appdefaultsdir="/usr/share/X11/app-defaults"
}
src_install () {
- emake DESTDIR="${D}" appdefaultsdir="/usr/share/X11/app-defaults" \
- appmandir="/usr/share/man/man1" install || die
- dodoc CHANGES README* TODO
+ autotools-utils_src_install \
+ appdefaultsdir="/usr/share/X11/app-defaults" \
+ appmandir="/usr/share/man/man1"
}
diff --git a/sci-electronics/xcircuit/xcircuit-3.8.24.ebuild b/sci-electronics/xcircuit/xcircuit-3.8.24.ebuild
index 33c6dd36434b..c5fe6b117777 100644
--- a/sci-electronics/xcircuit/xcircuit-3.8.24.ebuild
+++ b/sci-electronics/xcircuit/xcircuit-3.8.24.ebuild
@@ -1,10 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.8.24.ebuild,v 1.1 2012/06/13 13:14:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xcircuit/xcircuit-3.8.24.ebuild,v 1.2 2012/07/11 18:24:21 jlec Exp $
-EAPI=2
-WANT_AUTOMAKE="1.11"
-inherit autotools eutils multilib
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib
DESCRIPTION="Circuit drawing and schematic capture program."
SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
@@ -15,37 +17,47 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
-DEPEND="x11-libs/libX11
+DEPEND="
+ app-text/ghostscript-gpl
+ dev-lang/tk
+ sys-libs/zlib
+ x11-libs/libX11
x11-libs/libXt
x11-libs/libXpm
x11-libs/libSM
- x11-libs/libICE
- sys-libs/zlib
- app-text/ghostscript-gpl
- dev-lang/tcl
- dev-lang/tk"
+ x11-libs/libICE"
RDEPEND=${DEPEND}
RESTRICT="test" #131024
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
src_prepare() {
- eautoreconf # avoid QA-warning wrt automaintainer mode
+ # automake-1.12
+ sed \
+ -e '/AM_C_PROTOTYPES/d' \
+ -i configure.in || die
+ # automake-1.13
+ mv configure.{in,ac} || die
+ autotools-utils_src_prepare
}
src_configure() {
export loader_run_path="/usr/$(get_libdir)"
- econf \
- --disable-dependency-tracking \
- --with-tcl \
+ local myeconfargs=(
+ --disable-dependency-tracking
+ --with-tcl
--with-ngspice
+ )
+ autotools-utils_src_configure
}
src_compile() {
- emake appdefaultsdir="/usr/share/X11/app-defaults" || die
+ autotools-utils_src_compile appdefaultsdir="/usr/share/X11/app-defaults"
}
src_install () {
- emake DESTDIR="${D}" appdefaultsdir="/usr/share/X11/app-defaults" \
- appmandir="/usr/share/man/man1" install || die
- dodoc CHANGES README* TODO
+ autotools-utils_src_install \
+ appdefaultsdir="/usr/share/X11/app-defaults" \
+ appmandir="/usr/share/man/man1"
}
diff --git a/sci-libs/cfitsio/cfitsio-3.300-r1.ebuild b/sci-libs/cfitsio/cfitsio-3.300-r1.ebuild
index 725ef2ad0fee..078b0aa0669f 100644
--- a/sci-libs/cfitsio/cfitsio-3.300-r1.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.300-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.300-r1.ebuild,v 1.2 2012/07/10 21:18:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.300-r1.ebuild,v 1.3 2012/07/11 15:34:33 bicatali Exp $
EAPI=4
inherit autotools-utils
@@ -38,7 +38,7 @@ src_configure() {
src_install () {
autotools-utils_src_install
- dodoc changes.txt README* cfitsio.doc Changes.rst
+ dodoc changes.txt README* cfitsio.doc Changes*
use fortran && dodoc fitsio.doc
use doc && dodoc quick.pdf cfitsio.pdf fpackguide.pdf
use doc && use fortran && dodoc fitsio.pdf
diff --git a/sci-physics/geant-python/geant-python-4.9.5.ebuild b/sci-physics/geant-python/geant-python-4.9.5.ebuild
index 71d0c1cf3146..176358254280 100644
--- a/sci-physics/geant-python/geant-python-4.9.5.ebuild
+++ b/sci-physics/geant-python/geant-python-4.9.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/geant-python-4.9.5.ebuild,v 1.2 2012/05/21 04:49:12 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/geant-python-4.9.5.ebuild,v 1.3 2012/07/12 02:13:34 heroxbd Exp $
EAPI=4
@@ -29,24 +29,6 @@ src_prepare() {
# fix the visManager wrapper
epatch "${FILESDIR}"/${PN}-4.9.5-vis-fix.patch
-
- # let Geant4 module installed into python sitedir instead of default
- sed -i "/G4PY_LIBDIR :=/cG4PY_LIBDIR := $\(DESTDIR\)$(python_get_sitedir)/Geant4" \
- config/install.gmk || die "sed failed on config/install.gmk"
- for mfile in source/python{3,}/GNUmakefile
- do
- sed -i "/install_dir :=/cinstall_dir := $\(DESTDIR\)$(python_get_sitedir)/Geant4" \
- "${mfile}" || die "sed failed on ${mfile}"
- done
-
- # let g4py module installed into python sitedir instead of default
- sed -i "/install_dir :=/cinstall_dir := $\(DESTDIR\)$(python_get_sitedir)/g4py" \
- config/site-install.gmk || die "sed failed on config/site-install.gmk"
- for mfile in {processes/emcalculator,utils/MCScore}/{python3/,}GNUmakefile python/GNUmakefile
- do
- sed -i "/install_dir :=/cinstall_dir := $\(DESTDIR\)$(python_get_sitedir)/g4py" \
- "site-modules/${mfile}" || die "sed failed on site-modules/${mfile}"
- done
}
src_configure() {
@@ -64,6 +46,7 @@ src_configure() {
./configure ${ARG} \
--prefix="${EPREFIX}/usr" \
+ --libdir="${ED}/$(python_get_sitedir)" \
--with-g4-incdir="${EPREFIX}/usr/include/Geant4" \
--with-g4-libdir="${EPREFIX}/usr/lib" \
--with-clhep-incdir="${EPREFIX}/usr/include" \
diff --git a/sys-apps/chpax/chpax-0.7.ebuild b/sys-apps/chpax/chpax-0.7.ebuild
index 542d8df99e93..8ed0817bfbaa 100644
--- a/sys-apps/chpax/chpax-0.7.ebuild
+++ b/sys-apps/chpax/chpax-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.7.ebuild,v 1.16 2010/10/08 01:46:47 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/chpax/chpax-0.7.ebuild,v 1.17 2012/07/11 23:41:18 blueness Exp $
inherit flag-o-matic toolchain-funcs
@@ -8,7 +8,7 @@ DESCRIPTION="Manages various PaX related flags for ELF32, ELF64, and a.out binar
HOMEPAGE="http://pax.grsecurity.net/"
SRC_URI="http://pax.grsecurity.net/${P}.tar.gz"
-LICENSE="public-domain"
+LICENSE="public-domain GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 34867e826044..fed48481d77f 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -12,7 +12,7 @@ DIST coreutils-8.15-patches-1.tar.xz 4496 RMD160 c5376396205a3f2caa92406ad25de19
DIST coreutils-8.15.tar.xz 4943172 RMD160 9cc728b0d7136931ed73e42cbe897edae364732e SHA1 d5d2035ff6443ff63dc507420b52f54cf7a89545 SHA256 837eb377414eae463fee17d0f77e6d76bed79b87bc97ef0c23887710107fd49c
DIST coreutils-8.16-patches-1.tar.xz 4496 RMD160 c2c3ba3803c4f4aec49f8df824d0c8043277e17d SHA1 5e1ff1a973eeb57e216dd1bb229a8b32c9df9d0e SHA256 2912855202866b0ee8fd30063859f50a8ee6bcbb5b8f252f8f994f78b80099b2
DIST coreutils-8.16.tar.xz 5042844 RMD160 0f69e5cf554cc5758108ce2151306e0a05bef377 SHA1 973f1dfee67f60a878c2dd7cb6a5675dabc67ad6 SHA256 2a458fead15d9336f46bb4304cc3eaa6ed9407b9130e7ee2ec533909881d2067
-DIST coreutils-8.17-patches-1.tar.xz 4496 RMD160 74680ca3087c82a2c3616c67232bbce5e8bec865 SHA1 011187e4deb39efcc203e4fd8d1e16c9d1cdc344 SHA256 7054fc3cbb33ea7f6fc3f4d25697a3a0600c28cfe188f8296d98736f6936cb8b
+DIST coreutils-8.17-patches-1.1.tar.xz 5244 RMD160 be78d277747352b9ef2f4dc236655d68c6807a20 SHA1 28b68f0e51dc2eb8667cb79e0ce5b9af7dba8fd2 SHA256 1cfa92fd968f31b2ff3f723294efa2cd25ebe96f775a83b464c00928d0fb17dd
DIST coreutils-8.17.tar.xz 5077388 RMD160 0df232795cc7ae429e3090db3035d9e7c133ee73 SHA1 34139edf28d72ff26626a221aba0d73d485a0ad9 SHA256 4e075a0d238072a5bd079046e1f024dc5e0d9133d43a39c73d0b86b0d1e2c5e5
DIST coreutils-8.5-patches-1.tar.lzma 4456 RMD160 c91df722421089c9598a194bf5ae4d614d8ea990 SHA1 8bba5c4b0f946cdfe6d208dc5e507606b45a5c60 SHA256 5c805201cd08a3a9f8989c77239606d5266a037aeb7c00ec1d2224219af9a1a7
DIST coreutils-8.5-patches-2.tar.lzma 25979 RMD160 fe00a23185cc62a4c9f9ce7b0eea832106e9782b SHA1 c320aad0ffb011f752d9078257893197af5f404a SHA256 3fe98017886f0c97e15552caf4b38ba6085f15209c30ea9e5a2b65bee324f105
diff --git a/sys-apps/coreutils/coreutils-8.17.ebuild b/sys-apps/coreutils/coreutils-8.17.ebuild
index 1865ff65fb36..8a4a75102907 100644
--- a/sys-apps/coreutils/coreutils-8.17.ebuild
+++ b/sys-apps/coreutils/coreutils-8.17.ebuild
@@ -1,30 +1,30 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.17.ebuild,v 1.2 2012/05/24 02:33:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.17.ebuild,v 1.3 2012/07/11 14:33:02 ryao Exp $
EAPI="3"
inherit eutils flag-o-matic toolchain-funcs
-PATCH_VER="1"
+PATCH_VER="1.1"
DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
HOMEPAGE="http://www.gnu.org/software/coreutils/"
SRC_URI="mirror://gnu-alpha/coreutils/${P}.tar.xz
mirror://gnu/${PN}/${P}.tar.xz
mirror://gentoo/${P}.tar.xz
mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
- http://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.xz"
+ http://dev.gentoo.org/~ryao/dist/${P}-patches-${PATCH_VER}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="acl caps gmp nls selinux static unicode vanilla xattr"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="acl caps gmp nls selinux static unicode userland_BSD vanilla xattr"
RDEPEND="caps? ( sys-libs/libcap )
gmp? ( dev-libs/gmp )
selinux? ( sys-libs/libselinux )
acl? ( sys-apps/acl )
- xattr? ( sys-apps/attr )
+ xattr? ( !userland_BSD? ( sys-apps/attr ) )
nls? ( >=sys-devel/gettext-0.15 )
!app-misc/realpath
!=sys-apps/portage-2.1.9
+ sys-devel/gettext"
+DEPEND="${RDEPEND}
+ dev-util/intltool"
+
+REPO_CONFPATH="${ROOT}/etc/entropy/repositories.conf"
+REPO_D_CONFPATH="${ROOT}/etc/entropy/repositories.conf.d"
+ENTROPY_CACHEDIR="${ROOT}/var/lib/entropy/caches"
+
+pkg_setup() {
+ # Can:
+ # - update repos
+ # - update security advisories
+ # - handle on-disk cache (atm)
+ enewgroup entropy || die "failed to create entropy group"
+ # Create unprivileged entropy user
+ enewgroup entropy-nopriv || die "failed to create entropy-nopriv group"
+ enewuser entropy-nopriv -1 -1 -1 entropy-nopriv || die "failed to create entropy-nopriv user"
+}
+
+src_compile() {
+ cd "${S}"/client/po || die
+ emake || die "make failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" LIBDIR="usr/lib" entropy-install || die "make install failed"
+ cd "${S}"/client/po || die
+ emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed"
+}
+
+pkg_postinst() {
+ for ex_conf in "${REPO_D_CONFPATH}"/_entropy_sabayon-limbo.example; do
+ real_conf="${ex_conf%.example}"
+ if [ -f "${real_conf}" ] || [ -f "${real_conf/_}" ]; then
+ # skip installation then
+ continue
+ fi
+ elog "Installing: ${real_conf}"
+ cp "${ex_conf}" "${real_conf}" -p
+ done
+
+ # Copy config file over
+ if [ -f "${REPO_CONFPATH}.example" ] && [ ! -f "${REPO_CONFPATH}" ]; then
+ elog "Copying ${REPO_CONFPATH}.example over to ${REPO_CONFPATH}"
+ cp "${REPO_CONFPATH}.example" "${REPO_CONFPATH}" -p
+ fi
+
+ if [ -d "${ENTROPY_CACHEDIR}" ]; then
+ einfo "Purging current Entropy cache"
+ rm -rf "${ENTROPY_CACHEDIR}"/*
+ fi
+
+ # Fixup Entropy Resources Lock, and /etc/entropy/packages
+ # files permissions. This fixes unprivileged Entropy Library usage
+ local res_file="${ROOT}"/var/lib/entropy/client/database/*/.using_resources
+ if [ -f "${res_file}" ]; then
+ chown root:entropy "${res_file}"
+ chmod g+rw "${res_file}"
+ chmod o+r "${res_file}"
+ fi
+ local pkg_files="package.mask package.unmask package.mask.d package.unmask.d"
+ local pkg_file
+ for pkg_file in ${pkg_files}; do
+ pkg_file="${ROOT}/etc/entropy/packages/${pkg_file}"
+ recursive=""
+ if [ -d "${pkg_file}" ]; then
+ recursive="-R"
+ fi
+ if [ -e "${pkg_file}" ]; then
+ chown ${recursive} root:entropy "${pkg_file}"
+ chmod ${recursive} go+r "${pkg_file}"
+ fi
+ done
+
+ # Setup Entropy Library directories ownership
+ chown -R root:entropy "${ROOT}/var/tmp/entropy"
+ chown root:entropy "${ROOT}/var/lib/entropy" # no recursion
+ chown root:entropy "${ROOT}/var/lib/entropy/client/packages" # no recursion
+ chown root:entropy "${ROOT}/var/log/entropy" # no recursion
+
+ python_mod_optimize "/usr/lib/entropy/lib/entropy"
+
+ echo
+ elog "If you want to enable Entropy packages delta download support, please"
+ elog "install dev-util/bsdiff."
+ echo
+}
+
+pkg_postrm() {
+ python_mod_cleanup "/usr/lib/entropy/lib/entropy"
+}
diff --git a/sys-apps/magneto-core/Manifest b/sys-apps/magneto-core/Manifest
index 220b202a0001..7a2e688578e3 100644
--- a/sys-apps/magneto-core/Manifest
+++ b/sys-apps/magneto-core/Manifest
@@ -1,3 +1,4 @@
+DIST entropy-1.0_rc124.tar.bz2 1518029 SHA256 f81ca4f09de21e77064a3d382cb55bc3e78dc5b5991a16657e276b0e52f641bf SHA512 f61e3582aaa8e7c9e1efabeb4cf17a673cbdb72a8035bd12225e37e85c586ea6de8adf83a4ef8d727147a435e5c93f527b9b43d64b10ab95fdceb7cb07ec3cd6 WHIRLPOOL b8358a5b3e70778a190d0890b7c17f17052cf3e197401afee60214b8b7e458389dc6ba03ddae5db92f2513f66c047519d3cf4d27e230904f72d4890cc3a6421f
DIST entropy-1.0_rc38.tar.bz2 18397706 RMD160 9b99eab9f28b2f47135aa474c8b2e856f10614d4 SHA1 dfc159ff37c2d3619d68a1fbc2d91934cc2aab35 SHA256 08a7c841d70cad9c31fb8ee97f7daea4542c1b9e6a1aa1d1e6a5c82eb8bf8d7c
DIST entropy-1.0_rc43.tar.bz2 18410748 RMD160 8ba2eca99ef2509dd6fc6acb40f5cc3b91cfc366 SHA1 2449a874a091a3549eb1a1ab22357c1e601b6b1d SHA256 e922aa8c21d0a9338f7c1d498d42690c6418ece72e1bde68f98a5bce1d6c1cde
DIST entropy-1.0_rc53.tar.bz2 1675138 RMD160 b4ee06b5a9545e9aebb189f984335dd3213878be SHA1 fdd0dc011569f8c2346f7f16173cc05bbeb4b8af SHA256 a7201af69ba2ada4f438869dbbe77a181576d445e88aaef07f318d842d144de0
diff --git a/sys-apps/magneto-core/magneto-core-1.0_rc124.ebuild b/sys-apps/magneto-core/magneto-core-1.0_rc124.ebuild
new file mode 100644
index 000000000000..fc4a17d45c6c
--- /dev/null
+++ b/sys-apps/magneto-core/magneto-core-1.0_rc124.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/magneto-core/magneto-core-1.0_rc124.ebuild,v 1.1 2012/07/11 18:42:03 lxnay Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+inherit eutils python multilib
+
+DESCRIPTION="Entropy Package Manager notification applet library"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+S="${WORKDIR}/entropy-${PV}/magneto"
+
+DEPEND="~sys-apps/rigo-daemon-${PV}"
+RDEPEND="${DEPEND}
+ x11-misc/xdg-utils"
+
+src_compile() {
+ einfo "nothing to compile"
+}
+
+src_install() {
+ emake DESTDIR="${D}" LIBDIR="usr/lib" magneto-core-install || die "make install failed"
+}
+
+pkg_postinst() {
+ python_mod_optimize "/usr/$(get_libdir)/entropy/magneto"
+}
+
+pkg_postrm() {
+ python_mod_cleanup "/usr/$(get_libdir)/entropy/magneto"
+}
diff --git a/sys-apps/rigo-daemon/Manifest b/sys-apps/rigo-daemon/Manifest
new file mode 100644
index 000000000000..e70fb7bc15ba
--- /dev/null
+++ b/sys-apps/rigo-daemon/Manifest
@@ -0,0 +1 @@
+DIST entropy-1.0_rc124.tar.bz2 1518029 SHA256 f81ca4f09de21e77064a3d382cb55bc3e78dc5b5991a16657e276b0e52f641bf SHA512 f61e3582aaa8e7c9e1efabeb4cf17a673cbdb72a8035bd12225e37e85c586ea6de8adf83a4ef8d727147a435e5c93f527b9b43d64b10ab95fdceb7cb07ec3cd6 WHIRLPOOL b8358a5b3e70778a190d0890b7c17f17052cf3e197401afee60214b8b7e458389dc6ba03ddae5db92f2513f66c047519d3cf4d27e230904f72d4890cc3a6421f
diff --git a/dev-python/generatorrunner/metadata.xml b/sys-apps/rigo-daemon/metadata.xml
similarity index 55%
rename from dev-python/generatorrunner/metadata.xml
rename to sys-apps/rigo-daemon/metadata.xml
index dc439f7e84f5..187f7a710efe 100644
--- a/dev-python/generatorrunner/metadata.xml
+++ b/sys-apps/rigo-daemon/metadata.xml
@@ -1,5 +1,11 @@
-qt
+
+ lxnay@gentoo.org
+ Fabio Erculiani
+
+
+
diff --git a/sys-apps/rigo-daemon/rigo-daemon-1.0_rc124.ebuild b/sys-apps/rigo-daemon/rigo-daemon-1.0_rc124.ebuild
new file mode 100644
index 000000000000..aaaa9179bd8f
--- /dev/null
+++ b/sys-apps/rigo-daemon/rigo-daemon-1.0_rc124.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rigo-daemon/rigo-daemon-1.0_rc124.ebuild,v 1.1 2012/07/11 18:37:57 lxnay Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+inherit eutils python
+
+MY_PN="RigoDaemon"
+DESCRIPTION="Entropy Client DBus Services, aka RigoDaemon"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-3"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+
+S="${WORKDIR}/entropy-${PV}/rigo/${MY_PN}"
+
+DEPEND=""
+RDEPEND="dev-python/dbus-python
+ dev-python/pygobject:3
+ ~sys-apps/entropy-${PV}
+ sys-auth/polkit[introspection]
+ sys-devel/gettext"
+
+src_compile() {
+ emake || die "make failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "make install failed"
+}
+
+pkg_preinst() {
+ # ask RigoDaemon to shutdown, if running
+ # TODO: this will be removed in future
+ local shutdown_exec=${EROOT}/usr/lib/rigo/${MY_PN}/shutdown.py
+ [[ -x "${shutdown_exec}" ]] && "${shutdown_exec}"
+}
+
+pkg_postinst() {
+ python_mod_optimize "/usr/lib/rigo/${MY_PN}"
+}
+
+pkg_postrm() {
+ python_mod_cleanup "/usr/lib/rigo/${MY_PN}"
+}
diff --git a/sys-block/cec/Manifest b/sys-block/cec/Manifest
index 005ddc66ac94..8dd519e8c154 100644
--- a/sys-block/cec/Manifest
+++ b/sys-block/cec/Manifest
@@ -1 +1,2 @@
-DIST cec-8.tgz 12921 RMD160 2d32aea20dcb8ee5d94f83c8cd018ef75009670d SHA1 0744f4a1037be2dd242a0177a9892e3c569e493a SHA256 b111dd5e7ec703b16638790fa9d62a43ba34c16a0e6d34c3587f11766f18ed03
+DIST cec-11.tgz 21172 SHA256 49dc38333d035415c38eb550cb902492e916d1170b6cd99827188e9f1778f288 SHA512 42a6e502fcd93b86f74aadced99e44adc04fe21545b0c83e7599e528a64a4faa9bf5be42b7d3b7f241bb3a313aaaf86cf0aa4750e98b8ff4ff42ff308e7fa230 WHIRLPOOL ef7de849df027a1522034465f2d9b5c1426fa8f57383139c8fb53122c912d3c2ce075f7cf7e5f850d331a96e52d8f94ad7cf38d296113a1d85bca4acd7e62449
+DIST cec-8.tgz 12921 SHA256 b111dd5e7ec703b16638790fa9d62a43ba34c16a0e6d34c3587f11766f18ed03
diff --git a/sys-block/cec/cec-11.ebuild b/sys-block/cec/cec-11.ebuild
new file mode 100644
index 000000000000..c9f006945406
--- /dev/null
+++ b/sys-block/cec/cec-11.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/cec/cec-11.ebuild,v 1.1 2012/07/11 14:10:40 kensington Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Coraid Ethernet Console client"
+HOMEPAGE="http://sourceforge.net/projects/aoetools/"
+SRC_URI="mirror://sourceforge/aoetools/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dosbin ${PN}
+ doman ${PN}.8
+ dodoc ${PN}.txt NEWS README
+}
diff --git a/sys-block/cec/metadata.xml b/sys-block/cec/metadata.xml
index ff62877c67ae..ea792b8f60a9 100644
--- a/sys-block/cec/metadata.xml
+++ b/sys-block/cec/metadata.xml
@@ -1,7 +1,10 @@
-
- maintainer-needed@gentoo.org
-
+
+ maintainer-needed@gentoo.org
+
+
+ aoetools
+
diff --git a/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild
index e81c6c2a137e..e760992d7724 100644
--- a/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild,v 1.1 2012/07/11 08:10:46 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild,v 1.2 2012/07/11 16:05:16 mr_bones_ Exp $
EAPI="2"
@@ -72,4 +72,4 @@ src_configure() {
src_install() {
base_src_install
use static-libs || find "${D}" -type f -name "*.la" -delete
-}
\ No newline at end of file
+}
diff --git a/sys-fs/zfs/files/zfs-0.6.0_rc9-bsd-init.patch b/sys-fs/zfs/files/zfs-0.6.0_rc9-bsd-init.patch
new file mode 100644
index 000000000000..0d8fc1da1a55
--- /dev/null
+++ b/sys-fs/zfs/files/zfs-0.6.0_rc9-bsd-init.patch
@@ -0,0 +1,39 @@
+commit 0ac83722a09ccb15067cad91217103474b58dadf
+Author: Richard Yao
+Date: Tue Jul 10 09:27:09 2012 -0400
+
+ Relicense zfs.gentoo.in from GPLv2 to 2-clause BSD
+
+ As the Gentoo sys-fs/zfs maintainer, I receive license compatibility
+ questions and at times, those questions can be harassing. I feel that
+ the presence of the GPL in Gentoo's package metadata promotes such
+ questions. zfs.gentoo.in is the only GPLv2 licensed file in ZFS, so I
+ have taken the liberty of contacting all contributors to this file to
+ request permission to relicense it.
+
+ All of the contributors to this file have agreed to relicense it under
+ the 2-clause BSD license. I have added their Signed-offs to this commit,
+ in order of first contribution. Thankyou everyone for being so
+ understanding.
+
+ Signed-off-by: devsk
+ Signed-off-by: Alexey Shvetsov
+ Signed-off-by: Brian Behlendorf
+ Signed-off-by: Andrew Tselischev
+ Signed-off-by: Zachary Bedell
+ Signed-off-by: Gunnar Beutner
+ Signed-off-by: Kyle Fuller
+ Signed-off-by: Richard Yao
+
+diff --git a/etc/init.d/zfs.gentoo.in b/etc/init.d/zfs.gentoo.in
+index 957be99..df883cf 100644
+--- a/etc/init.d/zfs.gentoo.in
++++ b/etc/init.d/zfs.gentoo.in
+@@ -1,6 +1,6 @@
+ #!/sbin/runscript
+ # Copyright 1999-2011 Gentoo Foundation
+-# Distributed under the terms of the GNU General Public License v2
++# Released under the 2-clause BSD license.
+ # $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/files/zfs,v 0.9 2011/04/30 10:13:43 devsk Exp $
+
+ depend()
diff --git a/sys-fs/zfs/files/zfs-0.6.0_rc9-linux-3.5-support.patch b/sys-fs/zfs/files/zfs-0.6.0_rc9-linux-3.5-support.patch
new file mode 100644
index 000000000000..c337bcf804a1
--- /dev/null
+++ b/sys-fs/zfs/files/zfs-0.6.0_rc9-linux-3.5-support.patch
@@ -0,0 +1,183 @@
+commit c414d98b9f99aaa68abd418c93fad6e9bb3adca6
+Author: Richard Yao
+Date: Tue Jul 10 07:34:53 2012 -0400
+
+ Linux 3.5 compatibility: miscellaneous changes
+
+ torvalds/linux@b0b0382bb4904965a9e9fca77ad87514dfda0d1c changed
+ export_operations->encode_fn() to use struct inode * instead of struct
+ dentry *
+
+ torvalds/linux@17cf28afea2a1112f240a3a2da8af883be024811 renamed
+ end_writeback() to clear_inode()
+
+ torvalds/linux@17cf28afea2a1112f240a3a2da8af883be024811 removed
+ inode_operations->truncate_range(). The file hole punching functionality
+ is provided by inode_operations->fallocate()
+
+ Closes zfsonlinux/zfs#784
+
+ Signed-off-by: Richard Yao
+
+diff --git a/config/kernel-clear-inode.m4 b/config/kernel-clear-inode.m4
+new file mode 100644
+index 0000000..bedfc51
+--- /dev/null
++++ b/config/kernel-clear-inode.m4
+@@ -0,0 +1,13 @@
++dnl #
++dnl # 3.5.0 API change
++dnl # torvalds/linux@90324cc1b11a211e37eabd8cb863e1a1561d6b1d renamed
++dnl # end_writeback() to clear_inode().
++dnl #
++AC_DEFUN([ZFS_AC_KERNEL_CLEAR_INODE], [
++ ZFS_CHECK_SYMBOL_EXPORT(
++ [clear_inode],
++ [fs/inode.c],
++ [AC_DEFINE(HAVE_CLEAR_INODE, 1,
++ [clear_inode() is available])],
++ [])
++])
+diff --git a/config/kernel-encode_fh-inode.m4 b/config/kernel-encode_fh-inode.m4
+new file mode 100644
+index 0000000..e4d448d
+--- /dev/null
++++ b/config/kernel-encode_fh-inode.m4
+@@ -0,0 +1,23 @@
++dnl #
++dnl # 3.5.0 API change #
++dnl # torvalds/linux@b0b0382bb4904965a9e9fca77ad87514dfda0d1c changed the header
++dnl # to use struct inode * instead of struct dentry *
++dnl #
++AC_DEFUN([ZFS_AC_KERNEL_EXPORT_ENCODE_FH_WITH_INODE_PARAMETER], [
++ AC_MSG_CHECKING([export_operations->encodefh()])
++ ZFS_LINUX_TRY_COMPILE([
++ #include
++ ],[
++ int (*encode_fh)(struct inode *, __u32 *fh, int *, struct inode *) = NULL;
++ struct export_operations export_ops = {
++ .encode_fh = encode_fh,
++ };
++ export_ops.encode_fh(0, 0, 0, 0);
++ ],[
++ AC_MSG_RESULT(uses struct inode * as first parameter)
++ AC_DEFINE(HAVE_EXPORT_ENCODE_FH_WITH_INODE_PARAMETER, 1,
++ [fhfn() uses struct inode *])
++ ],[
++ AC_MSG_RESULT(does not use struct inode * as first parameter)
++ ])
++])
+diff --git a/config/kernel-truncate-range.m4 b/config/kernel-truncate-range.m4
+new file mode 100644
+index 0000000..1f23d6a
+--- /dev/null
++++ b/config/kernel-truncate-range.m4
+@@ -0,0 +1,26 @@
++dnl #
++dnl # 3.5.0 API change #
++dnl # torvalds/linux@17cf28afea2a1112f240a3a2da8af883be024811 removed
++dnl # truncate_range(). The file hole punching functionality is provided by
++dnl # fallocate()
++dnl #
++AC_DEFUN([ZFS_AC_KERNEL_INODE_TRUNCATE_RANGE], [
++ AC_MSG_CHECKING([inode_operations->truncate_range() exists])
++ ZFS_LINUX_TRY_COMPILE([
++ #include
++ ],[
++ void (*tr)(struct inode *, loff_t, loff_t) = NULL;
++ struct inode_operations inode_ops = {
++ .truncate_range = tr,
++ };
++ inode_ops.truncate_range(0, 0, 0);
++
++
++ ],[
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(HAVE_INODE_TRUNCATE_RANGE, 1,
++ [inode_operations->truncate_range() exists])
++ ],[
++ AC_MSG_RESULT(no)
++ ])
++])
+diff --git a/config/kernel.m4 b/config/kernel.m4
+index 7f07c90..752a7df 100644
+--- a/config/kernel.m4
++++ b/config/kernel.m4
+@@ -59,6 +59,9 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
+ ZFS_AC_KERNEL_BDI
+ ZFS_AC_KERNEL_BDI_SETUP_AND_REGISTER
+ ZFS_AC_KERNEL_SET_NLINK
++ ZFS_AC_KERNEL_EXPORT_ENCODE_FH_WITH_INODE_PARAMETER
++ ZFS_AC_KERNEL_INODE_TRUNCATE_RANGE
++ ZFS_AC_KERNEL_CLEAR_INODE
+
+ AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
+ KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
+diff --git a/module/zfs/zpl_export.c b/module/zfs/zpl_export.c
+index f82ee30..ab6e6d2 100644
+--- a/module/zfs/zpl_export.c
++++ b/module/zfs/zpl_export.c
+@@ -30,10 +30,15 @@
+
+
+ static int
++#ifdef HAVE_EXPORT_ENCODE_FH_WITH_INODE_PARAMETER
++zpl_encode_fh(struct inode *ip, __u32 *fh, int *max_len, struct inode *parent)
++{
++#else
+ zpl_encode_fh(struct dentry *dentry, __u32 *fh, int *max_len, int connectable)
+ {
+- fid_t *fid = (fid_t *)fh;
+ struct inode *ip = dentry->d_inode;
++#endif
++ fid_t *fid = (fid_t *)fh;
+ int len_bytes, rc;
+
+ len_bytes = *max_len * sizeof (__u32);
+diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c
+index 1f6169b..51202e7 100644
+--- a/module/zfs/zpl_inode.c
++++ b/module/zfs/zpl_inode.c
+@@ -329,6 +329,7 @@ out:
+ return (error);
+ }
+
++#ifdef HAVE_INODE_TRUNCATE_RANGE
+ static void
+ zpl_truncate_range(struct inode* ip, loff_t start, loff_t end)
+ {
+@@ -355,6 +356,7 @@ zpl_truncate_range(struct inode* ip, loff_t start, loff_t end)
+
+ crfree(cr);
+ }
++#endif
+
+ #ifdef HAVE_INODE_FALLOCATE
+ static long
+@@ -380,7 +382,9 @@ const struct inode_operations zpl_inode_operations = {
+ .getxattr = generic_getxattr,
+ .removexattr = generic_removexattr,
+ .listxattr = zpl_xattr_list,
++#ifdef HAVE_INODE_TRUNCATE_RANGE
+ .truncate_range = zpl_truncate_range,
++#endif /* HAVE_INODE_TRUNCATE_RANGE */
+ #ifdef HAVE_INODE_FALLOCATE
+ .fallocate = zpl_fallocate,
+ #endif /* HAVE_INODE_FALLOCATE */
+diff --git a/module/zfs/zpl_super.c b/module/zfs/zpl_super.c
+index 98d0a03..c2aac35 100644
+--- a/module/zfs/zpl_super.c
++++ b/module/zfs/zpl_super.c
+@@ -75,7 +75,12 @@ static void
+ zpl_evict_inode(struct inode *ip)
+ {
+ truncate_setsize(ip, 0);
++#ifdef HAVE_CLEAR_INODE
++ clear_inode(ip);
++#else
+ end_writeback(ip);
++
++#endif
+ zfs_inactive(ip);
+ }
+
diff --git a/sys-fs/zfs/files/zfs-0.6.0_rc9-range-lock-caller-allocate.patch b/sys-fs/zfs/files/zfs-0.6.0_rc9-range-lock-caller-allocate.patch
deleted file mode 100644
index 465e72740f67..000000000000
--- a/sys-fs/zfs/files/zfs-0.6.0_rc9-range-lock-caller-allocate.patch
+++ /dev/null
@@ -1,589 +0,0 @@
-commit e7deab3edf6940f13013ca147c91472577223923
-Author: Richard Yao
-Date: Mon Jun 25 14:41:30 2012 -0400
-
- Make callers responsible for memory allocation in zfs_range_lock()
-
- zfs_range_lock() is used in zvols, and previously, it could deadlock due
- to an allocation using KM_SLEEP. We avoid this by moving responsibility
- the memory allocation from zfs_range_lock() to the caller. This enables
- us to avoid such deadlocks and use stack allocations, which are more
- efficient and prevents deadlocks. The contexts in which stack
- allocations are done do not appear to be stack heavy, so we do not risk
- overflowing the stack from doing this.
-
- Signed-off-by: Richard Yao
-
- Conflicts:
-
- module/zfs/zvol.c
-
-diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
-index 72d511b..c5dd0c2 100644
---- a/cmd/ztest/ztest.c
-+++ b/cmd/ztest/ztest.c
-@@ -973,12 +973,11 @@ ztest_object_unlock(ztest_ds_t *zd, uint64_t object)
- }
-
- static rl_t *
--ztest_range_lock(ztest_ds_t *zd, uint64_t object, uint64_t offset,
-+ztest_range_lock(rl_t *rl, ztest_ds_t *zd, uint64_t object, uint64_t offset,
- uint64_t size, rl_type_t type)
- {
- uint64_t hash = object ^ (offset % (ZTEST_RANGE_LOCKS + 1));
- rll_t *rll = &zd->zd_range_lock[hash & (ZTEST_RANGE_LOCKS - 1)];
-- rl_t *rl;
-
- rl = umem_alloc(sizeof (*rl), UMEM_NOFAIL);
- rl->rl_object = object;
-@@ -1389,7 +1388,7 @@ ztest_replay_write(ztest_ds_t *zd, lr_write_t *lr, boolean_t byteswap)
- dmu_tx_t *tx;
- dmu_buf_t *db;
- arc_buf_t *abuf = NULL;
-- rl_t *rl;
-+ rl_t rl;
-
- if (byteswap)
- byteswap_uint64_array(lr, sizeof (*lr));
-@@ -1413,7 +1412,7 @@ ztest_replay_write(ztest_ds_t *zd, lr_write_t *lr, boolean_t byteswap)
- bt = NULL;
-
- ztest_object_lock(zd, lr->lr_foid, RL_READER);
-- rl = ztest_range_lock(zd, lr->lr_foid, offset, length, RL_WRITER);
-+ ztest_range_lock(&rl, zd, lr->lr_foid, offset, length, RL_WRITER);
-
- VERIFY3U(0, ==, dmu_bonus_hold(os, lr->lr_foid, FTAG, &db));
-
-@@ -1438,7 +1437,7 @@ ztest_replay_write(ztest_ds_t *zd, lr_write_t *lr, boolean_t byteswap)
- if (abuf != NULL)
- dmu_return_arcbuf(abuf);
- dmu_buf_rele(db, FTAG);
-- ztest_range_unlock(rl);
-+ ztest_range_unlock(&rl);
- ztest_object_unlock(zd, lr->lr_foid);
- return (ENOSPC);
- }
-@@ -1495,7 +1494,7 @@ ztest_replay_write(ztest_ds_t *zd, lr_write_t *lr, boolean_t byteswap)
-
- dmu_tx_commit(tx);
-
-- ztest_range_unlock(rl);
-+ ztest_range_unlock(&rl);
- ztest_object_unlock(zd, lr->lr_foid);
-
- return (0);
-@@ -1507,13 +1506,13 @@ ztest_replay_truncate(ztest_ds_t *zd, lr_truncate_t *lr, boolean_t byteswap)
- objset_t *os = zd->zd_os;
- dmu_tx_t *tx;
- uint64_t txg;
-- rl_t *rl;
-+ rl_t rl;
-
- if (byteswap)
- byteswap_uint64_array(lr, sizeof (*lr));
-
- ztest_object_lock(zd, lr->lr_foid, RL_READER);
-- rl = ztest_range_lock(zd, lr->lr_foid, lr->lr_offset, lr->lr_length,
-+ ztest_range_lock(&rl, zd, lr->lr_foid, lr->lr_offset, lr->lr_length,
- RL_WRITER);
-
- tx = dmu_tx_create(os);
-@@ -1522,7 +1521,7 @@ ztest_replay_truncate(ztest_ds_t *zd, lr_truncate_t *lr, boolean_t byteswap)
-
- txg = ztest_tx_assign(tx, TXG_WAIT, FTAG);
- if (txg == 0) {
-- ztest_range_unlock(rl);
-+ ztest_range_unlock(&rl);
- ztest_object_unlock(zd, lr->lr_foid);
- return (ENOSPC);
- }
-@@ -1534,7 +1533,7 @@ ztest_replay_truncate(ztest_ds_t *zd, lr_truncate_t *lr, boolean_t byteswap)
-
- dmu_tx_commit(tx);
-
-- ztest_range_unlock(rl);
-+ ztest_range_unlock(&rl);
- ztest_object_unlock(zd, lr->lr_foid);
-
- return (0);
-@@ -1670,6 +1669,8 @@ ztest_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio)
- dmu_object_info_t doi;
- dmu_buf_t *db;
- zgd_t *zgd;
-+ rl_t rl;
-+
- int error;
-
- ztest_object_lock(zd, object, RL_READER);
-@@ -1694,9 +1695,10 @@ ztest_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio)
- zgd = umem_zalloc(sizeof (*zgd), UMEM_NOFAIL);
- zgd->zgd_zilog = zd->zd_zilog;
- zgd->zgd_private = zd;
-+ zgd->zgd_rl = &rl;
-
- if (buf != NULL) { /* immediate write */
-- zgd->zgd_rl = ztest_range_lock(zd, object, offset, size,
-+ ztest_range_lock(zgd->zgd_rl, zd, object, offset, size,
- RL_READER);
-
- error = dmu_read(os, object, offset, size, buf,
-@@ -1711,7 +1713,7 @@ ztest_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio)
- offset = 0;
- }
-
-- zgd->zgd_rl = ztest_range_lock(zd, object, offset, size,
-+ ztest_range_lock(zgd->zgd_rl, zd, object, offset, size,
- RL_READER);
-
- error = dmu_buf_hold(os, object, offset, zgd, &db,
-@@ -1953,12 +1955,12 @@ ztest_prealloc(ztest_ds_t *zd, uint64_t object, uint64_t offset, uint64_t size)
- objset_t *os = zd->zd_os;
- dmu_tx_t *tx;
- uint64_t txg;
-- rl_t *rl;
-+ rl_t rl;
-
- txg_wait_synced(dmu_objset_pool(os), 0);
-
- ztest_object_lock(zd, object, RL_READER);
-- rl = ztest_range_lock(zd, object, offset, size, RL_WRITER);
-+ ztest_range_lock(&rl, zd, object, offset, size, RL_WRITER);
-
- tx = dmu_tx_create(os);
-
-@@ -1974,7 +1976,7 @@ ztest_prealloc(ztest_ds_t *zd, uint64_t object, uint64_t offset, uint64_t size)
- (void) dmu_free_long_range(os, object, offset, size);
- }
-
-- ztest_range_unlock(rl);
-+ ztest_range_unlock(&rl);
- ztest_object_unlock(zd, object);
- }
-
-diff --git a/include/sys/zfs_rlock.h b/include/sys/zfs_rlock.h
-index da18b1f..85dc16a 100644
---- a/include/sys/zfs_rlock.h
-+++ b/include/sys/zfs_rlock.h
-@@ -63,7 +63,7 @@ typedef struct rl {
- * is converted to WRITER that specified to lock from the start of the
- * end of file. zfs_range_lock() returns the range lock structure.
- */
--rl_t *zfs_range_lock(znode_t *zp, uint64_t off, uint64_t len, rl_type_t type);
-+rl_t *zfs_range_lock(rl_t *rl, znode_t *zp, uint64_t off, uint64_t len, rl_type_t type);
-
- /*
- * Unlock range and destroy range lock structure.
-diff --git a/module/zfs/zfs_rlock.c b/module/zfs/zfs_rlock.c
-index f3ada17..eb81777 100644
---- a/module/zfs/zfs_rlock.c
-+++ b/module/zfs/zfs_rlock.c
-@@ -31,9 +31,9 @@
- * Interface
- * ---------
- * Defined in zfs_rlock.h but essentially:
-- * rl = zfs_range_lock(zp, off, len, lock_type);
-- * zfs_range_unlock(rl);
-- * zfs_range_reduce(rl, off, len);
-+ * zfs_range_lock(&rl, zp, off, len, lock_type);
-+ * zfs_range_unlock(&rl);
-+ * zfs_range_reduce(&rl, off, len);
- *
- * AVL tree
- * --------
-@@ -420,13 +420,11 @@ got_lock:
- * previously locked as RL_WRITER).
- */
- rl_t *
--zfs_range_lock(znode_t *zp, uint64_t off, uint64_t len, rl_type_t type)
-+zfs_range_lock(rl_t *new, znode_t *zp, uint64_t off, uint64_t len, rl_type_t type)
- {
-- rl_t *new;
-
- ASSERT(type == RL_READER || type == RL_WRITER || type == RL_APPEND);
-
-- new = kmem_alloc(sizeof (rl_t), KM_SLEEP);
- new->r_zp = zp;
- new->r_off = off;
- if (len + off < off) /* overflow */
-@@ -531,7 +529,6 @@ zfs_range_unlock_reader(znode_t *zp, rl_t *remove, list_t *free_list)
- }
-
- mutex_exit(&zp->z_range_lock);
-- kmem_free(remove, sizeof (rl_t));
- }
- }
-
-@@ -572,7 +569,9 @@ zfs_range_unlock(rl_t *rl)
-
- while ((free_rl = list_head(&free_list)) != NULL) {
- list_remove(&free_list, free_rl);
-- zfs_range_free(free_rl);
-+ /* Freeing rl is the caller's responsibility */
-+ if (free_rl != rl)
-+ zfs_range_free(free_rl);
- }
-
- list_destroy(&free_list);
-diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
-index 2da5fec..1ef5299 100644
---- a/module/zfs/zfs_vnops.c
-+++ b/module/zfs/zfs_vnops.c
-@@ -370,7 +370,7 @@ zfs_read(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr)
- objset_t *os;
- ssize_t n, nbytes;
- int error = 0;
-- rl_t *rl;
-+ rl_t rl;
- #ifdef HAVE_UIO_ZEROCOPY
- xuio_t *xuio = NULL;
- #endif /* HAVE_UIO_ZEROCOPY */
-@@ -418,7 +418,7 @@ zfs_read(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr)
- /*
- * Lock the range against changes.
- */
-- rl = zfs_range_lock(zp, uio->uio_loffset, uio->uio_resid, RL_READER);
-+ zfs_range_lock(&rl, zp, uio->uio_loffset, uio->uio_resid, RL_READER);
-
- /*
- * If we are reading past end-of-file we can skip
-@@ -482,7 +482,7 @@ zfs_read(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr)
- n -= nbytes;
- }
- out:
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
-
- ZFS_ACCESSTIME_STAMP(zsb, zp);
- zfs_inode_update(zp);
-@@ -524,7 +524,7 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr)
- zilog_t *zilog;
- offset_t woff;
- ssize_t n, nbytes;
-- rl_t *rl;
-+ rl_t rl;
- int max_blksz = zsb->z_max_blksz;
- int error = 0;
- arc_buf_t *abuf;
-@@ -608,9 +608,9 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr)
- * Obtain an appending range lock to guarantee file append
- * semantics. We reset the write offset once we have the lock.
- */
-- rl = zfs_range_lock(zp, 0, n, RL_APPEND);
-- woff = rl->r_off;
-- if (rl->r_len == UINT64_MAX) {
-+ zfs_range_lock(&rl, zp, 0, n, RL_APPEND);
-+ woff = rl.r_off;
-+ if (rl.r_len == UINT64_MAX) {
- /*
- * We overlocked the file because this write will cause
- * the file block size to increase.
-@@ -625,11 +625,11 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr)
- * this write, then this range lock will lock the entire file
- * so that we can re-write the block safely.
- */
-- rl = zfs_range_lock(zp, woff, n, RL_WRITER);
-+ zfs_range_lock(&rl, zp, woff, n, RL_WRITER);
- }
-
- if (woff >= limit) {
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
- ZFS_EXIT(zsb);
- return (EFBIG);
- }
-@@ -719,7 +719,7 @@ again:
- * on the first iteration since zfs_range_reduce() will
- * shrink down r_len to the appropriate size.
- */
-- if (rl->r_len == UINT64_MAX) {
-+ if (rl.r_len == UINT64_MAX) {
- uint64_t new_blksz;
-
- if (zp->z_blksz > max_blksz) {
-@@ -729,7 +729,7 @@ again:
- new_blksz = MIN(end_size, max_blksz);
- }
- zfs_grow_blocksize(zp, new_blksz, tx);
-- zfs_range_reduce(rl, woff, n);
-+ zfs_range_reduce(&rl, woff, n);
- }
-
- /*
-@@ -842,7 +842,7 @@ again:
- uio_prefaultpages(MIN(n, max_blksz), uio);
- }
-
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
-
- /*
- * If we're in replay mode, or we made no progress, return error.
-@@ -893,6 +893,7 @@ zfs_get_done(zgd_t *zgd, int error)
- if (error == 0 && zgd->zgd_bp)
- zil_add_block(zgd->zgd_zilog, zgd->zgd_bp);
-
-+ kmem_free(zgd->zgd_rl, sizeof (rl_t));
- kmem_free(zgd, sizeof (zgd_t));
- }
-
-@@ -935,6 +936,7 @@ zfs_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio)
- }
-
- zgd = (zgd_t *)kmem_zalloc(sizeof (zgd_t), KM_SLEEP);
-+ zgd->zgd_rl = (rl_t *)kmem_zalloc(sizeof (rl_t), KM_SLEEP);
- zgd->zgd_zilog = zsb->z_log;
- zgd->zgd_private = zp;
-
-@@ -946,7 +948,7 @@ zfs_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio)
- * we don't have to write the data twice.
- */
- if (buf != NULL) { /* immediate write */
-- zgd->zgd_rl = zfs_range_lock(zp, offset, size, RL_READER);
-+ zfs_range_lock(zgd->zgd_rl, zp, offset, size, RL_READER);
- /* test for truncation needs to be done while range locked */
- if (offset >= zp->z_size) {
- error = ENOENT;
-@@ -967,7 +969,7 @@ zfs_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio)
- size = zp->z_blksz;
- blkoff = ISP2(size) ? P2PHASE(offset, size) : offset;
- offset -= blkoff;
-- zgd->zgd_rl = zfs_range_lock(zp, offset, size,
-+ zfs_range_lock(zgd->zgd_rl, zp, offset, size,
- RL_READER);
- if (zp->z_blksz == size)
- break;
-diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c
-index 3a6872f..e363839 100644
---- a/module/zfs/zfs_znode.c
-+++ b/module/zfs/zfs_znode.c
-@@ -1158,20 +1158,20 @@ zfs_extend(znode_t *zp, uint64_t end)
- {
- zfs_sb_t *zsb = ZTOZSB(zp);
- dmu_tx_t *tx;
-- rl_t *rl;
-+ rl_t rl;
- uint64_t newblksz;
- int error;
-
- /*
- * We will change zp_size, lock the whole file.
- */
-- rl = zfs_range_lock(zp, 0, UINT64_MAX, RL_WRITER);
-+ zfs_range_lock(&rl, zp, 0, UINT64_MAX, RL_WRITER);
-
- /*
- * Nothing to do if file already at desired length.
- */
- if (end <= zp->z_size) {
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
- return (0);
- }
- top:
-@@ -1202,7 +1202,7 @@ top:
- goto top;
- }
- dmu_tx_abort(tx);
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
- return (error);
- }
-
-@@ -1214,7 +1214,7 @@ top:
- VERIFY(0 == sa_update(zp->z_sa_hdl, SA_ZPL_SIZE(ZTOZSB(zp)),
- &zp->z_size, sizeof (zp->z_size), tx));
-
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
-
- dmu_tx_commit(tx);
-
-@@ -1235,19 +1235,19 @@ static int
- zfs_free_range(znode_t *zp, uint64_t off, uint64_t len)
- {
- zfs_sb_t *zsb = ZTOZSB(zp);
-- rl_t *rl;
-+ rl_t rl;
- int error;
-
- /*
- * Lock the range being freed.
- */
-- rl = zfs_range_lock(zp, off, len, RL_WRITER);
-+ zfs_range_lock(&rl, zp, off, len, RL_WRITER);
-
- /*
- * Nothing to do if file already at desired length.
- */
- if (off >= zp->z_size) {
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
- return (0);
- }
-
-@@ -1256,7 +1256,7 @@ zfs_free_range(znode_t *zp, uint64_t off, uint64_t len)
-
- error = dmu_free_long_range(zsb->z_os, zp->z_id, off, len);
-
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
-
- return (error);
- }
-@@ -1275,7 +1275,7 @@ zfs_trunc(znode_t *zp, uint64_t end)
- {
- zfs_sb_t *zsb = ZTOZSB(zp);
- dmu_tx_t *tx;
-- rl_t *rl;
-+ rl_t rl;
- int error;
- sa_bulk_attr_t bulk[2];
- int count = 0;
-@@ -1283,19 +1283,19 @@ zfs_trunc(znode_t *zp, uint64_t end)
- /*
- * We will change zp_size, lock the whole file.
- */
-- rl = zfs_range_lock(zp, 0, UINT64_MAX, RL_WRITER);
-+ zfs_range_lock(&rl, zp, 0, UINT64_MAX, RL_WRITER);
-
- /*
- * Nothing to do if file already at desired length.
- */
- if (end >= zp->z_size) {
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
- return (0);
- }
-
- error = dmu_free_long_range(zsb->z_os, zp->z_id, end, -1);
- if (error) {
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
- return (error);
- }
- top:
-@@ -1310,7 +1310,7 @@ top:
- goto top;
- }
- dmu_tx_abort(tx);
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
- return (error);
- }
-
-@@ -1327,7 +1327,7 @@ top:
-
- dmu_tx_commit(tx);
-
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
-
- return (0);
- }
-diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
-index 125d58d..bbe53d9 100644
---- a/module/zfs/zvol.c
-+++ b/module/zfs/zvol.c
-@@ -537,7 +537,7 @@ zvol_write(void *arg)
- uint64_t size = blk_rq_bytes(req);
- int error = 0;
- dmu_tx_t *tx;
-- rl_t *rl;
-+ rl_t rl;
-
- if (req->cmd_flags & VDEV_REQ_FLUSH)
- zil_commit(zv->zv_zilog, ZVOL_OBJ);
-@@ -550,7 +550,7 @@ zvol_write(void *arg)
- return;
- }
-
-- rl = zfs_range_lock(&zv->zv_znode, offset, size, RL_WRITER);
-+ zfs_range_lock(&rl, &zv->zv_znode, offset, size, RL_WRITER);
-
- tx = dmu_tx_create(zv->zv_objset);
- dmu_tx_hold_write(tx, ZVOL_OBJ, offset, size);
-@@ -559,7 +559,7 @@ zvol_write(void *arg)
- error = dmu_tx_assign(tx, TXG_WAIT);
- if (error) {
- dmu_tx_abort(tx);
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
- blk_end_request(req, -error, size);
- return;
- }
-@@ -570,7 +570,7 @@ zvol_write(void *arg)
- req->cmd_flags & VDEV_REQ_FUA);
-
- dmu_tx_commit(tx);
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
-
- if ((req->cmd_flags & VDEV_REQ_FUA) ||
- zv->zv_objset->os_sync == ZFS_SYNC_ALWAYS)
-@@ -589,7 +589,7 @@ zvol_discard(void *arg)
- uint64_t offset = blk_rq_pos(req) << 9;
- uint64_t size = blk_rq_bytes(req);
- int error;
-- rl_t *rl;
-+ rl_t rl;
-
- if (offset + size > zv->zv_volsize) {
- blk_end_request(req, -EIO, size);
-@@ -601,7 +601,7 @@ zvol_discard(void *arg)
- return;
- }
-
-- rl = zfs_range_lock(&zv->zv_znode, offset, size, RL_WRITER);
-+ zfs_range_lock(&rl, &zv->zv_znode, offset, size, RL_WRITER);
-
- error = dmu_free_long_range(zv->zv_objset, ZVOL_OBJ, offset, size);
-
-@@ -609,7 +609,7 @@ zvol_discard(void *arg)
- * TODO: maybe we should add the operation to the log.
- */
-
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
-
- blk_end_request(req, -error, size);
- }
-@@ -630,18 +630,18 @@ zvol_read(void *arg)
- uint64_t offset = blk_rq_pos(req) << 9;
- uint64_t size = blk_rq_bytes(req);
- int error;
-- rl_t *rl;
-+ rl_t rl;
-
- if (size == 0) {
- blk_end_request(req, 0, size);
- return;
- }
-
-- rl = zfs_range_lock(&zv->zv_znode, offset, size, RL_READER);
-+ zfs_range_lock(&rl, &zv->zv_znode, offset, size, RL_READER);
-
- error = dmu_read_req(zv->zv_objset, ZVOL_OBJ, req);
-
-- zfs_range_unlock(rl);
-+ zfs_range_unlock(&rl);
-
- /* convert checksum errors into IO errors */
- if (error == ECKSUM)
-@@ -744,6 +744,7 @@ zvol_get_done(zgd_t *zgd, int error)
- if (error == 0 && zgd->zgd_bp)
- zil_add_block(zgd->zgd_zilog, zgd->zgd_bp);
-
-+ kmem_free(zgd->zgd_rl, sizeof (rl_t));
- kmem_free(zgd, sizeof (zgd_t));
- }
-
-@@ -766,7 +767,8 @@ zvol_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio)
-
- zgd = (zgd_t *)kmem_zalloc(sizeof (zgd_t), KM_SLEEP);
- zgd->zgd_zilog = zv->zv_zilog;
-- zgd->zgd_rl = zfs_range_lock(&zv->zv_znode, offset, size, RL_READER);
-+ zgd->zgd_rl = kmem_alloc(sizeof (rl_t), KM_SLEEP);
-+ zfs_range_lock(zgd->zgd_rl, &zv->zv_znode, offset, size, RL_READER);
-
- /*
- * Write records come in two flavors: immediate and indirect.
diff --git a/sys-fs/zfs/files/zfs-0.6.0_rc9-use-pushpage.patch b/sys-fs/zfs/files/zfs-0.6.0_rc9-use-pushpage.patch
deleted file mode 100644
index 129894bb10f0..000000000000
--- a/sys-fs/zfs/files/zfs-0.6.0_rc9-use-pushpage.patch
+++ /dev/null
@@ -1,1100 +0,0 @@
-ab8aba2 Switch KM_SLEEP to KM_PUSHPAGE
-diff --git a/module/zfs/bplist.c b/module/zfs/bplist.c
-index 5d1cf7e..d196351 100644
---- a/module/zfs/bplist.c
-+++ b/module/zfs/bplist.c
-@@ -44,7 +44,7 @@
- void
- bplist_append(bplist_t *bpl, const blkptr_t *bp)
- {
-- bplist_entry_t *bpe = kmem_alloc(sizeof (*bpe), KM_SLEEP);
-+ bplist_entry_t *bpe = kmem_alloc(sizeof (*bpe), KM_PUSHPAGE);
-
- mutex_enter(&bpl->bpl_lock);
- bpe->bpe_blk = *bp;
-diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c
-index 34ce2f6..d5b469f 100644
---- a/module/zfs/dbuf.c
-+++ b/module/zfs/dbuf.c
-@@ -298,7 +298,7 @@ static void __dbuf_hold_impl_init(struct dbuf_hold_impl_data *dh,
- #if defined(_KERNEL) && defined(HAVE_SPL)
- /* Large allocations which do not require contiguous pages
- * should be using vmem_alloc() in the linux kernel */
-- h->hash_table = vmem_zalloc(hsize * sizeof (void *), KM_SLEEP);
-+ h->hash_table = vmem_zalloc(hsize * sizeof (void *), KM_PUSHPAGE);
- #else
- h->hash_table = kmem_zalloc(hsize * sizeof (void *), KM_NOSLEEP);
- #endif
-@@ -1719,7 +1719,7 @@ static void __dbuf_hold_impl_init(struct dbuf_hold_impl_data *dh,
- ASSERT(RW_LOCK_HELD(&dn->dn_struct_rwlock));
- ASSERT(dn->dn_type != DMU_OT_NONE);
-
-- db = kmem_cache_alloc(dbuf_cache, KM_SLEEP);
-+ db = kmem_cache_alloc(dbuf_cache, KM_PUSHPAGE);
-
- db->db_objset = os;
- db->db.db_object = dn->dn_object;
-@@ -2019,7 +2019,7 @@ static void __dbuf_hold_impl_init(struct dbuf_hold_impl_data *dh,
- int error;
-
- dh = kmem_zalloc(sizeof(struct dbuf_hold_impl_data) *
-- DBUF_HOLD_IMPL_MAX_DEPTH, KM_SLEEP);
-+ DBUF_HOLD_IMPL_MAX_DEPTH, KM_PUSHPAGE);
- __dbuf_hold_impl_init(dh, dn, level, blkid, fail_sparse, tag, dbp, 0);
-
- error = __dbuf_hold_impl(dh);
-diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
-index cda4f84..1d4d125 100644
---- a/module/zfs/dmu.c
-+++ b/module/zfs/dmu.c
-@@ -381,7 +381,7 @@
- }
- nblks = 1;
- }
-- dbp = kmem_zalloc(sizeof (dmu_buf_t *) * nblks, KM_SLEEP | KM_NODEBUG);
-+ dbp = kmem_zalloc(sizeof (dmu_buf_t *) * nblks, KM_PUSHPAGE | KM_NODEBUG);
-
- if (dn->dn_objset->os_dsl_dataset)
- dp = dn->dn_objset->os_dsl_dataset->ds_dir->dd_pool;
-@@ -863,11 +863,11 @@
- uio_t *uio = &xuio->xu_uio;
-
- uio->uio_iovcnt = nblk;
-- uio->uio_iov = kmem_zalloc(nblk * sizeof (iovec_t), KM_SLEEP);
-+ uio->uio_iov = kmem_zalloc(nblk * sizeof (iovec_t), KM_PUSHPAGE);
-
-- priv = kmem_zalloc(sizeof (dmu_xuio_t), KM_SLEEP);
-+ priv = kmem_zalloc(sizeof (dmu_xuio_t), KM_PUSHPAGE);
- priv->cnt = nblk;
-- priv->bufs = kmem_zalloc(nblk * sizeof (arc_buf_t *), KM_SLEEP);
-+ priv->bufs = kmem_zalloc(nblk * sizeof (arc_buf_t *), KM_PUSHPAGE);
- priv->iovp = uio->uio_iov;
- XUIO_XUZC_PRIV(xuio) = priv;
-
-@@ -1431,7 +1431,7 @@
- return (EIO); /* Make zl_get_data do txg_waited_synced() */
- }
-
-- dsa = kmem_alloc(sizeof (dmu_sync_arg_t), KM_SLEEP);
-+ dsa = kmem_alloc(sizeof (dmu_sync_arg_t), KM_PUSHPAGE);
- dsa->dsa_dr = NULL;
- dsa->dsa_done = done;
- dsa->dsa_zgd = zgd;
-@@ -1555,7 +1555,7 @@
- dr->dt.dl.dr_override_state = DR_IN_DMU_SYNC;
- mutex_exit(&db->db_mtx);
-
-- dsa = kmem_alloc(sizeof (dmu_sync_arg_t), KM_SLEEP);
-+ dsa = kmem_alloc(sizeof (dmu_sync_arg_t), KM_PUSHPAGE);
- dsa->dsa_dr = dr;
- dsa->dsa_done = done;
- dsa->dsa_zgd = zgd;
-diff --git a/module/zfs/dmu_tx.c b/module/zfs/dmu_tx.c
-index ead0f3e..81c6dfe 100644
---- a/module/zfs/dmu_tx.c
-+++ b/module/zfs/dmu_tx.c
-@@ -63,7 +63,7 @@ typedef void (*dmu_tx_hold_func_t)(dmu_tx_t *tx, struct dnode *dn,
- dmu_tx_t *
- dmu_tx_create_dd(dsl_dir_t *dd)
- {
-- dmu_tx_t *tx = kmem_zalloc(sizeof (dmu_tx_t), KM_SLEEP);
-+ dmu_tx_t *tx = kmem_zalloc(sizeof (dmu_tx_t), KM_PUSHPAGE);
- tx->tx_dir = dd;
- if (dd)
- tx->tx_pool = dd->dd_pool;
-@@ -141,7 +141,7 @@ typedef void (*dmu_tx_hold_func_t)(dmu_tx_t *tx, struct dnode *dn,
- }
- }
-
-- txh = kmem_zalloc(sizeof (dmu_tx_hold_t), KM_SLEEP);
-+ txh = kmem_zalloc(sizeof (dmu_tx_hold_t), KM_PUSHPAGE);
- txh->txh_tx = tx;
- txh->txh_dnode = dn;
- #ifdef DEBUG_DMU_TX
-@@ -1241,7 +1241,7 @@ typedef void (*dmu_tx_hold_func_t)(dmu_tx_t *tx, struct dnode *dn,
- {
- dmu_tx_callback_t *dcb;
-
-- dcb = kmem_alloc(sizeof (dmu_tx_callback_t), KM_SLEEP);
-+ dcb = kmem_alloc(sizeof (dmu_tx_callback_t), KM_PUSHPAGE);
-
- dcb->dcb_func = func;
- dcb->dcb_data = data;
-diff --git a/module/zfs/dmu_zfetch.c b/module/zfs/dmu_zfetch.c
-index 897ea8a..1763bae 100644
---- a/module/zfs/dmu_zfetch.c
-+++ b/module/zfs/dmu_zfetch.c
-@@ -699,7 +699,7 @@
- if (cur_streams >= max_streams) {
- return;
- }
-- newstream = kmem_zalloc(sizeof (zstream_t), KM_SLEEP);
-+ newstream = kmem_zalloc(sizeof (zstream_t), KM_PUSHPAGE);
- }
-
- newstream->zst_offset = zst.zst_offset;
-diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c
-index 5438f60..99ac625 100644
---- a/module/zfs/dnode.c
-+++ b/module/zfs/dnode.c
-@@ -372,7 +372,7 @@
- dnode_create(objset_t *os, dnode_phys_t *dnp, dmu_buf_impl_t *db,
- uint64_t object, dnode_handle_t *dnh)
- {
-- dnode_t *dn = kmem_cache_alloc(dnode_cache, KM_SLEEP);
-+ dnode_t *dn = kmem_cache_alloc(dnode_cache, KM_PUSHPAGE);
-
- ASSERT(!POINTER_IS_VALID(dn->dn_objset));
- dn->dn_moved = 0;
-@@ -1491,7 +1491,7 @@
- } else if (blkid > rp->fr_blkid && endblk < fr_endblk) {
- /* clear a chunk out of this range */
- free_range_t *new_rp =
-- kmem_alloc(sizeof (free_range_t), KM_SLEEP);
-+ kmem_alloc(sizeof (free_range_t), KM_PUSHPAGE);
-
- new_rp->fr_blkid = endblk;
- new_rp->fr_nblks = fr_endblk - endblk;
-@@ -1669,7 +1669,7 @@
- avl_tree_t *tree = &dn->dn_ranges[tx->tx_txg&TXG_MASK];
-
- /* Add new range to dn_ranges */
-- rp = kmem_alloc(sizeof (free_range_t), KM_SLEEP);
-+ rp = kmem_alloc(sizeof (free_range_t), KM_PUSHPAGE);
- rp->fr_blkid = blkid;
- rp->fr_nblks = nblks;
- found = avl_find(tree, rp, &where);
-diff --git a/module/zfs/lzjb.c b/module/zfs/lzjb.c
-index 4da30cf..43d0df0 100644
---- a/module/zfs/lzjb.c
-+++ b/module/zfs/lzjb.c
-@@ -56,7 +56,7 @@
- uint16_t *hp;
- uint16_t *lempel;
-
-- lempel = kmem_zalloc(LEMPEL_SIZE * sizeof (uint16_t), KM_SLEEP);
-+ lempel = kmem_zalloc(LEMPEL_SIZE * sizeof (uint16_t), KM_PUSHPAGE);
- while (src < (uchar_t *)s_start + s_len) {
- if ((copymask <<= 1) == (1 << NBBY)) {
- if (dst >= (uchar_t *)d_start + d_len - 1 - 2 * NBBY) {
-diff --git a/module/zfs/metaslab.c b/module/zfs/metaslab.c
-index c33c5e8..d06012f 100644
---- a/module/zfs/metaslab.c
-+++ b/module/zfs/metaslab.c
-@@ -102,7 +102,7 @@
- {
- metaslab_class_t *mc;
-
-- mc = kmem_zalloc(sizeof (metaslab_class_t), KM_SLEEP);
-+ mc = kmem_zalloc(sizeof (metaslab_class_t), KM_PUSHPAGE);
-
- mc->mc_spa = spa;
- mc->mc_rotor = NULL;
-@@ -217,7 +217,7 @@
- {
- metaslab_group_t *mg;
-
-- mg = kmem_zalloc(sizeof (metaslab_group_t), KM_SLEEP);
-+ mg = kmem_zalloc(sizeof (metaslab_group_t), KM_PUSHPAGE);
- mutex_init(&mg->mg_lock, NULL, MUTEX_DEFAULT, NULL);
- avl_create(&mg->mg_metaslab_tree, metaslab_compare,
- sizeof (metaslab_t), offsetof(struct metaslab, ms_group_node));
-@@ -422,9 +422,9 @@
- space_seg_t *ss;
-
- ASSERT(sm->sm_ppd == NULL);
-- sm->sm_ppd = kmem_zalloc(64 * sizeof (uint64_t), KM_SLEEP);
-+ sm->sm_ppd = kmem_zalloc(64 * sizeof (uint64_t), KM_PUSHPAGE);
-
-- sm->sm_pp_root = kmem_alloc(sizeof (avl_tree_t), KM_SLEEP);
-+ sm->sm_pp_root = kmem_alloc(sizeof (avl_tree_t), KM_PUSHPAGE);
- avl_create(sm->sm_pp_root, metaslab_segsize_compare,
- sizeof (space_seg_t), offsetof(struct space_seg, ss_pp_node));
-
-@@ -725,7 +725,7 @@
- vdev_t *vd = mg->mg_vd;
- metaslab_t *msp;
-
-- msp = kmem_zalloc(sizeof (metaslab_t), KM_SLEEP);
-+ msp = kmem_zalloc(sizeof (metaslab_t), KM_PUSHPAGE);
- mutex_init(&msp->ms_lock, NULL, MUTEX_DEFAULT, NULL);
-
- msp->ms_smo_syncing = *smo;
-diff --git a/module/zfs/spa.c b/module/zfs/spa.c
-index a43b883..c33a33a 100644
---- a/module/zfs/spa.c
-+++ b/module/zfs/spa.c
-@@ -151,7 +151,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- const char *propname = zpool_prop_to_name(prop);
- nvlist_t *propval;
-
-- VERIFY(nvlist_alloc(&propval, NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ VERIFY(nvlist_alloc(&propval, NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
- VERIFY(nvlist_add_uint64(propval, ZPROP_SOURCE, src) == 0);
-
- if (strval != NULL)
-@@ -233,7 +233,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- zap_attribute_t za;
- int err;
-
-- err = nvlist_alloc(nvp, NV_UNIQUE_NAME, KM_SLEEP);
-+ err = nvlist_alloc(nvp, NV_UNIQUE_NAME, KM_PUSHPAGE);
- if (err)
- return err;
-
-@@ -285,7 +285,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
-
- strval = kmem_alloc(
- MAXNAMELEN + strlen(MOS_DIR_NAME) + 1,
-- KM_SLEEP);
-+ KM_PUSHPAGE);
- dsl_dataset_name(ds, strval);
- dsl_dataset_rele(ds, FTAG);
- rw_exit(&dp->dp_config_rwlock);
-@@ -304,7 +304,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
-
- case 1:
- /* string property */
-- strval = kmem_alloc(za.za_num_integers, KM_SLEEP);
-+ strval = kmem_alloc(za.za_num_integers, KM_PUSHPAGE);
- err = zap_lookup(mos, spa->spa_pool_props_object,
- za.za_name, 1, za.za_num_integers, strval);
- if (err) {
-@@ -510,7 +510,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- return;
-
- dp = kmem_alloc(sizeof (spa_config_dirent_t),
-- KM_SLEEP);
-+ KM_PUSHPAGE);
-
- if (cachefile[0] == '\0')
- dp->scd_path = spa_strdup(spa_config_path);
-@@ -1083,7 +1083,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- * active configuration, then we also mark this vdev as an active spare.
- */
- spa->spa_spares.sav_vdevs = kmem_alloc(nspares * sizeof (void *),
-- KM_SLEEP);
-+ KM_PUSHPAGE);
- for (i = 0; i < spa->spa_spares.sav_count; i++) {
- VERIFY(spa_config_parse(spa, &vd, spares[i], NULL, 0,
- VDEV_ALLOC_SPARE) == 0);
-@@ -1131,7 +1131,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- DATA_TYPE_NVLIST_ARRAY) == 0);
-
- spares = kmem_alloc(spa->spa_spares.sav_count * sizeof (void *),
-- KM_SLEEP);
-+ KM_PUSHPAGE);
- for (i = 0; i < spa->spa_spares.sav_count; i++)
- spares[i] = vdev_config_generate(spa,
- spa->spa_spares.sav_vdevs[i], B_TRUE, VDEV_CONFIG_SPARE);
-@@ -1165,7 +1165,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- if (sav->sav_config != NULL) {
- VERIFY(nvlist_lookup_nvlist_array(sav->sav_config,
- ZPOOL_CONFIG_L2CACHE, &l2cache, &nl2cache) == 0);
-- newvdevs = kmem_alloc(nl2cache * sizeof (void *), KM_SLEEP);
-+ newvdevs = kmem_alloc(nl2cache * sizeof (void *), KM_PUSHPAGE);
- } else {
- nl2cache = 0;
- }
-@@ -1259,7 +1259,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- VERIFY(nvlist_remove(sav->sav_config, ZPOOL_CONFIG_L2CACHE,
- DATA_TYPE_NVLIST_ARRAY) == 0);
-
-- l2cache = kmem_alloc(sav->sav_count * sizeof (void *), KM_SLEEP);
-+ l2cache = kmem_alloc(sav->sav_count * sizeof (void *), KM_PUSHPAGE);
- for (i = 0; i < sav->sav_count; i++)
- l2cache[i] = vdev_config_generate(spa,
- sav->sav_vdevs[i], B_TRUE, VDEV_CONFIG_L2CACHE);
-@@ -1285,7 +1285,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- nvsize = *(uint64_t *)db->db_data;
- dmu_buf_rele(db, FTAG);
-
-- packed = kmem_alloc(nvsize, KM_SLEEP | KM_NODEBUG);
-+ packed = kmem_alloc(nvsize, KM_PUSHPAGE | KM_NODEBUG);
- error = dmu_read(spa->spa_meta_objset, obj, 0, nvsize, packed,
- DMU_READ_PREFETCH);
- if (error == 0)
-@@ -1341,8 +1341,8 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- uint64_t idx = 0;
-
- child = kmem_alloc(rvd->vdev_children * sizeof (nvlist_t **),
-- KM_SLEEP);
-- VERIFY(nvlist_alloc(&nv, NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ KM_PUSHPAGE);
-+ VERIFY(nvlist_alloc(&nv, NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
-
- for (c = 0; c < rvd->vdev_children; c++) {
- vdev_t *tvd = rvd->vdev_child[c];
-@@ -1697,7 +1697,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- &glist, &gcount) != 0)
- return;
-
-- vd = kmem_zalloc(gcount * sizeof (vdev_t *), KM_SLEEP);
-+ vd = kmem_zalloc(gcount * sizeof (vdev_t *), KM_PUSHPAGE);
-
- /* attempt to online all the vdevs & validate */
- attempt_reopen = B_TRUE;
-@@ -1778,7 +1778,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_SPLIT,
- &nvl) == 0) {
- VERIFY(nvlist_dup(nvl, &spa->spa_config_splitting,
-- KM_SLEEP) == 0);
-+ KM_PUSHPAGE) == 0);
- }
-
- gethrestime(&spa->spa_loaded_ts);
-@@ -2435,7 +2435,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- */
- if (config != NULL && spa->spa_config) {
- VERIFY(nvlist_dup(spa->spa_config, config,
-- KM_SLEEP) == 0);
-+ KM_PUSHPAGE) == 0);
- VERIFY(nvlist_add_nvlist(*config,
- ZPOOL_CONFIG_LOAD_INFO,
- spa->spa_load_info) == 0);
-@@ -2811,13 +2811,13 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- &olddevs, &oldndevs) == 0);
-
- newdevs = kmem_alloc(sizeof (void *) *
-- (ndevs + oldndevs), KM_SLEEP);
-+ (ndevs + oldndevs), KM_PUSHPAGE);
- for (i = 0; i < oldndevs; i++)
- VERIFY(nvlist_dup(olddevs[i], &newdevs[i],
-- KM_SLEEP) == 0);
-+ KM_PUSHPAGE) == 0);
- for (i = 0; i < ndevs; i++)
- VERIFY(nvlist_dup(devs[i], &newdevs[i + oldndevs],
-- KM_SLEEP) == 0);
-+ KM_PUSHPAGE) == 0);
-
- VERIFY(nvlist_remove(sav->sav_config, config,
- DATA_TYPE_NVLIST_ARRAY) == 0);
-@@ -2832,7 +2832,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- * Generate a new dev list.
- */
- VERIFY(nvlist_alloc(&sav->sav_config, NV_UNIQUE_NAME,
-- KM_SLEEP) == 0);
-+ KM_PUSHPAGE) == 0);
- VERIFY(nvlist_add_nvlist_array(sav->sav_config, config,
- devs, ndevs) == 0);
- }
-@@ -2958,7 +2958,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- if (nvlist_lookup_nvlist_array(nvroot, ZPOOL_CONFIG_SPARES,
- &spares, &nspares) == 0) {
- VERIFY(nvlist_alloc(&spa->spa_spares.sav_config, NV_UNIQUE_NAME,
-- KM_SLEEP) == 0);
-+ KM_PUSHPAGE) == 0);
- VERIFY(nvlist_add_nvlist_array(spa->spa_spares.sav_config,
- ZPOOL_CONFIG_SPARES, spares, nspares) == 0);
- spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
-@@ -2973,7 +2973,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- if (nvlist_lookup_nvlist_array(nvroot, ZPOOL_CONFIG_L2CACHE,
- &l2cache, &nl2cache) == 0) {
- VERIFY(nvlist_alloc(&spa->spa_l2cache.sav_config,
-- NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
- VERIFY(nvlist_add_nvlist_array(spa->spa_l2cache.sav_config,
- ZPOOL_CONFIG_L2CACHE, l2cache, nl2cache) == 0);
- spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
-@@ -3111,7 +3111,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- /*
- * Put this pool's top-level vdevs into a root vdev.
- */
-- VERIFY(nvlist_alloc(&nvroot, NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ VERIFY(nvlist_alloc(&nvroot, NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
- VERIFY(nvlist_add_string(nvroot, ZPOOL_CONFIG_TYPE,
- VDEV_TYPE_ROOT) == 0);
- VERIFY(nvlist_add_uint64(nvroot, ZPOOL_CONFIG_ID, 0ULL) == 0);
-@@ -3422,7 +3422,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- ZPOOL_CONFIG_SPARES, DATA_TYPE_NVLIST_ARRAY) == 0);
- else
- VERIFY(nvlist_alloc(&spa->spa_spares.sav_config,
-- NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
- VERIFY(nvlist_add_nvlist_array(spa->spa_spares.sav_config,
- ZPOOL_CONFIG_SPARES, spares, nspares) == 0);
- spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
-@@ -3437,7 +3437,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- ZPOOL_CONFIG_L2CACHE, DATA_TYPE_NVLIST_ARRAY) == 0);
- else
- VERIFY(nvlist_alloc(&spa->spa_l2cache.sav_config,
-- NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
- VERIFY(nvlist_add_nvlist_array(spa->spa_l2cache.sav_config,
- ZPOOL_CONFIG_L2CACHE, l2cache, nl2cache) == 0);
- spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
-@@ -3520,7 +3520,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- * pools are bootable.
- */
- if ((!error || error == EEXIST) && spa->spa_bootfs) {
-- char *tmpname = kmem_alloc(MAXPATHLEN, KM_SLEEP);
-+ char *tmpname = kmem_alloc(MAXPATHLEN, KM_PUSHPAGE);
-
- /*
- * We have to play games with the name since the
-@@ -3529,7 +3529,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- if (dsl_dsobj_to_dsname(spa_name(spa),
- spa->spa_bootfs, tmpname) == 0) {
- char *cp;
-- char *dsname = kmem_alloc(MAXPATHLEN, KM_SLEEP);
-+ char *dsname = kmem_alloc(MAXPATHLEN, KM_PUSHPAGE);
-
- cp = strchr(tmpname, '/');
- if (cp == NULL) {
-@@ -3934,7 +3934,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- if (strcmp(oldvd->vdev_path, newvd->vdev_path) == 0) {
- spa_strfree(oldvd->vdev_path);
- oldvd->vdev_path = kmem_alloc(strlen(newvd->vdev_path) + 5,
-- KM_SLEEP);
-+ KM_PUSHPAGE);
- (void) sprintf(oldvd->vdev_path, "%s/%s",
- newvd->vdev_path, "old");
- if (oldvd->vdev_devid != NULL) {
-@@ -4329,8 +4329,8 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- nvlist_lookup_nvlist(nvl, ZPOOL_CONFIG_L2CACHE, &tmp) == 0)
- return (spa_vdev_exit(spa, NULL, txg, EINVAL));
-
-- vml = kmem_zalloc(children * sizeof (vdev_t *), KM_SLEEP);
-- glist = kmem_zalloc(children * sizeof (uint64_t), KM_SLEEP);
-+ vml = kmem_zalloc(children * sizeof (vdev_t *), KM_PUSHPAGE);
-+ glist = kmem_zalloc(children * sizeof (uint64_t), KM_PUSHPAGE);
-
- /* then, loop over each vdev and validate it */
- for (c = 0; c < children; c++) {
-@@ -4410,7 +4410,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- * Temporarily record the splitting vdevs in the spa config. This
- * will disappear once the config is regenerated.
- */
-- VERIFY(nvlist_alloc(&nvl, NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ VERIFY(nvlist_alloc(&nvl, NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
- VERIFY(nvlist_add_uint64_array(nvl, ZPOOL_CONFIG_SPLIT_LIST,
- glist, children) == 0);
- kmem_free(glist, children * sizeof (uint64_t));
-@@ -4457,7 +4457,7 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- /* if that worked, generate a real config for the new pool */
- if (newspa->spa_root_vdev != NULL) {
- VERIFY(nvlist_alloc(&newspa->spa_config_splitting,
-- NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
- VERIFY(nvlist_add_uint64(newspa->spa_config_splitting,
- ZPOOL_CONFIG_SPLIT_GUID, spa_guid(spa)) == 0);
- spa_config_set(newspa, spa_config_generate(newspa, NULL, -1ULL,
-@@ -4569,12 +4569,12 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- int i, j;
-
- if (count > 1)
-- newdev = kmem_alloc((count - 1) * sizeof (void *), KM_SLEEP);
-+ newdev = kmem_alloc((count - 1) * sizeof (void *), KM_PUSHPAGE);
-
- for (i = 0, j = 0; i < count; i++) {
- if (dev[i] == dev_to_remove)
- continue;
-- VERIFY(nvlist_dup(dev[i], &newdev[j++], KM_SLEEP) == 0);
-+ VERIFY(nvlist_dup(dev[i], &newdev[j++], KM_PUSHPAGE) == 0);
- }
-
- VERIFY(nvlist_remove(config, name, DATA_TYPE_NVLIST_ARRAY) == 0);
-@@ -5229,10 +5229,10 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- * saves us a pre-read to get data we don't actually care about.
- */
- bufsize = P2ROUNDUP(nvsize, SPA_CONFIG_BLOCKSIZE);
-- packed = vmem_alloc(bufsize, KM_SLEEP);
-+ packed = vmem_alloc(bufsize, KM_PUSHPAGE);
-
- VERIFY(nvlist_pack(nv, &packed, &nvsize, NV_ENCODE_XDR,
-- KM_SLEEP) == 0);
-+ KM_PUSHPAGE) == 0);
- bzero(packed + nvsize, bufsize - nvsize);
-
- dmu_write(spa->spa_meta_objset, obj, 0, bufsize, packed, tx);
-@@ -5270,11 +5270,11 @@ static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
- &sav->sav_object, tx) == 0);
- }
-
-- VERIFY(nvlist_alloc(&nvroot, NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ VERIFY(nvlist_alloc(&nvroot, NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
- if (sav->sav_count == 0) {
- VERIFY(nvlist_add_nvlist_array(nvroot, config, NULL, 0) == 0);
- } else {
-- list = kmem_alloc(sav->sav_count * sizeof (void *), KM_SLEEP);
-+ list = kmem_alloc(sav->sav_count * sizeof (void *), KM_PUSHPAGE);
- for (i = 0; i < sav->sav_count; i++)
- list[i] = vdev_config_generate(spa, sav->sav_vdevs[i],
- B_FALSE, VDEV_CONFIG_L2CACHE);
-diff --git a/module/zfs/spa_config.c b/module/zfs/spa_config.c
-index d84d6b0..eca2328 100644
---- a/module/zfs/spa_config.c
-+++ b/module/zfs/spa_config.c
-@@ -81,7 +81,7 @@
- /*
- * Open the configuration file.
- */
-- pathname = kmem_alloc(MAXPATHLEN, KM_SLEEP);
-+ pathname = kmem_alloc(MAXPATHLEN, KM_PUSHPAGE);
-
- (void) snprintf(pathname, MAXPATHLEN, "%s%s",
- (rootdir != NULL) ? "./" : "", spa_config_path);
-@@ -96,7 +96,7 @@
- if (kobj_get_filesize(file, &fsize) != 0)
- goto out;
-
-- buf = kmem_alloc(fsize, KM_SLEEP | KM_NODEBUG);
-+ buf = kmem_alloc(fsize, KM_PUSHPAGE | KM_NODEBUG);
-
- /*
- * Read the nvlist from the file.
-@@ -107,7 +107,7 @@
- /*
- * Unpack the nvlist.
- */
-- if (nvlist_unpack(buf, fsize, &nvlist, KM_SLEEP) != 0)
-+ if (nvlist_unpack(buf, fsize, &nvlist, KM_PUSHPAGE) != 0)
- goto out;
-
- /*
-@@ -159,11 +159,11 @@
- */
- VERIFY(nvlist_size(nvl, &buflen, NV_ENCODE_XDR) == 0);
-
-- buf = kmem_alloc(buflen, KM_SLEEP | KM_NODEBUG);
-- temp = kmem_zalloc(MAXPATHLEN, KM_SLEEP);
-+ buf = kmem_alloc(buflen, KM_PUSHPAGE | KM_NODEBUG);
-+ temp = kmem_zalloc(MAXPATHLEN, KM_PUSHPAGE);
-
- VERIFY(nvlist_pack(nvl, &buf, &buflen, NV_ENCODE_XDR,
-- KM_SLEEP) == 0);
-+ KM_PUSHPAGE) == 0);
-
- /*
- * Write the configuration to disk. We need to do the traditional
-@@ -232,7 +232,7 @@
-
- if (nvl == NULL)
- VERIFY(nvlist_alloc(&nvl, NV_UNIQUE_NAME,
-- KM_SLEEP) == 0);
-+ KM_PUSHPAGE) == 0);
-
- VERIFY(nvlist_add_nvlist(nvl, spa->spa_name,
- spa->spa_config) == 0);
-@@ -275,7 +275,7 @@
- if (*generation == spa_config_generation)
- return (NULL);
-
-- VERIFY(nvlist_alloc(&pools, NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ VERIFY(nvlist_alloc(&pools, NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
-
- mutex_enter(&spa_namespace_lock);
- while ((spa = spa_next(spa)) != NULL) {
-@@ -332,7 +332,7 @@
- if (txg == -1ULL)
- txg = spa->spa_config_txg;
-
-- VERIFY(nvlist_alloc(&config, NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ VERIFY(nvlist_alloc(&config, NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
-
- VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_VERSION,
- spa_version(spa)) == 0);
-@@ -407,21 +407,21 @@
- ddt_stat_t *dds;
- ddt_object_t *ddo;
-
-- ddh = kmem_zalloc(sizeof (ddt_histogram_t), KM_SLEEP);
-+ ddh = kmem_zalloc(sizeof (ddt_histogram_t), KM_PUSHPAGE);
- ddt_get_dedup_histogram(spa, ddh);
- VERIFY(nvlist_add_uint64_array(config,
- ZPOOL_CONFIG_DDT_HISTOGRAM,
- (uint64_t *)ddh, sizeof (*ddh) / sizeof (uint64_t)) == 0);
- kmem_free(ddh, sizeof (ddt_histogram_t));
-
-- ddo = kmem_zalloc(sizeof (ddt_object_t), KM_SLEEP);
-+ ddo = kmem_zalloc(sizeof (ddt_object_t), KM_PUSHPAGE);
- ddt_get_dedup_object_stats(spa, ddo);
- VERIFY(nvlist_add_uint64_array(config,
- ZPOOL_CONFIG_DDT_OBJ_STATS,
- (uint64_t *)ddo, sizeof (*ddo) / sizeof (uint64_t)) == 0);
- kmem_free(ddo, sizeof (ddt_object_t));
-
-- dds = kmem_zalloc(sizeof (ddt_stat_t), KM_SLEEP);
-+ dds = kmem_zalloc(sizeof (ddt_stat_t), KM_PUSHPAGE);
- ddt_get_dedup_stats(spa, dds);
- VERIFY(nvlist_add_uint64_array(config,
- ZPOOL_CONFIG_DDT_STATS,
-diff --git a/module/zfs/spa_history.c b/module/zfs/spa_history.c
-index 243f2b4..508df2e 100644
---- a/module/zfs/spa_history.c
-+++ b/module/zfs/spa_history.c
-@@ -233,7 +233,7 @@
- }
- #endif
-
-- VERIFY(nvlist_alloc(&nvrecord, NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ VERIFY(nvlist_alloc(&nvrecord, NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
- VERIFY(nvlist_add_uint64(nvrecord, ZPOOL_HIST_TIME,
- gethrestime_sec()) == 0);
- VERIFY(nvlist_add_uint64(nvrecord, ZPOOL_HIST_WHO, hap->ha_uid) == 0);
-@@ -265,10 +265,10 @@
- }
-
- VERIFY(nvlist_size(nvrecord, &reclen, NV_ENCODE_XDR) == 0);
-- record_packed = kmem_alloc(reclen, KM_SLEEP);
-+ record_packed = kmem_alloc(reclen, KM_PUSHPAGE);
-
- VERIFY(nvlist_pack(nvrecord, &record_packed, &reclen,
-- NV_ENCODE_XDR, KM_SLEEP) == 0);
-+ NV_ENCODE_XDR, KM_PUSHPAGE) == 0);
-
- mutex_enter(&spa->spa_history_lock);
- if (hap->ha_log_type == LOG_CMD_POOL_CREATE)
-@@ -315,7 +315,7 @@
- return (err);
- }
-
-- ha = kmem_alloc(sizeof (history_arg_t), KM_SLEEP);
-+ ha = kmem_alloc(sizeof (history_arg_t), KM_PUSHPAGE);
- ha->ha_history_str = strdup(history_str);
- ha->ha_zone = strdup(spa_history_zone());
- ha->ha_log_type = what;
-@@ -441,7 +441,7 @@
- if (tx->tx_txg == TXG_INITIAL)
- return;
-
-- ha = kmem_alloc(sizeof (history_arg_t), KM_SLEEP);
-+ ha = kmem_alloc(sizeof (history_arg_t), KM_PUSHPAGE);
- va_copy(adx_copy, adx);
- ha->ha_history_str = kmem_vasprintf(fmt, adx_copy);
- va_end(adx_copy);
-diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c
-index 1016ac7..33b5575 100644
---- a/module/zfs/spa_misc.c
-+++ b/module/zfs/spa_misc.c
-@@ -424,7 +424,7 @@
-
- ASSERT(MUTEX_HELD(&spa_namespace_lock));
-
-- spa = kmem_zalloc(sizeof (spa_t), KM_SLEEP | KM_NODEBUG);
-+ spa = kmem_zalloc(sizeof (spa_t), KM_PUSHPAGE | KM_NODEBUG);
-
- mutex_init(&spa->spa_async_lock, NULL, MUTEX_DEFAULT, NULL);
- mutex_init(&spa->spa_errlist_lock, NULL, MUTEX_DEFAULT, NULL);
-@@ -471,12 +471,12 @@
- list_create(&spa->spa_config_list, sizeof (spa_config_dirent_t),
- offsetof(spa_config_dirent_t, scd_link));
-
-- dp = kmem_zalloc(sizeof (spa_config_dirent_t), KM_SLEEP);
-+ dp = kmem_zalloc(sizeof (spa_config_dirent_t), KM_PUSHPAGE);
- dp->scd_path = altroot ? NULL : spa_strdup(spa_config_path);
- list_insert_head(&spa->spa_config_list, dp);
-
- VERIFY(nvlist_alloc(&spa->spa_load_info, NV_UNIQUE_NAME,
-- KM_SLEEP) == 0);
-+ KM_PUSHPAGE) == 0);
-
- if (config != NULL)
- VERIFY(nvlist_dup(config, &spa->spa_config, 0) == 0);
-@@ -646,7 +646,7 @@
- if ((aux = avl_find(avl, &search, &where)) != NULL) {
- aux->aux_count++;
- } else {
-- aux = kmem_zalloc(sizeof (spa_aux_t), KM_SLEEP);
-+ aux = kmem_zalloc(sizeof (spa_aux_t), KM_PUSHPAGE);
- aux->aux_guid = vd->vdev_guid;
- aux->aux_count = 1;
- avl_insert(avl, aux, where);
-@@ -1130,7 +1130,7 @@
- char *new;
-
- len = strlen(s);
-- new = kmem_alloc(len + 1, KM_SLEEP);
-+ new = kmem_alloc(len + 1, KM_PUSHPAGE);
- bcopy(s, new, len);
- new[len] = '\0';
-
-diff --git a/module/zfs/space_map.c b/module/zfs/space_map.c
-index 1ce7b2a..9c0cdb6 100644
---- a/module/zfs/space_map.c
-+++ b/module/zfs/space_map.c
-@@ -134,7 +134,7 @@
- avl_remove(sm->sm_pp_root, ss_after);
- ss = ss_after;
- } else {
-- ss = kmem_alloc(sizeof (*ss), KM_SLEEP);
-+ ss = kmem_alloc(sizeof (*ss), KM_PUSHPAGE);
- ss->ss_start = start;
- ss->ss_end = end;
- avl_insert(&sm->sm_root, ss, where);
-@@ -181,7 +181,7 @@
- avl_remove(sm->sm_pp_root, ss);
-
- if (left_over && right_over) {
-- newseg = kmem_alloc(sizeof (*newseg), KM_SLEEP);
-+ newseg = kmem_alloc(sizeof (*newseg), KM_PUSHPAGE);
- newseg->ss_start = end;
- newseg->ss_end = ss->ss_end;
- ss->ss_end = start;
-@@ -551,7 +551,7 @@
- {
- space_ref_t *sr;
-
-- sr = kmem_alloc(sizeof (*sr), KM_SLEEP);
-+ sr = kmem_alloc(sizeof (*sr), KM_PUSHPAGE);
- sr->sr_offset = offset;
- sr->sr_refcnt = refcnt;
-
-diff --git a/module/zfs/txg.c b/module/zfs/txg.c
-index 6e64adf..5021e44 100644
---- a/module/zfs/txg.c
-+++ b/module/zfs/txg.c
-@@ -339,7 +339,7 @@
- TASKQ_THREADS_CPU_PCT | TASKQ_PREPOPULATE);
- }
-
-- cb_list = kmem_alloc(sizeof (list_t), KM_SLEEP);
-+ cb_list = kmem_alloc(sizeof (list_t), KM_PUSHPAGE);
- list_create(cb_list, sizeof (dmu_tx_callback_t),
- offsetof(dmu_tx_callback_t, dcb_node));
-
-diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c
-index 1630d2f..3f50489 100644
---- a/module/zfs/vdev.c
-+++ b/module/zfs/vdev.c
-@@ -193,7 +193,7 @@
- pvd->vdev_children = MAX(pvd->vdev_children, id + 1);
- newsize = pvd->vdev_children * sizeof (vdev_t *);
-
-- newchild = kmem_zalloc(newsize, KM_SLEEP);
-+ newchild = kmem_zalloc(newsize, KM_PUSHPAGE);
- if (pvd->vdev_child != NULL) {
- bcopy(pvd->vdev_child, newchild, oldsize);
- kmem_free(pvd->vdev_child, oldsize);
-@@ -263,7 +263,7 @@
- if (pvd->vdev_child[c])
- newc++;
-
-- newchild = kmem_alloc(newc * sizeof (vdev_t *), KM_SLEEP);
-+ newchild = kmem_alloc(newc * sizeof (vdev_t *), KM_PUSHPAGE);
-
- for (c = newc = 0; c < oldc; c++) {
- if ((cvd = pvd->vdev_child[c]) != NULL) {
-@@ -286,7 +286,7 @@
- vdev_t *vd;
- int t;
-
-- vd = kmem_zalloc(sizeof (vdev_t), KM_SLEEP);
-+ vd = kmem_zalloc(sizeof (vdev_t), KM_PUSHPAGE);
-
- if (spa->spa_root_vdev == NULL) {
- ASSERT(ops == &vdev_root_ops);
-@@ -835,7 +835,7 @@
-
- ASSERT(oldc <= newc);
-
-- mspp = kmem_zalloc(newc * sizeof (*mspp), KM_SLEEP | KM_NODEBUG);
-+ mspp = kmem_zalloc(newc * sizeof (*mspp), KM_PUSHPAGE | KM_NODEBUG);
-
- if (oldc != 0) {
- bcopy(vd->vdev_ms, mspp, oldc * sizeof (*mspp));
-@@ -990,7 +990,7 @@
- mutex_enter(&vd->vdev_probe_lock);
-
- if ((pio = vd->vdev_probe_zio) == NULL) {
-- vps = kmem_zalloc(sizeof (*vps), KM_SLEEP);
-+ vps = kmem_zalloc(sizeof (*vps), KM_PUSHPAGE);
-
- vps->vps_flags = ZIO_FLAG_CANFAIL | ZIO_FLAG_PROBE |
- ZIO_FLAG_DONT_CACHE | ZIO_FLAG_DONT_AGGREGATE |
-diff --git a/module/zfs/vdev_cache.c b/module/zfs/vdev_cache.c
-index e2f8040..bf4ae7b 100644
---- a/module/zfs/vdev_cache.c
-+++ b/module/zfs/vdev_cache.c
-@@ -177,7 +177,7 @@
- vdev_cache_evict(vc, ve);
- }
-
-- ve = kmem_zalloc(sizeof (vdev_cache_entry_t), KM_SLEEP);
-+ ve = kmem_zalloc(sizeof (vdev_cache_entry_t), KM_PUSHPAGE);
- ve->ve_offset = offset;
- ve->ve_lastused = ddi_get_lbolt();
- ve->ve_data = zio_buf_alloc(VCBS);
-@@ -274,7 +274,7 @@
-
- mutex_enter(&vc->vc_lock);
-
-- ve_search = kmem_alloc(sizeof(vdev_cache_entry_t), KM_SLEEP);
-+ ve_search = kmem_alloc(sizeof(vdev_cache_entry_t), KM_PUSHPAGE);
- ve_search->ve_offset = cache_offset;
- ve = avl_find(&vc->vc_offset_tree, ve_search, NULL);
- kmem_free(ve_search, sizeof(vdev_cache_entry_t));
-diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c
-index 28a4861..febb6d0 100644
---- a/module/zfs/vdev_disk.c
-+++ b/module/zfs/vdev_disk.c
-@@ -171,7 +171,7 @@
- return EINVAL;
- }
-
-- vd = kmem_zalloc(sizeof(vdev_disk_t), KM_SLEEP);
-+ vd = kmem_zalloc(sizeof(vdev_disk_t), KM_PUSHPAGE);
- if (vd == NULL)
- return ENOMEM;
-
-@@ -252,7 +252,7 @@
- int i;
-
- dr = kmem_zalloc(sizeof(dio_request_t) +
-- sizeof(struct bio *) * bio_count, KM_SLEEP);
-+ sizeof(struct bio *) * bio_count, KM_PUSHPAGE);
- if (dr) {
- init_completion(&dr->dr_comp);
- atomic_set(&dr->dr_ref, 0);
-@@ -721,7 +721,7 @@
- }
-
- size = P2ALIGN_TYPED(s, sizeof(vdev_label_t), uint64_t);
-- label = vmem_alloc(sizeof(vdev_label_t), KM_SLEEP);
-+ label = vmem_alloc(sizeof(vdev_label_t), KM_PUSHPAGE);
-
- for (i = 0; i < VDEV_LABELS; i++) {
- uint64_t offset, state, txg = 0;
-diff --git a/module/zfs/vdev_file.c b/module/zfs/vdev_file.c
-index ce49fe0..25d0bad 100644
---- a/module/zfs/vdev_file.c
-+++ b/module/zfs/vdev_file.c
-@@ -72,7 +72,7 @@
- goto skip_open;
- }
-
-- vf = vd->vdev_tsd = kmem_zalloc(sizeof (vdev_file_t), KM_SLEEP);
-+ vf = vd->vdev_tsd = kmem_zalloc(sizeof (vdev_file_t), KM_PUSHPAGE);
-
- /*
- * We always open the files from the root of the global zone, even if
-diff --git a/module/zfs/vdev_label.c b/module/zfs/vdev_label.c
-index 3774d71..7ac2350 100644
---- a/module/zfs/vdev_label.c
-+++ b/module/zfs/vdev_label.c
-@@ -212,7 +212,7 @@
- {
- nvlist_t *nv = NULL;
-
-- VERIFY(nvlist_alloc(&nv, NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ VERIFY(nvlist_alloc(&nv, NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
-
- VERIFY(nvlist_add_string(nv, ZPOOL_CONFIG_TYPE,
- vd->vdev_ops->vdev_op_type) == 0);
-@@ -319,7 +319,7 @@
- ASSERT(!vd->vdev_ishole);
-
- child = kmem_alloc(vd->vdev_children * sizeof (nvlist_t *),
-- KM_SLEEP);
-+ KM_PUSHPAGE);
-
- for (c = 0, idx = 0; c < vd->vdev_children; c++) {
- vdev_t *cvd = vd->vdev_child[c];
-@@ -408,7 +408,7 @@
- uint64_t *array;
- uint_t c, idx;
-
-- array = kmem_alloc(rvd->vdev_children * sizeof (uint64_t), KM_SLEEP);
-+ array = kmem_alloc(rvd->vdev_children * sizeof (uint64_t), KM_PUSHPAGE);
-
- for (c = 0, idx = 0; c < rvd->vdev_children; c++) {
- vdev_t *tvd = rvd->vdev_child[c];
-@@ -709,7 +709,7 @@
- * active hot spare (in which case we want to revert the
- * labels).
- */
-- VERIFY(nvlist_alloc(&label, NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ VERIFY(nvlist_alloc(&label, NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
-
- VERIFY(nvlist_add_uint64(label, ZPOOL_CONFIG_VERSION,
- spa_version(spa)) == 0);
-@@ -722,7 +722,7 @@
- /*
- * For level 2 ARC devices, add a special label.
- */
-- VERIFY(nvlist_alloc(&label, NV_UNIQUE_NAME, KM_SLEEP) == 0);
-+ VERIFY(nvlist_alloc(&label, NV_UNIQUE_NAME, KM_PUSHPAGE) == 0);
-
- VERIFY(nvlist_add_uint64(label, ZPOOL_CONFIG_VERSION,
- spa_version(spa)) == 0);
-@@ -749,7 +749,7 @@
- buf = vp->vp_nvlist;
- buflen = sizeof (vp->vp_nvlist);
-
-- error = nvlist_pack(label, &buf, &buflen, NV_ENCODE_XDR, KM_SLEEP);
-+ error = nvlist_pack(label, &buf, &buflen, NV_ENCODE_XDR, KM_PUSHPAGE);
- if (error != 0) {
- nvlist_free(label);
- zio_buf_free(vp, sizeof (vdev_phys_t));
-@@ -1061,7 +1061,7 @@
- buf = vp->vp_nvlist;
- buflen = sizeof (vp->vp_nvlist);
-
-- if (nvlist_pack(label, &buf, &buflen, NV_ENCODE_XDR, KM_SLEEP) == 0) {
-+ if (nvlist_pack(label, &buf, &buflen, NV_ENCODE_XDR, KM_PUSHPAGE) == 0) {
- for (; l < VDEV_LABELS; l += 2) {
- vdev_label_write(zio, vd, l, vp,
- offsetof(vdev_label_t, vl_vdev_phys),
-@@ -1094,7 +1094,7 @@
-
- ASSERT(!vd->vdev_ishole);
-
-- good_writes = kmem_zalloc(sizeof (uint64_t), KM_SLEEP);
-+ good_writes = kmem_zalloc(sizeof (uint64_t), KM_PUSHPAGE);
- vio = zio_null(zio, spa, NULL,
- (vd->vdev_islog || vd->vdev_aux != NULL) ?
- vdev_label_sync_ignore_done : vdev_label_sync_top_done,
-diff --git a/module/zfs/vdev_mirror.c b/module/zfs/vdev_mirror.c
-index 47181d4..96623d2 100644
---- a/module/zfs/vdev_mirror.c
-+++ b/module/zfs/vdev_mirror.c
-@@ -79,7 +79,7 @@
-
- c = BP_GET_NDVAS(zio->io_bp);
-
-- mm = kmem_zalloc(offsetof(mirror_map_t, mm_child[c]), KM_SLEEP);
-+ mm = kmem_zalloc(offsetof(mirror_map_t, mm_child[c]), KM_PUSHPAGE);
- mm->mm_children = c;
- mm->mm_replacing = B_FALSE;
- mm->mm_preferred = spa_get_random(c);
-@@ -106,7 +106,7 @@
- } else {
- c = vd->vdev_children;
-
-- mm = kmem_zalloc(offsetof(mirror_map_t, mm_child[c]), KM_SLEEP);
-+ mm = kmem_zalloc(offsetof(mirror_map_t, mm_child[c]), KM_PUSHPAGE);
- mm->mm_children = c;
- mm->mm_replacing = (vd->vdev_ops == &vdev_replacing_ops ||
- vd->vdev_ops == &vdev_spare_ops);
-diff --git a/module/zfs/vdev_raidz.c b/module/zfs/vdev_raidz.c
-index b987ac4..21c6e03 100644
---- a/module/zfs/vdev_raidz.c
-+++ b/module/zfs/vdev_raidz.c
-@@ -456,7 +456,7 @@
-
- ASSERT3U(acols, <=, scols);
-
-- rm = kmem_alloc(offsetof(raidz_map_t, rm_col[scols]), KM_SLEEP);
-+ rm = kmem_alloc(offsetof(raidz_map_t, rm_col[scols]), KM_PUSHPAGE);
-
- rm->rm_cols = acols;
- rm->rm_scols = scols;
-@@ -1196,7 +1196,7 @@
- size_t psize;
-
- psize = sizeof (invlog[0][0]) * n * nmissing;
-- p = kmem_alloc(psize, KM_SLEEP);
-+ p = kmem_alloc(psize, KM_PUSHPAGE);
-
- for (pp = p, i = 0; i < nmissing; i++) {
- invlog[i] = pp;
-@@ -1313,7 +1313,7 @@
-
- psize = (sizeof (rows[0][0]) + sizeof (invrows[0][0])) *
- nmissing_rows * n + sizeof (used[0]) * n;
-- p = kmem_alloc(psize, KM_SLEEP);
-+ p = kmem_alloc(psize, KM_PUSHPAGE);
-
- for (pp = p, i = 0; i < nmissing_rows; i++) {
- rows[i] = pp;
-diff --git a/module/zfs/zfs_fm.c b/module/zfs/zfs_fm.c
-index 7801837..0b98231 100644
---- a/module/zfs/zfs_fm.c
-+++ b/module/zfs/zfs_fm.c
-@@ -519,7 +519,7 @@
- size_t offset = 0;
- ssize_t start = -1;
-
-- zfs_ecksum_info_t *eip = kmem_zalloc(sizeof (*eip), KM_SLEEP);
-+ zfs_ecksum_info_t *eip = kmem_zalloc(sizeof (*eip), KM_PUSHPAGE);
-
- /* don't do any annotation for injected checksum errors */
- if (info != NULL && info->zbc_injected)
-@@ -688,7 +688,7 @@
- struct zio *zio, uint64_t offset, uint64_t length, void *arg,
- zio_bad_cksum_t *info)
- {
-- zio_cksum_report_t *report = kmem_zalloc(sizeof (*report), KM_SLEEP);
-+ zio_cksum_report_t *report = kmem_zalloc(sizeof (*report), KM_PUSHPAGE);
-
- if (zio->io_vsd != NULL)
- zio->io_vsd_ops->vsd_cksum_report(zio, report, arg);
-@@ -697,7 +697,7 @@
-
- /* copy the checksum failure information if it was provided */
- if (info != NULL) {
-- report->zcr_ckinfo = kmem_zalloc(sizeof (*info), KM_SLEEP);
-+ report->zcr_ckinfo = kmem_zalloc(sizeof (*info), KM_PUSHPAGE);
- bcopy(info, report->zcr_ckinfo, sizeof (*info));
- }
-
-diff --git a/module/zfs/zil.c b/module/zfs/zil.c
-index 5296b38..895ba52 100644
---- a/module/zfs/zil.c
-+++ b/module/zfs/zil.c
-@@ -144,7 +144,7 @@
- if (avl_find(t, dva, &where) != NULL)
- return (EEXIST);
-
-- zn = kmem_alloc(sizeof (zil_bp_node_t), KM_SLEEP);
-+ zn = kmem_alloc(sizeof (zil_bp_node_t), KM_PUSHPAGE);
- zn->zn_dva = *dva;
- avl_insert(t, zn, where);
-
-@@ -434,7 +434,7 @@
- {
- lwb_t *lwb;
-
-- lwb = kmem_cache_alloc(zil_lwb_cache, KM_SLEEP);
-+ lwb = kmem_cache_alloc(zil_lwb_cache, KM_PUSHPAGE);
- lwb->lwb_zilog = zilog;
- lwb->lwb_blk = *bp;
- lwb->lwb_buf = zio_buf_alloc(BP_GET_LSIZE(bp));
-@@ -731,7 +731,7 @@
- for (i = 0; i < ndvas; i++) {
- zvsearch.zv_vdev = DVA_GET_VDEV(&bp->blk_dva[i]);
- if (avl_find(t, &zvsearch, &where) == NULL) {
-- zv = kmem_alloc(sizeof (*zv), KM_SLEEP);
-+ zv = kmem_alloc(sizeof (*zv), KM_PUSHPAGE);
- zv->zv_vdev = zvsearch.zv_vdev;
- avl_insert(t, zv, where);
- }
-@@ -1235,7 +1235,7 @@
- }
- ASSERT(itxg->itxg_sod == 0);
- itxg->itxg_txg = txg;
-- itxs = itxg->itxg_itxs = kmem_zalloc(sizeof (itxs_t), KM_SLEEP);
-+ itxs = itxg->itxg_itxs = kmem_zalloc(sizeof (itxs_t), KM_PUSHPAGE);
-
- list_create(&itxs->i_sync_list, sizeof (itx_t),
- offsetof(itx_t, itx_node));
-@@ -1255,7 +1255,7 @@
-
- ian = avl_find(t, &foid, &where);
- if (ian == NULL) {
-- ian = kmem_alloc(sizeof (itx_async_node_t), KM_SLEEP);
-+ ian = kmem_alloc(sizeof (itx_async_node_t), KM_PUSHPAGE);
- list_create(&ian->ia_list, sizeof (itx_t),
- offsetof(itx_t, itx_node));
- ian->ia_foid = foid;
-@@ -1626,7 +1626,7 @@
- zilog_t *zilog;
- int i;
-
-- zilog = kmem_zalloc(sizeof (zilog_t), KM_SLEEP);
-+ zilog = kmem_zalloc(sizeof (zilog_t), KM_PUSHPAGE);
-
- zilog->zl_header = zh_phys;
- zilog->zl_os = os;
-@@ -1948,7 +1948,7 @@
- zr.zr_replay = replay_func;
- zr.zr_arg = arg;
- zr.zr_byteswap = BP_SHOULD_BYTESWAP(&zh->zh_log);
-- zr.zr_lr = vmem_alloc(2 * SPA_MAXBLOCKSIZE, KM_SLEEP);
-+ zr.zr_lr = vmem_alloc(2 * SPA_MAXBLOCKSIZE, KM_PUSHPAGE);
-
- /*
- * Wait for in-progress removes to sync before starting replay.
---
-1.7.10
-
diff --git a/sys-fs/zfs/zfs-0.6.0_rc9-r3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc9-r3.ebuild
deleted file mode 100644
index 61c85ab92f1a..000000000000
--- a/sys-fs/zfs/zfs-0.6.0_rc9-r3.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9-r3.ebuild,v 1.4 2012/07/01 13:03:28 ryao Exp $
-
-EAPI="4"
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit bash-completion-r1 flag-o-matic linux-mod toolchain-funcs autotools-utils
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
- S="${WORKDIR}/${PN}-${MY_PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Native ZFS for Linux"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="CDDL GPL-2 MIT"
-SLOT="0"
-IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs"
-
-DEPEND="
- =sys-kernel/spl-${PV}*
- sys-apps/util-linux[static-libs?]
- sys-libs/zlib[static-libs(+)?]
-"
-RDEPEND="${DEPEND}
- !sys-fs/zfs-fuse
- !prefix? ( sys-fs/udev )
- test-suite? (
- sys-apps/gawk
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- virtual/modutils
- )
- rootfs? (
- app-arch/cpio
- app-misc/pax-utils
- )
-"
-DEPEND+="
- test? ( sys-fs/mdadm )
-"
-
-pkg_setup() {
- CONFIG_CHECK="!DEBUG_LOCK_ALLOC
- !PREEMPT
- !PREEMPT_VOLUNTARY
- BLK_DEV_LOOP
- EFI_PARTITION
- MODULES
- ZLIB_DEFLATE
- ZLIB_INFLATE"
- use rootfs && \
- CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD
- DEVTMPFS"
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
- check_extra_config
-}
-
-src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
- # Workaround rename
- sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
-
- if [ ${PV} != "9999" ]
- then
- epatch "${FILESDIR}/${P}-hardened-support.patch"
-
- # Fix various deadlocks
- epatch "${FILESDIR}/${P}-use-pushpage.patch"
- epatch "${FILESDIR}/${P}-remove-pfmalloc-1-of-3.patch"
- epatch "${FILESDIR}/${P}-remove-pfmalloc-2-of-3.patch"
- epatch "${FILESDIR}/${P}-remove-pfmalloc-3-of-3.patch"
- epatch "${FILESDIR}/${P}-range-lock-caller-allocate.patch"
- fi
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- set_arch_to_kernel
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=all
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="${EPREFIX}/lib/udev"
- $(use_enable debug)
- )
- autotools-utils_src_configure
-}
-
-src_test() {
- if [ $UID -ne 0 ]
- then
- ewarn "Cannot run make check tests with FEATURES=userpriv."
- ewarn "Skipping make check tests."
- else
- autotools-utils_src_test
- fi
-}
-
-src_install() {
- autotools-utils_src_install
- gen_usr_ldscript -a uutil nvpair zpool zfs
- use dracut || rm -rf "${ED}usr/share/dracut"
- use test-suite || rm -rf "${ED}usr/libexec"
-
- if use rootfs
- then
- doinitd "${FILESDIR}/zfs-shutdown"
- exeinto /usr/share/zfs
- doexe "${FILESDIR}/linuxrc"
- fi
-
- newbashcomp "${FILESDIR}/bash-completion" zfs
-
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do not file bug reports."
-
- [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
- || ewarn 'You should add zfs to the boot runlevel.'
-
- use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \
- || ewarn 'You should add zfs-shutdown to the shutdown runlevel.')
-
-}
diff --git a/sys-fs/zfs/zfs-0.6.0_rc9-r4.ebuild b/sys-fs/zfs/zfs-0.6.0_rc9-r5.ebuild
similarity index 92%
rename from sys-fs/zfs/zfs-0.6.0_rc9-r4.ebuild
rename to sys-fs/zfs/zfs-0.6.0_rc9-r5.ebuild
index 7d6449aaa121..9a6dc91af126 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc9-r4.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc9-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9-r4.ebuild,v 1.1 2012/07/10 00:31:39 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9-r5.ebuild,v 1.1 2012/07/11 13:20:31 ryao Exp $
EAPI="4"
@@ -24,7 +24,7 @@ fi
DESCRIPTION="Native ZFS for Linux"
HOMEPAGE="http://zfsonlinux.org/"
-LICENSE="CDDL GPL-2 MIT"
+LICENSE="BSD-2 CDDL MIT"
SLOT="0"
IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs"
@@ -79,14 +79,18 @@ src_prepare() {
if [ ${PV} != "9999" ]
then
+ # Fix build issues
epatch "${FILESDIR}/${P}-hardened-support.patch"
+ epatch "${FILESDIR}/${P}-linux-3.5-support.patch"
+ epatch "${FILESDIR}/${P}-fix-32-bit-warnings.patch"
# Fix various deadlocks
- epatch "${FILESDIR}/${P}-fix-32-bit-warnings.patch"
epatch "${FILESDIR}/${P}-remove-pfmalloc-1-of-3.patch"
epatch "${FILESDIR}/${P}-remove-pfmalloc-2-of-3.patch"
epatch "${FILESDIR}/${P}-remove-pfmalloc-3-of-3.patch"
- epatch "${FILESDIR}/${P}-range-lock-caller-allocate.patch"
+
+ #Miscellaneous
+ epatch "${FILESDIR}/${P}-bsd-init.patch"
fi
autotools-utils_src_prepare
diff --git a/sys-fs/zfs/zfs-0.6.0_rc9.ebuild b/sys-fs/zfs/zfs-0.6.0_rc9.ebuild
deleted file mode 100644
index 85d3f254fc43..000000000000
--- a/sys-fs/zfs/zfs-0.6.0_rc9.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9.ebuild,v 1.7 2012/07/01 13:03:28 ryao Exp $
-
-EAPI="4"
-
-AT_M4DIR="config"
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit bash-completion-r1 flag-o-matic linux-mod toolchain-funcs autotools-utils
-
-if [ ${PV} == "9999" ] ; then
- inherit git-2
- EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
- inherit eutils versionator
- MY_PV=$(replace_version_separator 3 '-')
- SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz"
- S="${WORKDIR}/${PN}-${MY_PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Native ZFS for Linux"
-HOMEPAGE="http://zfsonlinux.org/"
-
-LICENSE="CDDL GPL-2 MIT"
-SLOT="0"
-IUSE="bash-completion custom-cflags debug dracut +rootfs test test-suite static-libs"
-
-DEPEND="
- =sys-kernel/spl-${PV}*
- sys-apps/util-linux[static-libs?]
- sys-libs/zlib[static-libs(+)?]
-"
-RDEPEND="${DEPEND}
- !sys-fs/zfs-fuse
- !prefix? ( sys-fs/udev )
- test-suite? (
- sys-apps/gawk
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- virtual/modutils
- )
- rootfs? (
- app-arch/cpio
- app-misc/pax-utils
- )
-"
-DEPEND+="
- test? ( sys-fs/mdadm )
-"
-
-pkg_setup() {
- CONFIG_CHECK="!DEBUG_LOCK_ALLOC
- !PREEMPT
- !PREEMPT_VOLUNTARY
- BLK_DEV_LOOP
- EFI_PARTITION
- MODULES
- ZLIB_DEFLATE
- ZLIB_INFLATE"
- use rootfs && CONFIG_CHECK="${CONFIG_CHECK} DEVTMPFS"
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
- check_extra_config
-}
-
-src_prepare() {
- # Workaround for hard coded path
- sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die
- # Workaround rename
- sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die
-
- if [ ${PV} != "9999" ]
- then
- epatch "${FILESDIR}/${P}-hardened-support.patch"
-
- # Fix various deadlocks
- epatch "${FILESDIR}/${P}-use-pushpage.patch"
- epatch "${FILESDIR}/${P}-remove-pfmalloc-1-of-3.patch"
- epatch "${FILESDIR}/${P}-remove-pfmalloc-2-of-3.patch"
- epatch "${FILESDIR}/${P}-remove-pfmalloc-3-of-3.patch"
- fi
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- use custom-cflags || strip-flags
- set_arch_to_kernel
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --sbindir="${EPREFIX}/sbin"
- --with-config=all
- --with-linux="${KV_DIR}"
- --with-linux-obj="${KV_OUT_DIR}"
- --with-udevdir="${EPREFIX}/lib/udev"
- $(use_enable debug)
- )
- autotools-utils_src_configure
-}
-
-src_test() {
- if [ $UID -ne 0 ]
- then
- ewarn "Cannot run make check tests with FEATURES=userpriv."
- ewarn "Skipping make check tests."
- else
- autotools-utils_src_test
- fi
-}
-
-src_install() {
- autotools-utils_src_install
- gen_usr_ldscript -a uutil nvpair zpool zfs
- use dracut || rm -rf "${ED}usr/share/dracut"
- use test-suite || rm -rf "${ED}usr/libexec"
-
- if use rootfs
- then
- doinitd "${FILESDIR}/zfs-shutdown"
- exeinto /usr/share/zfs
- doexe "${FILESDIR}/linuxrc"
- fi
-
- newbashcomp "${FILESDIR}/bash-completion" zfs
-
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do not file bug reports."
-
- [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
- || ewarn 'You should add zfs to the boot runlevel.'
-
- use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \
- || ewarn 'You should add zfs-shutdown to the shutdown runlevel.')
-
-}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 3c7599804511..4f4bd6d9c209 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.27 2012/07/01 13:03:28 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.28 2012/07/11 13:20:31 ryao Exp $
EAPI="4"
@@ -24,9 +24,9 @@ fi
DESCRIPTION="Native ZFS for Linux"
HOMEPAGE="http://zfsonlinux.org/"
-LICENSE="CDDL GPL-2 MIT"
+LICENSE="BSD-2 CDDL MIT"
SLOT="0"
-IUSE="bash-completion custom-cflags debug dracut +rootfs test test-suite static-libs"
+IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs"
DEPEND="
=sys-kernel/spl-${PV}*
@@ -64,7 +64,9 @@ pkg_setup() {
MODULES
ZLIB_DEFLATE
ZLIB_INFLATE"
- use rootfs && CONFIG_CHECK="${CONFIG_CHECK} DEVTMPFS"
+ use rootfs && \
+ CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD
+ DEVTMPFS"
kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required"
check_extra_config
}
@@ -77,13 +79,18 @@ src_prepare() {
if [ ${PV} != "9999" ]
then
+ # Fix build issues
epatch "${FILESDIR}/${P}-hardened-support.patch"
+ epatch "${FILESDIR}/${P}-linux-3.5-support.patch"
+ epatch "${FILESDIR}/${P}-fix-32-bit-warnings.patch"
# Fix various deadlocks
- epatch "${FILESDIR}/${P}-use-pushpage.patch"
epatch "${FILESDIR}/${P}-remove-pfmalloc-1-of-3.patch"
epatch "${FILESDIR}/${P}-remove-pfmalloc-2-of-3.patch"
epatch "${FILESDIR}/${P}-remove-pfmalloc-3-of-3.patch"
+
+ #Miscellaneous
+ epatch "${FILESDIR}/${P}-bsd-init.patch"
fi
autotools-utils_src_prepare
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 12e82044919d..fad3c37758a3 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -1,47 +1,48 @@
-DIST bfs357-penalise_fork_depth_account_threads.patch 9786 RMD160 4ff4047a717f718a211c4521e5d8c0d8af4254a6 SHA1 03fc0dbb4354103894b0cff30dc72d242d626dcc SHA256 c8ca930785b969ca24a6f8dbd63bdfbe4d07264b1c982272d50718e712d00f13
-DIST deblob-2.6.31 80819 RMD160 20972daf3852336198b5e1ac4f95a9d88f5d1d67 SHA1 41070a790894136913469bdcb3433b3d13b3e797 SHA256 4dce1f711d5098430f15ca0664ad3a1ad83a0ce6faf10d0dc8b8f53f2ab655f0
-DIST deblob-2.6.32 84094 RMD160 394f46ec5b869638a7bc2e87beb118167c9bd6cb SHA1 1a2a1efb72126609d9e3b9be99ae5be2751efd06 SHA256 de625f0bd221c9c38d4453f1b709622f222d86a0ae9350d2b7b0e17795e6de6d
-DIST deblob-2.6.33 86599 RMD160 534eb7b76ea29561a0b6e73659f67fc746fad111 SHA1 0c3c2d8c299f3cb5d807bc4a35b20bdca50ccbce SHA256 176aa9c73f27c9c69f198e3637cae61072f152c25c468ffbebf1a4c2494d52d0
-DIST deblob-2.6.34 88276 RMD160 12f83200b74a9d859b7241b1e8d8c0250d8bcb90 SHA1 985bd73ebca8e720f92eb01d11c22e25d21865b6 SHA256 9478ada7a36f3858ef9ba3dc5c9609fb45fa9b286a002ccfba09045c81b217ed
-DIST deblob-2.6.35 90643 RMD160 3ddd784a9be90b98f126345fc71b45bc711b66a6 SHA1 a8774f8e27c402701fb436e2bd3ea996d88178b6 SHA256 dda16c3b77c6159715ca05d8a45f509420f5fc708afee038a820e18751f537b7
-DIST deblob-2.6.36 90559 RMD160 32cc73f2b3fa0304e7ebf8c35f0501570ad08ce7 SHA1 71c2cc4bcdb800d46deac61cb9ac8c2cc51b1faa SHA256 fe4fb0cb06d017d1ec70f50c1c06e184c31c9bba6c4b359e43d54125d60501df
-DIST deblob-2.6.37 97431 RMD160 8880f01ec565b3d5093caeacf7b1ee2b93d6f586 SHA1 a34daada57dc6d73cfc61b25dfcb248eac245337 SHA256 8beee2feddd27230aac078017d4927b67296941c855720560e58ab520abe7e2e
-DIST deblob-2.6.38 99773 RMD160 f52e78df8e819319d0aabf24fe471e2ef9e02140 SHA1 0d176aa88f0525123d293e26617f2d287fabdddc SHA256 ddabcd846baa19b7e82adec3ca8ff17f2f7425c292516889098559f639e763eb
-DIST deblob-check-2.6.31 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
-DIST deblob-check-2.6.32 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
-DIST deblob-check-2.6.33 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
-DIST deblob-check-2.6.34 268995 RMD160 0186c8b3ef596feb0be938a7a75da620a7f425b2 SHA1 59f978b9455099c634947638ebf1ce6c82c1aead SHA256 2c995748c14bed50b93746a35a44b33138b2758031e3ef7d0159911cbab83c30
-DIST deblob-check-2.6.35 269127 RMD160 2143e3f0fc362d90b00f5f05cdd6dac811f352d0 SHA1 6f2b976d64ad375db641ca9220fc40df1c5e3d8f SHA256 2cf4a02ab3e06512fe16d75704ceca9bd4d97fe0985ea0a0a34f64ce7fc18527
-DIST deblob-check-2.6.36 285794 RMD160 2e3232ec9cbbb4874e90a4995372e2f10c0036e1 SHA1 f06f75e3b96d8bce109aa30ccab491624602795c SHA256 5e6fcb7110da5fb62edb0b85f169090de714cba2aac3cbfafbd84b6a860c8641
-DIST deblob-check-2.6.37 328720 RMD160 6739c283f68b9de253071d757991d41618722cb8 SHA1 65d202793837b916974de3e0d2dfa5312cbfe31e SHA256 113898a885fce63b367ea6b7ddcf1e7c3ae47bac01617c228252a061433b6d32
-DIST deblob-check-2.6.38 345831 RMD160 1caea73e54a21cb1100a4ee8226201ddd8a89985 SHA1 44de3ac14d9a3e94b97553051aff0ebfada45274 SHA256 6f681dbd1c1c44cba2c9902dd77a5a51b2d1cc81567cffc60ba92bd0bdd4ff2f
-DIST linux-2.6.31.tar.bz2 61494822 RMD160 c0d88e63740abf0d4f9d82557260a31643f5a01b SHA1 c6e0e6b473ba2b80d164e37cfabf294e783c03d9 SHA256 0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
-DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
-DIST linux-2.6.33.tar.bz2 66266488 RMD160 7f0897db8113bc17249d82d61ca41e3b91eb4664 SHA1 acc8db00f30c7dfb4f04183a88ba35a32b6f8e8d SHA256 63e237de3b3c4c46a21833b9ce7e20574548d52dabbd1a8bf376041e4455d5c6
-DIST linux-2.6.34.tar.bz2 67633622 RMD160 dafd721b00c13e3652405b517b379eed10020bf4 SHA1 4188857ba71f301991dc56285f593e9c311e5824 SHA256 fa395fec7de633df1cb85b6248b8f35af98380ed128a8bc465fb48bc4d252633
-DIST linux-2.6.35.tar.bz2 69305709 RMD160 f5d91abb4fa72fac812578d830b22180d85a0e6f SHA1 4cb1fbfbeedcd658ca37739679c65dfaa136bf4e SHA256 18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf
-DIST linux-2.6.36.tar.bz2 70277083 RMD160 d739da505a79e71a1370d36e1373b36be055c123 SHA1 b546ab66458d7d614151d80adbc03b4d28977ae2 SHA256 15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04
-DIST linux-2.6.37.tar.bz2 73577826 RMD160 fced3801f3c94aa545c90e10981de616376a3b41 SHA1 eba83c89e71a86060ef6ff76aefff660aef819e2 SHA256 edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a
-DIST linux-2.6.38.tar.bz2 74739098 RMD160 d1179be93f1309303b9aa6008a25b6247726e764 SHA1 02aade5ad3dedd70739c9b4a05de40edbe432d25 SHA256 72f0cfaefb8dc86b219d5a742dd0375332627641ecbdf5badd3158e2127b9304
-DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
-DIST linux-3.0.tar.bz2 76753134 RMD160 e20c9564ec0c8128e28a4c038986d4d93bbe34bb SHA1 45b64bffc860f70ab7956da4493c488010714650 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
-DIST linux-3.1.tar.bz2 77190238 RMD160 f9a3ce57b9f20a1402ef340792d3c223140ce1d2 SHA1 ac792701561b1cd4279302b8bb8f474731762ad1 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
-DIST linux-3.2.tar.bz2 78147838 RMD160 15eb022305dfc8b0e1d59e396911fa86eb9c3bdf SHA1 3460afa971049aa79b8f914e1bfd619eedd19f55 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
-DIST linux-3.3.tar.bz2 78963640 RMD160 2bdb25e5af4549a43d8b202508b85837005146e5 SHA1 dc10fd59e5afbe0f74de06862435dd8bed07ca6a SHA256 8fd669b4e48181b8d44644a45bf421a84bb8d5ec273ef36349796443e442f333
-DIST linux-3.4.tar.bz2 80173484 RMD160 e0bcaa53b6eb3de9498f51b2c8b90d6c52d54889 SHA1 dfc54e7fbee81f77aba85d3d8ff2d992e1e49573 SHA256 a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d
-DIST patch-2.6.31-pf9.bz2 358306 RMD160 125e81be6cc3eff4b2a52317978b713901968cb3 SHA1 55796d40ab58654914738af1544c334ba80b7cb9 SHA256 55106f8f17d7987e8789254d52f44e093a2ab520292d0106288d14ea4f3a1e9c
-DIST patch-2.6.32-pf16.bz2 445921 RMD160 b5116075a5fb12eaf6d8f67535e20b5b566c7eed SHA1 04f99492c102aa69918d3f1ae61328d8de78c7a9 SHA256 72ba0a9eb0c0dda1e553b9d0d7e450eec96cbfa625f3a3c2a8397d1ce12f7f20
-DIST patch-2.6.33-pf4.bz2 378325 RMD160 77d9df1f077777f0e94297c5374db86e14d1bf0d SHA1 0072e34e5b9624b636e01c70eda20f4f6017df6c SHA256 4b6b641746e30983ac51a20b3098053f69591861bdf0b43e3bed9df8ccf6ff70
-DIST patch-2.6.34-pf7.bz2 427361 RMD160 7afd6c3273a8c56d742e4ed1c7998cd8284e1de0 SHA1 9c7300734685d70aa60f122228621b0f43e8c8ae SHA256 d10679183c490243f3d60070f9825653d7894b49b9cf88ca75daf846c41f0282
-DIST patch-2.6.35-pf11.bz2 397185 RMD160 0ca7bdaf78d7460dc9857e189a85ec83f116c170 SHA1 bbd05731781c693733c7e6b944aed34caf6dcd0e SHA256 f5b92437f55b9d5e06821cc4aa75aec56641df9cd7610c3991f79b30c3265fc3
-DIST patch-2.6.36-pf6.bz2 345620 RMD160 5f7332c65dfe20cd3fc75673513575b0c4dee78b SHA1 e2ceb692624593eed6378950cdd3439b99971b17 SHA256 ceea90b693fc54afe9929aa7c7c820d21aa98c1447372d5282fb5f8ef4c7e638
-DIST patch-2.6.37-pf6.bz2 379823 RMD160 76dbc236a09f30b38a34c1ce9e38f5d3489ec148 SHA1 9696e4f30d68e1127a2e8e5269088e6c92c1c1da SHA256 0ba90c8f1be582a81568f2ffdfdb3f16feae8bbc446b59174f0767e873ce177a
-DIST patch-2.6.38-pf8.bz2 373278 RMD160 e5dcf139171e272ef04f18e52025410e5e78fff2 SHA1 cbcbd3f498e61c5522ec2207fd3609c3a12573a7 SHA256 9067998dd697d8d4acc272c0f4fd400e93ea74cdc3a5a06a32ff9d0d2cef3bbb
-DIST patch-2.6.39-pf4.bz2 351707 RMD160 6f317c3a525d8dacc475e7b0f2713a2e5604dccf SHA1 7c8bea6334eaed162c12edf0b40376094945db2e SHA256 c1e977b6b12dd5b0fc110bb2bd1dc98416e656bb95c445e0995182ad9766adbb
-DIST patch-3.0.7-pf.bz2 455906 RMD160 48f49443bdec15c9002d4c5fdb7dc3d7b5c128c0 SHA1 187f7121dfd9a78cd9439c3b1a6cd5bafae66638 SHA256 bde9041ee795eeddf56cb164d15355e0bf3b9ec996a8c4cbdbf8e30805e89340
-DIST patch-3.1.6-pf.bz2 424384 RMD160 6dd142e08612eed7918a2db63649d7d4cb2f182e SHA1 31712f46812cb95ba3f129e322bfb174aec5ca44 SHA256 bc7d0bcfa1a2fc6951dea5fa20f654e4f707cde0748e2d48a0b7b347e71e9faf
-DIST patch-3.2.7-pf.bz2 456810 RMD160 cb927656589e1840a0d486b66083d6546e49edf3 SHA1 ce929c556669fb0ae6348caa16f30f7c231853e3 SHA256 d657ad9afa1dd7aa3b2d09c5bd75adc409cb02ac64bb4ae143c9c63ec5d1b07d
-DIST patch-3.3.6-pf.bz2 462804 RMD160 b8e35406356ce65cdf4d2a92f937aecb9ac46bca SHA1 1ee12973a0dd4b1002ab1a9bd96517e71db6b7cd SHA256 ae3b6eb1aa940541f99e5b4d0286e4e5f56c6134c861c064bdf91d54cf38d262
-DIST patch-3.4.1-pf.bz2 464273 RMD160 564bd0fe3456aef0fc7b08d3ea260d2c8e9a609a SHA1 a560cb468d64e4dc591f2ef2a815467502fb271b SHA256 7ef91ba170eafd8a10bdeaf22acc366c35701b522b6b3d32636bb8090d604d3e
-DIST patch-3.4.2-pf.bz2 353458 RMD160 b32ac7d633c07075cd7a9ca96a9320bbb20a6a06 SHA1 9de69333dcb604918e8e1280bad771c590529be2 SHA256 3e5d0f6e03b03e7d2652f30711278553607a54661024df20506796e28fb3d985
-DIST patch-3.4.3-pf.bz2 367167 RMD160 dde134c5136144af35f6b10b2d5a976707af4914 SHA1 033a802b78c792064caf9c4aa308fb1185e3b97b SHA256 85589bd4b97d0bf1bdb2618440ed92814cfced2e6cb8e6c961bf35a9b7798602
+DIST bfs357-penalise_fork_depth_account_threads.patch 9786 SHA256 c8ca930785b969ca24a6f8dbd63bdfbe4d07264b1c982272d50718e712d00f13
+DIST deblob-2.6.31 80819 SHA256 4dce1f711d5098430f15ca0664ad3a1ad83a0ce6faf10d0dc8b8f53f2ab655f0
+DIST deblob-2.6.32 84094 SHA256 de625f0bd221c9c38d4453f1b709622f222d86a0ae9350d2b7b0e17795e6de6d
+DIST deblob-2.6.33 86599 SHA256 176aa9c73f27c9c69f198e3637cae61072f152c25c468ffbebf1a4c2494d52d0
+DIST deblob-2.6.34 88276 SHA256 9478ada7a36f3858ef9ba3dc5c9609fb45fa9b286a002ccfba09045c81b217ed
+DIST deblob-2.6.35 90643 SHA256 dda16c3b77c6159715ca05d8a45f509420f5fc708afee038a820e18751f537b7
+DIST deblob-2.6.36 90559 SHA256 fe4fb0cb06d017d1ec70f50c1c06e184c31c9bba6c4b359e43d54125d60501df
+DIST deblob-2.6.37 97431 SHA256 8beee2feddd27230aac078017d4927b67296941c855720560e58ab520abe7e2e
+DIST deblob-2.6.38 99773 SHA256 ddabcd846baa19b7e82adec3ca8ff17f2f7425c292516889098559f639e763eb
+DIST deblob-check-2.6.31 247608 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
+DIST deblob-check-2.6.32 247608 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
+DIST deblob-check-2.6.33 247608 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
+DIST deblob-check-2.6.34 268995 SHA256 2c995748c14bed50b93746a35a44b33138b2758031e3ef7d0159911cbab83c30
+DIST deblob-check-2.6.35 269127 SHA256 2cf4a02ab3e06512fe16d75704ceca9bd4d97fe0985ea0a0a34f64ce7fc18527
+DIST deblob-check-2.6.36 285794 SHA256 5e6fcb7110da5fb62edb0b85f169090de714cba2aac3cbfafbd84b6a860c8641
+DIST deblob-check-2.6.37 328720 SHA256 113898a885fce63b367ea6b7ddcf1e7c3ae47bac01617c228252a061433b6d32
+DIST deblob-check-2.6.38 345831 SHA256 6f681dbd1c1c44cba2c9902dd77a5a51b2d1cc81567cffc60ba92bd0bdd4ff2f
+DIST linux-2.6.31.tar.bz2 61494822 SHA256 0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
+DIST linux-2.6.32.tar.bz2 64424138 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
+DIST linux-2.6.33.tar.bz2 66266488 SHA256 63e237de3b3c4c46a21833b9ce7e20574548d52dabbd1a8bf376041e4455d5c6
+DIST linux-2.6.34.tar.bz2 67633622 SHA256 fa395fec7de633df1cb85b6248b8f35af98380ed128a8bc465fb48bc4d252633
+DIST linux-2.6.35.tar.bz2 69305709 SHA256 18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf
+DIST linux-2.6.36.tar.bz2 70277083 SHA256 15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04
+DIST linux-2.6.37.tar.bz2 73577826 SHA256 edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a
+DIST linux-2.6.38.tar.bz2 74739098 SHA256 72f0cfaefb8dc86b219d5a742dd0375332627641ecbdf5badd3158e2127b9304
+DIST linux-2.6.39.tar.bz2 76096559 SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
+DIST linux-3.0.tar.bz2 76753134 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0 SHA512 4a87bba5f62945d226d8c0059d38e6354ad8cd379b8d7936f934a3868a69c6a4c724aad56d974966e8ef1de45f1e0bbe628cb15fc568b6f8cfc63dbc8104bc9d WHIRLPOOL 4bf0a38a623797be81eadaa4b102f9ea1da31edab9aa9e886577bfda79ffd6e105fff702438c2e1350cbb005f9e7594be8e07fe76ad36b1c28ef94184b6edf9f
+DIST linux-3.1.tar.bz2 77190238 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
+DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463 SHA512 1f57b98e8da34b10f37ce94e0f13a994c111d483b104c27a8f58a4a55013a73a9f1ffcebb597be63ce0dfadb92201e93b0e072ba49bac0033026aceb0840c812 WHIRLPOOL 3dc893bde09f064e4614183964a4b9feaab938ca7a739f46f825818a577884eae815f195b52a4c55c571345de59d7ba09631fb68dac481a0837b24868ce60e3d
+DIST linux-3.3.tar.bz2 78963640 SHA256 8fd669b4e48181b8d44644a45bf421a84bb8d5ec273ef36349796443e442f333 SHA512 dcb99e48827d6b022fe75cbc4cd8079adf6b2ca3dae7964a34ac3a8a6374f6ced44047abc4ce814bbe2fb537ab003911563962eb3cb6c7e98788d9277dd716df WHIRLPOOL 4895be5e6301f7359807482711242efc1d2a8850641b7b584fba9f12785ef9241520687ad28c79a2d39ba5abc4f371f1f080305e416a175200b4a58c59c0d86f
+DIST linux-3.4.tar.bz2 80173484 SHA256 a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d SHA512 597002fa82b70b5052f9e05c1d8547bc5f89d8e1aecfd1765f4033f6d2c5c02d51b6372dbeef12c2eb070ae318a04c39925050cb37a39399961c8b263479fca1 WHIRLPOOL 57e6dd7094db2bc41175d7bb551e8237ea96eacf3710a734e8413915c54304e84ca11455e41c7752882ce81048459555d44d1798bf0775b79c3d74b13aa3a9f2
+DIST patch-2.6.31-pf9.bz2 358306 SHA256 55106f8f17d7987e8789254d52f44e093a2ab520292d0106288d14ea4f3a1e9c
+DIST patch-2.6.32-pf16.bz2 445921 SHA256 72ba0a9eb0c0dda1e553b9d0d7e450eec96cbfa625f3a3c2a8397d1ce12f7f20
+DIST patch-2.6.33-pf4.bz2 378325 SHA256 4b6b641746e30983ac51a20b3098053f69591861bdf0b43e3bed9df8ccf6ff70
+DIST patch-2.6.34-pf7.bz2 427361 SHA256 d10679183c490243f3d60070f9825653d7894b49b9cf88ca75daf846c41f0282
+DIST patch-2.6.35-pf11.bz2 397185 SHA256 f5b92437f55b9d5e06821cc4aa75aec56641df9cd7610c3991f79b30c3265fc3
+DIST patch-2.6.36-pf6.bz2 345620 SHA256 ceea90b693fc54afe9929aa7c7c820d21aa98c1447372d5282fb5f8ef4c7e638
+DIST patch-2.6.37-pf6.bz2 379823 SHA256 0ba90c8f1be582a81568f2ffdfdb3f16feae8bbc446b59174f0767e873ce177a
+DIST patch-2.6.38-pf8.bz2 373278 SHA256 9067998dd697d8d4acc272c0f4fd400e93ea74cdc3a5a06a32ff9d0d2cef3bbb
+DIST patch-2.6.39-pf4.bz2 351707 SHA256 c1e977b6b12dd5b0fc110bb2bd1dc98416e656bb95c445e0995182ad9766adbb
+DIST patch-3.0.7-pf.bz2 455906 SHA256 bde9041ee795eeddf56cb164d15355e0bf3b9ec996a8c4cbdbf8e30805e89340
+DIST patch-3.1.6-pf.bz2 424384 SHA256 bc7d0bcfa1a2fc6951dea5fa20f654e4f707cde0748e2d48a0b7b347e71e9faf
+DIST patch-3.2.7-pf.bz2 456810 SHA256 d657ad9afa1dd7aa3b2d09c5bd75adc409cb02ac64bb4ae143c9c63ec5d1b07d
+DIST patch-3.3.6-pf.bz2 462804 SHA256 ae3b6eb1aa940541f99e5b4d0286e4e5f56c6134c861c064bdf91d54cf38d262 SHA512 d56860e0e2a6a4bad22b578aa68512654356877d1bdf614ba1ccf50ca24cf9c59d71a0ccab60df2caac8d593982f82e5db09827649890cc263d53ad98784f413 WHIRLPOOL ebf6504f5863f3a5b134e63f994a6f1229c0955d1980d85c29f9125341d38155effbeb35a8222b8ebed3b1451082327fa6999b5c52c5b3f84404b551a8897806
+DIST patch-3.4.1-pf.bz2 464273 SHA256 7ef91ba170eafd8a10bdeaf22acc366c35701b522b6b3d32636bb8090d604d3e SHA512 3283ac45fd5f3fc348f7d9e1906e02c92d7618c6097c17a035a1a83ce43dd3ea1c6f337d19b100f58a5308debb3f0d8a34dc40756a4b44db67f13956194e7a1b WHIRLPOOL 6b6bf89de39f0d5ca8786e3dc0d90eda8adf82cc2ee31ba4073693f23e60528567348714fe2118d89e48b38cb8548fa13899a1d479f1e88c60e3baaca6f5cbb8
+DIST patch-3.4.2-pf.bz2 353458 SHA256 3e5d0f6e03b03e7d2652f30711278553607a54661024df20506796e28fb3d985 SHA512 2df0600bfc5f3eb875b232e63f0a996c16ff600693b8f584bde988f8a11f6f0fec50ff1462da99ce08780b32c28020ba25226f576be720f641413090a6e268d5 WHIRLPOOL 8ea48e1fcde88b4b8471e6e46154f9b04d3acb306a0e5a0517c765699faf901ca43a8d35ab9b2d4d44bf56d442496c04a7970232482eb870c2f891fddf692e6b
+DIST patch-3.4.3-pf.bz2 367167 SHA256 85589bd4b97d0bf1bdb2618440ed92814cfced2e6cb8e6c961bf35a9b7798602
+DIST patch-3.4.4-pf.bz2 367249 SHA256 8d7141c06112155a8c64eb5b2635eb512dee958c49a2a7c3e81117545c699888 SHA512 1b1f1380f8013ad245e1e9fbd5ff979d7226eb19819a7bb2e4a836077dedef0a903a1ccd981ec1a0e37420b373f0070392f090be1c1fba23274062d38857ee04 WHIRLPOOL a291c5960757b8c34796fab5d5f1725c5c706a51a86db49dbc3559bda3f6c5eb06d9013e1ad527fac7bd643eb91f691dbfb4c0f7a44052080b528c69cee8a1e9
diff --git a/sys-kernel/pf-sources/pf-sources-3.4.4.ebuild b/sys-kernel/pf-sources/pf-sources-3.4.4.ebuild
new file mode 100644
index 000000000000..5f2375ade605
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-3.4.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/pf-sources-3.4.4.ebuild,v 1.1 2012/07/11 17:57:39 hwoarang Exp $
+
+EAPI="2"
+
+inherit versionator
+
+COMPRESSTYPE=".bz2"
+K_USEPV="yes"
+UNIPATCH_STRICTORDER="yes"
+K_SECURITY_UNSUPPORTED="1"
+
+CKV="$(get_version_component_range 1-2)"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+K_NOSETEXTRAVERSION="don't_set_it"
+
+DESCRIPTION="Linux kernel fork with new features, including the -ck patchset (BFS), BFQ, TuxOnIce and LinuxIMQ"
+HOMEPAGE="http://pf.natalenko.name/"
+
+PF_FILE="patch-${PV}-pf${COMPRESSTYPE}"
+PF_URI="http://pf.natalenko.name/sources/$(get_version_component_range 1-2)/${PF_FILE}"
+EXPERIMENTAL_PATCHES=(
+ # http://ck-hack.blogspot.com/2010/11/create-task-groups-by-tty-comment.html
+ # http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch
+)
+EXPERIMENTAL_URI="
+ experimental? (
+ ${EXPERIMENTAL_PATCHES[@]}
+ )
+"
+SRC_URI="${KERNEL_URI} ${PF_URI}" # \${EXPERIMENTAL_URI}
+
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="" # experimental
+
+KV_FULL="${PVR}-pf"
+S="${WORKDIR}"/linux-"${KV_FULL}"
+
+pkg_setup(){
+ ewarn
+ ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+ ewarn "If you need support, please contact the pf developers directly."
+ ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+ ewarn "the ebuilds. Thank you."
+ ewarn
+ kernel-2_pkg_setup
+}
+
+src_prepare(){
+ epatch "${DISTDIR}"/"${PF_FILE}"
+}
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+
+ elog
+ elog "${P} has the following optional runtime dependencies:"
+ elog " sys-apps/tuxonice-userui"
+ elog " provides minimal userspace progress information related to"
+ elog " suspending and resuming process"
+ elog " sys-power/hibernate-script or sys-power/pm-utils"
+ elog " runtime utilites for hibernating and suspending your computer"
+ elog
+}
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+see: ${HOMEPAGE}."
diff --git a/sys-libs/mtdev/mtdev-1.1.2.ebuild b/sys-libs/mtdev/mtdev-1.1.2.ebuild
index 92bd1cdf38dc..26129c432581 100644
--- a/sys-libs/mtdev/mtdev-1.1.2.ebuild
+++ b/sys-libs/mtdev/mtdev-1.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/mtdev/mtdev-1.1.2.ebuild,v 1.8 2012/06/28 15:53:53 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/mtdev/mtdev-1.1.2.ebuild,v 1.9 2012/07/11 19:17:10 ranger Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://bitmath.org/code/mtdev/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86"
IUSE="static-libs"
DEPEND=">=sys-kernel/linux-headers-2.6"
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 03535ff8a0c2..4745fe6d5491 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -1,2 +1,2 @@
-DIST apcupsd-3.14.10.tar.gz 1336852 SHA256 0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032
-DIST apcupsd-3.14.8.tar.gz 1317601 SHA256 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7
+DIST apcupsd-3.14.10.tar.gz 1336852 SHA256 0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032 SHA512 f95918bff783cb60fa40b03a532ee7447293b0542f44f2f9ecf36ee028df3aa414f01e2b834a28fc319d88ec2e84c81314cd546b5628554176f2ca47fdc66bbc WHIRLPOOL 1fb40a5199eb8dfcd287bab08c2bbf51f02a3657ba615e16395d5f377bc9a5b6144db24b83ef5e9172ff970a715f87f685118a035c00372c34702984fac02d38
+DIST apcupsd-3.14.8.tar.gz 1317601 SHA256 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7 SHA512 07e6a15538bf1824b5063a1a93f33231639cf962e658c0dada1b244f2554af81824825d807ea81fd0388e25ed8fac0957621bfded96e3faeb7b594548fc4d418 WHIRLPOOL e5a580afc4955a373f020cb6e4ccbf07f9f020d4c15eaae59b416499c25a00b9d4bbc6af012bd2529024e8a3668a1d7c47f19f1bcb99f5ba60dc0108fa13c4f2
diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml
index bee9f9ae6f02..63354fe477db 100644
--- a/sys-power/apcupsd/metadata.xml
+++ b/sys-power/apcupsd/metadata.xml
@@ -1,5 +1,20 @@
- base-system
+
+mattm@gentoo.org
+Matthew Marlowe
+
+
+Apcupsd can be used for power mangement and controlling most of
+APC's UPS models on Unix and Windows machines. Apcupsd works with
+most of APC's Smart-UPS models as well as most simple signalling
+models such a Back-UPS, and BackUPS-Office. During a power failure,
+apcupsd will inform the users about the power failure and that a
+shutdown may occur. If power is not restored, a system shutdown
+will follow when the battery is exhausted, a timeout (seconds)
+expires, or runtime expires based on internal APC calculations
+determined by power consumption rates.
+
+base-system
diff --git a/virtual/httpd-php/httpd-php-5.3.ebuild b/virtual/httpd-php/httpd-php-5.3.ebuild
index f9645ba7f7b3..dd231fe09eeb 100644
--- a/virtual/httpd-php/httpd-php-5.3.ebuild
+++ b/virtual/httpd-php/httpd-php-5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/httpd-php/httpd-php-5.3.ebuild,v 1.13 2011/08/22 17:54:39 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/httpd-php/httpd-php-5.3.ebuild,v 1.14 2012/07/11 22:53:18 blueness Exp $
EAPI="2"
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
SLOT="5.3"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="|| ( =dev-lang/php-5.3*[apache2]
diff --git a/virtual/httpd-php/httpd-php-5.4.ebuild b/virtual/httpd-php/httpd-php-5.4.ebuild
index f8e0ab4ea7a9..4336c84e8106 100644
--- a/virtual/httpd-php/httpd-php-5.4.ebuild
+++ b/virtual/httpd-php/httpd-php-5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/httpd-php/httpd-php-5.4.ebuild,v 1.1 2011/11/11 13:55:17 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/httpd-php/httpd-php-5.4.ebuild,v 1.2 2012/07/11 22:53:18 blueness Exp $
EAPI="2"
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
SLOT="5.3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="|| ( =dev-lang/php-5.4*[apache2]
diff --git a/www-apps/coppermine/Manifest b/www-apps/coppermine/Manifest
index 14010de23602..910d6f2e8522 100644
--- a/www-apps/coppermine/Manifest
+++ b/www-apps/coppermine/Manifest
@@ -1,2 +1 @@
-DIST cpg1.4.27.zip 4191318 RMD160 2d86650a9ab4507f432cb6a9baffffc0ff37ef04 SHA1 9ae36a204cabeb0df4e0e8f25ad0921dc14bca2c SHA256 7312449e8774e9a64647ebafef4586cdcadaca48014f4e836b366655d37b04c3
-DIST cpg1.5.20.zip 19122378 RMD160 0d6a04cbc257f401e722b087531fcf88c559be8f SHA1 d680100c9c2eec996c992749a9d322982a7951c7 SHA256 f5388d6fa0952f4aba8f51ae9f86c7f916c432831e02050c27d27737cececcf5
+DIST cpg1.5.20.zip 19122378 SHA256 f5388d6fa0952f4aba8f51ae9f86c7f916c432831e02050c27d27737cececcf5 SHA512 8dd1ab52eedd8d1bd9eb95936125eaff595a66ca936857a8f21025a81a4d65194b0813b2f0b5db8d9bfab5f4ffb4442afd7c06cbae078e576bc8355c921042bf WHIRLPOOL 1c6c28a72aaa63501e3b11a794de89a5cd1b30577768e3c76f5ae97f0f56c6c743b2af1ec8a07a2fde6e745bbbf89ffe1b8b74140039e0468830bf748b1b44fe
diff --git a/www-apps/coppermine/coppermine-1.4.27.ebuild b/www-apps/coppermine/coppermine-1.4.27.ebuild
deleted file mode 100644
index 65ba2a01be58..000000000000
--- a/www-apps/coppermine/coppermine-1.4.27.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/coppermine/coppermine-1.4.27.ebuild,v 1.1 2011/06/09 06:53:53 pva Exp $
-
-inherit webapp versionator depend.php
-
-DESCRIPTION="Web picture gallery written in PHP with a MySQL backend"
-HOMEPAGE="http://coppermine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/cpg${PV}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="imagemagick"
-
-DEPEND="app-arch/unzip"
-RDEPEND="imagemagick? ( media-gfx/imagemagick )"
-
-S="${WORKDIR}"/cpg$(delete_all_version_separators ${PV})
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
- webapp_pkg_setup
- require_php_with_use mysql
-}
-
-src_install() {
- webapp_src_preinst
-
- dodoc CHANGELOG README.txt
- dohtml -r docs
- rm -rf CHANGELOG README.txt COPYING docs/
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
-
- dodir "${MY_HTDOCSDIR}"/albums/{userpics,edit}
- webapp_serverowned "${MY_HTDOCSDIR}"/albums{,/userpics,/edit}
- webapp_serverowned "${MY_HTDOCSDIR}"/include
-
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- webapp_src_install
-}
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index f0809121c356..ffa68e2a2723 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,10 +1,5 @@
-DIST moodle-1.9.18.tgz 14052970 RMD160 c28332851657eea16b41b3826de3bde74668861d SHA1 4f3804ded0b2a00f4c1b2c80db8a8ea7d393d810 SHA256 8707e5de8925f171e410737b360a0f2f3c2a1dd36dff4109bac97101889c24a3
DIST moodle-1.9.19.tgz 14071136 SHA256 969a7de07b1b116e3528e1c5d0bdaeeb7f00ae81d10b6451167d1eea85818d98 SHA512 55098ab1e8016f25163a0e24734a8f394e891cf7aeea61ef6ad9e73fbbaccb5187da20edbbc3290729db7bd6ed6b731ebfa620de2b40445d4ce04c0623a78c71 WHIRLPOOL 9b3db6315273cea9fc24f9f327d82ca81c69ec22e3e1f52f7ce82902b47d465dcf6ccbda11f5400480fd1598ab811f8e64093b5187a5e6d5717984141a45c2ba
DIST moodle-2.0.10.tgz 22521921 SHA256 1b73f14c21eab866edbb9fb64e662bd25fcc2fefb630b7e3e9564bf0f95cc8f2 SHA512 cbf8b88de07e5534b98d87ff5c00becb0bb4db3e9fd7b9090792fc356ffab2c0e2c5594b77b6e632e574e37080ce40e800b754c47acc8f16ef0a5ca0d4114cf7 WHIRLPOOL 8c36ceb119333ce3a732abd446492a835343829571f13008ee3017127799a979ca95379309426150f2c3fa6afdb33c3174cf950d28c04f53d52e1b9570fdd500
-DIST moodle-2.0.9.tgz 22519227 RMD160 6d6737fd653dee9a9bc4f04b9791ceb56afb470d SHA1 9c32b751728b7e4f9bfb7ff16ea4b2d865420b7b SHA256 4e543af4d0ad4b3cf1fdeb00e11769c1bc2d0c75b21a9a2dd07e4c4b1d537344
-DIST moodle-2.1.6.tgz 24026036 RMD160 f216beac815e0f505d6486d54f7670f098f1366c SHA1 167fe992e6a0dcfc6495794521e076d43dd68796 SHA256 860c44ac08fb3f660008104b6d08f2b8ae81782d2ff13418ce76bfd9620372e0
DIST moodle-2.1.7.tgz 24035837 SHA256 8de6a6ac4121b208cee7f642be77b470a5c6c0012d8a6d39a187a1d51d531a9c SHA512 657fd886f8a62d33728f68bafd136e4cba965d657b8794284616acbbb1479d28ab88a0fcfae8f848715b4f457b7140507c3e54d658c59e11cf18da39ff84ef7e WHIRLPOOL 337b42dcf9b163555e70ee8473e100ad029e861cc63ee8fbda0de0d8b95c0ccf172a0bb678d6ad2a6ae78b85103e1d143a70e4946c1559f0cb5273cdebd3ff1f
-DIST moodle-2.2.3.tgz 24961469 RMD160 9ea0654160d632fa32b5b4264b10bd79bb2c3697 SHA1 be96e4b8a2d91094f49b69cf3ff8e0d478d787a8 SHA256 4a3e6a7ff0d508e5dce2ce085e99ee265847be0819604a798310d33d49555287
DIST moodle-2.2.4.tgz 24974166 SHA256 f093fa32b20247c47d258f2f99af97a4f1ee64a86a3397265da5d5569215110f SHA512 946759fa656d397eea2e668be73591604cf3253f92d41c8717d73e9361e11bf9b8cca64b3ef7334de0308294fa2cd4d401f4ed389497d95bcb7f775a34a10ada WHIRLPOOL 8851e9ca22a5df44a6e2a2e3a03b39dd031622b53c1d714bfc90710b34b376765966551607a7bcd54979a2d4e844b6db3aae68f9744cafe6e990a383a0d49758
DIST moodle-2.3.1.tgz 28464309 SHA256 b09a6f15fdfde1a6acf3e94e69e6e175f80e0efa217d0cd88545c375b7c28770 SHA512 261579036512a4eecbb238bd281d3579b35fdf89e3d31148d64fd26cf4eb229d5444ca3f87b10cf9804c4f5dfe145199952de1d8847995b606462e9eb5bc4258 WHIRLPOOL 0d7cb6f203f00678e572ba722df7063bfc166636ce748606f866b00df7e353cac402d4e2558bc46199711478b806dfa677ca4fd549d64d022f7162b89dc89b8a
-DIST moodle-2.3.tgz 28429018 RMD160 c1bbe8ef7f8ac268cd0c42f7e719202caaea01a8 SHA1 63e15c1dcb9f9ca3c02d18c8b79f79368eed838a SHA256 abe44e2bc3d8036004af0325cd910b75d53a306f69cc6abfa06d2b2e3fece4d8
diff --git a/www-apps/moodle/moodle-1.9.18.ebuild b/www-apps/moodle/moodle-1.9.18.ebuild
deleted file mode 100644
index 2c472a4f3338..000000000000
--- a/www-apps/moodle/moodle-1.9.18.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.18.ebuild,v 1.1 2012/05/16 02:11:08 blueness Exp $
-
-EAPI="4"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DBFLAGS="mysql?,postgres?"
-DBTYPES=${DBFLAGS//\?/}
-DBTYPES=${DBTYPES//,/ }
-
-AUTHFLAGS="imap?,ldap?,odbc?"
-AUTHMODES=${AUTHFLAGS//\?/}
-AUTHMODES=${AUTHMODES//,/ }
-
-PHPFLAGS="ctype,curl,gd,iconv,session,ssl,tokenizer,xml,xmlrpc,zlib"
-
-IUSE="${DBTYPES} ${AUTHMODES} vhosts"
-
-# No forced dependency on
-# mysql? ( virtual/mysql )
-# postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND="
- >=dev-lang/php-4.3.0[${DBFLAGS},${AUTHFLAGS},${PHPFLAGS}]
- virtual/httpd-php
- virtual/cron"
-
-pkg_setup() {
- webapp_pkg_setup
-
- # How many dbs were selected? If one and only one, which one is it?
- MYDB=""
- DB_COUNT=0
- for db in ${DBTYPES}; do
- if use ${db}; then
- MYDB=${db}
- DB_COUNT=$(($DB_COUNT+1))
- fi
- done
-
- if [[ ${DB_COUNT} -eq 0 ]]; then
- eerror
- eerror "\033[1;31m**************************************************\033[00m"
- eerror "No database selected in your USE flags,"
- eerror "You must select at least one."
- eerror "\033[1;31m**************************************************\033[00m"
- eerror
- die
- fi
-
- if [[ ${DB_COUNT} -gt 1 ]]; then
- MYDB=""
- ewarn
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn "Multiple databases selected in your USE flags,"
- ewarn "You will have to choose your database manually."
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn
- fi
-}
-
-src_prepare() {
- rm COPYING.txt
- cp "${FILESDIR}"/config.php .
-
- #
- # Moodle expect postgres7, not postgres
- #
- MYDB=${MYDB/postgres/postgres7}
- if [[ ${DB_COUNT} -eq 1 ]] ; then
- sed -i -e "s|mydb|${MYDB}|" config.php
- fi
-}
-
-src_install() {
- webapp_src_preinst
-
- local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
- dodir ${MOODLEDATA}
- webapp_serverowned -R "${MOODLEDATA}"
-
- local MOODLEROOT="${MY_HTDOCSDIR}"
- insinto ${MOODLEROOT}
- doins -r *
-
- webapp_configfile "${MOODLEROOT}"/config.php
-
- if [[ ${DB_COUNT} -eq 1 ]]; then
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- else
- webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
- fi
-
- webapp_src_install
-}
-
-pkg_postinst() {
- einfo
- einfo "\033[1;32m**************************************************\033[00m"
- einfo
- einfo "To see the post install instructions, do"
- einfo
- einfo " webapp-config --show-postinst ${PN} ${PVR}"
- einfo
- einfo "\033[1;32m**************************************************\033[00m"
- einfo
-}
diff --git a/www-apps/moodle/moodle-1.9.19.ebuild b/www-apps/moodle/moodle-1.9.19.ebuild
index a1e1df8f1dbc..b53fa1785934 100644
--- a/www-apps/moodle/moodle-1.9.19.ebuild
+++ b/www-apps/moodle/moodle-1.9.19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.19.ebuild,v 1.1 2012/07/06 09:27:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.19.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
EAPI="4"
@@ -15,7 +15,7 @@ SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
#SLOT empty due to webapp
DBFLAGS="mysql?,postgres?"
diff --git a/www-apps/moodle/moodle-2.0.10.ebuild b/www-apps/moodle/moodle-2.0.10.ebuild
index 132c50657d5a..6b59e41e2f8c 100644
--- a/www-apps/moodle/moodle-2.0.10.ebuild
+++ b/www-apps/moodle/moodle-2.0.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.10.ebuild,v 1.1 2012/07/06 09:27:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.10.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
EAPI="4"
@@ -15,7 +15,7 @@ SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
#SLOT empty due to webapp
DB_FLAGS="mysqli?,postgres?"
diff --git a/www-apps/moodle/moodle-2.0.9.ebuild b/www-apps/moodle/moodle-2.0.9.ebuild
deleted file mode 100644
index 86b5d850a8f1..000000000000
--- a/www-apps/moodle/moodle-2.0.9.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.9.ebuild,v 1.1 2012/05/16 02:11:08 blueness Exp $
-
-EAPI="4"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-
-# No forced dependency on
-# mysql? ( virtual/mysql )
-# postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND="
- =dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53}]
- virtual/httpd-php
- virtual/cron"
-
-pkg_setup() {
- webapp_pkg_setup
-
- # How many dbs were selected? If one and only one, which one is it?
- MYDB=""
- DB_COUNT=0
- for db in ${DB_TYPES}; do
- if use ${db}; then
- MYDB=${db}
- DB_COUNT=$(($DB_COUNT+1))
- fi
- done
-
- if [[ ${DB_COUNT} -eq 0 ]]; then
- eerror
- eerror "\033[1;31m**************************************************\033[00m"
- eerror "No database selected in your USE flags,"
- eerror "You must select at least one."
- eerror "\033[1;31m**************************************************\033[00m"
- eerror
- die
- fi
-
- if [[ ${DB_COUNT} -gt 1 ]]; then
- MYDB=""
- ewarn
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn "Multiple databases selected in your USE flags,"
- ewarn "You will have to choose your database manually."
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn
- fi
-}
-
-src_prepare() {
- rm COPYING.txt
- cp "${FILESDIR}"/config.php .
-
- # Moodle expect postgres7, not postgres
- MYDB=${MYDB/postgres/postgres7}
-
- # Moodle expects mysql, not mysqli
- MYDB=${MYDB/mysqli/mysql}
-
- if [[ ${DB_COUNT} -eq 1 ]] ; then
- sed -i -e "s|mydb|${MYDB}|" config.php
- fi
-}
-
-src_install() {
- webapp_src_preinst
-
- local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
- dodir ${MOODLEDATA}
- webapp_serverowned -R "${MOODLEDATA}"
-
- local MOODLEROOT="${MY_HTDOCSDIR}"
- insinto ${MOODLEROOT}
- doins -r *
-
- webapp_configfile "${MOODLEROOT}"/config.php
-
- if [[ ${DB_COUNT} -eq 1 ]]; then
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- else
- webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
- fi
-
- webapp_src_install
-}
-
-pkg_postinst() {
- einfo
- einfo "\033[1;32m**************************************************\033[00m"
- einfo
- einfo "To see the post install instructions, do"
- einfo
- einfo " webapp-config --show-postinst ${PN} ${PVR}"
- einfo
- einfo "\033[1;32m**************************************************\033[00m"
- einfo
-}
diff --git a/www-apps/moodle/moodle-2.1.6.ebuild b/www-apps/moodle/moodle-2.1.6.ebuild
deleted file mode 100644
index 2ae451a9ffca..000000000000
--- a/www-apps/moodle/moodle-2.1.6.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.6.ebuild,v 1.1 2012/05/16 02:11:08 blueness Exp $
-
-EAPI="4"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-
-# No forced dependency on
-# mysql? ( virtual/mysql )
-# postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND="
- =dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53}]
- virtual/httpd-php
- virtual/cron"
-
-pkg_setup() {
- webapp_pkg_setup
-
- # How many dbs were selected? If one and only one, which one is it?
- MYDB=""
- DB_COUNT=0
- for db in ${DB_TYPES}; do
- if use ${db}; then
- MYDB=${db}
- DB_COUNT=$(($DB_COUNT+1))
- fi
- done
-
- if [[ ${DB_COUNT} -eq 0 ]]; then
- eerror
- eerror "\033[1;31m**************************************************\033[00m"
- eerror "No database selected in your USE flags,"
- eerror "You must select at least one."
- eerror "\033[1;31m**************************************************\033[00m"
- eerror
- die
- fi
-
- if [[ ${DB_COUNT} -gt 1 ]]; then
- MYDB=""
- ewarn
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn "Multiple databases selected in your USE flags,"
- ewarn "You will have to choose your database manually."
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn
- fi
-}
-
-src_prepare() {
- rm COPYING.txt
- cp "${FILESDIR}"/config.php .
-
- # Moodle expect postgres7, not postgres
- MYDB=${MYDB/postgres/postgres7}
-
- # Moodle expects mysql, not mysqli
- MYDB=${MYDB/mysqli/mysql}
-
- if [[ ${DB_COUNT} -eq 1 ]] ; then
- sed -i -e "s|mydb|${MYDB}|" config.php
- fi
-}
-
-src_install() {
- webapp_src_preinst
-
- local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
- dodir ${MOODLEDATA}
- webapp_serverowned -R "${MOODLEDATA}"
-
- local MOODLEROOT="${MY_HTDOCSDIR}"
- insinto ${MOODLEROOT}
- doins -r *
-
- webapp_configfile "${MOODLEROOT}"/config.php
-
- if [[ ${DB_COUNT} -eq 1 ]]; then
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- else
- webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
- fi
-
- webapp_src_install
-}
-
-pkg_postinst() {
- einfo
- einfo "\033[1;32m**************************************************\033[00m"
- einfo
- einfo "To see the post install instructions, do"
- einfo
- einfo " webapp-config --show-postinst ${PN} ${PVR}"
- einfo
- einfo "\033[1;32m**************************************************\033[00m"
- einfo
-}
diff --git a/www-apps/moodle/moodle-2.1.7.ebuild b/www-apps/moodle/moodle-2.1.7.ebuild
index 8c9a2100cccc..6a0429b6295d 100644
--- a/www-apps/moodle/moodle-2.1.7.ebuild
+++ b/www-apps/moodle/moodle-2.1.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.7.ebuild,v 1.1 2012/07/06 09:27:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.7.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
EAPI="4"
@@ -15,7 +15,7 @@ SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
#SLOT empty due to webapp
DB_FLAGS="mysqli?,postgres?"
diff --git a/www-apps/moodle/moodle-2.2.3.ebuild b/www-apps/moodle/moodle-2.2.3.ebuild
deleted file mode 100644
index ddfab64f4f34..000000000000
--- a/www-apps/moodle/moodle-2.2.3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.2.3.ebuild,v 1.1 2012/05/16 02:11:08 blueness Exp $
-
-EAPI="4"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-
-# No forced dependency on
-# mysql? ( virtual/mysql )
-# postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND="
- =dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53}]
- virtual/httpd-php
- virtual/cron"
-
-pkg_setup() {
- webapp_pkg_setup
-
- # How many dbs were selected? If one and only one, which one is it?
- MYDB=""
- DB_COUNT=0
- for db in ${DB_TYPES}; do
- if use ${db}; then
- MYDB=${db}
- DB_COUNT=$(($DB_COUNT+1))
- fi
- done
-
- if [[ ${DB_COUNT} -eq 0 ]]; then
- eerror
- eerror "\033[1;31m**************************************************\033[00m"
- eerror "No database selected in your USE flags,"
- eerror "You must select at least one."
- eerror "\033[1;31m**************************************************\033[00m"
- eerror
- die
- fi
-
- if [[ ${DB_COUNT} -gt 1 ]]; then
- MYDB=""
- ewarn
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn "Multiple databases selected in your USE flags,"
- ewarn "You will have to choose your database manually."
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn
- fi
-}
-
-src_prepare() {
- rm COPYING.txt
- cp "${FILESDIR}"/config.php .
-
- # Moodle expect postgres7, not postgres
- MYDB=${MYDB/postgres/postgres7}
-
- # Moodle expects mysql, not mysqli
- MYDB=${MYDB/mysqli/mysql}
-
- if [[ ${DB_COUNT} -eq 1 ]] ; then
- sed -i -e "s|mydb|${MYDB}|" config.php
- fi
-}
-
-src_install() {
- webapp_src_preinst
-
- local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
- dodir ${MOODLEDATA}
- webapp_serverowned -R "${MOODLEDATA}"
-
- local MOODLEROOT="${MY_HTDOCSDIR}"
- insinto ${MOODLEROOT}
- doins -r *
-
- webapp_configfile "${MOODLEROOT}"/config.php
-
- if [[ ${DB_COUNT} -eq 1 ]]; then
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- else
- webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
- fi
-
- webapp_src_install
-}
-
-pkg_postinst() {
- einfo
- einfo "\033[1;32m**************************************************\033[00m"
- einfo
- einfo "To see the post install instructions, do"
- einfo
- einfo " webapp-config --show-postinst ${PN} ${PVR}"
- einfo
- einfo "\033[1;32m**************************************************\033[00m"
- einfo
-}
diff --git a/www-apps/moodle/moodle-2.2.4.ebuild b/www-apps/moodle/moodle-2.2.4.ebuild
index 4ddeca4392a8..c1594d1ef066 100644
--- a/www-apps/moodle/moodle-2.2.4.ebuild
+++ b/www-apps/moodle/moodle-2.2.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.2.4.ebuild,v 1.1 2012/07/06 09:27:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.2.4.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
EAPI="4"
@@ -15,7 +15,7 @@ SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
#SLOT empty due to webapp
DB_FLAGS="mysqli?,postgres?"
diff --git a/www-apps/moodle/moodle-2.3.1.ebuild b/www-apps/moodle/moodle-2.3.1.ebuild
index f317a7ec5eee..f26b679880df 100644
--- a/www-apps/moodle/moodle-2.3.1.ebuild
+++ b/www-apps/moodle/moodle-2.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.3.1.ebuild,v 1.1 2012/07/06 09:27:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.3.1.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
EAPI="4"
@@ -15,7 +15,7 @@ SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
#SLOT empty due to webapp
DB_FLAGS="mysqli?,postgres?"
diff --git a/www-apps/moodle/moodle-2.3.ebuild b/www-apps/moodle/moodle-2.3.ebuild
deleted file mode 100644
index 443ca8df41b0..000000000000
--- a/www-apps/moodle/moodle-2.3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.3.ebuild,v 1.1 2012/06/26 14:55:03 blueness Exp $
-
-EAPI="4"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS_53="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS_53="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-
-# No forced dependency on
-# mysql? ( virtual/mysql )
-# postgres? ( dev-db/postgresql-server-7* )
-# which may live on another server
-DEPEND=""
-RDEPEND="
- =dev-lang/php-5.3*[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS_53}]
- virtual/httpd-php
- virtual/cron"
-
-pkg_setup() {
- webapp_pkg_setup
-
- # How many dbs were selected? If one and only one, which one is it?
- MYDB=""
- DB_COUNT=0
- for db in ${DB_TYPES}; do
- if use ${db}; then
- MYDB=${db}
- DB_COUNT=$(($DB_COUNT+1))
- fi
- done
-
- if [[ ${DB_COUNT} -eq 0 ]]; then
- eerror
- eerror "\033[1;31m**************************************************\033[00m"
- eerror "No database selected in your USE flags,"
- eerror "You must select at least one."
- eerror "\033[1;31m**************************************************\033[00m"
- eerror
- die
- fi
-
- if [[ ${DB_COUNT} -gt 1 ]]; then
- MYDB=""
- ewarn
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn "Multiple databases selected in your USE flags,"
- ewarn "You will have to choose your database manually."
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn
- fi
-}
-
-src_prepare() {
- rm COPYING.txt
- cp "${FILESDIR}"/config.php .
-
- # Moodle expect postgres7, not postgres
- MYDB=${MYDB/postgres/postgres7}
-
- # Moodle expects mysql, not mysqli
- MYDB=${MYDB/mysqli/mysql}
-
- if [[ ${DB_COUNT} -eq 1 ]] ; then
- sed -i -e "s|mydb|${MYDB}|" config.php
- fi
-}
-
-src_install() {
- webapp_src_preinst
-
- local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
- dodir ${MOODLEDATA}
- webapp_serverowned -R "${MOODLEDATA}"
-
- local MOODLEROOT="${MY_HTDOCSDIR}"
- insinto ${MOODLEROOT}
- doins -r *
-
- webapp_configfile "${MOODLEROOT}"/config.php
-
- if [[ ${DB_COUNT} -eq 1 ]]; then
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- else
- webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
- fi
-
- webapp_src_install
-}
-
-pkg_postinst() {
- einfo
- einfo "\033[1;32m**************************************************\033[00m"
- einfo
- einfo "To see the post install instructions, do"
- einfo
- einfo " webapp-config --show-postinst ${PN} ${PVR}"
- einfo
- einfo "\033[1;32m**************************************************\033[00m"
- einfo
-}
diff --git a/www-apps/mythweb/Manifest b/www-apps/mythweb/Manifest
index 5c4ced83dca0..11f535118357 100644
--- a/www-apps/mythweb/Manifest
+++ b/www-apps/mythweb/Manifest
@@ -1 +1,2 @@
+DIST mythplugins-0.25.1.tar.bz2 36766362 SHA256 46085e0d7678a4d14ec3eb0c83629e543e2bedbbeb3e14c7210a6fe803f67897 SHA512 0beaa40535aeb05e09e66a37b7b5d9e7d47b8a78864cbd78c9186cd00577c0d239bb63f1ab450a0bd6c8dfd0036de0b2c8de1649b3f6f9f3432f1e0f278f38d0 WHIRLPOOL bf99636ae5291e4bff0c32836d40fa43268560288281f4d42e9681843340fce788129fc3c3756e93b90abbda3ae7809ca9fe8f8a26f2469a110f92a2e9166c4f
DIST mythweb-0.24_p20110310.tar.gz 2037726 RMD160 017fbbae3537b301f9ed188719e0928d8d31fde9 SHA1 8585fd13a894343ac8a19fd114f8de5b0157da06 SHA256 506f7a4af21bde5875086d9d6387291bc444c9389c367c05bf8126483ee350df
diff --git a/www-apps/mythweb/files/mythweb-0.22_p22763-ao-click.patch b/www-apps/mythweb/files/mythweb-0.22_p22763-ao-click.patch
deleted file mode 100644
index 25f6e7b553f6..000000000000
--- a/www-apps/mythweb/files/mythweb-0.22_p22763-ao-click.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mythplugins/mythweb/modules/tv/tmpl/default/_advanced_options.php
-===================================================================
---- mythplugins/mythweb/modules/tv/tmpl/default/_advanced_options.php (revision 22859)
-+++ mythplugins/mythweb/modules/tv/tmpl/default/_advanced_options.php (working copy)
-@@ -29,7 +29,7 @@
-
- :
- (', t('Hide'), '',
diff --git a/www-apps/mythweb/files/postinstall-en-0.20.txt b/www-apps/mythweb/files/postinstall-en-0.20.txt
deleted file mode 100644
index e3d7f7962b44..000000000000
--- a/www-apps/mythweb/files/postinstall-en-0.20.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-You should modify ${MY_INSTALLDIR}/.htaccess to fit your needs.
-
-****************************************************
-In order to prevent unauthorized access to your Myth
-installation, MythWeb has been installed requiring
-authentication by default but with no valid users.
-You can add users by using these instructions:
-
-Run htpasswd2 as follows to set your username and
-password.
-
-# htpasswd2 -c ${MY_INSTALLDIR}/.htpasswd
-
-If you already have an .htpasswd file you'd like to
-use, copy it to ${MY_INSTALLDIR}
-*****************************************************
diff --git a/www-apps/mythweb/files/postinstall-en-0.21.txt b/www-apps/mythweb/files/postinstall-en-0.21.txt
deleted file mode 100644
index 623c103f46f7..000000000000
--- a/www-apps/mythweb/files/postinstall-en-0.21.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-****************************************************
-You probably want to modify
-${MY_SERVERCONFIGDIR}/mythweb.conf.apache
-to fit your needs and create a symlink to it as
-/etc/apache2/modules.d/mythweb.conf
-****************************************************
-In order to prevent unauthorized access to your Myth
-installation, MythWeb can be configured to require
-authentication using htdigest. The apache controls for
-doing this are commented out in mythweb.conf.apache
-by default.
-*****************************************************
diff --git a/www-apps/mythweb/mythweb-0.25.1.ebuild b/www-apps/mythweb/mythweb-0.25.1.ebuild
new file mode 100644
index 000000000000..2a664ffa1738
--- /dev/null
+++ b/www-apps/mythweb/mythweb-0.25.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mythweb/mythweb-0.25.1.ebuild,v 1.1 2012/07/12 02:59:19 cardoe Exp $
+
+EAPI=4
+
+inherit webapp depend.php
+
+# Release version
+MY_PV="${PV%_*}"
+
+DESCRIPTION="PHP scripts intended to manage MythTV from a web browser."
+HOMEPAGE="http://www.mythtv.org"
+LICENSE="GPL-2"
+SRC_URI="ftp://ftp.osuosl.org/pub/mythtv/mythplugins-${MY_PV}.tar.bz2"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="dev-lang/php:5.3[json,mysql,session,posix]
+ dev-perl/DBI
+ dev-perl/DBD-mysql
+ dev-perl/HTTP-Date
+ dev-perl/Net-UPnP"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/mythplugins-${MY_PV}/${PN}"
+
+need_httpd_cgi
+need_php5_httpd
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ webapp_src_preinst
+
+ cd "${S}"
+ dodoc README INSTALL
+
+ dodir "${MY_HTDOCSDIR}"/data
+
+ insinto "${MY_HTDOCSDIR}"
+ doins -r [[:lower:]]*
+
+ webapp_configfile "${MY_HTDOCSDIR}"/mythweb.conf.{apache,lighttpd}
+
+ webapp_serverowned "${MY_HTDOCSDIR}"/data
+
+ webapp_postinst_txt en "${FILESDIR}"/0.24-postinstall-en.txt
+
+ webapp_src_install
+
+ fperms 755 /usr/share/webapps/mythweb/${PV}/htdocs/mythweb.pl
+}
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 5b4de4efd67c..65354e62dbe3 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,3 +1,4 @@
-DIST phpsysinfo-3.0.15.tar.gz 466195 RMD160 1930081ff7e0e0747ac0183063c959b22f04b765 SHA1 427a785309b75b02e4fa326a8fb089aa75cdd99c SHA256 2db8dc4b9348ef051fd50a000fd6b9f33149d442e5fb4334e5e83b37870c2740
-DIST phpsysinfo-3.0.16.tar.gz 470865 RMD160 f0a857f646b6979824022fa42006407ebd892930 SHA1 1b32935d20093ba130c423da0970c5a24902ed2d SHA256 b5d2bb6aac8be8c0ce104da3803ecd114f914f21d09362b907ad6a78d536a176
-DIST phpsysinfo-3.0.17.tar.gz 478270 RMD160 fcbf05b9d9018f624a721d04f773bc80880c6e42 SHA1 73670a74ef803b8a7bc77bc3c351c686c0f9fd6a SHA256 4527b891f293e7508e6a2e0c9e5616c106405aed0ed6ea0cb0e2c894e83a6202
+DIST phpsysinfo-3.0.15.tar.gz 466195 SHA256 2db8dc4b9348ef051fd50a000fd6b9f33149d442e5fb4334e5e83b37870c2740
+DIST phpsysinfo-3.0.16.tar.gz 470865 SHA256 b5d2bb6aac8be8c0ce104da3803ecd114f914f21d09362b907ad6a78d536a176
+DIST phpsysinfo-3.0.17.tar.gz 478270 SHA256 4527b891f293e7508e6a2e0c9e5616c106405aed0ed6ea0cb0e2c894e83a6202 SHA512 4cda07304f4ae2935f3a7a469d4b3d2e0a90f0a75819b0743a964b86091d3dfa151c9deff429bfe86b916543215f488a5c2b41f9490dcb9abf0471feddb2866a WHIRLPOOL ea8099c8428232fe4873ed7f2f2b0db255657a2b24a207953face5ea10c1a6ae6004bc4c4c8fc0a3cb9a6620750bde99c280542fffa2df8eeb936012ab3db419
+DIST phpsysinfo-3.0.18.tar.gz 482610 SHA256 1ac8144dd6cbd6086ce72d8a0d2add92cc02338bae3fc9549a912398b4ac6b40 SHA512 39b4ad32652b752f48be8424da63a11584379b2bf76a96eea9330edf303a8e2a261ff4421c86d99356136fe08d9488c166288dcaeebed74c873d3423978b5563 WHIRLPOOL 616a0c9a0c24cedf477400896d53cf4f665c10c3a47e1bb51c2edc2bab76f487973b31d4de71597d2797a90a29e2a0e1520c26488b0fd65a06cc1215296ca28a
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.0.18.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.0.18.ebuild
new file mode 100644
index 000000000000..a62c58350e3d
--- /dev/null
+++ b/www-apps/phpsysinfo/phpsysinfo-3.0.18.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpsysinfo/phpsysinfo-3.0.18.ebuild,v 1.1 2012/07/11 21:15:21 radhermit Exp $
+
+EAPI="4"
+
+inherit webapp
+
+DESCRIPTION="phpSysInfo is a nice package that will display your system stats via PHP."
+HOMEPAGE="http://phpsysinfo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="virtual/httpd-php
+ dev-lang/php[simplexml,xml,xsl,unicode]"
+
+S="${WORKDIR}/${PN}"
+
+need_httpd_cgi
+
+src_install() {
+ webapp_src_preinst
+
+ dodoc ChangeLog README*
+ rm -f ChangeLog COPYING README*
+
+ insinto "${MY_HTDOCSDIR}"
+ doins -r .
+ newins config.php{.new,}
+
+ webapp_configfile "${MY_HTDOCSDIR}"/config.php
+ webapp_src_install
+}
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 4461c8926545..3f80df74fa87 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,4 +1,5 @@
DIST chromium-20.0.1132.43.tar.bz2 185068725 SHA256 c21bdee0ec136102e10c527a0d98e3a29e40406d8f7eb63e8e0ac23801722824 SHA512 dbd209c1bbcaf005155d8c779c4af486189b8313eb9f68e81177ccb7f07b4875439ca34ec2bd40baace45b64e07bb68cced129c3e60ca35e0651c13975be8fe6 WHIRLPOOL 688689d424eaff904a2b04d666fd3c5c9204d8ce56b4094927eec59fe7006e97fb58c552d9259ccb88fe0956e65d02badca96c26b9dc3dc96562cac089bb94a7
+DIST chromium-20.0.1132.57.tar.bz2 184791674 SHA256 1225c6b6306e89c8892bc0d18e94567d6081d777dee9b8c90efd0da9f6f2641b SHA512 be621e5fc82399bb174d7896f86ccd59ddabb18f98662016f2b01bd7bb0d642d05f1c5b0771f0295b3f25b71f3145eee51565b373b13d4df37745931d87839cc WHIRLPOOL 9b2f3b0cd56083fe71b9836da5b279f82dc2aeabc540b76ecd6bf7d593e76181a87a4a0f60b0b303dc30079c670b4587c11b6afab928810de64f75166a9624a3
DIST chromium-21.0.1180.0.tar.bz2 192677871 SHA256 ca0f4f76764890f58e1a128d9fcc0ae2a62eeea17318848f4ac24ccbb517cb36 SHA512 1afadf2e5f5dbb3b26f09378bf0ae387c6abd8164334cd7a11725986da0a4cf0188574cb0dc643f7327d15c7e2b4b54758e2c9b8db3bb90ebaad49b0623d8674 WHIRLPOOL f0a8b6cb08fa5521dddd9c1a9e85317da5f89d0d919b1a292cb2a1504bd1c0c5655b6cbfd4607a2a72b31401faadde6015d450d62b9f02cd9d949b05d61e1ce7
DIST chromium-21.0.1180.11.tar.bz2 192864327 SHA256 b6c36afb2b9bbed97950fc390d8986ab14b4f3e9949b7aa56b6dcf3f3842a02e SHA512 38bc6cc55a316a5e1e116ab098ec0eed4fdb390b8de1946e3bcddff98bc202663fb76cde95dd22ff266297a21b648879b2c66700171bac5fc1f6cf1334b844f2 WHIRLPOOL 3449cd0547c73ac059f251cb981193fd7c7380f0bf33602bd546fa6a10e9f7af5dcd605831ffc6ffed509ccb7cbf9b9911d3ee938b6fd745f9c73041976b1f9d
DIST chromium-22.0.1201.0.tar.bz2 192832381 SHA256 5f52531cdf63b56fd504a44ad11c55bd71ecbc754c78c2ebe2342ba1eb0b3341 SHA512 ecd7fd5bd4e9ddf47d3a3b7693d2bcb30815a4a0585b5a14e852ef12128ff454f3a1c04cc12cb8d86fe5916109d5934dc121195e21a4c9e001e2180e31bc3ac7 WHIRLPOOL 57497d56ee7b1b556d80ceeee696812d8800bed3f97de90d9a0deaa0df57f8044371b64d1cc5f71b3409f75daf42928b1606b8c1bae04f7cebf6732a274ca6c2
diff --git a/www-client/chromium/chromium-20.0.1132.57.ebuild b/www-client/chromium/chromium-20.0.1132.57.ebuild
new file mode 100644
index 000000000000..53fa71e3b9dc
--- /dev/null
+++ b/www-client/chromium/chromium-20.0.1132.57.ebuild
@@ -0,0 +1,422 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-20.0.1132.57.ebuild,v 1.2 2012/07/12 00:53:03 rich0 Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+ hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+ sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit chromium eutils flag-o-matic multilib \
+ pax-utils portability python toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux"
+
+RDEPEND="app-arch/bzip2
+ cups? (
+ dev-libs/libgcrypt
+ >=net-print/cups-1.3.11
+ )
+ >=dev-lang/v8-3.10.2.1
+ dev-libs/dbus-glib
+ dev-libs/elfutils
+ >=dev-libs/icu-49.1.1-r1
+ >=dev-libs/libevent-1.4.13
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ >=dev-libs/nss-3.12.3
+ gnome? ( >=gnome-base/gconf-2.24.0 )
+ gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
+ >=media-libs/alsa-lib-1.0.19
+ media-libs/flac
+ >=media-libs/libjpeg-turbo-1.2.0-r1
+ media-libs/libpng
+ >=media-libs/libwebp-0.1.3
+ media-libs/speex
+ pulseaudio? ( media-sound/pulseaudio )
+ sys-fs/udev
+ sys-libs/zlib
+ x11-libs/gtk+:2
+ x11-libs/libXinerama
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ kerberos? ( virtual/krb5 )
+ selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+ >=dev-lang/nacl-toolchain-newlib-0_p7311
+ dev-lang/perl
+ dev-lang/yasm
+ dev-python/ply
+ dev-python/simplejson
+ >=dev-util/gperf-3.0.3
+ >=sys-devel/bison-2.4.3
+ sys-devel/flex
+ >=sys-devel/make-3.81-r2
+ virtual/pkgconfig
+ test? (
+ dev-python/pyftpdlib
+ )"
+RDEPEND+="
+ !=www-client/chromium-9999
+ x11-misc/xdg-utils
+ virtual/ttf-fonts"
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+ EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+pkg_setup() {
+ if [[ "${SLOT}" == "0" ]]; then
+ CHROMIUM_SUFFIX=""
+ else
+ CHROMIUM_SUFFIX="-${SLOT}"
+ fi
+ CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+ # Make sure the build system will use the right tools, bug #340795.
+ tc-export AR CC CXX RANLIB
+
+ # Make sure the build system will use the right python, bug #344367.
+ python_set_active_version 2
+ python_pkg_setup
+
+ chromium_suid_sandbox_check_kernel_config
+
+ if use bindist; then
+ elog "bindist enabled: H.264 video support will be disabled."
+ else
+ elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+ fi
+}
+
+src_prepare() {
+ ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
+ native_client/toolchain/linux_x86_newlib || die
+
+ # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
+ sed -i '1i#define OF(x) x' \
+ third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
+ chrome/common/zip*.cc || die
+
+ epatch "${FILESDIR}/${PN}-svnversion-r0.patch"
+
+ # Backport upstream fix for Gentoo bug #415601.
+ epatch "${FILESDIR}/${PN}-unistd-r0.patch"
+
+ # Fix build without tcmalloc. To be upstreamed.
+ epatch "${FILESDIR}/${PN}-tcmalloc-r0.patch"
+
+ # Backport a crash fix, bug #420357.
+ epatch "${FILESDIR}/${PN}-alignment-r0.patch"
+
+ epatch_user
+
+ # Remove most bundled libraries. Some are still needed.
+ find third_party -type f \! -iname '*.gyp*' \
+ \! -path 'third_party/WebKit/*' \
+ \! -path 'third_party/angle/*' \
+ \! -path 'third_party/cacheinvalidation/*' \
+ \! -path 'third_party/cld/*' \
+ \! -path 'third_party/expat/*' \
+ \! -path 'third_party/ffmpeg/*' \
+ \! -path 'third_party/flac/flac.h' \
+ \! -path 'third_party/gpsd/*' \
+ \! -path 'third_party/harfbuzz/*' \
+ \! -path 'third_party/hunspell/*' \
+ \! -path 'third_party/iccjpeg/*' \
+ \! -path 'third_party/jsoncpp/*' \
+ \! -path 'third_party/khronos/*' \
+ \! -path 'third_party/launchpad_translations/*' \
+ \! -path 'third_party/leveldatabase/*' \
+ \! -path 'third_party/libjingle/*' \
+ \! -path 'third_party/libphonenumber/*' \
+ \! -path 'third_party/libsrtp/*' \
+ \! -path 'third_party/libusb/*' \
+ \! -path 'third_party/libvpx/*' \
+ \! -path 'third_party/libxml/chromium/*' \
+ \! -path 'third_party/libyuv/*' \
+ \! -path 'third_party/lss/*' \
+ \! -path 'third_party/mesa/*' \
+ \! -path 'third_party/modp_b64/*' \
+ \! -path 'third_party/mongoose/*' \
+ \! -path 'third_party/npapi/*' \
+ \! -path 'third_party/openmax/*' \
+ \! -path 'third_party/ots/*' \
+ \! -path 'third_party/protobuf/*' \
+ \! -path 'third_party/scons-2.0.1/*' \
+ \! -path 'third_party/sfntly/*' \
+ \! -path 'third_party/skia/*' \
+ \! -path 'third_party/smhasher/*' \
+ \! -path 'third_party/speex/speex.h' \
+ \! -path 'third_party/sqlite/*' \
+ \! -path 'third_party/tlslite/*' \
+ \! -path 'third_party/undoview/*' \
+ \! -path 'third_party/v8-i18n/*' \
+ \! -path 'third_party/webdriver/*' \
+ \! -path 'third_party/webgl_conformance/*' \
+ \! -path 'third_party/webrtc/*' \
+ \! -path 'third_party/zlib/contrib/minizip/*' \
+ -delete || die
+
+ local v8_bundled="$(chromium_bundled_v8_version)"
+ local v8_installed="$(chromium_installed_v8_version)"
+ einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
+
+ # Remove bundled v8.
+ find v8 -type f \! -iname '*.gyp*' -delete || die
+
+ # The implementation files include v8 headers with full path,
+ # like #include "v8/include/v8.h". Make sure the system headers
+ # will be used.
+ # TODO: find a solution that can be upstreamed.
+ rmdir v8/include || die
+ ln -s /usr/include v8/include || die
+
+ # Make sure the build system will use the right python, bug #344367.
+ # Only convert directories that need it, to save time.
+ python_convert_shebangs -q -r 2 build tools
+}
+
+src_configure() {
+ local myconf=""
+
+ # Never tell the build system to "enable" SSE2, it has a few unexpected
+ # additions, bug #336871.
+ myconf+=" -Ddisable_sse2=1"
+
+ # Disable tcmalloc, it causes problems with e.g. NVIDIA
+ # drivers, bug #413637.
+ myconf+=" -Dlinux_use_tcmalloc=0"
+
+ # Make it possible to remove third_party/adobe.
+ echo > "${T}/flapper_version.h" || die
+ myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+ # Use system-provided libraries.
+ # TODO: use_system_ffmpeg
+ # TODO: use_system_hunspell (upstream changes needed).
+ # TODO: use_system_ssl (http://crbug.com/58087).
+ # TODO: use_system_sqlite (http://crbug.com/22208).
+ # TODO: use_system_vpx
+ myconf+="
+ -Duse_system_bzip2=1
+ -Duse_system_flac=1
+ -Duse_system_icu=1
+ -Duse_system_libevent=1
+ -Duse_system_libjpeg=1
+ -Duse_system_libpng=1
+ -Duse_system_libwebp=1
+ -Duse_system_libxml=1
+ -Duse_system_speex=1
+ -Duse_system_v8=1
+ -Duse_system_xdg_utils=1
+ -Duse_system_yasm=1
+ -Duse_system_zlib=1"
+
+ # Optional dependencies.
+ # TODO: linux_link_kerberos, bug #381289.
+ myconf+="
+ $(gyp_use cups use_cups)
+ $(gyp_use gnome use_gconf)
+ $(gyp_use gnome-keyring use_gnome_keyring)
+ $(gyp_use gnome-keyring linux_link_gnome_keyring)
+ $(gyp_use kerberos use_kerberos)
+ $(gyp_use pulseaudio use_pulseaudio)
+ $(gyp_use selinux selinux)"
+
+ if ! use selinux; then
+ # Enable SUID sandbox.
+ myconf+="
+ -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+ -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+ fi
+
+ # Never use bundled gold binary. Disable gold linker flags for now.
+ myconf+="
+ -Dlinux_use_gold_binary=0
+ -Dlinux_use_gold_flags=0"
+
+ if ! use bindist; then
+ # Enable H.624 support in bundled ffmpeg.
+ myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
+ fi
+
+ local myarch="$(tc-arch)"
+ if [[ $myarch = amd64 ]] ; then
+ myconf+=" -Dtarget_arch=x64"
+ elif [[ $myarch = x86 ]] ; then
+ myconf+=" -Dtarget_arch=ia32"
+ else
+ die "Failed to determine target arch, got '$myarch'."
+ fi
+
+ # Make sure that -Werror doesn't get added to CFLAGS by the build system.
+ # Depending on GCC version the warnings are different and we don't want
+ # the build to fail because of that.
+ myconf+=" -Dwerror="
+
+ # Avoid CFLAGS problems, bug #352457, bug #390147.
+ if ! use custom-cflags; then
+ replace-flags "-Os" "-O2"
+ strip-flags
+ fi
+
+ egyp_chromium ${myconf} || die
+}
+
+src_compile() {
+ local test_targets
+ for x in base cacheinvalidation crypto \
+ googleurl gpu media net printing; do
+ test_targets+=" ${x}_unittests"
+ done
+
+ local make_targets="chrome chromedriver"
+ if ! use selinux; then
+ make_targets+=" chrome_sandbox"
+ fi
+ if use test; then
+ make_targets+=$test_targets
+ fi
+
+ # See bug #410883 for more info about the .host mess.
+ emake ${make_targets} BUILDTYPE=Release V=1 \
+ CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
+ CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
+ LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
+ AR.host="$(tc-getAR)" || die
+
+ pax-mark m out/Release/chrome
+ if use test; then
+ for x in $test_targets; do
+ pax-mark m out/Release/${x}
+ done
+ fi
+}
+
+src_test() {
+ # For more info see bug #350349.
+ local mylocale='en_US.utf8'
+ if ! locale -a | grep -q "$mylocale"; then
+ eerror "${PN} requires ${mylocale} locale for tests"
+ eerror "Please read the following guides for more information:"
+ eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
+ eerror " http://www.gentoo.org/doc/en/utf-8.xml"
+ die "locale ${mylocale} is not supported"
+ fi
+
+ # For more info see bug #370957.
+ if [[ $UID -eq 0 ]]; then
+ die "Tests must be run as non-root. Please use FEATURES=userpriv."
+ fi
+
+ # ICUStringConversionsTest: bug #350347.
+ # MessagePumpLibeventTest: bug #398501.
+ LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
+ '--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
+
+ LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake
+ LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
+ LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
+ LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake
+ LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake
+
+ # NetUtilTest: bug #361885.
+ # DnsConfigServiceTest.GetSystemConfig: bug #394883.
+ # CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
+ LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
+ '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned'
+
+ LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
+}
+
+src_install() {
+ exeinto "${CHROMIUM_HOME}"
+ doexe out/Release/chrome || die
+
+ if ! use selinux; then
+ doexe out/Release/chrome_sandbox || die
+ fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+ fi
+
+ doexe out/Release/chromedriver || die
+
+ doexe out/Release/nacl_helper{,_bootstrap} || die
+ insinto "${CHROMIUM_HOME}"
+ doins out/Release/nacl_irt_*.nexe || die
+ doins out/Release/libppGoogleNaClPluginChrome.so || die
+
+ newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
+ if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+ sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
+ -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+ sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
+ -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+ sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
+ -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+ fi
+
+ # It is important that we name the target "chromium-browser",
+ # xdg-utils expect it; bug #355517.
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+ # keep the old symlink around for consistency
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+ # Allow users to override command-line options, bug #357629.
+ dodir /etc/chromium || die
+ insinto /etc/chromium
+ newins "${FILESDIR}/chromium.default" "default" || die
+
+ pushd out/Release/locales > /dev/null || die
+ chromium_remove_language_paks
+ popd
+
+ insinto "${CHROMIUM_HOME}"
+ doins out/Release/*.pak || die
+
+ doins -r out/Release/locales || die
+ doins -r out/Release/resources || die
+
+ newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+ newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+ doexe out/Release/libffmpegsumo.so || die
+
+ # Install icons and desktop entry.
+ for SIZE in 16 22 24 32 48 64 128 256 ; do
+ insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
+ newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
+ chromium-browser${CHROMIUM_SUFFIX}.png || die
+ done
+ local mime_types="text/html;text/xml;application/xhtml+xml;"
+ mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+ mime_types+="x-scheme-handler/ftp;" # bug #412185
+ mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+ make_desktop_entry \
+ chromium-browser${CHROMIUM_SUFFIX} \
+ "Chromium${CHROMIUM_SUFFIX}" \
+ chromium-browser${CHROMIUM_SUFFIX} \
+ "Network;WebBrowser" \
+ "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+ sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+ # Install GNOME default application entry (bug #303100).
+ if use gnome; then
+ dodir /usr/share/gnome-control-center/default-apps || die
+ insinto /usr/share/gnome-control-center/default-apps
+ newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+ if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+ sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+ "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+ fi
+ fi
+}
diff --git a/www-client/fetch/Manifest b/www-client/fetch/Manifest
index 0cbdd246a835..1137b8722145 100644
--- a/www-client/fetch/Manifest
+++ b/www-client/fetch/Manifest
@@ -1 +1 @@
-DIST fetch-1.0.tar.gz 62009 RMD160 e69ff24a2a27a2977df64360232cbd64be5d2351 SHA1 edac1ee54b24bb9d094682743c193eaa47eb5a48 SHA256 a2804a8b67672fe759a8687977dd13f810718152e69550654845014c94f7d8dc
+DIST fetch-1.0.tar.gz 62009 SHA256 a2804a8b67672fe759a8687977dd13f810718152e69550654845014c94f7d8dc
diff --git a/www-client/fetch/fetch-1.0.ebuild b/www-client/fetch/fetch-1.0.ebuild
deleted file mode 100644
index 15a25cfcf838..000000000000
--- a/www-client/fetch/fetch-1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/fetch/fetch-1.0.ebuild,v 1.4 2011/06/15 15:47:42 jer Exp $
-
-DESCRIPTION="Fetch is a simple, fast, and flexible HTTP download tool built on the HTTP Fetcher library."
-HOMEPAGE="http://sourceforge.net/projects/fetch/"
-SRC_URI="mirror://sourceforge/fetch/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-libs/http-fetcher-1.0.1"
-
-src_compile() {
- ./configure \
- --host=${CHOST} \
- --prefix=/usr \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man || die "./configure failed"
- emake || die
-}
-
-src_install() {
- make DESTDIR=${D} install || die
- dodoc README INSTALL LICENSE
- dohtml docs/*.html
-}
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index c95ed3bb95ee..d71ac008908f 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,6 +1,6 @@
DIST google-chrome-beta_21.0.1180.15-r144745_amd64.deb 33881914 SHA256 837deaf14ebc873a358149c2839903ea1d6d3fd2b8a046b543d844489eb9b9cb SHA512 4bf604332da814ef9167ddeb12ea3db21afff08449686f197be41952895628f65d51d56fac89697fcbfbab36c3d1fb47eaa2a4f0ec97b5ebedac41a13c9a89c1 WHIRLPOOL cf25304b071f670a5613adcf77325cec1e4cd3219e06394344f339aef1eb579bb83c5609535aac5838772ae3cc0152e586a2cd2cfe61a66190f64a01f7863f7f
DIST google-chrome-beta_21.0.1180.15-r144745_i386.deb 32186560 SHA256 eba611a2c10caaaf78b6001c987b26a6c7141d709b854bc28eaffc0534342765 SHA512 b3adaf8ef0d137a636d7c28cd475f7d399155a0eb3429a28e4f9a97a180d9f85bf8c12ecee9ffbe9ad9acfeefbf22e4b437c3367500af6c33c86ee66058e3f53 WHIRLPOOL 17b7ae3992b7272442dd6170439d17e5123c82bb1f3f9e19121bcf8d03ef513e29c183b5787ead700d8c99bb0f226158b30af6d748b1583ced2a184d98366f66
-DIST google-chrome-stable_20.0.1132.47-r144678_amd64.deb 32929630 SHA256 70ff04d452c0df15694b63c8ed0fa60287be5471d5c0712648a5da9eef2e3abb
-DIST google-chrome-stable_20.0.1132.47-r144678_i386.deb 31315784 SHA256 bbe5923dd00182053efcdffe01391ce353e2c7a58c168cab04757ab2b3877640
+DIST google-chrome-stable_20.0.1132.57-r145807_amd64.deb 32933868 SHA256 f9f07295f0b1e90fe0cfb4a2372e560487156c987f824c53bdb137ec3deb536d SHA512 2d26d2da195467e057066d6b5d41d061f8f41f2d20b0c5e250f1d7f58b3ab167d50e7c90e276bfb9ac62625e24aa6830afe638036114d72f3c129d6440574ec2 WHIRLPOOL 8607c50b233d9f6a7c68616c7a5697dce3feae09e11f6244ffd3caf832bf639c7199e2dbf2460e3f14f5a4b5fdb1144950ee72c1c379c3e74061e3600b3ef9e5
+DIST google-chrome-stable_20.0.1132.57-r145807_i386.deb 31296984 SHA256 2f4bac4abd2cf8075c31452aa4966ad65a50bf2a155bbd15ac3c79992b1e7a39 SHA512 8280c253d3638221628844a2da7f01a4960f3e4c5aaac9c35c1beb2e5b34a73d170e097b7e91723c9f65f02b0ea5893ccab763f7bd4bda2ae934ea418cd60ef3 WHIRLPOOL 9f3530100428d292b8eb44dd054ab578c3c88a3ac373bb4a7dfd850ca93f0958034ddb83b7241b1bf4d87d2dcc4b6298b1e97d1962f74f7cbe004fdfa82abc02
DIST google-chrome-unstable_22.0.1201.0-r145644_amd64.deb 34013984 SHA256 b650ccdf6c8903a3b4dd1ea41a470568a1963579e1ea7c3b6df6d4bbacd122df SHA512 f33d3f806945806f6de5e5f799d8208d650b316b41cbedaf43370ee1a4bb9edac11d5927d52b43727a0bf111fcdfe159dbb4556602c86d9e10d7a850258f2381 WHIRLPOOL 8e94fe82be6ca825c6bca15db48c4ec0dabd89a6b465f6e9fe733672220327cab5b0a68b21217e0023a2a97d98c1fb8304c00397a16cfff72dfc8e485eb6852c
DIST google-chrome-unstable_22.0.1201.0-r145644_i386.deb 32486616 SHA256 d5eecb04832de7af59824e7d2a9d4f6d8eec283cbd6dbc3dee14cd996f58a0b5 SHA512 525315b2a7dde82710e831268258d88766b4458d4dea0744d2636b7bfd56dcfbc8d3663e46420540a17301dced36369d710f4c14408c755a7c24cf88a22c61e0 WHIRLPOOL 0d2dbd386c068b138ae29e81db0edf9fed3280543055995f1cd709c82ce7e70179b2d7b043cb491e2af6b18bf7a90e8ff824eb4de64a120539987b2eff8b74c3
diff --git a/www-client/google-chrome/google-chrome-20.0.1132.47_p144678-r1.ebuild b/www-client/google-chrome/google-chrome-20.0.1132.57_p145807.ebuild
similarity index 97%
rename from www-client/google-chrome/google-chrome-20.0.1132.47_p144678-r1.ebuild
rename to www-client/google-chrome/google-chrome-20.0.1132.57_p145807.ebuild
index bef584c7316a..2abb2fafd9a2 100644
--- a/www-client/google-chrome/google-chrome-20.0.1132.47_p144678-r1.ebuild
+++ b/www-client/google-chrome/google-chrome-20.0.1132.57_p145807.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-20.0.1132.47_p144678-r1.ebuild,v 1.1 2012/07/07 17:02:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-20.0.1132.57_p145807.ebuild,v 1.1 2012/07/11 18:20:50 jdhore Exp $
EAPI="4"
diff --git a/www-servers/cherokee/cherokee-1.2.101-r1.ebuild b/www-servers/cherokee/cherokee-1.2.101-r1.ebuild
index d21d9743fd2d..e8a5b1025519 100644
--- a/www-servers/cherokee/cherokee-1.2.101-r1.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.101-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.101-r1.ebuild,v 1.1 2012/03/24 11:26:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.101-r1.ebuild,v 1.2 2012/07/11 23:06:39 blueness Exp $
EAPI=4
PYTHON_DEPEND="admin? 2"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.cherokee-project.com/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~mips ~x86"
IUSE="admin coverpage ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php rrdtool ssl static static-libs"
COMMON_DEPEND="dev-libs/libpcre
diff --git a/www-servers/thttpd/thttpd-2.25b-r7.ebuild b/www-servers/thttpd/thttpd-2.25b-r7.ebuild
index 1cb059d5d3a6..0375e1deea92 100644
--- a/www-servers/thttpd/thttpd-2.25b-r7.ebuild
+++ b/www-servers/thttpd/thttpd-2.25b-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r7.ebuild,v 1.7 2009/08/09 13:39:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r7.ebuild,v 1.8 2012/07/11 23:36:11 blueness Exp $
inherit eutils flag-o-matic
@@ -10,7 +10,7 @@ DESCRIPTION="Small and fast multiplexing webserver."
HOMEPAGE="http://www.acme.com/software/thttpd/"
SRC_URI="http://www.acme.com/software/thttpd/${P}.tar.gz"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="amd64 ~hppa ~mips ppc sparc x86 ~x86-fbsd"
IUSE="static"
diff --git a/www-servers/thttpd/thttpd-2.26.2.ebuild b/www-servers/thttpd/thttpd-2.26.2.ebuild
index 6b17473b964b..2b45bad81f96 100644
--- a/www-servers/thttpd/thttpd-2.26.2.ebuild
+++ b/www-servers/thttpd/thttpd-2.26.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.26.2.ebuild,v 1.6 2012/06/27 15:57:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.26.2.ebuild,v 1.7 2012/07/11 23:36:11 blueness Exp $
EAPI="4"
@@ -13,7 +13,7 @@ HOMEPAGE="http://opensource.dyc.edu/sthttpd"
SRC_URI="http://opensource.dyc.edu/pub/sthttpd/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="amd64 ~hppa ~mips x86 ~amd64-linux ~x86-linux"
IUSE=""
diff --git a/www-servers/varnish/varnish-2.0.4-r1.ebuild b/www-servers/varnish/varnish-2.0.4-r1.ebuild
index 0653ebc5ec5a..d7d9eec65277 100644
--- a/www-servers/varnish/varnish-2.0.4-r1.ebuild
+++ b/www-servers/varnish/varnish-2.0.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-2.0.4-r1.ebuild,v 1.6 2012/05/21 19:31:30 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-2.0.4-r1.ebuild,v 1.7 2012/07/11 23:27:45 blueness Exp $
EAPI="2"
@@ -10,7 +10,7 @@ DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator."
HOMEPAGE="http://varnish.projects.linpro.no/"
SRC_URI="mirror://sourceforge/varnish/${P}.tar.gz"
-LICENSE="BSD-2"
+LICENSE="BSD-2 GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
diff --git a/www-servers/varnish/varnish-3.0.2-r1.ebuild b/www-servers/varnish/varnish-3.0.2-r1.ebuild
index 690140a56aaa..05ecd2782fe2 100644
--- a/www-servers/varnish/varnish-3.0.2-r1.ebuild
+++ b/www-servers/varnish/varnish-3.0.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.2-r1.ebuild,v 1.4 2012/06/15 09:37:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.2-r1.ebuild,v 1.6 2012/07/11 23:27:45 blueness Exp $
EAPI="4"
@@ -10,9 +10,9 @@ DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
HOMEPAGE="http://www.varnish-cache.org/"
SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-LICENSE="BSD-2"
+LICENSE="BSD-2 GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~mips x86"
IUSE="doc libedit static-libs +tools"
CDEPEND="dev-libs/libpcre
diff --git a/x11-apps/bitmap/bitmap-1.0.6.ebuild b/x11-apps/bitmap/bitmap-1.0.6.ebuild
index fd7a6ec21c84..bb484df9b750 100644
--- a/x11-apps/bitmap/bitmap-1.0.6.ebuild
+++ b/x11-apps/bitmap/bitmap-1.0.6.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/bitmap-1.0.6.ebuild,v 1.6 2012/06/28 14:19:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/bitmap-1.0.6.ebuild,v 1.7 2012/07/11 19:17:43 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org bitmap application"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXmu
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild
index f03e1eaa982d..494c07b9c4c0 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild,v 1.4 2012/06/27 17:55:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild,v 1.5 2012/07/11 19:18:16 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
=media-libs/freetype-2*
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild
index e48cb88dc782..5f46887697fc 100644
--- a/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild,v 1.4 2012/06/27 17:57:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild,v 1.5 2012/07/11 19:18:50 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="list fonts served by X font server"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="x11-proto/xproto
diff --git a/x11-apps/fstobdf/fstobdf-1.0.5.ebuild b/x11-apps/fstobdf/fstobdf-1.0.5.ebuild
index d62d6bdc0261..b0d488b3b877 100644
--- a/x11-apps/fstobdf/fstobdf-1.0.5.ebuild
+++ b/x11-apps/fstobdf/fstobdf-1.0.5.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/fstobdf-1.0.5.ebuild,v 1.4 2012/06/27 18:00:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/fstobdf-1.0.5.ebuild,v 1.5 2012/07/11 19:19:24 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="generate BDF font from X font server"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/listres/listres-1.0.3.ebuild b/x11-apps/listres/listres-1.0.3.ebuild
index 2f08a07f96bc..2d7d55e9fb7f 100644
--- a/x11-apps/listres/listres-1.0.3.ebuild
+++ b/x11-apps/listres/listres-1.0.3.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/listres/listres-1.0.3.ebuild,v 1.5 2012/06/28 14:19:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/listres/listres-1.0.3.ebuild,v 1.6 2012/07/11 19:19:58 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="list resources in widgets"
-KEYWORDS="amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXt
diff --git a/x11-apps/luit/luit-1.1.1.ebuild b/x11-apps/luit/luit-1.1.1.ebuild
index db0f0aba3e79..c5941c99021f 100644
--- a/x11-apps/luit/luit-1.1.1.ebuild
+++ b/x11-apps/luit/luit-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/luit/luit-1.1.1.ebuild,v 1.6 2012/06/28 14:20:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/luit/luit-1.1.1.ebuild,v 1.7 2012/07/11 19:20:32 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="Locale and ISO 2022 support for Unicode terminals"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="sys-libs/zlib
x11-libs/libX11
diff --git a/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild b/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
index 9405c02adf58..b4bc2edd1fb0 100644
--- a/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
+++ b/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild,v 1.6 2012/06/28 14:21:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild,v 1.7 2012/07/11 19:21:05 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="create an index of X font files in a directory"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-apps/mkfontscale"
diff --git a/x11-apps/oclock/oclock-1.0.3.ebuild b/x11-apps/oclock/oclock-1.0.3.ebuild
index 60200f6ed3e1..bb92de381141 100644
--- a/x11-apps/oclock/oclock-1.0.3.ebuild
+++ b/x11-apps/oclock/oclock-1.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/oclock/oclock-1.0.3.ebuild,v 1.5 2012/06/27 18:16:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/oclock/oclock-1.0.3.ebuild,v 1.6 2012/07/11 19:21:39 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="round X clock"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXext
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
index 54e5bd1d5ad7..a2959d2212ed 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild,v 1.6 2012/06/28 14:22:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild,v 1.7 2012/07/11 19:22:13 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="Controls the keyboard layout of a running X server."
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="x11-libs/libxkbfile
x11-libs/libX11"
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index 948784fa0176..87b51c3f9b82 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,3 +1,3 @@
-DIST xauth-1.0.5.tar.bz2 129568 RMD160 261346ede1d4f06f2293de23175335fc7d03d6db SHA1 6d94b5822e8ce08630a8ff510230246d5ed45290 SHA256 6d139500ff1daf806525adf071f8c1778ad138a0378c73ea831ad18847ad746c
+DIST xauth-1.0.5.tar.bz2 129568 SHA256 6d139500ff1daf806525adf071f8c1778ad138a0378c73ea831ad18847ad746c SHA512 d459dc2b8e38ed46eb45075306edbe2cb5a927823944a693e44cb7ab63ed0c10a8a04aa4697dfa74b13240f5407191dfbc190515a8de00c16f7e207554a26b86 WHIRLPOOL 18f3bd60269217d1fab81da08fa05135b5593a9d46ca10f32393ee942744e64d3132a50d1928b861e5db3033c98d3b5a74a66bcce82cb21770c01ea19d39839f
DIST xauth-1.0.6.tar.bz2 133785 RMD160 c408d9fd03e609186558da1a19ef19c8674ef7f4 SHA1 10a68367ecc60a641b9aa89e6f24f7ca71f23874 SHA256 a686406951f0ed6be45bc26182a1423e2cdffad2d492b33ff3fbf72f7bcb6b0b
DIST xauth-1.0.7.tar.bz2 139436 RMD160 805167c0f54230c719a1e6a59d872ebfd3fe7608 SHA1 54f93f0539a98900c36c4f7c8ae933f77699dc7b SHA256 84f78c08ebc6687e2e36c9ff1f5610988c6a03fc5bf51ef89aec4d155de3028d
diff --git a/x11-apps/xauth/xauth-1.0.7.ebuild b/x11-apps/xauth/xauth-1.0.7.ebuild
index f968d6bfce21..fa192a37225d 100644
--- a/x11-apps/xauth/xauth-1.0.7.ebuild
+++ b/x11-apps/xauth/xauth-1.0.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-1.0.7.ebuild,v 1.6 2012/06/28 14:23:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-1.0.7.ebuild,v 1.7 2012/07/11 19:22:47 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="X authority file utility"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="ipv6"
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xclipboard/xclipboard-1.1.2.ebuild b/x11-apps/xclipboard/xclipboard-1.1.2.ebuild
index e829f5cbfa8d..e1af71e813e9 100644
--- a/x11-apps/xclipboard/xclipboard-1.1.2.ebuild
+++ b/x11-apps/xclipboard/xclipboard-1.1.2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclipboard/xclipboard-1.1.2.ebuild,v 1.6 2012/06/28 14:23:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclipboard/xclipboard-1.1.2.ebuild,v 1.7 2012/07/11 19:23:21 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="interchange between cut buffer and selection"
-KEYWORDS="amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
x11-libs/libxkbfile
diff --git a/x11-apps/xclock/xclock-1.0.6.ebuild b/x11-apps/xclock/xclock-1.0.6.ebuild
index c62ee7627374..745cd61dc6bc 100644
--- a/x11-apps/xclock/xclock-1.0.6.ebuild
+++ b/x11-apps/xclock/xclock-1.0.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclock/xclock-1.0.6.ebuild,v 1.6 2012/06/28 14:25:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclock/xclock-1.0.6.ebuild,v 1.7 2012/07/11 19:23:56 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="analog / digital clock for X"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
index 0c2302e48235..75f3ef5e0365 100644
--- a/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild,v 1.6 2012/06/28 14:25:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild,v 1.7 2012/07/11 19:24:30 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="Device Color Characterization utility for X Color Management System"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild
index 17f0ea7a6a42..0ccc716ab9f9 100644
--- a/x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild,v 1.6 2012/06/28 14:26:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild,v 1.7 2012/07/11 19:25:03 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="create an X cursor file from a collection of PNG images"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index 4b3421668faf..ae25d95bafdb 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,2 +1,2 @@
-DIST xev-1.1.0.tar.bz2 110850 RMD160 db206322c6a18a1770c45c64d9cb34ace76528aa SHA1 77dcbdaa2046db56f31936f921843bd05df2255f SHA256 3859c268edb26ad0484281a244a567ef2f70ba5f91f4b5dfd37799255ccf01c6
+DIST xev-1.1.0.tar.bz2 110850 SHA256 3859c268edb26ad0484281a244a567ef2f70ba5f91f4b5dfd37799255ccf01c6 SHA512 30b1e072ef9faeb9f406e48fe7d3b397115b44468ea0ee77a17457be3c4b3b162ae1667c0f9880b489b75238445b4ed49053ed9293012f5f69a530e224d59eb2 WHIRLPOOL 3328a179227a87e958d424eed730ecbdb3c66c11570fc84c66a0540d500568c44c267838346fe599d228787a16a7ac58e56cbe1813806849d7c4920b56cfe307
DIST xev-1.2.0.tar.bz2 122329 RMD160 c1fe193a888b0b52ec3ea144e75b1b28d2a45db3 SHA1 6b05706ed39382b5d08c5351c00ba7e127709eec SHA256 3786a77dab17741d508d5d117a0ff33bb6eabf93e0935388b5f920bfcf2fb38f
diff --git a/x11-apps/xev/xev-1.2.0.ebuild b/x11-apps/xev/xev-1.2.0.ebuild
index 274794ffc418..2bbec0b6838d 100644
--- a/x11-apps/xev/xev-1.2.0.ebuild
+++ b/x11-apps/xev/xev-1.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/xev-1.2.0.ebuild,v 1.8 2012/06/28 14:26:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/xev-1.2.0.ebuild,v 1.9 2012/07/11 19:25:38 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="print contents of X events"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xfd/xfd-1.1.1.ebuild b/x11-apps/xfd/xfd-1.1.1.ebuild
index 5d911939d07f..b61b3de4c151 100644
--- a/x11-apps/xfd/xfd-1.1.1.ebuild
+++ b/x11-apps/xfd/xfd-1.1.1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfd/xfd-1.1.1.ebuild,v 1.5 2012/06/28 14:27:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfd/xfd-1.1.1.ebuild,v 1.6 2012/07/11 19:26:12 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org xfd application"
-KEYWORDS="amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE=""
RDEPEND="media-libs/freetype:2
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index 1ee12e02db85..ccc6a5bc6969 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1,2 +1,2 @@
-DIST xfontsel-1.0.3.tar.bz2 125665 RMD160 6e21b434c3aed1bf2fc601551da8fd089d53fb8c SHA1 df2eb12b90339b7091bd362b095344015ec8b6fa SHA256 95046ac274b5480ab57c8e04ca04f858957e139b1e8b6ddf5de869bbff7b9ee0
+DIST xfontsel-1.0.3.tar.bz2 125665 SHA256 95046ac274b5480ab57c8e04ca04f858957e139b1e8b6ddf5de869bbff7b9ee0 SHA512 84d9018a60acd2ea0851466a3cc78198d7c8f0588f52fdd3ad7dd5ecc099df2a96331a43f95b9e2d452a6f59a7f9533e46bcbe8e542aea2e28785cff0311fc56 WHIRLPOOL fb11c43195f22c2bd8d5654c36adcb38b39e66ce287e66ee68f8710271bdd82cf6b5424fea0a5a5509b94dc8dc7a4974b623345754f4bd31fe298634d787efdd
DIST xfontsel-1.0.4.tar.bz2 136256 RMD160 9fbb2092540e26f0a0f67104cf3e40aef95aaef3 SHA1 8e3da9d050ad71531bfeb98d5f1071c7b392b3bd SHA256 25491e9b7762607299f8a7099c97452d9b83e92266f8b0579b380ca01e5a5f7e
diff --git a/x11-apps/xfontsel/xfontsel-1.0.4.ebuild b/x11-apps/xfontsel/xfontsel-1.0.4.ebuild
index 04fb103f12df..22c1a0b5da05 100644
--- a/x11-apps/xfontsel/xfontsel-1.0.4.ebuild
+++ b/x11-apps/xfontsel/xfontsel-1.0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfontsel/xfontsel-1.0.4.ebuild,v 1.5 2012/06/28 14:27:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfontsel/xfontsel-1.0.4.ebuild,v 1.6 2012/07/11 19:26:46 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="point and click selection of X11 font names"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xgamma/xgamma-1.0.5.ebuild b/x11-apps/xgamma/xgamma-1.0.5.ebuild
index 7538764d6ef1..26a178d37a0b 100644
--- a/x11-apps/xgamma/xgamma-1.0.5.ebuild
+++ b/x11-apps/xgamma/xgamma-1.0.5.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/xgamma-1.0.5.ebuild,v 1.6 2012/06/28 14:28:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/xgamma-1.0.5.ebuild,v 1.7 2012/07/11 19:27:22 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="Alter a monitor's gamma correction through the X server"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="x11-libs/libXxf86vm
diff --git a/x11-apps/xhost/xhost-1.0.5.ebuild b/x11-apps/xhost/xhost-1.0.5.ebuild
index 4979f355069f..a2e968506667 100644
--- a/x11-apps/xhost/xhost-1.0.5.ebuild
+++ b/x11-apps/xhost/xhost-1.0.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/xhost-1.0.5.ebuild,v 1.7 2012/07/05 15:24:20 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/xhost-1.0.5.ebuild,v 1.8 2012/07/11 19:27:55 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="Controls host and/or user access to a running X server."
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6"
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 68c5ff4685aa..369b8add9554 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,3 +1,3 @@
-DIST xinit-1.3.0.tar.bz2 138315 RMD160 6759083ed787beace9f485e69d46b97fb397edbd SHA1 6437292214bbca6efad8889c68e72a1ca584928b SHA256 ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c
+DIST xinit-1.3.0.tar.bz2 138315 SHA256 ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c SHA512 afb525e8fce9e460f513926a7aeb3344b064834b1d5031ba30400fa2bcb5bddada57b4e42b49f839bbcd177b8ee8fd30b75844c69b5ec786508ab2b221fe528e WHIRLPOOL 10bb91af43379fe59a12f9f544006bf11cef088a4e770f0be17b17f96e3357a74c14474626981ecdd9bd940ff0f6da41e866628aa291f6ef1fd6b8a641df42db
DIST xinit-1.3.1.tar.bz2 147067 RMD160 aadb0729c65438819cfaae4733f512574fa39c2d SHA1 6d3981c23ce49212a26912651d6d2473a5065766 SHA256 c7468dfae94bdb42785d79623c27156dc4bf379d8372992830482cb04d8439b0
DIST xinit-1.3.2.tar.bz2 148443 RMD160 097cd409e829255c328d1d87d69fb8206482f5d5 SHA1 1c287ac016d277f973652fa3707eef6db8353d5a SHA256 a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e690e0235
diff --git a/x11-apps/xinit/xinit-1.3.2.ebuild b/x11-apps/xinit/xinit-1.3.2.ebuild
index 5ee45c75f53e..b7a3e157a322 100644
--- a/x11-apps/xinit/xinit-1.3.2.ebuild
+++ b/x11-apps/xinit/xinit-1.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.2.ebuild,v 1.6 2012/06/28 14:29:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.2.ebuild,v 1.7 2012/07/11 19:28:29 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X Window System initializer"
LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+minimal"
RDEPEND="
diff --git a/x11-apps/xinput/Manifest b/x11-apps/xinput/Manifest
index df824b350005..b0ca480500bf 100644
--- a/x11-apps/xinput/Manifest
+++ b/x11-apps/xinput/Manifest
@@ -1,3 +1,3 @@
-DIST xinput-1.5.3.tar.bz2 131585 RMD160 15b3b23b900db9475c29bd4316e6b8f9801f4d2e SHA1 70f258279acaa45fb77820ae3f8c2bee9f2d2235 SHA256 6aade131cecddaeefc39ddce1dd5e8473f6039c2e4efbfd9fbb5ee2a75885c76
+DIST xinput-1.5.3.tar.bz2 131585 SHA256 6aade131cecddaeefc39ddce1dd5e8473f6039c2e4efbfd9fbb5ee2a75885c76 SHA512 b6f389d5b1fe63de006d90da54824628be9407bf961ffa33ccc2f4080c7aed6e7c8dfe01b7289d6077d80b3d565d2cf9fa60578cc51793135e66e7066606b4b7 WHIRLPOOL acbf3106fa1ac748234c2c29d83d057fd231a576b5cfaaa7a140c5b68f633d5cfefa23a6a5bf514d40cc29a5cd9d61b5cb3daad95c4ce0884b559bcee67cf53d
DIST xinput-1.5.4.tar.bz2 134702 RMD160 4df018cee7d431517b85b6624ec5e4312c6ba0bd SHA1 4e77f4034aa4bc720726beb0795d77a47a71d2c8 SHA256 a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
DIST xinput-1.6.0.tar.bz2 146209 RMD160 d5fccf7e6d91902519a08dc6b907b4c78c2acb62 SHA1 958b77a2acf52197b9a1e3e3d11e9bc57fbb1e6c SHA256 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
diff --git a/x11-apps/xinput/xinput-1.6.0.ebuild b/x11-apps/xinput/xinput-1.6.0.ebuild
index c49c26d95b30..2824320b1834 100644
--- a/x11-apps/xinput/xinput-1.6.0.ebuild
+++ b/x11-apps/xinput/xinput-1.6.0.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/xinput-1.6.0.ebuild,v 1.6 2012/06/28 14:34:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/xinput-1.6.0.ebuild,v 1.7 2012/07/11 19:29:03 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="Utility to set XInput device parameters"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=x11-libs/libX11-1.3
diff --git a/x11-apps/xkbevd/xkbevd-1.1.3.ebuild b/x11-apps/xkbevd/xkbevd-1.1.3.ebuild
index 82ed76059de1..96bb94cfade1 100644
--- a/x11-apps/xkbevd/xkbevd-1.1.3.ebuild
+++ b/x11-apps/xkbevd/xkbevd-1.1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/xkbevd-1.1.3.ebuild,v 1.6 2012/06/28 14:30:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/xkbevd-1.1.3.ebuild,v 1.7 2012/07/11 19:29:36 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="XKB event daemon"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xload/xload-1.1.1.ebuild b/x11-apps/xload/xload-1.1.1.ebuild
index 725acc18db55..203f72bd9c84 100644
--- a/x11-apps/xload/xload-1.1.1.ebuild
+++ b/x11-apps/xload/xload-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xload/xload-1.1.1.ebuild,v 1.5 2012/06/28 14:35:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xload/xload-1.1.1.ebuild,v 1.6 2012/07/11 19:30:10 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="system load average display for X"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xlogo/xlogo-1.0.4.ebuild b/x11-apps/xlogo/xlogo-1.0.4.ebuild
index fc6515964f23..7ccbb7fa4942 100644
--- a/x11-apps/xlogo/xlogo-1.0.4.ebuild
+++ b/x11-apps/xlogo/xlogo-1.0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlogo/xlogo-1.0.4.ebuild,v 1.5 2012/06/28 14:35:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlogo/xlogo-1.0.4.ebuild,v 1.6 2012/07/11 19:30:44 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="X Window System logo"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-interix"
IUSE=""
RDEPEND="x11-libs/libXrender
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
index 28b9c235b0c5..74819dcf7de2 100644
--- a/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
+++ b/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild,v 1.6 2012/06/28 14:36:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild,v 1.7 2012/07/11 19:31:18 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="list interned atoms defined on server"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="x11-libs/libxcb"
diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
index 3e69609d4ad1..449af98ab858 100644
--- a/x11-apps/xlsfonts/Manifest
+++ b/x11-apps/xlsfonts/Manifest
@@ -1,2 +1,2 @@
-DIST xlsfonts-1.0.3.tar.bz2 112147 RMD160 b9add9e6cccb7370ea2651b24eea966a1bce6cb8 SHA1 9d4e0adbcb83362dd9234e90507c0528f60e309b SHA256 b59358b664f8220e3856d01d6b3e60adcc70f04fc588d71e0f7d9fd35e0e67c2
+DIST xlsfonts-1.0.3.tar.bz2 112147 SHA256 b59358b664f8220e3856d01d6b3e60adcc70f04fc588d71e0f7d9fd35e0e67c2 SHA512 ba0be063c7cf0c979e383e7e34399044597c2a1552ba8d81525ef941036bf6a8386771b9bdf9a9edfdfe507ce20e736ab5f5f70ba18f4f1171ea3f243182a24c WHIRLPOOL 5f085a9bd76b891f329cf3951783deb83b2e1245fa95c066ae016bf54e95819ada8ff0fd597e2eb6fda979bb151b68299a7ef742f0ec7d7bba4f7a4f00e3cfab
DIST xlsfonts-1.0.4.tar.bz2 124533 RMD160 69b0ca0dfe0ef7bc73a82ffeee073ea10770617f SHA1 6fc23537797bb1ae4945efd8c01e675edf4a4c3f SHA256 28179185ec2bf81dfe13652d65bdb2a4ae74e2775df591a62d66a70f80e90cd2
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild
index 68ec33c24ac4..66aa852c7b05 100644
--- a/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild,v 1.5 2012/06/28 14:36:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild,v 1.6 2012/07/11 19:31:52 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="X.Org xlsfonts application"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmodmap/xmodmap-1.0.7.ebuild b/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
index 3e9fd6dca466..adeb2af159f1 100644
--- a/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
+++ b/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-1.0.7.ebuild,v 1.7 2012/06/28 14:37:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-1.0.7.ebuild,v 1.8 2012/07/11 19:32:30 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xpr/xpr-1.0.4.ebuild b/x11-apps/xpr/xpr-1.0.4.ebuild
index 78d8b133afc3..4f2825c2d3b7 100644
--- a/x11-apps/xpr/xpr-1.0.4.ebuild
+++ b/x11-apps/xpr/xpr-1.0.4.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xpr/xpr-1.0.4.ebuild,v 1.6 2012/06/28 14:38:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xpr/xpr-1.0.4.ebuild,v 1.7 2012/07/11 19:33:06 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org xpr application"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="x11-libs/libXmu
x11-libs/libX11"
diff --git a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
index b0665738482a..6fa131141468 100644
--- a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
+++ b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild,v 1.5 2012/06/28 14:38:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild,v 1.6 2012/07/11 19:33:40 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org xtrap application"
-KEYWORDS="amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXTrap"
diff --git a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
index 0efcd4ab3571..6b8b96566121 100644
--- a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
+++ b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild,v 1.5 2012/06/28 14:39:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild,v 1.6 2012/07/11 19:34:14 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="video mode tuner for Xorg"
-KEYWORDS="~alpha amd64 arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xwarppointer/Manifest b/x11-apps/xwarppointer/Manifest
index 19e05696a4ea..257d92cb0356 100644
--- a/x11-apps/xwarppointer/Manifest
+++ b/x11-apps/xwarppointer/Manifest
@@ -1 +1 @@
-DIST xwarppointer.tar.gz 2338 RMD160 e80ddd1ccb57aeb46fca1a1c75b9b98748eacc8d SHA1 75c49addb0b94706df19187ec8ebee87ea41f710 SHA256 3569bf9e67ef080b8f8b2b13f51f6648866c1ff19f63c1385c8a72a6b064930e
+DIST xwarppointer.tar.gz 2338 SHA256 3569bf9e67ef080b8f8b2b13f51f6648866c1ff19f63c1385c8a72a6b064930e
diff --git a/x11-apps/xwarppointer/xwarppointer-1.ebuild b/x11-apps/xwarppointer/xwarppointer-1.ebuild
deleted file mode 100644
index 563a025243e8..000000000000
--- a/x11-apps/xwarppointer/xwarppointer-1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwarppointer/xwarppointer-1.ebuild,v 1.3 2008/12/23 17:57:16 hncaldwell Exp $
-
-DESCRIPTION="Program to move the mouse cursor"
-HOMEPAGE="http://www.ishiboo.com/~nirva/Projects/xwarppointer/"
-SRC_URI="http://www.ishiboo.com/~nirva/Projects/xwarppointer/${PN}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
- sed -i 's:^X11HOME=.*:X11HOME=/usr/X11R6:' \
- Makefile || die 'setting X11HOME failed'
-
- emake || die "emake failed"
-}
-
-src_install() {
- dobin xwarppointer || die "install failed"
- dodoc README
-}
diff --git a/x11-apps/xwd/xwd-1.0.5.ebuild b/x11-apps/xwd/xwd-1.0.5.ebuild
index 5aba6cf1d8a4..fdc16f1929eb 100644
--- a/x11-apps/xwd/xwd-1.0.5.ebuild
+++ b/x11-apps/xwd/xwd-1.0.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwd/xwd-1.0.5.ebuild,v 1.8 2012/06/28 14:39:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwd/xwd-1.0.5.ebuild,v 1.9 2012/07/11 19:34:48 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="dump an image of an X window"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
# libXt dependency is not in configure.ac, bug #408629, upstream #47462."
diff --git a/x11-apps/xwud/xwud-1.0.4.ebuild b/x11-apps/xwud/xwud-1.0.4.ebuild
index 4eaaeb9a6147..18bc5be7f0d3 100644
--- a/x11-apps/xwud/xwud-1.0.4.ebuild
+++ b/x11-apps/xwud/xwud-1.0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwud/xwud-1.0.4.ebuild,v 1.6 2012/06/28 14:40:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwud/xwud-1.0.4.ebuild,v 1.7 2012/07/11 19:35:21 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="image displayer for X"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="x11-libs/libX11"
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild
index 460c7bf05729..ce0c1549baf7 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild,v 1.10 2012/06/28 20:55:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild,v 1.11 2012/07/11 19:35:56 ranger Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE_INPUT_DEVICES="
input_devices_acecad
diff --git a/x11-base/xorg-server/xorg-server-1.12.2.ebuild b/x11-base/xorg-server/xorg-server-1.12.2.ebuild
index f80d6ca668ec..21efdefbc1c5 100644
--- a/x11-base/xorg-server/xorg-server-1.12.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.6 2012/06/28 21:06:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.7 2012/07/11 19:36:33 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit flag-o-matic xorg-2 multilib versionator
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
index c1def0a0e651..220119e5f727 100644
--- a/x11-drivers/xf86-input-evdev/Manifest
+++ b/x11-drivers/xf86-input-evdev/Manifest
@@ -1,2 +1,2 @@
-DIST xf86-input-evdev-2.6.0.tar.bz2 322773 RMD160 cde3345f882a4774dffe3ec9c716ef077f25febf SHA1 fb6f7a6f5168ae07efe890e4ace9fb8af1d4e1e0 SHA256 b0e7f3991a8183a4743196c3e16d7184d439b80bf43653aa2f45b0756a6753ac
+DIST xf86-input-evdev-2.6.0.tar.bz2 322773 SHA256 b0e7f3991a8183a4743196c3e16d7184d439b80bf43653aa2f45b0756a6753ac SHA512 c5ff503d6bde7e5690333867595d54ddd5403e6d8f556b09a631bcb65629aa82f55c694f5257d925541cbe86cc47a9464a3c21b9ff62fda8b4bf0118c92637c5 WHIRLPOOL f3c11b3f7b3a16093b0cf0dafedee27b1c2e17ad79b44a171a7cf70ea8acf4c091cc32831ef1b44ee2a93b8809b408c30f4b71937767199c711a0432a2225d44
DIST xf86-input-evdev-2.7.0.tar.bz2 360116 RMD160 39c6ba04aa44bd3123bbfece2c2155e4cafe6f86 SHA1 f0cb2d8400c33e8e83b538b53512e77ba73367fa SHA256 3ee1feee0ccf748005ca30b0993d0c1b80f85158b726745f9e0cb220902d6ec7
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild
index 0cf6b33dc366..5aa75a1c87a9 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild,v 1.10 2012/06/29 04:10:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild,v 1.11 2012/07/11 19:37:07 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="Generic Linux input driver"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86"
IUSE=""
RDEPEND="x11-base/xorg-server[udev]
diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild
index 40635c3c3c3a..6033587c64aa 100644
--- a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild,v 1.6 2012/06/29 04:12:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild,v 1.7 2012/07/11 19:37:41 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org driver for joystick input devices"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=x11-base/xorg-server-1.10"
diff --git a/x11-drivers/xf86-input-keyboard/Manifest b/x11-drivers/xf86-input-keyboard/Manifest
index 53fd869a5241..768eeba65e8f 100644
--- a/x11-drivers/xf86-input-keyboard/Manifest
+++ b/x11-drivers/xf86-input-keyboard/Manifest
@@ -1,2 +1,2 @@
-DIST xf86-input-keyboard-1.6.0.tar.bz2 297675 RMD160 453e8c007b34e0f11164c507518774ed07adb521 SHA1 8e845086749f8c4b64fdfa852b4b26cf7bb62dc9 SHA256 c46c790fec905d696573b7a374b10ab8b4389112a8f69993fe011006c99e858e
+DIST xf86-input-keyboard-1.6.0.tar.bz2 297675 SHA256 c46c790fec905d696573b7a374b10ab8b4389112a8f69993fe011006c99e858e SHA512 9af424bcb917f108695239671d0f0dd4b7c80e3ee3924aad248d4c5a01fbaa93c0b540da51dd9980577e70f6d7f42c2a032c50a5a83d7e699b970328d60bef6e WHIRLPOOL 1de3158c74c5e5d5148059bedc3d3c7fc271cfcf7eb9f3d3313b2455eef54e0a4cc08ad9c954d5f28f6d4538bbd884ca7744c9926a9aea264a62ddea4ca27c4d
DIST xf86-input-keyboard-1.6.1.tar.bz2 304166 RMD160 72211dc8ec05ad93ee0fb9050b760ead7162458c SHA1 ef30fecb9e846a5268ae339846401489a785e413 SHA256 aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild
index 5d5219026ff8..74178507444a 100644
--- a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild,v 1.6 2012/06/29 04:15:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild,v 1.7 2012/07/11 19:38:15 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="Keyboard input driver"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=x11-base/xorg-server-1.6.3"
diff --git a/x11-drivers/xf86-input-mouse/Manifest b/x11-drivers/xf86-input-mouse/Manifest
index 170dd83e3763..6684827d143a 100644
--- a/x11-drivers/xf86-input-mouse/Manifest
+++ b/x11-drivers/xf86-input-mouse/Manifest
@@ -1,3 +1,3 @@
-DIST xf86-input-mouse-1.7.0.tar.bz2 319953 RMD160 868722bf50ad73ee3860f693276db184c4bb3845 SHA1 8b99054e5e4feafd7e08c87b936e64386b74ae8f SHA256 4e989542b5e9e0c5f9087288b18e70de1064dd27c83a4bc6dce58f3ea9d74994
+DIST xf86-input-mouse-1.7.0.tar.bz2 319953 SHA256 4e989542b5e9e0c5f9087288b18e70de1064dd27c83a4bc6dce58f3ea9d74994 SHA512 7969bd39759abd0a3adda6d2e38278756abd23b2fe6b911b9bb054bdfe2787c4e73a7bbd219e500208cb45e82f9dc8c9c82319cba534703e953a39e5f653d5c6 WHIRLPOOL 3c3e17ab5639a47f028ced83033f28a5e4cd800786105278017c9ca9fb2c9c1997a80935ec7eb88ae9317a8b4a4bc26b6ecb108b0bb169c10d5ca83814f55357
DIST xf86-input-mouse-1.7.1.tar.bz2 319429 RMD160 27ec9a6578b2fb97e135afb991b0ff73dc656da4 SHA1 11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed SHA256 d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
DIST xf86-input-mouse-1.7.2.tar.bz2 341378 RMD160 467870d6b65decc832fadf66896d613456f217cd SHA1 0da6390c6f3d7d636110a52f08193739929ae4ae SHA256 332b7357c18e6b9daba51c8ed48ce118e9b51fb5990b6a2a68637be62da7413b
diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild
index 09a5536eeec7..e44487a572f2 100644
--- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild
+++ b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild,v 1.6 2012/06/29 04:17:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild,v 1.7 2012/07/11 19:38:49 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org driver for mouse input devices"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=x11-base/xorg-server-1.5.99.901"
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild
index a8e89adef68f..283e7caf8061 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild,v 1.3 2012/06/24 19:02:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild,v 1.4 2012/07/11 19:39:24 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit linux-info xorg-2
DESCRIPTION="Driver for Synaptics touchpads"
HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~mips ~ppc ppc64 x86"
IUSE=""
RDEPEND="sys-libs/mtdev
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild
index 9faaedf2e4ef..4b41555c151e 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild,v 1.4 2012/07/09 18:37:12 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild,v 1.5 2012/07/11 19:39:58 ranger Exp $
EAPI=4
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
[[ ${PV} != 9999* ]] && \
SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
IUSE="debug"
RDEPEND=">=x11-base/xorg-server-1.7
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 1a1a2316eb4d..72104651c317 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,5 +1,5 @@
DIST xf86-video-ati-6.13.2.tar.bz2 985673 RMD160 46f581fcd631c841b511bb7071a1aa2252fe9078 SHA1 f9d379a884a833829ab1942de4ad4f4766cdcd46 SHA256 d85f60081e5b71bf19da4ca48bce95a9e9df3635c8540dd2640785bedfbc36ee
-DIST xf86-video-ati-6.14.0.tar.bz2 1054336 RMD160 0997c743680b9924166365ab51a69c79e6975d38 SHA1 132a6b1ed6e03f7365659cdcf520516746a8fc27 SHA256 9dcaaf83e883808a49f67fc2af1deec3aa163feaa6ce957c1c028e22b959028b
+DIST xf86-video-ati-6.14.0.tar.bz2 1054336 SHA256 9dcaaf83e883808a49f67fc2af1deec3aa163feaa6ce957c1c028e22b959028b SHA512 6b9b544459b4f2a6891d0d73f77b6cf7bc06e78f31654188dfbb14cd057d26910d5f0066bdef62a652d45ae5c1a15b6ef983bcb107e3138d41cdf03068b2dbb0 WHIRLPOOL c2a727e46b843d4d8d2a3528c0d06e8f07d7640cc097a9b3c8190e245adcf514f700a649fe9d876590734eb77f3d83dc44604ffb1c07f94e15cfb017b9aef89d
DIST xf86-video-ati-6.14.1.tar.bz2 1058696 RMD160 0caa260c0b3dccf3444241e84bb04cdf02db8426 SHA1 89b8a64a23fc307646a11cd2c2636a8125fada8f SHA256 e457285096e1e40f53ae5b58b948906c69add5160cc38ce510f0d15e82d91c75
DIST xf86-video-ati-6.14.2.tar.bz2 1072263 RMD160 69e733c43bf030783bea049235f6723e818b763c SHA1 2733b3c126ad9e082ea18b7e7663d6d87fce4d49 SHA256 017974b622eea3b4483405368492b0c6f178854a9b9753d50e13c578b8a328dc
DIST xf86-video-ati-6.14.3.tar.bz2 1113119 RMD160 fc39fd2a16c6de65ad9ae87b30fdad15134bc139 SHA1 db635e2e2858d5db90362f546ac0adad85474bad SHA256 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild
index 1714611137e8..c8f387513281 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild,v 1.6 2012/06/24 19:05:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild,v 1.7 2012/07/11 19:40:35 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="ATI video driver"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=x11-libs/libdrm-2.4.33[video_cards_radeon]"
diff --git a/x11-drivers/xf86-video-dummy/Manifest b/x11-drivers/xf86-video-dummy/Manifest
index 20cfadd07fcb..3f021f53a9ae 100644
--- a/x11-drivers/xf86-video-dummy/Manifest
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -1,2 +1,2 @@
-DIST xf86-video-dummy-0.3.4.tar.bz2 255658 SHA256 7e84dff50eb3a783c0bc718a08f82f1f34583531469c98ca75a815d177871bdc
+DIST xf86-video-dummy-0.3.4.tar.bz2 255658 SHA256 7e84dff50eb3a783c0bc718a08f82f1f34583531469c98ca75a815d177871bdc SHA512 976c486dcbc0b700e4e186f3dc2d45851fcdfbc7600baf99805199c3c906fba1f39c77836b75ca4333d6b02bf89250f6f90580c96a1718322ddc035e92dc62f2 WHIRLPOOL b3ee2c6c4c1c00b4d225a28d96dbbf715d19833ea03ea84d52ab93d7fe4e182dad21745ad9283fcc8dac2010c2972d90eaaff6cc46f2a25c5c516e27b3008fd2
DIST xf86-video-dummy-0.3.5.tar.bz2 274761 SHA256 d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f SHA512 99637074e7ef19d0b72298c5f0c8e571e1ec1fcf832f89d5c6f7ea23cd96dbed0590a42fe9e7d7f85bc4a700980df8091bb0b4e0a38992e2cabb90028c433f9b WHIRLPOOL 2aa3acda827f514135ad6802a0c0ac6e3a0b8db5a240c13cff6155ae03a1072207dbd1e88eb524065e8c03c3dc8633053904126c2615b1a174fc496a7ae28818
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild
index e2d37fc05e29..296288f4d822 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild,v 1.3 2012/07/10 20:01:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild,v 1.4 2012/07/11 19:41:10 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org driver for dummy cards"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="dga"
RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild
index 1be8d5dd4f3d..654e8fafb143 100644
--- a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild
+++ b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild,v 1.4 2012/06/24 19:08:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild,v 1.5 2012/07/11 19:41:46 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="ATI Mach64 video driver"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=x11-base/xorg-server-1.10"
diff --git a/x11-drivers/xf86-video-mga/Manifest b/x11-drivers/xf86-video-mga/Manifest
index eb1bc9b755c8..764de6866591 100644
--- a/x11-drivers/xf86-video-mga/Manifest
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -1,3 +1,3 @@
-DIST xf86-video-mga-1.4.13.tar.bz2 423134 RMD160 c68d9e02ec322d23f9be7b06c54895a05cf5f962 SHA1 55aa185cf381def4b5905c8b93694b8dfbd5c378 SHA256 b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
+DIST xf86-video-mga-1.4.13.tar.bz2 423134 SHA256 b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6 SHA512 3cf5feec8f71af3fb8afff852b4ebcab94bb96185a30b53859c84953575a42a99a988da5113c7f057e802558e960864a06588f3458969ed82ec2bbb6cd6af877 WHIRLPOOL db368b0df34b05e4be0b69979a10350a80b875bde321627a7b7570b4d154b290dc9706b566db98ed27273dd697fa3c84b16f3b7a599bfcc7c21e40300fec4875
DIST xf86-video-mga-1.5.0.tar.bz2 431769 RMD160 9f038d430dfaf08299ad942ff320d6bf1d1d3ac3 SHA1 de82e4dc8d05fe1306498e3067f9e65479cfa5a1 SHA256 ca983d780dd90115c0599980a7a83425b5e4eeb16f2e8c7fed15823fcbe7830e
DIST xf86-video-mga-1.6.0.tar.bz2 448824 SHA256 f0894fd8ddb1984d9212880544b7a7c30294e374df52bcce0c2acc93d434ce15 SHA512 e4388c9f85b34525e35b10a4912ece11657fb458b1e8330244df7f6ebc06cd2fd684b690cd8f712359c48b41a4790c85148d46eb206c5245d09e21ab62862569 WHIRLPOOL 183ca7620b5ab4c6a2aac51d8171a3f590f7e61a1331d7f01c96178ec73ce26a2c23b5507d1eda3c40d83d868bb7d650acfedde472c9ace4c74c4748d28362f0
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild
index 32f51ca7bf96..13f76eec1368 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild,v 1.4 2012/06/24 19:09:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild,v 1.5 2012/07/11 19:42:20 ranger Exp $
EAPI=4
XORG_DRI=dri
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="Matrox video driver"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="dri"
RDEPEND=">=x11-base/xorg-server-1.4"
diff --git a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild
index b30ca9fed3a4..8cc1607f03c2 100644
--- a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild
+++ b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild,v 1.7 2012/06/28 20:53:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild,v 1.8 2012/07/11 19:42:54 ranger Exp $
EAPI=4
@@ -8,5 +8,5 @@ inherit xorg-2
DESCRIPTION="Unaccelerated generic driver for kernel modesetting"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild
index 0005db76a1a1..fd4e056f59d0 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild,v 1.4 2012/06/24 19:10:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild,v 1.5 2012/07/11 19:43:29 ranger Exp $
EAPI=4
XORG_EAUTORECONF="yes"
@@ -11,7 +11,7 @@ DESCRIPTION="Accelerated Open Source driver for nVidia cards"
HOMEPAGE="http://nouveau.freedesktop.org/"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
IUSE=""
RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild
index 90a47af03040..9c969822db08 100644
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild,v 1.3 2012/06/24 19:11:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild,v 1.4 2012/07/11 19:44:02 ranger Exp $
EAPI=4
XORG_DRI=dri
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="ATI Rage128 video driver"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="dri"
RDEPEND=">=x11-base/xorg-server-1.2"
diff --git a/x11-libs/libFS/libFS-1.0.4.ebuild b/x11-libs/libFS/libFS-1.0.4.ebuild
index a3bfc5e598af..41ec7b9ab0db 100644
--- a/x11-libs/libFS/libFS-1.0.4.ebuild
+++ b/x11-libs/libFS/libFS-1.0.4.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libFS/libFS-1.0.4.ebuild,v 1.5 2012/06/29 04:22:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libFS/libFS-1.0.4.ebuild,v 1.6 2012/07/11 19:44:35 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org FS library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
IUSE="ipv6"
RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index cdbb8c23d37a..ec35a8bf7515 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,2 +1,2 @@
-DIST libICE-1.0.7.tar.bz2 323808 RMD160 c7de88091897017869eb5859bae4fabcdef1b2a1 SHA1 c7d0f4c5b0e999385445b8be1bc89aec4e5de71d SHA256 a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
+DIST libICE-1.0.7.tar.bz2 323808 SHA256 a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901 SHA512 ce5c73947328aa97b374b02c60d6bf6449246d313c413ab0703d655236f688d37b0a85918f6cab157ba06b0bdccf4e99f3878e9cff523914d670a02fb7ce6731 WHIRLPOOL 20612487c090133eeb5443a2caf09188ed16d3b2975197da2087c57489b4dd535adb9199e0d5c7da826847bb860a5df8c49c61a840a39cd2a9e7cc489cac6fc1
DIST libICE-1.0.8.tar.bz2 365762 RMD160 18d6e7dbb0804bff181120758e7ce4d0ca609478 SHA1 ddb14df8bbc43df7322978f5f9f802936e2a7324 SHA256 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
diff --git a/x11-libs/libICE/libICE-1.0.8.ebuild b/x11-libs/libICE/libICE-1.0.8.ebuild
index 3fd66a56bf80..aa7fd41f6293 100644
--- a/x11-libs/libICE/libICE-1.0.8.ebuild
+++ b/x11-libs/libICE/libICE-1.0.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libICE/libICE-1.0.8.ebuild,v 1.6 2012/06/29 04:25:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libICE/libICE-1.0.8.ebuild,v 1.7 2012/07/11 19:45:09 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org ICE library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="ipv6"
RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index e79c34c22222..96b7d46f87a9 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,2 +1,2 @@
-DIST libSM-1.2.0.tar.bz2 284287 RMD160 751e4cbd9e594959212ab47b68ca173628c90d30 SHA1 f78bc72f0b3ec26cbf980f84f014422ba854544d SHA256 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
+DIST libSM-1.2.0.tar.bz2 284287 SHA256 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb SHA512 09fd78a060d4527ae2dcd9458bbb23d9b57d9cbf1bad61a5fcfe7d16436d074cbe3bb6d701a6591d828ef7ed172b05cf198e1c051d3319c3ae082c5ae30f811c WHIRLPOOL 7f8910cb7aa62299389270be73f552ead4e66dded6760a1fbe9ee8292c46673b8e43f1ce4ac0cb8b72b38b9d3c6df97f7601b52232399c78e6f05c7db4c217b3
DIST libSM-1.2.1.tar.bz2 334696 RMD160 f092ef40158f9b4b71b98c20f9b0606a5e5f8e3a SHA1 8d354a165e330022ffd3606aba562b8c8154213d SHA256 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d
diff --git a/x11-libs/libSM/libSM-1.2.1.ebuild b/x11-libs/libSM/libSM-1.2.1.ebuild
index b854a8ffd3b0..98f5f4defb84 100644
--- a/x11-libs/libSM/libSM-1.2.1.ebuild
+++ b/x11-libs/libSM/libSM-1.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.1.ebuild,v 1.6 2012/06/29 04:27:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.1.ebuild,v 1.7 2012/07/11 19:45:43 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org SM library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc ipv6 +uuid"
RDEPEND=">=x11-libs/libICE-1.0.5
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 43673d3bffce..7374905c2df7 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,4 +1,4 @@
-DIST libX11-1.4.1.tar.bz2 2301883 RMD160 42b460c917382c15902d482021dec19c2d101683 SHA1 83590cdac5071b7154b223d73655edcfc82095c1 SHA256 70f4e0f798645a0f269f362bfdbd4c7934dae3a2dd9ecbad28d6ede414f63ce2
+DIST libX11-1.4.1.tar.bz2 2301883 SHA256 70f4e0f798645a0f269f362bfdbd4c7934dae3a2dd9ecbad28d6ede414f63ce2 SHA512 8dc7f15f2cc06a089875dbe6478df0d2647b799f3425f2f67a7ecda790e0414a86649614167e975e25649990202a9d6157216d0c84dee7a7c0d41c89158d7b10 WHIRLPOOL b1855c997e2ee35e9a9cdf3f73c79778c1614ba892fb5da72645d1557ba84a580675b0b7f01e1c276ea1c541086b5fc891cfe9aa2ee3b56800ccebd77fd85ee0
DIST libX11-1.4.3.tar.bz2 2308939 RMD160 4b0ff1cf0725b974cc8503fbac9dad65373b4600 SHA1 174270a0e51614b5077026fc6c20701d4e09aef8 SHA256 38b5ddd93291714a46a02cb8a5dd94b995a04ed76a608551c44d1598e113635a
-DIST libX11-1.4.4.tar.bz2 2323404 RMD160 b331b8b38c13db9dc7c2b2ab247b19021d9a343a SHA1 2d9d38bfd7003ec60eea0b1999ab72cfd5fa3b90 SHA256 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
+DIST libX11-1.4.4.tar.bz2 2323404 SHA256 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d SHA512 f2fe14172fb95254cd959c2db4524653f8209760950dcca031ad821f01fa4d449e53867e31ddddb19f1d114dbdbb8cf9f7640dcfb385f3f5cece8b0f7d6c4094 WHIRLPOOL f192c8b82391a2baf1468f9d8248103fd7b198258fe7f82dd02106554e3d8d0dac5a0b86c7048dc7e2909a3070b9beacf68a69857c71666cf506a81c7c588be9
DIST libX11-1.5.0.tar.bz2 2322265 RMD160 53873128000cb6827941ee81cb005f5b730a7940 SHA1 8177535c9c59d8c3ab98d55ce53520b5737ccd1a SHA256 c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86
diff --git a/x11-libs/libX11/libX11-1.5.0.ebuild b/x11-libs/libX11/libX11-1.5.0.ebuild
index 9fe4ed46ea14..dfb019b03920 100644
--- a/x11-libs/libX11/libX11-1.5.0.ebuild
+++ b/x11-libs/libX11/libX11-1.5.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.5.0.ebuild,v 1.5 2012/06/28 14:33:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.5.0.ebuild,v 1.6 2012/07/11 19:46:18 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2 toolchain-funcs flag-o-matic
DESCRIPTION="X.Org X11 library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="ipv6 test"
RDEPEND=">=x11-libs/libxcb-1.8.1
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index 4f3679dffb14..ca3b3eb395ad 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,2 +1,2 @@
-DIST libXScrnSaver-1.2.1.tar.bz2 268322 RMD160 85d7bf43e6260cc0670b81a5c2154919421d41fa SHA1 3c29e2222fd68e26e408234c51c6d8b2edf6ab19 SHA256 ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a
+DIST libXScrnSaver-1.2.1.tar.bz2 268322 SHA256 ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a SHA512 6c109bbc5cff47aa3839c540bf30204d371a01fb1849b5ad52f0d89f47b05eecbebf9a229f3834f1927d767fe0c2f9848e3b58fed048aad1001a18ad4b1affb8 WHIRLPOOL c3e32731c9f08c85122d52716001c696386b17b4409e0583cbe98696e9e773b0d398cdedfdb55e6bbdaa70118f11a54cdbe9a8c1541e88eb8c5277d6d9d9c389
DIST libXScrnSaver-1.2.2.tar.bz2 290437 RMD160 b0d007fe39d64eafa4cabb0276d49c0f04e04e89 SHA1 7b8298eec371c33a71232e3653370a98f03c6c88 SHA256 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild
index f23c1816930e..d3f075eedab0 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild,v 1.6 2012/06/29 04:30:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild,v 1.7 2012/07/11 19:46:52 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild b/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild
index 6ae9c0bfba79..1a36940d919f 100644
--- a/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild
+++ b/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild,v 1.6 2012/06/29 04:34:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild,v 1.7 2012/07/11 19:47:26 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org XTrap library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 399ce7c7d793..3caef018c027 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,2 +1,2 @@
-DIST libXau-1.0.6.tar.bz2 261501 RMD160 4af9e97d242546e2ee61e0fc3cceeda2b8cfa082 SHA1 0e1ab449f98026e4599f6e0d7491810d36c8fe4d SHA256 ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc
+DIST libXau-1.0.6.tar.bz2 261501 SHA256 ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc SHA512 673f6621384388f1ff12274a4d68d95b67e344dab30c2ceb7e96cfa515d0268874a712cfb26c792829b80855a91f0dbc777b16446a8858da28b8d10f3998bc53 WHIRLPOOL 63eb4d1757ff40acd81b1d21b76223e8cba319afa2d15642a86655cd50aad657f370b056d9bb552f51c76c0c3f288f990179c5fb605349bb52a2ad5116ea14fd
DIST libXau-1.0.7.tar.bz2 274681 RMD160 2d72bd7bb634f10a254b7b2924f2fd066381a528 SHA1 29c47207fd246425b906f525b2220235ce4cd0f6 SHA256 7153ba503e2362d552612d9dc2e7d7ad3106d5055e310a26ecf28addf471a489
diff --git a/x11-libs/libXau/libXau-1.0.7.ebuild b/x11-libs/libXau/libXau-1.0.7.ebuild
index f226063697ad..52f3401e5bd9 100644
--- a/x11-libs/libXau/libXau-1.0.7.ebuild
+++ b/x11-libs/libXau/libXau-1.0.7.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXau/libXau-1.0.7.ebuild,v 1.6 2012/06/29 04:37:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXau/libXau-1.0.7.ebuild,v 1.7 2012/07/11 19:48:00 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org Xau library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-proto/xproto"
diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
index 2d31aeaf458c..d194a3bc213c 100644
--- a/x11-libs/libXaw/Manifest
+++ b/x11-libs/libXaw/Manifest
@@ -1,3 +1,3 @@
DIST libXaw-1.0.10.tar.bz2 655512 RMD160 a391bb6e44c59dae300534e3b626897c6c94d7c9 SHA1 8caa4c692e28f9681678a22168978b7668df57be SHA256 2d96bcf92638b8ec5c91d379f5ec2e7b15133adeb2ba22066d48bf3239ee1bdd
DIST libXaw-1.0.11.tar.bz2 649633 RMD160 551785a6b92a2b274354615e7dff343d9cf059ae SHA1 a27556b14e2b4c250afcb98b6e99eebd7623816f SHA256 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
-DIST libXaw-1.0.9.tar.bz2 650634 RMD160 e2b789857f477479860fde26d1ec78cb63781903 SHA1 5f8fc1b10316f31d4c6fa1d938b2297ff5bd2da5 SHA256 a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
+DIST libXaw-1.0.9.tar.bz2 650634 SHA256 a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037 SHA512 6c3fffafac63519be51c25a2e82ce8c3edecd80d18173b60745d6b663d2a0026dcfefb1e8e7a5f72cc70ce87fe953570ec144ecdf1e09b2202da1705f65c7d44 WHIRLPOOL 87ff7beea0ae3393ca39896e3adb290bdd3f80aac11facec38250bfc89bf7cef9fe41f2bf5daa9b006b6c5181b76f8ac6ab59a39eece4492bd3edb074557f54f
diff --git a/x11-libs/libXaw/libXaw-1.0.11.ebuild b/x11-libs/libXaw/libXaw-1.0.11.ebuild
index a4cac08992e8..1f0f9cdf0ef2 100644
--- a/x11-libs/libXaw/libXaw-1.0.11.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.11.ebuild,v 1.5 2012/06/29 04:39:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.11.ebuild,v 1.6 2012/07/11 19:48:34 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xaw library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index 9eadadc21dc6..d9357ee1f81a 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,3 +1,3 @@
DIST libXcursor-1.1.11.tar.bz2 272680 RMD160 f8e1c9ad9c42a11d6fa59933d8479fac0c357127 SHA1 35491bd17cbcdda712e1a064c67ccbc523e2702c SHA256 a06ef74579e2c06f9490e682b8e7ac915cb5280ee47bb071a2b850637a2bf6fe
-DIST libXcursor-1.1.12.tar.bz2 297332 RMD160 22a7d2735bbb8882243a0a3bde40b1319e0b5e67 SHA1 f68d7baed5ecf4b1ae88004dd05ef4680d63ee2c SHA256 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
+DIST libXcursor-1.1.12.tar.bz2 297332 SHA256 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4 SHA512 8521f937f110d50535d90305e73a1898f42c68957284d27cfe7bf74c7e4b21d913dab8df506f7694f340fb900b574d23aaf1449140f5f79836f56bd5caa8a767 WHIRLPOOL ab9e2054888919d297190527f43a9dd319e1af183251754b31722c2af4fc8cb5c1f4449ade2d7d766c4a3b56a1caa785c0499e7b131e2f274f58b0fb1565b619
DIST libXcursor-1.1.13.tar.bz2 302525 RMD160 11f643f8fa934a5670249156bd98b89554353566 SHA1 4e461d9e4324689ca8a84706926a8c0fe9470e47 SHA256 f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f
diff --git a/x11-libs/libXcursor/libXcursor-1.1.13.ebuild b/x11-libs/libXcursor/libXcursor-1.1.13.ebuild
index 9ce380f0cd1a..c72f1d5dc9da 100644
--- a/x11-libs/libXcursor/libXcursor-1.1.13.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.1.13.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/libXcursor-1.1.13.ebuild,v 1.6 2012/06/29 04:42:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/libXcursor-1.1.13.ebuild,v 1.7 2012/07/11 19:49:08 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org Xcursor library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=x11-libs/libXrender-0.8.2
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index 27b6d36adb48..59dfbcd2f459 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,2 +1,2 @@
-DIST libXdmcp-1.1.0.tar.bz2 288256 RMD160 4a0eb45bb198365263974084edfcb987c3e81397 SHA1 28132db24727552f77e998e6a6798a5b9b30789f SHA256 b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072
+DIST libXdmcp-1.1.0.tar.bz2 288256 SHA256 b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072 SHA512 de87173cdd27ad7672189d078a006551681ff25f4cdac07f9db58b2af47e6cd0e4793156e5c361e6346b32d2b61cc038e577a94ff970d2185f7a3e55259bfb6b WHIRLPOOL 988680c229e69da657259173d8b436fcc7f233ca6559d5f13e02ec5b144dbb23f696ddb8910bb5ec822944ae4a3235b88bda07ba295068be94325ccfc870f273
DIST libXdmcp-1.1.1.tar.bz2 310878 RMD160 c8cf4964c0702431b05c347594438ea7bb10c382 SHA1 3b63e8fc1600c51d9897d017da190fc6c16245b6 SHA256 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild
index 0760be2de6f6..7dc92630e80e 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild,v 1.6 2012/06/29 04:45:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXdmcp/libXdmcp-1.1.1.ebuild,v 1.7 2012/07/11 19:49:41 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xdmcp library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-proto/xproto"
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index 491c604427f9..0667b279af84 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,3 +1,3 @@
-DIST libXext-1.2.0.tar.bz2 313332 RMD160 2d84b0f69ef9a84af7114da7bff6bfb559ebb4fc SHA1 090d7109c5fffde8a0063e10f22f3e2ec48cf19e SHA256 4aed3e211e41c47908c293515580e731c26048f61a1212bf0888d1f456de6ff7
-DIST libXext-1.3.0.tar.bz2 341172 RMD160 fc3bb37882945e3475a338cb83c89dae04eb75fe SHA1 0bf3708177b9320091ebc069e905c042c31d859d SHA256 e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
+DIST libXext-1.2.0.tar.bz2 313332 SHA256 4aed3e211e41c47908c293515580e731c26048f61a1212bf0888d1f456de6ff7 SHA512 7e0d9568c97fd299448513b21605379cb21bc3c4c4ab8c0b269e2b7ceefcf5a54f4fe98f79594b6b8a14115fa870d2bcfb8f4e6871dece0756ffe60d741462a8 WHIRLPOOL 396cadbc3fbbf31c5f7c4a119d5745ab77c4b7bfc965984829f527e9fe0c1508d8d89b491ce8eb402015ab3d811a45f3c9be8ee303048d9f2631f4ef363a5430
+DIST libXext-1.3.0.tar.bz2 341172 SHA256 e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0 SHA512 64ce6f49487825f89aa71cfd77c800dbf25b5bba21c57d7d1844edce628649d11c6c9c70ad37764424de4f4ca0b85d79658ea99f12ff0a60ef8f38c64c659666 WHIRLPOOL 23931cb7951eb2c2d5708f0c17d09e91632c1392c63850949ab8d6acbbc1d481e7f33de7cabb47528b75be57ed1dcf4f4fcd9b976307ed0107a04dc44db5831b
DIST libXext-1.3.1.tar.bz2 372728 RMD160 add5e4362d64e57f885d35abaae9b5f3dc0d14d2 SHA1 764ac472ae19a0faade193717a9e0938d3430aaa SHA256 56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859
diff --git a/x11-libs/libXext/libXext-1.3.1.ebuild b/x11-libs/libXext/libXext-1.3.1.ebuild
index caf9975ad35b..bdac2d26dd1c 100644
--- a/x11-libs/libXext/libXext-1.3.1.ebuild
+++ b/x11-libs/libXext/libXext-1.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.3.1.ebuild,v 1.6 2012/06/29 04:48:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.3.1.ebuild,v 1.7 2012/07/11 19:50:16 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xext library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND=">=x11-libs/libX11-1.2
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index 2c31d4a8ce41..1a6b2dc8a58b 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1,2 +1,2 @@
-DIST libXfont-1.4.4.tar.bz2 440022 RMD160 0241b2505ed65b0bd66d8bd3c80330a4db6eea6d SHA1 189dd7a3756cb80bcf41b779bf05ec3c366e3041 SHA256 a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a
+DIST libXfont-1.4.4.tar.bz2 440022 SHA256 a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a SHA512 ccd99530cea0f4034a87d07299e3bbee2cd9cca16dc3db56d9fd5f534b96fda28b49da67fec8ebfcba8677aa590bdf4dfc3e82a724bf122fb690100310a4ba49 WHIRLPOOL 07c5486a5cd47706a3c8d11aa9f358110956ec56e09d3be32bfd8acddbd97045f3e8930349e7d71be372e6abd2305a9f2917b1bf22dcd0c7e224402531023795
DIST libXfont-1.4.5.tar.bz2 470879 RMD160 f7749eb4fb7f8e73921c45c5bdcb48fc5f9a0645 SHA1 0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e SHA256 bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170
diff --git a/x11-libs/libXfont/libXfont-1.4.5.ebuild b/x11-libs/libXfont/libXfont-1.4.5.ebuild
index 6ea2115d27a0..55b002b5666c 100644
--- a/x11-libs/libXfont/libXfont-1.4.5.ebuild
+++ b/x11-libs/libXfont/libXfont-1.4.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.5.ebuild,v 1.8 2012/06/29 04:50:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.5.ebuild,v 1.9 2012/07/11 19:50:50 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xfont library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6"
RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild b/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild
index 1915bacb9b5b..3ed3d813b377 100644
--- a/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild
+++ b/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild,v 1.5 2012/06/29 04:53:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild,v 1.6 2012/07/11 19:51:24 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org Xfontcache library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 35c086c7c229..a3cb51412b04 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,3 +1,3 @@
-DIST libXft-2.2.0.tar.bz2 290451 RMD160 e2955cfd5c8d2e02d4dba5f01b5132634005f971 SHA1 ed29784259f4e26df78141035560ae8a7c62e83f SHA256 c8685ae56da0c1dcc2bc1e34607e7d76ae98b86a1a71baba3a6b76dbcf5ff9b2
+DIST libXft-2.2.0.tar.bz2 290451 SHA256 c8685ae56da0c1dcc2bc1e34607e7d76ae98b86a1a71baba3a6b76dbcf5ff9b2 SHA512 948ba8918895e49705b4b925b7821a3885c6b9de2e1fe1e95e3fcfee10d06906bf00eeb8035b0ae1a911c28028de0bd109fd6bda54695a3bbd2a19a80f0de37a WHIRLPOOL d639220ed5d2c3efcafa08e55ae719815766e5b1f4ef56c395463e4475f9bab01d66d3a4e0007fc10ca3dd1ccd1bce775620326e0a29975cc0892bb5835a4eba
DIST libXft-2.3.0.tar.bz2 325561 RMD160 4941af3b2c5bcc06baf5246a1d6249e01087a7be SHA1 687f38a810b9ae58e1169c295d9d438370235e23 SHA256 3426393ad72a5c47006536d474e396c7a21c33131bb28f495578e05a5858b044
DIST libXft-2.3.1.tar.bz2 311556 RMD160 81a29298af843dff03234a6f0068ae052e698380 SHA1 c7ec1361e3d4f095910f8c58988ab42e32f314d9 SHA256 7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd
diff --git a/x11-libs/libXft/libXft-2.3.1.ebuild b/x11-libs/libXft/libXft-2.3.1.ebuild
index 18ae5d7ec42e..2035dd54a2af 100644
--- a/x11-libs/libXft/libXft-2.3.1.ebuild
+++ b/x11-libs/libXft/libXft-2.3.1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.3.1.ebuild,v 1.5 2012/06/29 04:56:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.3.1.ebuild,v 1.6 2012/07/11 19:51:58 ranger Exp $
EAPI=4
inherit xorg-2 flag-o-matic
DESCRIPTION="X.Org Xft library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND=">=x11-libs/libXrender-0.8.2
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index bc556cc954a1..64b864b1d934 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,6 +1,6 @@
-DIST libXi-1.4.1.tar.bz2 407880 RMD160 7447cc3ef411d833bee36fca6f6ffb13108ce113 SHA1 15c9d369cc76c73b5e3833ba3b39355e6cc06636 SHA256 599f1c0930f94c2ae74711b2577a7f354c4a991cc97b5ec5bb655b855c1429a6
+DIST libXi-1.4.1.tar.bz2 407880 SHA256 599f1c0930f94c2ae74711b2577a7f354c4a991cc97b5ec5bb655b855c1429a6 SHA512 55e7b342d1937e12af49b365293e3ce4f86c76826ae13582f88707eab262ff74d291948e8974b24fd23a4b830851ee164949d990fe70aad958acb697b7dfeae5 WHIRLPOOL 78853bc981c7faf170446f5c3676266223eec6b47c112dd0ddb63304f7400c86ed8fa518b5072f10cac9e3c39b5735552a7e5712d0d9ea4509c5647e77e88a47
DIST libXi-1.4.2.tar.bz2 398801 RMD160 2753987b72a91683321bc02172901f1d5c5b5664 SHA1 97e60a60dd789287e47df807e487f4952dd4ff95 SHA256 272b8041efc0a0203fb0ba33481ddec989539aed862181b58c8c3e410e325691
-DIST libXi-1.4.3.tar.bz2 422637 RMD160 142d44e8e13abbb8a41826b7005f8ede1807e3ff SHA1 c66cfdee74e8d169a7992b5f257395e653ca761b SHA256 08c9d89a404740592621e6f5078414df86ccc78ca876e3da1af15639d81c74e0
+DIST libXi-1.4.3.tar.bz2 422637 SHA256 08c9d89a404740592621e6f5078414df86ccc78ca876e3da1af15639d81c74e0 SHA512 6ec8cedd7f6ad5ec6deb7ea594893615c87823537be20b6b1d67c8595364566ac4d22292e49640cb94e0ba2216c60859fcfb8f0650089015df9dc42b10a02b87 WHIRLPOOL 9c3e09f178d09b64cee5ef94c813c6a2521ad112a95716d59fd0f38b4b970468148306e17d4a51dd4e0339829304d788898ff44ab394be4447a7902ee568a349
DIST libXi-1.4.5.tar.bz2 416807 RMD160 c8d40d85eb2e25303a84b43e409c1e057bc4e295 SHA1 8ac24dec8e488f49fd6a6b256c815da9ceec9737 SHA256 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5
DIST libXi-1.5.0.tar.bz2 415728 RMD160 39d42522f9724f867e4d74dac85b1411d46e21bc SHA1 2d5219ecd270ba985f3a6f4fa3a17c033bb05b78 SHA256 fa4a9e4749a439c7a7911e366a898862158c802a0ff8ea0c73f98201aefb4f85
DIST libXi-1.6.0.tar.bz2 418674 RMD160 a47e51cf70621ec4b8a6573f93670ec0cc5ef91c SHA1 b7edf48f93e8abd13ca688fa7f597452c4b74346 SHA256 b2fc65a24a269405c5bbe27152e97ed4c5987ca728b9d7e7576e4c9543c4a7af
diff --git a/x11-libs/libXi/libXi-1.6.1.ebuild b/x11-libs/libXi/libXi-1.6.1.ebuild
index 654bd878b4ad..d287b0ee3f97 100644
--- a/x11-libs/libXi/libXi-1.6.1.ebuild
+++ b/x11-libs/libXi/libXi-1.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.6.1.ebuild,v 1.6 2012/06/28 14:34:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.6.1.ebuild,v 1.7 2012/07/11 19:52:33 ranger Exp $
EAPI=4
@@ -8,7 +8,7 @@ XORG_DOC=doc
inherit xorg-2
DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND=">=x11-libs/libX11-1.4.99.1
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index 36c42d74b125..211a13f9d1c3 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,2 +1,2 @@
-DIST libXinerama-1.1.1.tar.bz2 266086 RMD160 f0f49a96f6bb323ca4504f085a032cc1d10ff520 SHA1 f030b0cfcce15502aac78188524f32a6f29bd0a4 SHA256 bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f
+DIST libXinerama-1.1.1.tar.bz2 266086 SHA256 bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f SHA512 52ac574fee774ea2d9fa087f8acd371f807b7bc8586fa88c0d023313931d953cd05ae328c94859e9623efa888ad8c0212beb44ebadcef0f7783c385e41eeddaa WHIRLPOOL c9e4bdaeb03e641292df9dea778d8468b36a6d99d5a398f53b3f672eaf67c55817ad3eb77f4ae98da88ac86140d19f0be742185ff86c75e5260744c6050a3e92
DIST libXinerama-1.1.2.tar.bz2 279682 RMD160 4b5858c8c8a2c6992ecb3c400ab3a2107e0a5667 SHA1 06a5b636305725ce09f6c3a4d5a15f2f188b5afd SHA256 a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac
diff --git a/x11-libs/libXinerama/libXinerama-1.1.2.ebuild b/x11-libs/libXinerama/libXinerama-1.1.2.ebuild
index 75cde28f2d23..908b919f5cb3 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.2.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.2.ebuild,v 1.6 2012/06/29 04:58:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXinerama/libXinerama-1.1.2.ebuild,v 1.7 2012/07/11 19:53:08 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org Xinerama library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index eb62a6df6055..3a4965488b54 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,2 +1,2 @@
-DIST libXmu-1.1.0.tar.bz2 360663 RMD160 e6ca19dfb86a3532faa6e37c8a5cd6edff6a1c62 SHA1 81876a0848070bfc4476a2538fc16898eb6d96cd SHA256 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
+DIST libXmu-1.1.0.tar.bz2 360663 SHA256 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad SHA512 c89e19ca1aaef50b9fb05ea5186606d6d74243dad0dab4cb2b0b831c674d4a6f1e2b5acc32f2c9e5a1062243a4bfe0a522e7610cfaf962b9608ae2e6e4b0f592 WHIRLPOOL 519447d8dd060014bd89c82d52da64bf8ab855c551ef58d50f5d5a87a35a588c8cd7c999213bc6466724467f0737f771f46a88b8d280a075811193eba4b57570
DIST libXmu-1.1.1.tar.bz2 383473 RMD160 9b04624ee16ebd10c07b9554771e18d16d77374f SHA1 3e280aa927d78c05f94db6c7ae606f7ad132b495 SHA256 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd
diff --git a/x11-libs/libXmu/libXmu-1.1.1.ebuild b/x11-libs/libXmu/libXmu-1.1.1.ebuild
index ea8f1dbb8b80..6026b23378cd 100644
--- a/x11-libs/libXmu/libXmu-1.1.1.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXmu/libXmu-1.1.1.ebuild,v 1.6 2012/06/29 05:01:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXmu/libXmu-1.1.1.ebuild,v 1.7 2012/07/11 19:53:41 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xmu library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6"
RDEPEND="x11-libs/libXt
diff --git a/x11-libs/libXpm/libXpm-3.5.10.ebuild b/x11-libs/libXpm/libXpm-3.5.10.ebuild
index 9ad98caa6ed4..e2c0ebbad5a9 100644
--- a/x11-libs/libXpm/libXpm-3.5.10.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.10.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.10.ebuild,v 1.7 2012/06/29 05:03:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.10.ebuild,v 1.8 2012/07/11 19:54:15 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org Xpm library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index 76713c56ee70..6c80a32ebf44 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1,2 +1,2 @@
-DIST libXrender-0.9.6.tar.bz2 258249 RMD160 4eb2ac0762dd533c7254b43361b21812ca12d50f SHA1 65bd96dc17da6b064f95109da02d9c9d14cb06dc SHA256 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
+DIST libXrender-0.9.6.tar.bz2 258249 SHA256 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668 SHA512 78fcb840d98c32a344a2864be851f0280aeec286d0410ef461077f921f19efbc7714620ffa6ff3a8e85699b01fb725cad734641fcb64d920eb2328245b64ebd7 WHIRLPOOL 75448109cdd6a917ea0888d8a5e253463d8b91bec23dc9336de056210ae20c582ebeec555920d15e3e03246bda8b2f498fa5de857e80f222f21e4e19297c9ed2
DIST libXrender-0.9.7.tar.bz2 281098 RMD160 2641fde5d38b158e56e78382c36906b313a3c525 SHA1 6e4d75d8316d5217324258f555eba3a5d383feb2 SHA256 f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6
diff --git a/x11-libs/libXrender/libXrender-0.9.7.ebuild b/x11-libs/libXrender/libXrender-0.9.7.ebuild
index 76d5d88244df..ddb836b0418e 100644
--- a/x11-libs/libXrender/libXrender-0.9.7.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.7.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/libXrender-0.9.7.ebuild,v 1.6 2012/06/29 05:06:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/libXrender-0.9.7.ebuild,v 1.7 2012/07/11 19:54:49 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org Xrender library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXres/libXres-1.0.6.ebuild b/x11-libs/libXres/libXres-1.0.6.ebuild
index 84b6c4e95c5a..7464cf375f12 100644
--- a/x11-libs/libXres/libXres-1.0.6.ebuild
+++ b/x11-libs/libXres/libXres-1.0.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXres/libXres-1.0.6.ebuild,v 1.6 2012/06/29 05:08:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXres/libXres-1.0.6.ebuild,v 1.7 2012/07/11 19:55:24 ranger Exp $
EAPI=4
inherit xorg-2
@@ -8,7 +8,7 @@ inherit xorg-2
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/lib/libXRes"
DESCRIPTION="X.Org XRes library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index 94e6a220c07d..8ac1d1df244a 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,2 +1,2 @@
-DIST libXt-1.1.1.tar.bz2 715424 RMD160 aeefbc3c8c43ed70db47add04d9b16cf19fa940e SHA1 a29a97f8521bdc7a95364e163f0ce474de572ae5 SHA256 a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
+DIST libXt-1.1.1.tar.bz2 715424 SHA256 a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7 SHA512 8494c598f53841841f22e0945257d04ba837dbe32261447bed2223ccd4c9aa8ba5795d5a0825e64178002e1581706f5e64851a633c981fb9ee948536359b3375 WHIRLPOOL 063bc96f4d34624bc5ce866b75bb9b12a9fb465bcb191c7fa4ad1699db34cc4b228b0c17f0092195d630be666e38e034b8b8422db7f527dc29d0179ac3e20d63
DIST libXt-1.1.3.tar.bz2 734679 RMD160 d1cffd17864ea0081437a07ea78dcaa8316a5fa0 SHA1 2cef068bc4d7170e31b89b5c06aeaf4451a7699a SHA256 8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd
diff --git a/x11-libs/libXt/libXt-1.1.3.ebuild b/x11-libs/libXt/libXt-1.1.3.ebuild
index 2503ebe5de20..267fb88edeca 100644
--- a/x11-libs/libXt/libXt-1.1.3.ebuild
+++ b/x11-libs/libXt/libXt-1.1.3.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.1.3.ebuild,v 1.6 2012/06/29 05:11:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.1.3.ebuild,v 1.7 2012/07/11 19:55:57 ranger Exp $
EAPI=4
inherit xorg-2 toolchain-funcs
DESCRIPTION="X.Org Xt library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index 5da9f62f3b14..ca26f45a799d 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,2 +1,2 @@
-DIST libXtst-1.2.0.tar.bz2 281922 RMD160 0cde01dd80e77308e79ffecad01f0a1e3d391c39 SHA1 9fb06ed599caf7f9e7115cbbfadf02b47c17aa72 SHA256 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408
+DIST libXtst-1.2.0.tar.bz2 281922 SHA256 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408 SHA512 ee24d2c2f5f17349d7329e86dd1212a51821582b51f0df6f6a8939ea21a5903798ff9cf264f0cef1cbeb8d1e61ef8cb024967fdfd7ad62269948468340bbb542 WHIRLPOOL cd6cef8a504fc74f81c4a37d41e43cd9016274b2064be859b22f5fe52ed00290d43b5f9332433264e31877db9b53b6f5af40bc011b92c2d8c14ce4fba5fa596f
DIST libXtst-1.2.1.tar.bz2 313147 RMD160 2e41994b87fe6c77345990255545b1d140b46206 SHA1 44e19899f9938d3db5546e51c338d6f86d88cfe2 SHA256 7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0
diff --git a/x11-libs/libXtst/libXtst-1.2.1.ebuild b/x11-libs/libXtst/libXtst-1.2.1.ebuild
index 162a9e0196ce..6cc42f30deaf 100644
--- a/x11-libs/libXtst/libXtst-1.2.1.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXtst/libXtst-1.2.1.ebuild,v 1.6 2012/06/29 05:14:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXtst/libXtst-1.2.1.ebuild,v 1.7 2012/07/11 19:56:31 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xtst library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index c51661d715b4..4401e4ce1778 100644
--- a/x11-libs/libXv/Manifest
+++ b/x11-libs/libXv/Manifest
@@ -1,2 +1,2 @@
-DIST libXv-1.0.6.tar.bz2 271504 RMD160 eb7a241a9981c15572209cb1406532db02f81456 SHA1 9ebb6d7936a7b247b9b0f6dc81def39a18e4214c SHA256 e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee
+DIST libXv-1.0.6.tar.bz2 271504 SHA256 e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee SHA512 75ec0ff96af23381509e5cef08d68532485694d9f454efce5a722c62ba65cf6c33de6675bff645973306975cd5b165641473d18e697951938d28d29193bca717 WHIRLPOOL afb1581328d6ecd944bc381d90a5f082020dad7581a997ecf8c5d4c27032d4018349489c142b2cb423bc3d9a808593d6c96b20886327b380780b75fb9e40767a
DIST libXv-1.0.7.tar.bz2 285379 RMD160 72b26d44dc17708e8585e92dcf8c33992ae272c5 SHA1 49c87e0ccb999966b7b1b4e72cb927f05e0835bd SHA256 5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010
diff --git a/x11-libs/libXv/libXv-1.0.7.ebuild b/x11-libs/libXv/libXv-1.0.7.ebuild
index 674c31361d6b..0e03abb16e7c 100644
--- a/x11-libs/libXv/libXv-1.0.7.ebuild
+++ b/x11-libs/libXv/libXv-1.0.7.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXv/libXv-1.0.7.ebuild,v 1.6 2012/06/29 05:16:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXv/libXv-1.0.7.ebuild,v 1.7 2012/07/11 19:57:07 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org Xv library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXvMC/libXvMC-1.0.7.ebuild b/x11-libs/libXvMC/libXvMC-1.0.7.ebuild
index 2295f2a1b2d6..c9ee85c9eb3a 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.7.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.7.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXvMC/libXvMC-1.0.7.ebuild,v 1.6 2012/06/29 05:19:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXvMC/libXvMC-1.0.7.ebuild,v 1.7 2012/07/11 19:57:41 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org XvMC library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild
index 2393e1f4de47..2c2a0049882f 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild,v 1.7 2012/06/29 05:21:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild,v 1.8 2012/07/11 19:58:14 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org Xxf86dga library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index 22dd1941a07a..2dfd13a8f899 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,2 +1,2 @@
-DIST libXxf86vm-1.1.1.tar.bz2 252404 RMD160 e4d28d2e4462bd76416eb9c7e0395c242572a313 SHA1 2ff2d2b3c60a5c5c0cc4e0a18492d3b7168a03af SHA256 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e
+DIST libXxf86vm-1.1.1.tar.bz2 252404 SHA256 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e SHA512 94cbb3c8956bb94f1279730ac96b9a8ba19bb912006c943073e03b280c155edaf032274b4455b623eb42576a01e222487a6e4f709f04ddc2797ff5a4726feb19 WHIRLPOOL 0ac4258130a381e166f408ac9fae804a0559c5add1c6fb36a7fb3b32473da2507b6dc7fb149171c922f4231160e200c3dc46eb7c343c628eabcb5d90400bc50c
DIST libXxf86vm-1.1.2.tar.bz2 284717 RMD160 41afefbdea90f0df507faa91c0edf91c0db6ddc7 SHA1 57bbf3bb69a49f6a6dec515813394a383f85502f SHA256 a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.2.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.2.ebuild
index 23e1e279bd23..6e180dc91a6d 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.2.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86vm/libXxf86vm-1.1.2.ebuild,v 1.6 2012/06/29 05:24:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86vm/libXxf86vm-1.1.2.ebuild,v 1.7 2012/07/11 19:58:48 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org Xxf86vm library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libdmx/libdmx-1.1.2.ebuild b/x11-libs/libdmx/libdmx-1.1.2.ebuild
index 0012bf836839..e85a6b073276 100644
--- a/x11-libs/libdmx/libdmx-1.1.2.ebuild
+++ b/x11-libs/libdmx/libdmx-1.1.2.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdmx/libdmx-1.1.2.ebuild,v 1.6 2012/06/29 05:26:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdmx/libdmx-1.1.2.ebuild,v 1.7 2012/07/11 19:59:21 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org dmx library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 7cbe5b10aea0..d8150241359c 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,6 @@
-DIST libdrm-2.4.20.tar.bz2 400812 RMD160 5581c45abfb9cb2bd0b95d4754d7812bb8323e3a SHA1 f1448ac0f1c7a5f74a86d2fb50941fc12dc932db SHA256 24b5316839c1d459066eaee160132d45931462e301740a660932907350415cb9
+DIST libdrm-2.4.20.tar.bz2 400812 SHA256 24b5316839c1d459066eaee160132d45931462e301740a660932907350415cb9 SHA512 fa7a042a80b71057b7d15a36c7902e1882abb23dea77cabfa2e78590d9477d8e0259364f0e2eb6005b316254be2c728e295c114b1fe365074438539bc3dd9392 WHIRLPOOL 92a9fba9f64d0c988e8e6bcbdd1798583a420bc1287b4e85c1ca9a84c5fd3c95e5079dc111eee89811038832a5a90139780292d43554257465c99726b7f27661
DIST libdrm-2.4.25.tar.bz2 445388 RMD160 5c3174e53b71de148a64fb51f5235de202786bb2 SHA1 b950f29cd1c4bb9f1c98a926486a47256b0a4194 SHA256 51f99a815a18876977991bbc6f190607791d25a6e47a3269880ce7679dbd0e9f
-DIST libdrm-2.4.26.tar.bz2 448627 RMD160 c7892a9ef0038d2d0192fece9b43ff5b18be4a63 SHA1 e7215e804bbd30e42132d3df874122d2f6a9c929 SHA256 b25b06ab5a077736044cbd9a3a05a9a23b873a0887ab1aaf93aa2b3218b2d3dc
+DIST libdrm-2.4.26.tar.bz2 448627 SHA256 b25b06ab5a077736044cbd9a3a05a9a23b873a0887ab1aaf93aa2b3218b2d3dc SHA512 7605a54f6876e3c73cb41bc85c7e8568962a969c3b6eb388fb480c4ba08951f91ab0d024171b98543addc2e440f5c7a4692d666d59a3b2be1793234a86332576 WHIRLPOOL 468e9ff9599a4ad12664dc8a57f6207624c98c05fdfc8497bca304e5dde33a999331b3fb8cfb513c51c0127dc28c92d8aa58588da1753a99ab0a4ec65c653f9c
DIST libdrm-2.4.27.tar.bz2 491451 RMD160 cc08ca54ba272f1ad34183d0b96d331c5ee024c4 SHA1 f5b40d30a7f2bfa369ab9b3bd9a0aa844a7f1e16 SHA256 ea6b04dd3298e36c7a43aadd5f80f48baeafe4caaabcf78b01dc919c5c757973
DIST libdrm-2.4.29.tar.bz2 453793 RMD160 4f0bdf07523efd8264221ee42a3cbb973e29acef SHA1 054ca4f6b9145b1bb5192f3cba4dd1835fcc5977 SHA256 e2432dc93e933479132123a1dca382294c30f55bc895bb737b6bdd6f2b8c452e
DIST libdrm-2.4.30.tar.bz2 547931 RMD160 11114abe5c06794eb447e1268c6b3900aa7f8560 SHA1 5ba36a0bcbacbe67e6a2e0d5318ed9455da59bbc SHA256 cacea9c157ec824ad278a06f4910659b2f3ae69686518ece8d6967843cddcd56
diff --git a/x11-libs/libdrm/libdrm-2.4.33.ebuild b/x11-libs/libdrm/libdrm-2.4.33.ebuild
index 745f1483132b..66942b924391 100644
--- a/x11-libs/libdrm/libdrm-2.4.33.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.33.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.33.ebuild,v 1.6 2012/06/29 05:29:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.33.ebuild,v 1.7 2012/07/11 19:59:56 ranger Exp $
EAPI=4
inherit xorg-2
@@ -15,7 +15,7 @@ else
SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
fi
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
VIDEO_CARDS="intel nouveau omap radeon vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index 93f71c37b930..8e87bd61a24a 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,2 +1,2 @@
-DIST libfontenc-1.1.0.tar.bz2 268872 RMD160 c83603e38f012ea709c996ebf0ee66e208c5c68a SHA1 ba158e4c10a1aff2351ef632def03dec0e0ee11e SHA256 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf
+DIST libfontenc-1.1.0.tar.bz2 268872 SHA256 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf SHA512 febae66e0d0e6d020dde06a0dd918f2126c92f1e2404020bf3f947be8f7fb48e2082dac3f53ba997b772d6fb35fd1043a4736c577eab048787e629ff878c7ff7 WHIRLPOOL 3528a4962194a0f6e48b5bc763404a32c3807f06d5c3bfefda1de415815dcdb297f6b9696feb65fd9a0e3d628c26be28a3b429b0ad8921c32c743a8450e8ffd1
DIST libfontenc-1.1.1.tar.bz2 289688 RMD160 237ca9ba30d46666608894a13f974eb76d067b34 SHA1 90bdd53d75585dd0f06ad7bc23faccd8a01bb733 SHA256 de72812f1856bb63bd2226ec8c2e2301931d3c72bd0f08b0d63a0cdf0722017f
diff --git a/x11-libs/libfontenc/libfontenc-1.1.1.ebuild b/x11-libs/libfontenc/libfontenc-1.1.1.ebuild
index a46279833020..3b14917f9fe0 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.1.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/libfontenc-1.1.1.ebuild,v 1.6 2012/06/29 05:32:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/libfontenc-1.1.1.ebuild,v 1.7 2012/07/11 20:00:32 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org fontenc library"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 0b5cb4f1b223..bb3d167e9bbd 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,3 +1,3 @@
-DIST libpciaccess-0.12.1.tar.bz2 326217 RMD160 d74b62e6d6dd502805f7c4d456f4bcf3f2a0780e SHA1 4933bda545df37395e57ff6b4bd61e17a5431770 SHA256 cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
+DIST libpciaccess-0.12.1.tar.bz2 326217 SHA256 cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344 SHA512 4f796a4caf784dddab48b0bfa0b81249b06937aa968a4b533a3dc0767d4b17f2c9a122d11171d9efa3cc3d54e83201001916e1945921fb684f8e28439d7762b5 WHIRLPOOL fcb0a0dc27847ff52ea8dc6dcda97ea4399bbf799ef6f61ca01bfc5d91c99218e972ad371fb9959cb10fff8fb4dc627ce48f49352a8db5d3930caf0fa500a6e9
DIST libpciaccess-0.13.1.tar.bz2 352351 RMD160 2e4c94bd782e98d360664cc0ce3d5ad2d1b0045c SHA1 ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac SHA256 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
DIST libpciaccess-0.13.tar.bz2 334074 RMD160 179151e65ca8a7d36f4a2000d370c24446bd9d4d SHA1 7ddd8e1de27326f6f4a3ac6b4d2241fe77ef5353 SHA256 24368520b0947487ec73729e3c97c95f3d9bf83704a910bb0abe1d5a63df32fd
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.1.ebuild
index 5f0c77a65553..f780161d7d6c 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.13.1.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.13.1.ebuild,v 1.6 2012/06/28 21:00:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.13.1.ebuild,v 1.7 2012/07/11 20:01:08 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="minimal zlib"
DEPEND="!
+
+
+
+ lxnay@gentoo.org
+ Fabio Erculiani
+
+
+
+
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 1bed3a8fd28d..e8fda276d756 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,2 +1,2 @@
-DIST makedepend-1.0.3.tar.bz2 123703 RMD160 19e3e3405bd2f7e2b95f416ddd104300ecac29f6 SHA1 9a2ea514c0e52b59712678be1f9a33a74a4e0b8e SHA256 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737
+DIST makedepend-1.0.3.tar.bz2 123703 SHA256 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737 SHA512 343154fd938c1e649813546d21771183605db95f853606bf8a2934b36afe700659d4aa03fd2148a7b543d52fd68e03bf8400f817012371905243d62f44b0ba8a WHIRLPOOL c5eaa89802a52a51361160bb42d57400454349b58925629c0f48e816c0da2543b2b11a4c7444f602416d3c43900f79cbb641a76f8e67af2b208879e0d3fcd6a2
DIST makedepend-1.0.4.tar.bz2 131683 RMD160 d853b322d1fb34ff5a0d49f78b1846181be94f07 SHA1 1f0f8aea1526c6c022f2cf16f7a6c67118c68336 SHA256 ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe
diff --git a/x11-misc/makedepend/makedepend-1.0.4.ebuild b/x11-misc/makedepend/makedepend-1.0.4.ebuild
index d5425a078f8e..20f93e4f7f7c 100644
--- a/x11-misc/makedepend/makedepend-1.0.4.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.4.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/makedepend/makedepend-1.0.4.ebuild,v 1.6 2012/06/29 17:58:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/makedepend/makedepend-1.0.4.ebuild,v 1.7 2012/07/11 20:08:43 ranger Exp $
EAPI=4
XORG_STATIC=no
inherit xorg-2
DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.6.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.6.ebuild
index 91a42ad7467a..e31753b9d7be 100644
--- a/x11-misc/xcompmgr/xcompmgr-1.1.6.ebuild
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcompmgr/xcompmgr-1.1.6.ebuild,v 1.3 2012/06/24 19:39:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcompmgr/xcompmgr-1.1.6.ebuild,v 1.4 2012/07/11 20:09:17 ranger Exp $
EAPI=4
inherit xorg-2
@@ -9,7 +9,7 @@ DESCRIPTION="X Compositing manager"
HOMEPAGE="http://freedesktop.org/Software/xapps"
SRC_URI="http://xorg.freedesktop.org/releases/individual/app/${P}.tar.bz2"
LICENSE="BSD"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
IUSE=""
RDEPEND="x11-libs/libXrender
x11-libs/libXdamage
diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest
index 01994dfe25b6..d49313c54ea0 100644
--- a/x11-misc/xfractint/Manifest
+++ b/x11-misc/xfractint/Manifest
@@ -1,2 +1,2 @@
-DIST xfractint-20.04p07.tar.gz 1322518 RMD160 1a51654fe43db03c91c03fca6826b299ac1212c6 SHA1 d7fd0aa64f7e991006a8cdd30d5c2078afd41e14 SHA256 557118b6ba9f6e14800ca932a2ec2a11528c707aa5bf06b0816fad2820fdf520
-DIST xfractint-20.04p12.tar.gz 1335480 RMD160 6e5d70575a46fbae7e491aa896ec236e5eac0aee SHA1 50385f08e3ac1f85bc708f6823d5f9edee449424 SHA256 e81affa9d3b3826f14502cedf1fc4a4dd41bcfa71ba32f8e4224748c5b9c69e0
+DIST xfractint-20.04p07.tar.gz 1322518 SHA256 557118b6ba9f6e14800ca932a2ec2a11528c707aa5bf06b0816fad2820fdf520
+DIST xfractint-20.04p12.tar.gz 1335480 SHA256 e81affa9d3b3826f14502cedf1fc4a4dd41bcfa71ba32f8e4224748c5b9c69e0 SHA512 ef233b417ccdff153e53b70f4ac0500be99e9fc6e87360b341640573592320b2485f18fd6426436432d968d33fa41d4862babf193c3b11c480f514a4602bb8f2 WHIRLPOOL 47a2f4c0919232109309a00a131ffc4a5a87519727469af09f51101f7984b54851e71d928147faed27d51d167ce3c13f5332cd0747e63cf96c18cbed2d81b404
diff --git a/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch b/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch
index 81805066717c..382bdc6a285c 100644
--- a/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch
+++ b/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch
@@ -1,9 +1,26 @@
-diff -Naurp xfractint-20.04p09-orig//Makefile xfractint-20.04p09/Makefile
---- xfractint-20.04p09-orig//Makefile 2010-09-30 12:40:42.713823642 +0200
-+++ xfractint-20.04p09/Makefile 2010-09-30 12:42:36.539819331 +0200
-@@ -301,7 +301,7 @@ xfractint: fractint.hlp $(SRCFILES)
+--- Makefile
++++ Makefile
+@@ -125,7 +125,7 @@
+
+ ifeq ($(AS),/usr/bin/nasm)
+
+-CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin
++CFLAGS = -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin
+ #CFLAGS = -I. -D_CONST $(DEFINES)
+ #CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX \
+ # -march=$(ARCH) -DNASM -fno-builtin
+@@ -133,7 +133,7 @@
+
+ else
+
+-CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -fno-builtin
++CFLAGS = -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -fno-builtin
+ #CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX \
+ # -march=$(ARCH) -fno-builtin
+ #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -fno-builtin
+@@ -312,7 +312,7 @@
"HFD=.${HFD}"
- cd unix ; ${MAKE} all "CFLAGS= -I.${HFD} ${CFLAGS} ${OPT}" "SRCDIR=${SHRDIR}" \
+ cd unix ; ${MAKE} all "CC=${CC}" "CFLAGS= -I.${HFD} -I${XFTHFD} ${CFLAGS} ${OPT}" "SRCDIR=${SHRDIR}" \
"AS=${AS}" "AFLAGS=${AFLAGS}" "HFD=.${HFD}"
- $(CC) -o xfractint $(CFLAGS) $(OPT) $(OBJS) $(U_OBJS) $(LIBS)
+ $(CC) -o xfractint $(CFLAGS) $(LDFLAGS) $(OPT) $(OBJS) $(U_OBJS) $(LIBS)
diff --git a/x11-misc/xfractint/xfractint-20.04_p12.ebuild b/x11-misc/xfractint/xfractint-20.04_p12.ebuild
index 20df0389d237..fd514c1b5ed1 100644
--- a/x11-misc/xfractint/xfractint-20.04_p12.ebuild
+++ b/x11-misc/xfractint/xfractint-20.04_p12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.04_p12.ebuild,v 1.1 2012/05/14 15:27:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.04_p12.ebuild,v 1.2 2012/07/11 15:17:04 ago Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="http://www.fractint.org/ftp/current/linux/${MY_P}.tar.gz"
LICENSE="freedist"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
IUSE=""
RDEPEND="x11-libs/libX11"
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index c9463e3c911f..b1ab231af429 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,6 @@
-DIST xkeyboard-config-2.1.tar.bz2 699368 RMD160 235b20c991666a45f1af6d76633679e6eae08d81 SHA1 4e96e0704b2a17b291f98b2240611390e7a99f9e SHA256 f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075
+DIST xkeyboard-config-2.1.tar.bz2 699368 SHA256 f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075 SHA512 2c3c310d21df4882ad2a25703a921577b81fe33433fc9e597b1ae72f8531b39e80014d3fcb165fa37e88a929a73f2dde9fc4b0c51e006d7253f4ce38bc87cdd2 WHIRLPOOL 002fdc275b2ba166c5ae2567f977332deb8bd12a3c5b4b72b0d3c8802c83fd8fe418b0fdcbc9d3b65b140e8c8728c5fb00ea79d723cc2c218c66f48f894897d5
DIST xkeyboard-config-2.2.1.tar.bz2 739766 RMD160 f9e6147e664a8834b49ddb36eb553c49c81ffd65 SHA1 3962f1e92e9defb0382ce46ec0cc86cc30ff897f SHA256 642feb6e39096be1e081c5ba952c93fdfd93d41355dd6f88c20458a8251c6bd0
-DIST xkeyboard-config-2.3.tar.bz2 771953 RMD160 a89d10bfbab88c8c1f1330bcfe82cb38f32918f8 SHA1 a49c4cce9cfb7003aa04a32114f369c6bd7a9077 SHA256 d8a5dd169adca52dea3f751b99c500608c05894d759102521fd4ea9e8e284c80
+DIST xkeyboard-config-2.3.tar.bz2 771953 SHA256 d8a5dd169adca52dea3f751b99c500608c05894d759102521fd4ea9e8e284c80 SHA512 d6ffd14f45a98f6beae2fae7ce0d3457f6afe78621e7c01b7e2994a3dfaa42109eaa4073fda695e4568c8e33fb1b3c06da1336f9d1530e328305fe2c7cf1bb5a WHIRLPOOL 5161ca2095b346adc9b54258845589c9da88b2e5fb2719f4ffc57c9905127ae74af01f80e8afe80b93d9b6b328ea3ada2a267666138ed882fd4d156c6690fef0
DIST xkeyboard-config-2.4.1.tar.bz2 813373 RMD160 942692b54f0c9e06d95063bd90ce0fedfad5f108 SHA1 0596017597a6ead04ada1dda7e0b2de2ce597adb SHA256 f048bdd6e3d71c621b5a47a7ee72d691eda1922e0e07808b157b292e0c857a0a
DIST xkeyboard-config-2.5.1.tar.bz2 833871 RMD160 b9244c671def2fd2e2d85c23139275ea74bf1485 SHA1 80f241325fed23278730a8cb565aa6c0e094b912 SHA256 eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
DIST xkeyboard-config-2.5.tar.bz2 835731 RMD160 fbb91b59e62feb49d28b4678b9c502c1277ca935 SHA1 53e0680622cfa3e29f210fcbef88bc20d9e082eb SHA256 0f50579d34e56d817a1bf7ff26582984dd7262209e9e74862237cfae5a7a2961
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.6.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.6.ebuild
index 2f2fe403110f..104be26a3494 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.6.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.6.ebuild,v 1.5 2012/06/29 18:01:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.6.ebuild,v 1.6 2012/07/11 20:09:52 ranger Exp $
EAPI=4
@@ -13,7 +13,7 @@ DESCRIPTION="X keyboard configuration database"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
LICENSE="MIT"
diff --git a/x11-plugins/fsviewer/Manifest b/x11-plugins/fsviewer/Manifest
index b56fbbfaaa84..f4adec3867cb 100644
--- a/x11-plugins/fsviewer/Manifest
+++ b/x11-plugins/fsviewer/Manifest
@@ -1,2 +1,2 @@
-DIST FSViewer.app-0.2.5.tar.gz 858696 RMD160 6e11d8c950c4c4b6020b2af33a32d31f7bca371d SHA1 0df2e5c6317f13b2c867c4d07c9840e455134f7d SHA256 12bbf02df5d8561c26a2934403fade8a1fca6efa4a00f15addaaf2d0c3d3aea8
-DIST fsviewer-app-0.2.6.tar.bz2 785422 RMD160 2c1ef34733b6bf614054c3c22bee4323d49dee58 SHA1 f643d550d0897130d63aba6e792b4f71e5652727 SHA256 18f964da350bf617a76ccca6411000862394bca09f7616b5b019d6a760bfa57b
+DIST FSViewer.app-0.2.5.tar.gz 858696 SHA256 12bbf02df5d8561c26a2934403fade8a1fca6efa4a00f15addaaf2d0c3d3aea8
+DIST fsviewer-app-0.2.6.tar.bz2 785422 SHA256 18f964da350bf617a76ccca6411000862394bca09f7616b5b019d6a760bfa57b SHA512 47c10a049120db8e5b095fdcc82033b66a4413f8f7e88959f0190b568324e85c8362486e0419b9c098e62e19e38dd8f2f56c6f0d1e7829afafd21a4837b4859b WHIRLPOOL b3304d65687dd1444787caadfd31164cd67535adad99e5d8d6c6b221187130d44653276ffb3048961db87d2e877f76adf25b635a9c8fa98b427224ce2e012e76
diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.6-wmaker-0.95_support.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.6-wmaker-0.95_support.patch
new file mode 100644
index 000000000000..da64f3a0389e
--- /dev/null
+++ b/x11-plugins/fsviewer/files/fsviewer-0.2.6-wmaker-0.95_support.patch
@@ -0,0 +1,36 @@
+diff -Naur fsviewer-app-0.2.6.orig/configure.ac fsviewer-app-0.2.6/configure.ac
+--- fsviewer-app-0.2.6.orig/configure.ac 2012-07-11 17:55:06.448981246 +0200
++++ fsviewer-app-0.2.6/configure.ac 2012-07-11 18:04:15.528940159 +0200
+@@ -81,6 +81,8 @@
+ AC_MSG_ERROR([WMaker library not found]))
+ AC_CHECK_LIB(WINGs, WMAppSetMainMenu,,
+ AC_MSG_ERROR([WINGs library not found]))
++AC_CHECK_LIB(WUtil, WMCreatePLString,,
++ AC_MSG_ERROR([WUtil library not found]))
+
+ dnl Checks for PropList (not necessary since version 0.2.3b)
+ dnl AC_CHECK_HEADERS(proplist.h,, AC_MSG_WARN(Can't find PropList include-file: Please install libPropList (included in WindowMaker)))
+diff -Naur fsviewer-app-0.2.6.orig/defs/chdef.c fsviewer-app-0.2.6/defs/chdef.c
+--- fsviewer-app-0.2.6.orig/defs/chdef.c 2012-07-11 17:55:06.444981361 +0200
++++ fsviewer-app-0.2.6/defs/chdef.c 2012-07-11 17:55:50.387699640 +0200
+@@ -374,7 +374,7 @@
+ SetIntegerForKey(0, "DisplayMCListPixmap");
+
+ WMWritePropListToFile(filesDB,
+- wdefaultspathfordomain("FSViewer"), True);
++ wdefaultspathfordomain("FSViewer"));
+ result = 0;
+ }
+ else
+diff -Naur fsviewer-app-0.2.6.orig/src/extnInspector.c fsviewer-app-0.2.6/src/extnInspector.c
+--- fsviewer-app-0.2.6.orig/src/extnInspector.c 2012-07-11 17:55:06.452981130 +0200
++++ fsviewer-app-0.2.6/src/extnInspector.c 2012-07-11 17:56:02.315351669 +0200
+@@ -229,7 +229,7 @@
+
+ if(numRows > 0)
+ WMWritePropListToFile(filesDB,
+- wdefaultspathfordomain("FSViewer"), True);
++ wdefaultspathfordomain("FSViewer"));
+
+ if(extn)
+ free(extn);
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild
index 2dd33d684a03..37b41c961187 100644
--- a/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild
+++ b/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild,v 1.12 2012/06/14 15:43:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild,v 1.13 2012/07/11 22:06:05 voyageur Exp $
EAPI=1
@@ -40,7 +40,8 @@ DEPEND="
x11-libs/libXt
x11-proto/xextproto
x11-proto/xproto
- x11-wm/windowmaker"
+ =x11-wm/windowmaker-0.95.2
x11-libs/libXft
x11-libs/libXpm
x11-libs/libX11"
@@ -26,14 +26,19 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-wmaker-0.95_support.patch
+ eautoreconf
+}
+
src_configure() {
econf \
- --disable-dependency-tracking \
$(use_enable nls) \
--with-appspath=/usr/$(get_libdir)/GNUstep
}
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install
+ dosym /usr/$(get_libdir)/GNUstep/FSViewer.app/FSViewer /usr/bin/FSViewer
dodoc AUTHORS ChangeLog NEWS README
}
diff --git a/x11-proto/bigreqsproto/bigreqsproto-1.1.2.ebuild b/x11-proto/bigreqsproto/bigreqsproto-1.1.2.ebuild
index f326e255ba41..ae9a27d4b983 100644
--- a/x11-proto/bigreqsproto/bigreqsproto-1.1.2.ebuild
+++ b/x11-proto/bigreqsproto/bigreqsproto-1.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/bigreqsproto/bigreqsproto-1.1.2.ebuild,v 1.6 2012/06/29 18:04:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/bigreqsproto/bigreqsproto-1.1.2.ebuild,v 1.7 2012/07/11 20:10:28 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org BigReqs protocol headers"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/x11-proto/fontsproto/Manifest b/x11-proto/fontsproto/Manifest
index 7f745107ac71..e37126a0c437 100644
--- a/x11-proto/fontsproto/Manifest
+++ b/x11-proto/fontsproto/Manifest
@@ -1,2 +1,2 @@
-DIST fontsproto-2.1.1.tar.bz2 131040 RMD160 5c7b646dbfec1bf4ee1a38d490d9885c08ada0dd SHA1 77ab428ad4ad7cf0294a72a2201d665c4edf5fb1 SHA256 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
+DIST fontsproto-2.1.1.tar.bz2 131040 SHA256 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc SHA512 3ac1f7678510d5e9ab6a90e0b9fb035362f2c37b6d43d17864852ae77be0f584dbfa01d81f787c6e5fed4bf520d7a054b9cc3e80678d982a8a437b9cf6260e16 WHIRLPOOL 952707a840b76db6d9bc2982170ae44ac8ea6e9c773ebb2b869a9f90ae2f522c190fcc1f65ec915d323f3dc2d2b4e163fb3ad68133e6d7d6e6b0a71ff59be536
DIST fontsproto-2.1.2.tar.bz2 141990 RMD160 5a196c43dab89c7f4887dc14b419d53604e5672b SHA1 538f0880faa6981cb1a348ced93dc715c42840f7 SHA256 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9
diff --git a/x11-proto/fontsproto/fontsproto-2.1.2.ebuild b/x11-proto/fontsproto/fontsproto-2.1.2.ebuild
index 9506223c2b91..4d96c9533c23 100644
--- a/x11-proto/fontsproto/fontsproto-2.1.2.ebuild
+++ b/x11-proto/fontsproto/fontsproto-2.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/fontsproto/fontsproto-2.1.2.ebuild,v 1.6 2012/06/29 18:06:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/fontsproto/fontsproto-2.1.2.ebuild,v 1.7 2012/07/11 20:11:02 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org Fonts protocol headers"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND=""
diff --git a/x11-proto/glproto/Manifest b/x11-proto/glproto/Manifest
index 26cac51b1d6c..57b6ec9ba999 100644
--- a/x11-proto/glproto/Manifest
+++ b/x11-proto/glproto/Manifest
@@ -1,2 +1,2 @@
-DIST glproto-1.4.14.tar.bz2 113392 RMD160 275ebb8d8f16f8476256da6b5bd0d924e22f659a SHA1 ab1941ad184a76c023858dd1623edd625d70fc2c SHA256 7aaf555a100a63c67dbffc63153dcaaa3de1a36e605a2e98fce63f64089ff999
+DIST glproto-1.4.14.tar.bz2 113392 SHA256 7aaf555a100a63c67dbffc63153dcaaa3de1a36e605a2e98fce63f64089ff999 SHA512 4299f79b2f05810abe6c56f294578a61e05274c4c5b7539997920be7dd6fd5fd1a57bb9360f48829769544e3cc21f755016c4180279ae56a833e443caf08caab WHIRLPOOL cdabff024ef3bf5bdc27fb3c6f2184ae52420e341c946f8afda96b2309a638347bee7750f9029e6c24c7aaeaa2aa7870b81928de4495d5478cba34b07b3ee507
DIST glproto-1.4.15.tar.bz2 113671 RMD160 b8c96c4e049bdce3ae6120260f8967e0c8f949d1 SHA1 4cee35232f1926312b29d59a94da1c526b01e5c3 SHA256 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171
diff --git a/x11-proto/glproto/glproto-1.4.15.ebuild b/x11-proto/glproto/glproto-1.4.15.ebuild
index 40f78449a5b1..daf9334c7b92 100644
--- a/x11-proto/glproto/glproto-1.4.15.ebuild
+++ b/x11-proto/glproto/glproto-1.4.15.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.15.ebuild,v 1.6 2012/06/29 18:09:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.15.ebuild,v 1.7 2012/07/11 20:11:36 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org GL protocol headers"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
LICENSE="SGI-B-2.0"
IUSE=""
diff --git a/x11-proto/inputproto/Manifest b/x11-proto/inputproto/Manifest
index aed85fe2faf7..2a4eb6c7eaf7 100644
--- a/x11-proto/inputproto/Manifest
+++ b/x11-proto/inputproto/Manifest
@@ -1,3 +1,3 @@
-DIST inputproto-2.0.2.tar.bz2 155535 RMD160 0e232294719ec25386a1a606776a39641d1cd30a SHA1 a34c01c67aa2ed9058ff19ace0041978b1d8d711 SHA256 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005
+DIST inputproto-2.0.2.tar.bz2 155535 SHA256 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005 SHA512 33ac36e447d58dec7e604d4a7f3d4f86734104ee9d8001dece3808edac5a7e6bd7f18c0c70ad2263051a7bc88d9e9f12db944775e42ae43f3cb021cd234a8c1f WHIRLPOOL d1076a8ee94411baf055de48cfc346dbf42b0c0c3ecb0e112bb1114d049d3e0562e857b9f96746520164aa914dc3c11c455dabecf828c53e472d38ecc9c08865
DIST inputproto-2.1.tar.bz2 163763 RMD160 fc11652b297f28281a7d309139804eaec464c334 SHA1 67b2c5af588d21a7dad2d60f9d3b1d148edb9d36 SHA256 b3ffff17361cdd09d79ba27f13d4e08adc793db27b491c4d513729e0d0312139
DIST inputproto-2.2.tar.bz2 178839 RMD160 7b93f798ab953e21e64a21170d6d151c6ffe3171 SHA1 500e0a6dac3523887c0b82753fe5e9d4bb982137 SHA256 de7516ab25c299740da46c0f1af02f1831c5aa93b7283f512c0f35edaac2bcb0
diff --git a/x11-proto/inputproto/inputproto-2.2.ebuild b/x11-proto/inputproto/inputproto-2.2.ebuild
index bdf56b16dbb3..02b4aad5bf42 100644
--- a/x11-proto/inputproto/inputproto-2.2.ebuild
+++ b/x11-proto/inputproto/inputproto-2.2.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-2.2.ebuild,v 1.6 2012/06/28 14:32:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-2.2.ebuild,v 1.7 2012/07/11 20:12:10 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org Input protocol headers"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND=""
diff --git a/x11-proto/kbproto/Manifest b/x11-proto/kbproto/Manifest
index b04f62026872..0feadf26175d 100644
--- a/x11-proto/kbproto/Manifest
+++ b/x11-proto/kbproto/Manifest
@@ -1,2 +1,2 @@
-DIST kbproto-1.0.5.tar.bz2 111270 RMD160 76f97a2a2e40328bd91a7a9de4030ceac788fb6e SHA1 d95fada09399568c434729b436e1a09503e15b7a SHA256 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
+DIST kbproto-1.0.5.tar.bz2 111270 SHA256 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d SHA512 9664d443f2c1dfbe6a0404a7d0bafdb6ada7eaab8ebb91711eaa64394a0904176d2ad9107cd074bf2e5045be11c0cd92b676c4ac90adf4e759b38c2e2cbd6e00 WHIRLPOOL 56c94dff75b1c2a66a9737c245d5e84ec971071e48d712d12f79dea69406ca19b5e095251a9d3c00909455379034e913992b909453467f0b9e6973e374e56084
DIST kbproto-1.0.6.tar.bz2 256988 RMD160 e46be5686436cb2ffbf006ad853df2077141a5f5 SHA1 a2cc82357c22a1f4d6243017982c32703c95575c SHA256 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479
diff --git a/x11-proto/kbproto/kbproto-1.0.6.ebuild b/x11-proto/kbproto/kbproto-1.0.6.ebuild
index 6d831d432e96..c23fd22998e1 100644
--- a/x11-proto/kbproto/kbproto-1.0.6.ebuild
+++ b/x11-proto/kbproto/kbproto-1.0.6.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/kbproto/kbproto-1.0.6.ebuild,v 1.6 2012/06/29 18:12:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/kbproto/kbproto-1.0.6.ebuild,v 1.7 2012/07/11 20:12:44 ranger Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="X.Org KB protocol headers"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND=""
diff --git a/x11-proto/recordproto/Manifest b/x11-proto/recordproto/Manifest
index c1164ee9b40f..89775e4f93ce 100644
--- a/x11-proto/recordproto/Manifest
+++ b/x11-proto/recordproto/Manifest
@@ -1,2 +1,2 @@
-DIST recordproto-1.14.1.tar.bz2 112238 RMD160 cab883a9175adef6bab78b814a6c36ac22518fae SHA1 14acb36540814bfe5d3caf47311b72a3bf1322bd SHA256 b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d
+DIST recordproto-1.14.1.tar.bz2 112238 SHA256 b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d SHA512 bf82548c2cf9d49d700d4a6bbebe71f1b0f3d0fca594cc58d4d2f772d20df264bbb420d27ab2fab4e20e4012bfb1f0c706cd636f5470add3a99b7745f96f0f75 WHIRLPOOL 08d55198cb68f4701d50254d921e6c8f0f7eb7561a1f1d29cb91677d3bc4d19f13d420526dc728535d2a5edc1d04b47d861a5da7c6d7e915b331a2551583aeba
DIST recordproto-1.14.2.tar.bz2 123033 RMD160 7cf5ab53e3c06fcb917d67fdbfe235be5b019b23 SHA1 1f48c4b0004d8b133efd0498e8d88d68d3b9199c SHA256 a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370
diff --git a/x11-proto/recordproto/recordproto-1.14.2.ebuild b/x11-proto/recordproto/recordproto-1.14.2.ebuild
index 2584909e3c13..dc995f5321b1 100644
--- a/x11-proto/recordproto/recordproto-1.14.2.ebuild
+++ b/x11-proto/recordproto/recordproto-1.14.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/recordproto/recordproto-1.14.2.ebuild,v 1.6 2012/06/29 18:14:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/recordproto/recordproto-1.14.2.ebuild,v 1.7 2012/07/11 20:13:17 ranger Exp $
EAPI=4
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="X.Org Record protocol headers"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="!=x11-libs/libXft-2.1.0
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libXv
+ gif? ( >=media-libs/giflib-4.1.0-r3 )
+ png? ( media-libs/libpng:0 )
+ jpeg? ( virtual/jpeg )
+ tiff? ( media-libs/tiff:0 )
+ xinerama? ( x11-libs/libXinerama )
+ xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}
+ nls? ( >=sys-devel/gettext-0.10.39 )"
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+src_prepare() {
+ # Fix some paths
+ for file in WindowMaker/*menu* util/wmgenmenu.c; do
+ if [[ -r $file ]] ; then
+ sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
+ sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+ sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+ fi;
+ done;
+
+ epatch "${FILESDIR}"/${P}-fix_underlinking.patch
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ # image format types
+ # xpm is provided by X itself
+ myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
+
+ # non required X capabilities
+ myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)"
+
+ if use nls; then
+ [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+ else
+ myconf="${myconf} --disable-locale"
+ fi
+
+ # default settings with $myconf appended
+ econf \
+ --sysconfdir="${EPREFIX}"/etc/X11 \
+ --with-x \
+ --enable-usermenu \
+ --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+ --with-nlsdir="${EPREFIX}"/usr/share/locale \
+ ${myconf}
+
+ cd ../WindowMaker-extra-0.1
+ econf
+}
+
+src_compile() {
+ emake
+
+ # WindowMaker Extra Package (themes and icons)
+ cd ../WindowMaker-extra-0.1
+ emake
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
+ README* NEWS TODO
+
+ # WindowMaker Extra
+ cd ../WindowMaker-extra-0.1
+ emake DESTDIR="${D}" install
+
+ newdoc README README.extra
+
+ # create wmaker session shell script
+ echo "#!/usr/bin/env bash" > wmaker
+ echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+ exeinto /etc/X11/Sessions/
+ doexe wmaker
+
+ insinto /usr/share/xsessions
+ doins "${FILESDIR}"/wmaker.desktop
+ make_desktop_entry /usr/bin/wmaker
+}