diff --git a/app-admin/eselect-awk/eselect-awk-0.2.ebuild b/app-admin/eselect-awk/eselect-awk-0.2.ebuild
index e4c94761fe2a..19642ba900a6 100644
--- a/app-admin/eselect-awk/eselect-awk-0.2.ebuild
+++ b/app-admin/eselect-awk/eselect-awk-0.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/app-admin/eselect-awk/eselect-awk-0.2.ebuild,v 1.2 2012/06/04 17:25:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-awk/eselect-awk-0.2.ebuild,v 1.3 2012/06/07 13:48:59 jer Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~ottxor/distfiles/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
IUSE=""
src_install() {
diff --git a/app-admin/eselect/eselect-1.3.1.ebuild b/app-admin/eselect/eselect-1.3.1.ebuild
index ff285bed24b1..4138186d42ac 100644
--- a/app-admin/eselect/eselect-1.3.1.ebuild
+++ b/app-admin/eselect/eselect-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/app-admin/eselect/eselect-1.3.1.ebuild,v 1.2 2012/04/26 14:52:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.1.ebuild,v 1.3 2012/06/07 13:38:19 johu Exp $
EAPI=3
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
RDEPEND="sys-apps/sed
diff --git a/app-admin/lib_users/lib_users-0.5.ebuild b/app-admin/lib_users/lib_users-0.5.ebuild
index 0913d551c8e2..61391ee687fe 100644
--- a/app-admin/lib_users/lib_users-0.5.ebuild
+++ b/app-admin/lib_users/lib_users-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/app-admin/lib_users/lib_users-0.5.ebuild,v 1.1 2012/05/07 19:11:33 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/lib_users-0.5.ebuild,v 1.2 2012/06/07 09:34:52 klausman Exp $
EAPI=3
PYTHON_DEPEND="2"
@@ -14,7 +14,7 @@ SRC_URI="http://schwarzvogel.de/pkgs/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="alpha ~amd64 ~hppa ~ppc ~x86"
IUSE="test"
DEPEND="test? ( dev-python/nose )"
diff --git a/app-emulation/lxc/files/lxc.initd.2 b/app-emulation/lxc/files/lxc.initd.2
index 49f85bd5072c..0977eb6f958f 100644
--- a/app-emulation/lxc/files/lxc.initd.2
+++ b/app-emulation/lxc/files/lxc.initd.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.2,v 1.3 2012/05/01 21:14:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.2,v 1.4 2012/06/07 12:59:28 flameeyes Exp $
CONTAINER=${SVCNAME#*.}
@@ -12,7 +12,7 @@ lxc_get_configfile() {
echo "/etc/lxc/${CONTAINER}/config"
else
eerror "Unable to find a suitable configuration file."
- eerror "If you set up the contianer in a non-standard"
+ eerror "If you set up the container in a non-standard"
eerror "location, please set the CONFIGFILE variable."
return 1
fi
@@ -76,13 +76,13 @@ start() {
rootpath=$(lxc_get_var lxc.rootfs)
- # Check the format of our init and the chroot's init, to see if we
- # have to use linux32 or linux64...
- case $(scanelf -BF '%M#f' /sbin/init ${rootpath}/sbin/init | tr '\n' ':') in
- ELFCLASS64:ELFCLASS64:) setarch=;;
- ELFCLASS32:ELFCLASS32:) setarch=;;
- ELFCLASS32:ELFCLASS64:) setarch=linux64;;
- ELFCLASS64:ELFCLASS32:) setarch=linux32;;
+ # Check the format of our init and the chroot's init, to see
+ # if we have to use linux32 or linux64; always use setarch
+ # when required, as that makes it easier to deal with
+ # x32-based containers.
+ case $(scanelf -BF '%a#f' ${rootpath}/sbin/init) in
+ EM_X86_64) setarch=linux64;;
+ EM_I386) setarch=linux32;;
esac
ebegin "Starting ${CONTAINER}"
diff --git a/app-emulation/lxc/lxc-0.8.0_rc1-r4.ebuild b/app-emulation/lxc/lxc-0.8.0_rc1-r5.ebuild
similarity index 98%
rename from app-emulation/lxc/lxc-0.8.0_rc1-r4.ebuild
rename to app-emulation/lxc/lxc-0.8.0_rc1-r5.ebuild
index 1b746879aa8b..e8db0254570f 100644
--- a/app-emulation/lxc/lxc-0.8.0_rc1-r4.ebuild
+++ b/app-emulation/lxc/lxc-0.8.0_rc1-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/app-emulation/lxc/lxc-0.8.0_rc1-r4.ebuild,v 1.3 2012/05/31 23:03:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.8.0_rc1-r5.ebuild,v 1.1 2012/06/07 12:59:27 flameeyes Exp $
EAPI="4"
diff --git a/app-emulation/spice/files/0.10.1-gold.patch b/app-emulation/spice/files/0.10.1-gold.patch
new file mode 100644
index 000000000000..24add0ee95c6
--- /dev/null
+++ b/app-emulation/spice/files/0.10.1-gold.patch
@@ -0,0 +1,16 @@
+ server/tests/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
+index 4513322..265b22b 100644
+--- a/server/tests/Makefile.am
++++ b/server/tests/Makefile.am
+@@ -9,7 +9,7 @@ INCLUDES = \
+ $(SPICE_NONPKGCONFIG_CFLAGS) \
+ $(NULL)
+
+-AM_LDFLAGS = $(top_builddir)/server/libspice-server.la
++AM_LDFLAGS = $(top_builddir)/server/libspice-server.la -pthread
+
+ COMMON_BASE=basic_event_loop.c basic_event_loop.h test_util.h ../../common/backtrace.c
+
diff --git a/app-emulation/spice/spice-0.10.1.ebuild b/app-emulation/spice/spice-0.10.1.ebuild
index 46449d43db18..34251582eda1 100644
--- a/app-emulation/spice/spice-0.10.1.ebuild
+++ b/app-emulation/spice/spice-0.10.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/app-emulation/spice/spice-0.10.1.ebuild,v 1.4 2012/05/03 18:49:07 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.10.1.ebuild,v 1.5 2012/06/07 15:36:01 jlec Exp $
EAPI=4
@@ -39,7 +39,9 @@ DEPEND="virtual/pkgconfig
# * TODO: add slirp for tunnel-support
src_prepare() {
- epatch "${FILESDIR}/0.10.1-disable-werror.patch"
+ epatch \
+ "${FILESDIR}/0.10.1-disable-werror.patch" \
+ "${FILESDIR}/${PV}-gold.patch"
eautoreconf
}
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 99c33688541d..9af77bfc3a95 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-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/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.82 2012/06/05 15:43:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.83 2012/06/07 11:45:15 scarabeus Exp $
EAPI=4
@@ -101,6 +101,7 @@ COMMON_DEPEND="
>=app-text/hunspell-1.3.2-r3
app-text/mythes
>=app-text/libexttextcat-3.2
+ app-text/libmspub
app-text/libwpd:0.9[tools]
app-text/libwpg:0.2
>=app-text/libwps-0.2.2
diff --git a/app-portage/euscan/euscan-0.1.0.ebuild b/app-portage/euscan/euscan-0.1.0.ebuild
index 314cdb32d3ab..e73811409782 100644
--- a/app-portage/euscan/euscan-0.1.0.ebuild
+++ b/app-portage/euscan/euscan-0.1.0.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/app-portage/euscan/euscan-0.1.0.ebuild,v 1.1 2011/11/28 19:34:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/euscan/euscan-0.1.0.ebuild,v 1.2 2012/06/07 14:47:13 jlec Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
+RESTRICT_PYTHON_ABIS="2.[45] 3.* 2.7-pypy-*"
PYTHON_USE_WITH="xml"
PYTHON_NONVERSIONED_EXECUTABLES=(".*")
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
>=app-portage/gentoolkit-0.2.8
dev-python/argparse
dev-python/setuptools
- dev-python/beautifulsoup"
+ dev-python/beautifulsoup:python-2"
distutils_src_compile_pre_hook() {
echo VERSION="${PV}" "$(PYTHON)" setup.py set_version
diff --git a/app-portage/euscan/euscan-0.1.1.ebuild b/app-portage/euscan/euscan-0.1.1.ebuild
index 39eedd5aed5a..4e09e710aab0 100644
--- a/app-portage/euscan/euscan-0.1.1.ebuild
+++ b/app-portage/euscan/euscan-0.1.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/euscan/euscan-0.1.1.ebuild,v 1.1 2012/01/18 18:59:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/euscan/euscan-0.1.1.ebuild,v 1.2 2012/06/07 14:47:12 jlec Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
+RESTRICT_PYTHON_ABIS="2.[45] 3.* 2.7-pypy-*"
PYTHON_USE_WITH="xml"
PYTHON_NONVERSIONED_EXECUTABLES=(".*")
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
>=app-portage/gentoolkit-0.2.8
dev-python/argparse
dev-python/setuptools
- dev-python/beautifulsoup"
+ dev-python/beautifulsoup:python-2"
distutils_src_compile_pre_hook() {
echo VERSION="${PV}" "$(PYTHON)" setup.py set_version
diff --git a/app-portage/euscan/euscan-9999.ebuild b/app-portage/euscan/euscan-9999.ebuild
index f6f1943238b4..abc2c2f1c41c 100644
--- a/app-portage/euscan/euscan-9999.ebuild
+++ b/app-portage/euscan/euscan-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/euscan/euscan-9999.ebuild,v 1.2 2012/04/10 13:07:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/euscan/euscan-9999.ebuild,v 1.3 2012/06/07 14:47:13 jlec Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
+RESTRICT_PYTHON_ABIS="2.[45] 3.* 2.7-pypy-*"
PYTHON_USE_WITH="xml"
PYTHON_NONVERSIONED_EXECUTABLES=(".*")
@@ -27,7 +27,7 @@ RDEPEND="${DEPEND}
>=app-portage/gentoolkit-0.2.8
dev-python/argparse
dev-python/setuptools
- dev-python/beautifulsoup"
+ dev-python/beautifulsoup:python-2"
distutils_src_compile_pre_hook() {
echo VERSION="9999-${EGIT_VERSION}" "$(PYTHON)" setup.py set_version
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
new file mode 100644
index 000000000000..3ec133f2c60d
--- /dev/null
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/libmspub/libmspub-9999.ebuild,v 1.1 2012/06/07 11:41:17 scarabeus Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/${PN}/"
+[[ ${PV} == 9999 ]] && vcs="autotools git-2"
+inherit base ${vcs}
+unset vcs
+
+DESCRIPTION="Library parsing the Microsoft Publisher documents"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libmspub"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+ app-text/libwpd:0.9
+ app-text/libwpg:0.2
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/libtool
+ doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+ base_src_prepare
+ [[ -d m4 ]] || mkdir "m4"
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ --disable-werror \
+ $(use_with doc docs)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-text/libmspub/metadata.xml b/app-text/libmspub/metadata.xml
new file mode 100644
index 000000000000..5d46203011d6
--- /dev/null
+++ b/app-text/libmspub/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+ openoffice
+
diff --git a/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch b/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch
index e9fc485be2ad..1afe68b800e9 100644
--- a/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch
+++ b/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch
@@ -1,6 +1,27 @@
---- msggen.pl 2003-02-19 10:57:37.000000000 -0800
-+++ msggen.pl 2003-02-19 10:58:06.000000000 -0800
-@@ -61,7 +61,7 @@
+Use Getopt::Std in place of getopts.pl.
+https://bugs.gentoo.org/show_bug.cgi?id=420083
+
+--- a/msggen.pl
++++ b/msggen.pl
+@@ -4,6 +4,7 @@
+ # See the file COPYING for copying permission.
+
+ use POSIX;
++use Getopt::Std;
+
+ # Package and version.
+ $package = 'openjade';
+@@ -18,8 +19,7 @@
+ undef $opt_l;
+ undef $opt_p;
+ undef $opt_t;
+-do 'getopts.pl';
+-&Getopts('l:p:t:');
++getopts('l:p:t:');
+ $module = $opt_l;
+ $pot_file = $opt_p;
+
+@@ -72,7 +72,7 @@
else {
$field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");;
$type[$num] = substr($field[0], 0, 1);
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index 6f4fa14450a7..7c0857754b7b 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1 +1,2 @@
DIST pgadmin3-1.14.2.tar.gz 15041255 RMD160 59dbe656724d14a0322aa61fafdb76ff6913a527 SHA1 ca75c89f536199cb78446daa7ea091bbe6fafb00 SHA256 043e782fcedbf46f040d7164256f531ad4711730b97bd280b16035fb279fd872
+DIST pgadmin3-1.14.3.tar.gz 15074739 RMD160 e7846f76c54a935ba1395265f0c2de265c199c45 SHA1 bde9e64802b7864da3a38693b2e96caef6c2a2c2 SHA256 00724a88b9f9f6ded24c98052053aef9b09a6a51816fbe9809f398307de12dd7
diff --git a/dev-db/pgadmin3/pgadmin3-1.14.3.ebuild b/dev-db/pgadmin3/pgadmin3-1.14.3.ebuild
new file mode 100644
index 000000000000..f47999f89623
--- /dev/null
+++ b/dev-db/pgadmin3/pgadmin3-1.14.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.14.3.ebuild,v 1.1 2012/06/07 15:40:51 titanofold Exp $
+
+EAPI="4"
+
+WX_GTK_VER="2.8"
+
+inherit multilib versionator wxwidgets
+
+DESCRIPTION="wxWidgets GUI for PostgreSQL."
+HOMEPAGE="http://www.pgadmin.org/"
+SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="x11-libs/wxGTK:2.8[X,debug=]
+ >=dev-db/postgresql-base-8.4.0
+ >=dev-libs/libxml2-2.6.18
+ >=dev-libs/libxslt-1.1"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ local pgslot=$(postgresql-config show)
+
+ if [[ ${pgslot//.} < 84 ]] ; then
+ eerror "PostgreSQL slot must be set to 8.4 or higher."
+ eerror " postgresql-config set 8.4"
+ die "PostgreSQL slot is not set to 8.4 or higher."
+ fi
+}
+
+src_configure() {
+ econf --with-wx-version=2.8 \
+ $(use_enable debug)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ newicon "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png
+
+ # icon location for the desktop file provided in pkg folder
+ insinto /usr/share/pgadmin3
+ doins "${S}/pgadmin/include/images/pgAdmin3.png"
+
+ domenu "${S}/pkg/pgadmin3.desktop"
+
+ # Fixing world-writable files
+ fperms -R go-w /usr/share
+}
diff --git a/dev-lang/squirrel/files/squirrel-2.2.4-gcc47.patch b/dev-lang/squirrel/files/squirrel-2.2.4-gcc47.patch
new file mode 100644
index 000000000000..032a4eb914a6
--- /dev/null
+++ b/dev-lang/squirrel/files/squirrel-2.2.4-gcc47.patch
@@ -0,0 +1,59 @@
+From fd2d422f16ca1134f3be8d693290e6b1c536bf71 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich
+Date: Thu, 7 Jun 2012 10:10:28 +0300
+Subject: [squirrel: PATCH] fix build breakage on gcc-4.7 and clang++
+
+gcc 4.7 got proper support for argument dependent lookup
+for builtin types:
+ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46075
+
+It exposed old problem:
+> gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c sqapi.cpp sqbaselib.cpp sqfuncstate.cpp sqdebug.cpp \
+ sqlexer.cpp sqobject.cpp sqcompiler.cpp sqstate.cpp sqtable.cpp sqmem.cpp sqvm.cpp sqclass.cpp -I../include -I. -Iinclude
+ In file included from sqobject.h:5:0,
+ from sqpcheader.h:16,
+ from sqapi.cpp:4:
+ squtils.h: In instantiation of 'sqvector::~sqvector() [with T = long long int]':
+ sqclosure.h:142:52: required from here
+ squtils.h:46:4: error: 'sq_vm_free' was not declared in this scope, and no declarations were found by argument-dependent
+ lookup at the point of instantiation [-fpermissive]
+ In file included from sqpcheader.h:17:0,
+ from sqapi.cpp:4:
+ sqstate.h:143:6: note: 'void sq_vm_free(void*, SQUnsignedInteger)' declared here, later in the translation unit
+
+Signed-off-by: Sergei Trofimovich
+---
+ squirrel/sqstate.h | 3 ---
+ squirrel/squtils.h | 4 ++++
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/squirrel/sqstate.h b/squirrel/sqstate.h
+index 3ed3307..e931404 100755
+--- a/squirrel/sqstate.h
++++ b/squirrel/sqstate.h
+@@ -138,7 +138,4 @@ private:
+
+ bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
+
+-void *sq_vm_malloc(SQUnsignedInteger size);
+-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
+-void sq_vm_free(void *p,SQUnsignedInteger size);
+ #endif //_SQSTATE_H_
+diff --git a/squirrel/squtils.h b/squirrel/squtils.h
+index bff7d24..ac3aef9 100755
+--- a/squirrel/squtils.h
++++ b/squirrel/squtils.h
+@@ -10,6 +10,10 @@
+
+ #define sq_aligning(v) (((size_t)(v) + (SQ_ALIGNMENT-1)) & (~(SQ_ALIGNMENT-1)))
+
++
++void *sq_vm_malloc(SQUnsignedInteger size);
++void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
++void sq_vm_free(void *p,SQUnsignedInteger size);
+ //sqvector mini vector class, supports objects by value
+ template class sqvector
+ {
+--
+1.7.8.6
+
diff --git a/dev-lang/squirrel/squirrel-2.2.4-r2.ebuild b/dev-lang/squirrel/squirrel-2.2.4-r2.ebuild
new file mode 100644
index 000000000000..7d1905e643c0
--- /dev/null
+++ b/dev-lang/squirrel/squirrel-2.2.4-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/squirrel/squirrel-2.2.4-r2.ebuild,v 1.1 2012/06/07 12:20:01 slyfox Exp $
+
+EAPI=3
+
+inherit autotools eutils multilib
+
+MY_P="${PN}_${PV}_stable"
+DESCRIPTION="A interpreted language mainly used for games"
+HOMEPAGE="http://squirrel-lang.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}${PV:0:1}/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples static-libs"
+
+# /usr/bin/sq conflicts
+RDEPEND="!app-text/ispell"
+
+S="${WORKDIR}/SQUIRREL${PV:0:1}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-autotools.patch
+ epatch "${FILESDIR}"/${P}-supertux-const.patch
+ epatch "${FILESDIR}"/${P}-stdint.h.patch
+ epatch "${FILESDIR}"/${P}-gcc47.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ econf --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ $(use_enable doc) \
+ $(use_enable examples) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ if ! use static-libs; then
+ rm -v "${ED}"/usr/$(get_libdir)/*.la || die
+ fi
+
+ dodoc HISTORY README || die
+}
diff --git a/dev-libs/libtar/Manifest b/dev-libs/libtar/Manifest
index 06330490483c..d7f6aee78a0a 100644
--- a/dev-libs/libtar/Manifest
+++ b/dev-libs/libtar/Manifest
@@ -1,2 +1,3 @@
DIST libtar-1.2.11.tar.gz 145354 RMD160 205d1213ed32f9708fb2135010afdd9e184c430e SHA1 9611f23024b0e89aad1cfea301122186b3c160f8 SHA256 4a2eefb6b7088f41de57356e5059cbf1f917509b4a810f7c614625a378e87bb8
DIST libtar_1.2.11-6.diff.gz 245511 RMD160 05a7bb41acd6d341b2e79ed6a699585089d3c3c3 SHA1 8ca2905f3f175fb0b15bb37a498ab5815891f50c SHA256 002d067499a94988dfa23a71e3f46d6b9af26fdce266870dc9b7c81d54fc820d
+DIST libtar_1.2.11-8.debian.tar.gz 10275 RMD160 af0838698bdab02b2d05e2754c202753192d876a SHA1 3506bac4a0fff61e8b92ff400f7771155dc834e0 SHA256 ab55b827ac0d60c4b17decdbab827b1e4c79ed75383133814e103b202cc4fbbe
diff --git a/dev-libs/libtar/libtar-1.2.11-r5.ebuild b/dev-libs/libtar/libtar-1.2.11-r5.ebuild
new file mode 100644
index 000000000000..ef7db4d072cb
--- /dev/null
+++ b/dev-libs/libtar/libtar-1.2.11-r5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/libtar-1.2.11-r5.ebuild,v 1.1 2012/06/07 10:28:53 pacho Exp $
+
+EAPI=4
+inherit autotools eutils multilib
+
+p_level=8
+
+DESCRIPTION="C library for manipulating tar archives"
+HOMEPAGE="http://www.feep.net/libtar/ http://packages.qa.debian.org/libt/libtar.html"
+SRC_URI="ftp://ftp.feep.net/pub/software/libtar/${P}.tar.gz
+ mirror://debian/pool/main/libt/${PN}/${PN}_${PV}-${p_level}.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static-libs zlib"
+
+DEPEND="zlib? ( sys-libs/zlib )
+ !zlib? ( app-arch/gzip )"
+
+src_prepare() {
+ local d="${WORKDIR}"/debian/patches
+ sed -i -e '/#/d' "${d}"/series || die
+ EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
+
+ epatch "${FILESDIR}"/${P}-f{ree,ortify}.patch
+
+ sed -i \
+ -e '/INSTALL_PROGRAM/s:-s::' \
+ {doc,lib{,tar}}/Makefile.in || die
+
+ sed -i -e "/\/usr\/share\/aclocal/s:/usr:$EPREFIX/usr:" aclocal.m4
+ eautoreconf # reconf for missing config.sub
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_with zlib)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc ChangeLog* README TODO
+ newdoc compat/README README.compat
+ newdoc compat/TODO TODO.compat
+ newdoc listhash/TODO TODO.listhash
+ newdoc "${WORKDIR}"/debian/changelog ChangeLog.debian
+
+ prune_libtool_files
+}
diff --git a/dev-perl/Color-Library/Color-Library-0.21.0.ebuild b/dev-perl/Color-Library/Color-Library-0.21.0.ebuild
index 2956ee9380ec..a54ed8a3d61b 100644
--- a/dev-perl/Color-Library/Color-Library-0.21.0.ebuild
+++ b/dev-perl/Color-Library/Color-Library-0.21.0.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/dev-perl/Color-Library/Color-Library-0.21.0.ebuild,v 1.1 2011/12/19 16:00:31 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Color-Library/Color-Library-0.21.0.ebuild,v 1.2 2012/06/07 12:16:38 tove Exp $
EAPI=4
@@ -12,12 +12,17 @@ DESCRIPTION="An easy-to-use and comprehensive named-color library"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
-RDEPEND="virtual/perl-Module-Pluggable
+RDEPEND="
+ virtual/perl-Module-Pluggable
dev-perl/Class-Accessor
- dev-perl/Class-Data-Inheritable"
+ dev-perl/Class-Data-Inheritable
+"
DEPEND="${RDEPEND}
- virtual/perl-Module-Build"
+ test? (
+ dev-perl/Test-Most
+ )
+"
SRC_TEST="do"
diff --git a/dev-perl/Data-AMF/Data-AMF-0.90.0.ebuild b/dev-perl/Data-AMF/Data-AMF-0.90.0.ebuild
index f14ddf475ba7..fa0a35e229d3 100644
--- a/dev-perl/Data-AMF/Data-AMF-0.90.0.ebuild
+++ b/dev-perl/Data-AMF/Data-AMF-0.90.0.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/dev-perl/Data-AMF/Data-AMF-0.90.0.ebuild,v 1.2 2011/09/03 21:04:34 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Data-AMF/Data-AMF-0.90.0.ebuild,v 1.3 2012/06/07 14:45:01 tove Exp $
EAPI=4
@@ -22,4 +22,10 @@ RDEPEND="dev-perl/DateTime
DEPEND="${RDEPEND}
test? ( dev-perl/yaml )"
+src_prepare() {
+ sed -i '/^inc\/YAML.pm/d' MANIFEST || die
+ rm inc/YAML.pm || die
+ perl-module_src_prepare
+}
+
SRC_TEST="do"
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index bbfb3fcec133..0909d6cf6226 100644
--- a/dev-util/itstool/Manifest
+++ b/dev-util/itstool/Manifest
@@ -1,2 +1,2 @@
-DIST itstool-1.1.1.tar.bz2 78824 RMD160 199939e180d838708bea2adb7f4a06d79b3ac28b SHA1 4b60216c50363e2f56ddbb8e9c457f92853e8e6f SHA256 0fffba8f7249dbfadf0182aedf0ce210cd409b4240021c4c8693e3dd1f7b90c9
DIST itstool-1.1.2.tar.bz2 79291 RMD160 4d9b901c861b3c2961497d04cbaa2ff609405bbd SHA1 09e1c85c2231f05087ff63f89b8e98e33b8c49b1 SHA256 49235f63b536f95927e26d093bfe4513e2be042d0dd8be9c84a0d58c70262514
+DIST itstool-1.1.3.tar.bz2 79803 RMD160 2924194a3e7f3d943aab5c1efd4c1c75a643c5f7 SHA1 efc9160151f5b528f9c6bb555c0323207d311357 SHA256 e635b445eb6836fa3b30e95ca3fefc4c246f7857e09c172cb2f85ab4bf0d6a9e
diff --git a/dev-util/itstool/itstool-1.1.1.ebuild b/dev-util/itstool/itstool-1.1.3.ebuild
similarity index 81%
rename from dev-util/itstool/itstool-1.1.1.ebuild
rename to dev-util/itstool/itstool-1.1.3.ebuild
index ef43dc5fc511..120e22b0ac07 100644
--- a/dev-util/itstool/itstool-1.1.1.ebuild
+++ b/dev-util/itstool/itstool-1.1.3.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/dev-util/itstool/itstool-1.1.1.ebuild,v 1.4 2012/01/14 16:50:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/itstool/itstool-1.1.3.ebuild,v 1.1 2012/06/07 08:32:48 tetromino Exp $
-EAPI="3"
+EAPI="4"
PYTHON_USE_WITH="xml"
PYTHON_DEPEND="2:2.5"
-inherit base python
+inherit python
DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS rules"
HOMEPAGE="http://itstool.org/"
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
# files in /usr/share/itstool/its are as-is
LICENSE="GPL-3 as-is"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-libs/libxml2[python]"
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}"
pkg_setup() {
DOCS=(ChangeLog NEWS) # AUTHORS, README are empty
+ python_set_active_version 2
+ python_pkg_setup
}
src_prepare() {
diff --git a/dev-util/strace/strace-4.7.ebuild b/dev-util/strace/strace-4.7.ebuild
index 554f22aad538..3bb0c3961cb3 100644
--- a/dev-util/strace/strace-4.7.ebuild
+++ b/dev-util/strace/strace-4.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/dev-util/strace/strace-4.7.ebuild,v 1.5 2012/06/06 06:25:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.7.ebuild,v 1.6 2012/06/07 14:47:59 jer Exp $
EAPI="4"
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2 autotools
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
fi
DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index a83bd71f7743..5ad78c7642b5 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -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/eclass/qt4-build.eclass,v 1.131 2012/05/25 12:06:05 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.132 2012/06/07 15:36:49 pesa Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -58,42 +58,42 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
fi
RDEPEND="
- !x11-libs/qt-assistant-${PV}-r9999
- !x11-libs/qt-bearer-${PV}-r9999
- !x11-libs/qt-core-${PV}-r9999
- !x11-libs/qt-dbus-${PV}-r9999
- !x11-libs/qt-declarative-${PV}-r9999
- !x11-libs/qt-demo-${PV}-r9999
- !x11-libs/qt-gui-${PV}-r9999
- !x11-libs/qt-multimedia-${PV}-r9999
- !x11-libs/qt-opengl-${PV}-r9999
- !x11-libs/qt-openvg-${PV}-r9999
- !x11-libs/qt-phonon-${PV}-r9999
- !x11-libs/qt-qt3support-${PV}-r9999
- !x11-libs/qt-script-${PV}-r9999
- !x11-libs/qt-sql-${PV}-r9999
- !x11-libs/qt-svg-${PV}-r9999
- !x11-libs/qt-test-${PV}-r9999
- !x11-libs/qt-webkit-${PV}-r9999
- !x11-libs/qt-xmlpatterns-${PV}-r9999
+ !x11-libs/qt-assistant-${PV}-r9999:4
+ !x11-libs/qt-bearer-${PV}-r9999:4
+ !x11-libs/qt-core-${PV}-r9999:4
+ !x11-libs/qt-dbus-${PV}-r9999:4
+ !x11-libs/qt-declarative-${PV}-r9999:4
+ !x11-libs/qt-demo-${PV}-r9999:4
+ !x11-libs/qt-gui-${PV}-r9999:4
+ !x11-libs/qt-multimedia-${PV}-r9999:4
+ !x11-libs/qt-opengl-${PV}-r9999:4
+ !x11-libs/qt-openvg-${PV}-r9999:4
+ !x11-libs/qt-phonon-${PV}-r9999:4
+ !x11-libs/qt-qt3support-${PV}-r9999:4
+ !x11-libs/qt-script-${PV}-r9999:4
+ !x11-libs/qt-sql-${PV}-r9999:4
+ !x11-libs/qt-svg-${PV}-r9999:4
+ !x11-libs/qt-test-${PV}-r9999:4
+ !x11-libs/qt-webkit-${PV}-r9999:4
+ !x11-libs/qt-xmlpatterns-${PV}-r9999:4
"
S=${WORKDIR}/${MY_P}
@@ -106,7 +106,7 @@ qt4-build_pkg_setup() {
# Protect users by not allowing downgrades between releases
# Downgrading revisions within the same release should be allowed
- if has_version '>'${CATEGORY}/${P}-r9999; then
+ if has_version ">${CATEGORY}/${P}-r9999:4"; then
if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
eerror
eerror "Sanity check to keep you from breaking your system:"
diff --git a/gnome-base/gnome-panel/files/gnome-panel-3.2.1-gold.patch b/gnome-base/gnome-panel/files/gnome-panel-3.2.1-gold.patch
new file mode 100644
index 000000000000..d6b39fa841a7
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-3.2.1-gold.patch
@@ -0,0 +1,55 @@
+ configure | 12 ++++++------
+ configure.ac | 2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure b/configure
+index e4c9423..21bfa66 100755
+--- a/configure
++++ b/configure
+@@ -13057,12 +13057,12 @@ if test -n "$PANEL_LIBS"; then
+ pkg_cv_PANEL_LIBS="$PANEL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-3.0 >= \$GTK_REQUIRED cairo-xlib glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED gnome-desktop-3.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu-3.0 >= \$LIBGNOME_MENU_REQUIRED dconf\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED pango >= \$PANGO_REQUIRED gtk+-3.0 >= \$GTK_REQUIRED cairo-xlib glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gio-unix-2.0 >= \$GLIB_REQUIRED gnome-desktop-3.0 >= \$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libgnome-menu-3.0 >= \$LIBGNOME_MENU_REQUIRED dconf\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>/dev/null`
++ pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -13082,14 +13082,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>&1`
++ PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>&1`
+ else
+- PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>&1`
++ PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PANEL_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf) were not met:
++ as_fn_error $? "Package requirements (gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf) were not met:
+
+ $PANEL_PKG_ERRORS
+
+diff --git a/configure.ac b/configure.ac
+index 73d198e..93c9f80 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,7 +77,7 @@ dnl pkg-config dependency checks
+
+ PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-3.0)
+
+-PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf)
++PKG_CHECK_MODULES(PANEL, gmodule-2.0 >= $GLIB_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf)
+ AC_SUBST(PANEL_CFLAGS)
+ AC_SUBST(PANEL_LIBS)
+
diff --git a/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild
index 5ab372c99784..2ce2c3523563 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.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/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild,v 1.2 2012/05/05 05:38:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild,v 1.3 2012/06/07 10:49:51 jlec Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -68,6 +68,11 @@ pkg_setup() {
DOCS="AUTHORS ChangeLog HACKING NEWS README"
}
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gold.patch
+ gnome2_src_prepare
+}
+
pkg_postinst() {
local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
local gconftool="${EROOT}usr/bin/gconftool-2"
diff --git a/gnustep-apps/aclock/aclock-0.4.0.ebuild b/gnustep-apps/aclock/aclock-0.4.0.ebuild
index c04937e66ec2..6e49fcc568bb 100644
--- a/gnustep-apps/aclock/aclock-0.4.0.ebuild
+++ b/gnustep-apps/aclock/aclock-0.4.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/gnustep-apps/aclock/aclock-0.4.0.ebuild,v 1.3 2012/04/07 14:51:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/aclock/aclock-0.4.0.ebuild,v 1.4 2012/06/07 14:44:18 xmw Exp $
EAPI=4
inherit gnustep-2
@@ -11,7 +11,7 @@ HOMEPAGE="http://gap.nongnu.org/aclock/"
SRC_URI="http://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/cenon/cenon-3.9.5.ebuild b/gnustep-apps/cenon/cenon-3.9.5.ebuild
index 91c0fe647779..ebee229cb9eb 100644
--- a/gnustep-apps/cenon/cenon-3.9.5.ebuild
+++ b/gnustep-apps/cenon/cenon-3.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/gnustep-apps/cenon/cenon-3.9.5.ebuild,v 1.3 2012/04/07 14:48:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cenon/cenon-3.9.5.ebuild,v 1.4 2012/06/07 15:56:20 xmw Exp $
EAPI=4
inherit gnustep-2
@@ -10,7 +10,7 @@ S=${WORKDIR}/${PN/c/C}
DESCRIPTION="Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX"
HOMEPAGE="http://www.cenon.info/"
SRC_URI="http://www.vhf-group.com/vhf-interservice/download/source/${P/c/C}.tar.bz2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
SLOT="0"
LICENSE="Cenon"
IUSE=""
diff --git a/gnustep-apps/easydiff/easydiff-0.4.0.ebuild b/gnustep-apps/easydiff/easydiff-0.4.0.ebuild
index 56507e9cf34b..550b712becc6 100644
--- a/gnustep-apps/easydiff/easydiff-0.4.0.ebuild
+++ b/gnustep-apps/easydiff/easydiff-0.4.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/gnustep-apps/easydiff/easydiff-0.4.0.ebuild,v 1.4 2012/04/07 14:52:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/easydiff/easydiff-0.4.0.ebuild,v 1.5 2012/06/07 15:11:13 xmw Exp $
inherit gnustep-2
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE="cvs"
RDEPEND="cvs? ( dev-vcs/cvs )"
diff --git a/gnustep-apps/gmines/gmines-0.2.ebuild b/gnustep-apps/gmines/gmines-0.2.ebuild
index 92ea370e2470..8c1d5c87be46 100644
--- a/gnustep-apps/gmines/gmines-0.2.ebuild
+++ b/gnustep-apps/gmines/gmines-0.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/gnustep-apps/gmines/gmines-0.2.ebuild,v 1.3 2012/04/07 14:52:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gmines/gmines-0.2.ebuild,v 1.4 2012/06/07 15:13:11 xmw Exp $
EAPI=4
inherit gnustep-2
@@ -8,7 +8,7 @@ inherit gnustep-2
DESCRIPTION="The well-known minesweeper game."
HOMEPAGE="http://gap.nongnu.org/gmines/index.html"
SRC_URI="http://savannah.nongnu.org/download/gap/${P/gm/GM}.tar.gz"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
SLOT="0"
LICENSE="GPL-2"
IUSE=""
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.0.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.0.ebuild
index ab3ce1d7458a..d129cc9280c2 100644
--- a/gnustep-apps/gworkspace/gworkspace-0.9.0.ebuild
+++ b/gnustep-apps/gworkspace/gworkspace-0.9.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/gnustep-apps/gworkspace/gworkspace-0.9.0.ebuild,v 1.3 2012/04/07 14:53:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/gworkspace-0.9.0.ebuild,v 1.4 2012/06/07 15:28:04 xmw Exp $
EAPI=3
inherit gnustep-2
@@ -9,7 +9,7 @@ DESCRIPTION="A workspace manager for GNUstep"
HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
LICENSE="GPL-2"
SLOT="0"
diff --git a/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild b/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild
index c963c04be0b1..649f19f4633d 100644
--- a/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild
+++ b/gnustep-apps/simpleagenda/simpleagenda-0.42.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/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild,v 1.3 2012/04/07 14:50:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild,v 1.4 2012/06/07 15:58:41 xmw Exp $
EAPI=4
inherit gnustep-2
@@ -12,7 +12,7 @@ SRC_URI="http://coyote.octets.fr/pub/gnustep/${MY_PN}-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE="dbus"
DEPEND=">=dev-libs/libical-0.27
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.22.0.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.22.0.ebuild
index 2dded92f6c60..0f5523ea67ce 100644
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.22.0.ebuild
+++ b/gnustep-base/gnustep-back-art/gnustep-back-art-0.22.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/gnustep-base/gnustep-back-art/gnustep-back-art-0.22.0.ebuild,v 1.4 2012/04/07 14:44:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-art/gnustep-back-art-0.22.0.ebuild,v 1.5 2012/06/07 14:51:24 xmw Exp $
EAPI=4
inherit gnustep-base
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="opengl xim"
RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild
index db653524fdf8..d531fc37bb80 100644
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild
+++ b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.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/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild,v 1.5 2012/05/02 21:21:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild,v 1.6 2012/06/07 14:42:06 xmw Exp $
EAPI=4
inherit gnustep-base
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="opengl xim"
RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.22.0.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.22.0.ebuild
index 7635c86d8133..513979f046bb 100644
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.22.0.ebuild
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.22.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/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.22.0.ebuild,v 1.4 2012/04/07 14:46:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.22.0.ebuild,v 1.5 2012/06/07 14:40:27 xmw Exp $
EAPI=4
inherit gnustep-base
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="opengl xim"
RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild
index a087ef464eee..b7669fdb5ae9 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.24.0-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/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild,v 1.4 2012/05/02 21:21:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild,v 1.5 2012/06/07 14:36:41 xmw Exp $
EAPI=4
inherit gnustep-base
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="+icu +libffi ssl zeroconf"
RDEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild
index 2dcfbceeaafe..f51f4b9416c2 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.22.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/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild,v 1.4 2012/04/07 14:43:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild,v 1.5 2012/06/07 14:37:46 xmw Exp $
EAPI=4
inherit gnustep-base multilib
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="cups gif jpeg png speech"
DEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
index 97bbab414ec4..61e4284eac3b 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.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/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.7 2012/04/07 14:40:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.8 2012/06/07 14:36:03 xmw Exp $
EAPI=4
inherit gnustep-base eutils prefix toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="native-exceptions"
DEPEND="${GNUSTEP_CORE_DEPEND}
diff --git a/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild b/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild
index e470d6514fa5..e15df876ca13 100644
--- a/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild
+++ b/gnustep-base/gnustep-updater/gnustep-updater-0.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/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild,v 1.4 2012/04/07 14:41:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild,v 1.5 2012/06/07 14:39:38 xmw Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND="app-shells/bash"
diff --git a/gnustep-libs/cenonlibrary/cenonlibrary-3.9.4.ebuild b/gnustep-libs/cenonlibrary/cenonlibrary-3.9.4.ebuild
index ad3be27cdc4c..85963f2ef2cc 100644
--- a/gnustep-libs/cenonlibrary/cenonlibrary-3.9.4.ebuild
+++ b/gnustep-libs/cenonlibrary/cenonlibrary-3.9.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/gnustep-libs/cenonlibrary/cenonlibrary-3.9.4.ebuild,v 1.3 2012/04/07 14:47:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/cenonlibrary/cenonlibrary-3.9.4.ebuild,v 1.4 2012/06/07 15:06:00 xmw Exp $
EAPI=4
inherit gnustep-2
@@ -10,7 +10,7 @@ S=${WORKDIR}/Cenon
DESCRIPTION="Default library required to run Cenon"
HOMEPAGE="http://www.cenon.info/"
SRC_URI="http://www.vhf-group.com/vhf-interservice/download/source/CenonLibrary-${PV}-1.tar.bz2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
SLOT="0"
LICENSE="Cenon"
IUSE=""
diff --git a/gnustep-libs/dbuskit/dbuskit-0.1.ebuild b/gnustep-libs/dbuskit/dbuskit-0.1.ebuild
index 579e65ada124..9c88d2dc6e4c 100644
--- a/gnustep-libs/dbuskit/dbuskit-0.1.ebuild
+++ b/gnustep-libs/dbuskit/dbuskit-0.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/gnustep-libs/dbuskit/dbuskit-0.1.ebuild,v 1.6 2012/04/07 14:49:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/dbuskit/dbuskit-0.1.ebuild,v 1.7 2012/06/07 15:09:06 xmw Exp $
EAPI=4
inherit autotools gnustep-2
@@ -11,7 +11,7 @@ SRC_URI="http://download.gna.org/gnustep/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
DEPEND=">=sys-apps/dbus-1.2.1"
diff --git a/gnustep-libs/highlighterkit/highlighterkit-0.1.2.ebuild b/gnustep-libs/highlighterkit/highlighterkit-0.1.2.ebuild
index 54f61925696f..551c730af04e 100644
--- a/gnustep-libs/highlighterkit/highlighterkit-0.1.2.ebuild
+++ b/gnustep-libs/highlighterkit/highlighterkit-0.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/gnustep-libs/highlighterkit/highlighterkit-0.1.2.ebuild,v 1.3 2012/04/07 14:49:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/highlighterkit/highlighterkit-0.1.2.ebuild,v 1.4 2012/06/07 15:10:24 xmw Exp $
EAPI=4
inherit gnustep-2
@@ -13,7 +13,7 @@ SRC_URI="http://download.gna.org/gnustep-nonfsf/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/graphviz/graphviz-2.28.0.ebuild b/media-gfx/graphviz/graphviz-2.28.0.ebuild
index fe7ef2d84c2b..30c8bb2e5554 100644
--- a/media-gfx/graphviz/graphviz-2.28.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.28.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/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.7 2012/06/05 20:00:58 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.8 2012/06/07 15:24:31 jlec Exp $
EAPI=4
PYTHON_DEPEND="python? 2"
@@ -28,6 +28,7 @@ RDEPEND="
>=media-libs/freetype-2.1.10
>=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype]
>=media-libs/libpng-1.2:0
+ !<=sci-chemistry/cluster-1.3.081231
virtual/jpeg
virtual/libiconv
X? (
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index ff55a617856c..874551f457f2 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -1,8 +1,8 @@
-graphics
-
+ graphics
+
graphviz is a set of graph drawing tools for Unix or MS-Windows
(win32), including a web service interface (webdot). Source code and
binary executables for common platforms are available. Graph drawing
@@ -28,22 +28,22 @@ documents
* you would like to discover patterns and communities of interest in
a database of telephone calls or e-mail messages
-
diff --git a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1.ebuild b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1.ebuild
index e2f58d589727..37b15b4c1c30 100644
--- a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1.ebuild
+++ b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.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/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1.ebuild,v 1.5 2012/06/03 19:19:53 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1.ebuild,v 1.6 2012/06/07 13:07:38 scarabeus Exp $
EAPI=4
@@ -15,6 +15,9 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
+RDEPEND="media-libs/mesa"
+DEPEND="${RDEPEND}"
+
RESTRICT="bindist"
foreachabi() {
diff --git a/media-libs/opengtl/Manifest b/media-libs/opengtl/Manifest
index 7fa4c39736b5..9fc709fae12f 100644
--- a/media-libs/opengtl/Manifest
+++ b/media-libs/opengtl/Manifest
@@ -1,2 +1,3 @@
DIST OpenGTL-0.9.15.2.tar.bz2 495966 RMD160 e77ba56b0dfe92361724aae02c5817248355b52d SHA1 b6beea4086a0907dcdb326d421d253f368689b45 SHA256 306427f2814439703f13b6ee17092c466172c4df57cdb896b6e5eadfa1154ae2
DIST OpenGTL-0.9.16.tar.bz2 533833 RMD160 77cac5891ff5c620092c815d80681373cf3d9145 SHA1 3cfe4a08e5778c13f7e74dfc822adb68f97ad048 SHA256 81e81a53eeeb07e9e6a6ecfd0d960c10453fedc041ab7d885e66ee3053757107
+DIST OpenGTL-0.9.17.tar.bz2 534132 RMD160 f20591ca0c022bd3c5db3ef7672a105ec1c1188e SHA1 10369bd11109312466389b3b050469dd69e54d2b SHA256 89a37394fe71f2e771d7230333c86b93706f0083f86a58a86a670bca7e4f905e
diff --git a/media-libs/opengtl/files/opengtl-0.9.17-gcc-4.7.patch b/media-libs/opengtl/files/opengtl-0.9.17-gcc-4.7.patch
new file mode 100644
index 000000000000..c209bb9e581f
--- /dev/null
+++ b/media-libs/opengtl/files/opengtl-0.9.17-gcc-4.7.patch
@@ -0,0 +1,47 @@
+diff -up OpenGTL-0.9.15.2/OpenCTL/tests/library/TestCompileThreading.h.gcc47 OpenGTL-0.9.15.2/OpenCTL/tests/library/TestCompileThreading.h
+--- OpenGTL-0.9.15.2/OpenCTL/tests/library/TestCompileThreading.h.gcc47 2012-01-10 11:17:50.904275650 -0500
++++ OpenGTL-0.9.15.2/OpenCTL/tests/library/TestCompileThreading.h 2012-01-10 11:17:57.860216380 -0500
+@@ -19,6 +19,8 @@
+
+ #include "GTLTest/Thread.h"
+
++#include
++
+ #ifdef GTLTEST_HAVE_THREAD
+
+ class MyThreadTCTLCT : public GTLTest::Thread
+diff -up OpenGTL-0.9.15.2/OpenCTL/tests/library/TestRuntimeThreading.h.gcc47 OpenGTL-0.9.15.2/OpenCTL/tests/library/TestRuntimeThreading.h
+--- OpenGTL-0.9.15.2/OpenCTL/tests/library/TestRuntimeThreading.h.gcc47 2012-01-10 11:18:19.128035026 -0500
++++ OpenGTL-0.9.15.2/OpenCTL/tests/library/TestRuntimeThreading.h 2012-01-10 11:18:28.365717117 -0500
+@@ -19,6 +19,8 @@
+
+ #include "GTLTest/Thread.h"
+
++#include
++
+ #ifdef GTLTEST_HAVE_THREAD
+
+ class MyThreadTCTLRT : public GTLTest::Thread
+diff -up OpenGTL-0.9.15.2/OpenGTL/GTLCore/tests/TestMemoryManagerThread.h.gcc47 OpenGTL-0.9.15.2/OpenGTL/GTLCore/tests/TestMemoryManagerThread.h
+--- OpenGTL-0.9.15.2/OpenGTL/GTLCore/tests/TestMemoryManagerThread.h.gcc47 2011-10-30 10:32:09.000000000 -0400
++++ OpenGTL-0.9.15.2/OpenGTL/GTLCore/tests/TestMemoryManagerThread.h 2012-01-10 11:16:41.936863656 -0500
+@@ -18,6 +18,7 @@
+ */
+
+ #include "GTLTest/Thread.h"
++#include
+
+ #ifdef GTLTEST_HAVE_THREAD
+
+diff -up OpenGTL-0.9.15.2/OpenShiva/tests/library/TestKernelThreading.h.gcc47 OpenGTL-0.9.15.2/OpenShiva/tests/library/TestKernelThreading.h
+--- OpenGTL-0.9.15.2/OpenShiva/tests/library/TestKernelThreading.h.gcc47 2012-01-10 11:18:50.154530703 -0500
++++ OpenGTL-0.9.15.2/OpenShiva/tests/library/TestKernelThreading.h 2012-01-10 11:18:59.409451568 -0500
+@@ -21,6 +21,8 @@
+ #include "GTLCore/Image.h"
+ #include "GTLCore/Type.h"
+
++#include
++
+ #ifdef GTLTEST_HAVE_THREAD
+
+ class MyThreadTCTLKT : public GTLTest::Thread
diff --git a/media-libs/opengtl/files/opengtl-0.9.17-ldflags.patch b/media-libs/opengtl/files/opengtl-0.9.17-ldflags.patch
new file mode 100644
index 000000000000..caac05be182a
--- /dev/null
+++ b/media-libs/opengtl/files/opengtl-0.9.17-ldflags.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -176,7 +176,7 @@
+ set( LCOV_RDIR "${CMAKE_BINARY_DIR}/lcov-report" )
+ add_definitions(-fprofile-arcs -ftest-coverage)
+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
+- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXEC_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
++ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
+ add_custom_target( coverage-clean
+ COMMAND mkdir -p ${LCOV_RDIR}
+ COMMAND ${LCOV} -d ${CMAKE_BINARY_DIR} -z
diff --git a/media-libs/opengtl/opengtl-0.9.17.ebuild b/media-libs/opengtl/opengtl-0.9.17.ebuild
new file mode 100644
index 000000000000..cff5fbc6aae6
--- /dev/null
+++ b/media-libs/opengtl/opengtl-0.9.17.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.17.ebuild,v 1.1 2012/06/07 10:50:51 kensington Exp $
+
+EAPI=4
+
+MY_P="OpenGTL-${PV}"
+
+inherit cmake-utils
+
+DESCRIPTION="Collection of libraries for graphics transformation algorithms"
+HOMEPAGE="http://opengtl.org/"
+SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+
+RDEPEND="
+ media-libs/libpng
+ =sys-devel/llvm-3.1*
+"
+DEPEND="${RDEPEND}
+ test? ( dev-util/lcov )
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${P}-ldflags.patch"
+ "${FILESDIR}/${P}-gcc-4.7.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use debug OPENGTL_ENABLE_DEBUG_OUTPUT)
+ $(cmake-utils_use test OPENGTL_BUILD_TESTS)
+ $(cmake-utils_use test OPENGTL_CODE_COVERAGE)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ newdoc OpenShiva/doc/reference/region.pdf OpenShiva.pdf
+}
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 630e7d50e8e8..c94094f818bb 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,2 +1,3 @@
DIST kid3-1.4.tar.gz 1539244 RMD160 c73090e90d7c785d33b4e10d6ff5f75d525aeb30 SHA1 4c53ac9f23449c6643bf3d9d7547978c41146922 SHA256 dc3f79617cfe2e3fcc3414542d65424ea22864b289d93f3552853c2ba14df418
DIST kid3-2.0.1.tar.gz 805506 RMD160 cfbd8e1103f6211c3ca74e84135c9f1ad055e271 SHA1 951864e665b3b40c7020dcce38de6186cf4a7e12 SHA256 32c3bdf5a3f170076e46c5f3b9523f688e8ea6265d22d2264c1bcd318da9f32e
+DIST kid3-2.1.tar.gz 915298 RMD160 3fb1bf5b442bf3e16dbbb33567bc59920d616b6c SHA1 bdfad021123d41cdbe38dc02f92869786d9cdff6 SHA256 8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225
diff --git a/media-sound/kid3/kid3-2.0.1.ebuild b/media-sound/kid3/kid3-2.0.1.ebuild
index aeee6c1005f0..45ebf048f33f 100644
--- a/media-sound/kid3/kid3-2.0.1.ebuild
+++ b/media-sound/kid3/kid3-2.0.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/media-sound/kid3/kid3-2.0.1.ebuild,v 1.3 2012/05/19 09:07:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-2.0.1.ebuild,v 1.4 2012/06/07 15:42:02 johu Exp $
EAPI=4
KDE_LINGUAS="cs de es et fi fr it nl pl ru tr zh_TW"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="flac mp3 mp4 +taglib vorbis"
RDEPEND="
diff --git a/media-sound/kid3/kid3-2.1.ebuild b/media-sound/kid3/kid3-2.1.ebuild
new file mode 100644
index 000000000000..c30538cebe7f
--- /dev/null
+++ b/media-sound/kid3/kid3-2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-2.1.ebuild,v 1.2 2012/06/07 13:24:55 kensington Exp $
+
+EAPI=4
+KDE_LINGUAS="cs de es et fi fr it nl pl ru sr sr@ijekavian sr@ijekavianlatin sr@Latn tr zh_TW"
+KDE_REQUIRED="always"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A simple tag editor for KDE"
+HOMEPAGE="http://kid3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="chroma flac mp3 mp4 +taglib vorbis"
+
+RDEPEND="
+ chroma? (
+ media-libs/chromaprint
+ virtual/ffmpeg
+ )
+ flac? (
+ media-libs/flac[cxx]
+ media-libs/libvorbis
+ )
+ mp3? ( media-libs/id3lib )
+ mp4? ( media-libs/libmp4v2:0 )
+ taglib? ( media-libs/taglib )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with chroma CHROMAPRINT)
+ $(cmake-utils_use_with flac)
+ $(cmake-utils_use_with mp3 ID3LIB)
+ $(cmake-utils_use_with mp4 MP4V2)
+ $(cmake-utils_use_with vorbis)
+ $(cmake-utils_use_with taglib)
+ "-DWITH_KDE=ON"
+ )
+
+ kde4-base_src_configure
+}
diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
index c19e8bd339f5..aa5405b3a25e 100644
--- a/media-sound/kid3/metadata.xml
+++ b/media-sound/kid3/metadata.xml
@@ -3,4 +3,12 @@
kde
sound
+
+ Enable support for acoustic fingerprinting plugin using
+ (media-libs/chromaprint)
+
+
+ http://sourceforge.net/tracker/?group_id=70849
+ kid3
+
diff --git a/media-sound/quodlibet/quodlibet-2.4.ebuild b/media-sound/quodlibet/quodlibet-2.4.ebuild
index 61b6c053f8ed..8c8e2f7b7bf7 100644
--- a/media-sound/quodlibet/quodlibet-2.4.ebuild
+++ b/media-sound/quodlibet/quodlibet-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/media-sound/quodlibet/quodlibet-2.4.ebuild,v 1.2 2012/04/17 09:04:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.4.ebuild,v 1.3 2012/06/07 08:47:15 ssuominen Exp $
EAPI=4
@@ -39,6 +39,10 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="ipod? ( dbus )"
src_prepare() {
+ if has_version '>=sys-fs/udev-183'; then
+ sed -i -e '/LoadLibrary/s:libudev.so.0:libudev.so.1:' ${PN}/devices/__init__.py || die
+ fi
+
local qlconfig=${PN}/config.py
if ! use gstreamer; then
diff --git a/metadata/cache/app-admin/eselect-1.3.1 b/metadata/cache/app-admin/eselect-1.3.1
index ca3edaf0ab96..bae9c8c8180e 100644
--- a/metadata/cache/app-admin/eselect-1.3.1
+++ b/metadata/cache/app-admin/eselect-1.3.1
@@ -6,7 +6,7 @@ mirror://gentoo/eselect-1.3.1.tar.xz
http://www.gentoo.org/proj/en/eselect/
GPL-2
Gentoo's multi-purpose configuration and management tool
-~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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
bash-completion-r1
doc
diff --git a/metadata/cache/app-admin/eselect-awk-0.2 b/metadata/cache/app-admin/eselect-awk-0.2
index a7478913595c..19ba94e10a60 100644
--- a/metadata/cache/app-admin/eselect-awk-0.2
+++ b/metadata/cache/app-admin/eselect-awk-0.2
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~ottxor/distfiles/eselect-awk-0.2.tar.gz
http://www.gentoo.org
GPL-2
Manages the {,/usr}/bin/awk symlink
-~amd64 ~x86
+~amd64 ~hppa ~x86
diff --git a/metadata/cache/app-admin/lib_users-0.5 b/metadata/cache/app-admin/lib_users-0.5
index 1bbb7b31170c..c19339570865 100644
--- a/metadata/cache/app-admin/lib_users-0.5
+++ b/metadata/cache/app-admin/lib_users-0.5
@@ -6,7 +6,7 @@ http://schwarzvogel.de/pkgs/lib_users-0.5.tar.gz
http://schwarzvogel.de/software-misc.shtml
GPL-2
Goes through /proc and finds all cases of libraries being mapped but marked as deleted
-~alpha ~amd64 ~hppa ~ppc ~x86
+alpha ~amd64 ~hppa ~ppc ~x86
multilib python toolchain-funcs
test
diff --git a/metadata/cache/app-emulation/lxc-0.8.0_rc1-r4 b/metadata/cache/app-emulation/lxc-0.8.0_rc1-r5
similarity index 100%
rename from metadata/cache/app-emulation/lxc-0.8.0_rc1-r4
rename to metadata/cache/app-emulation/lxc-0.8.0_rc1-r5
diff --git a/metadata/cache/app-office/libreoffice-9999-r2 b/metadata/cache/app-office/libreoffice-9999-r2
index 906d433ac6cd..c06e1de533a0 100644
--- a/metadata/cache/app-office/libreoffice-9999-r2
+++ b/metadata/cache/app-office/libreoffice-9999-r2
@@ -1,5 +1,5 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
0
branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.5.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
diff --git a/metadata/cache/app-portage/euscan-0.1.0 b/metadata/cache/app-portage/euscan-0.1.0
index 43e2f4439d27..0febb62d0408 100644
--- a/metadata/cache/app-portage/euscan-0.1.0
+++ b/metadata/cache/app-portage/euscan-0.1.0
@@ -1,5 +1,5 @@
sys-apps/portage dev-lang/python[xml] dev-lang/python
-sys-apps/portage >=app-portage/gentoolkit-0.2.8 dev-python/argparse dev-python/setuptools dev-python/beautifulsoup dev-lang/python[xml] dev-lang/python
+sys-apps/portage >=app-portage/gentoolkit-0.2.8 dev-python/argparse dev-python/setuptools dev-python/beautifulsoup:python-2 dev-lang/python[xml] dev-lang/python
0
http://dev.gentoo.org/~hwoarang/distfiles/euscan-0.1.0.tar.gz
diff --git a/metadata/cache/app-portage/euscan-0.1.1 b/metadata/cache/app-portage/euscan-0.1.1
index f18a0fdd9ef0..5db2170783d1 100644
--- a/metadata/cache/app-portage/euscan-0.1.1
+++ b/metadata/cache/app-portage/euscan-0.1.1
@@ -1,5 +1,5 @@
sys-apps/portage dev-lang/python[xml] dev-lang/python
-sys-apps/portage >=app-portage/gentoolkit-0.2.8 dev-python/argparse dev-python/setuptools dev-python/beautifulsoup dev-lang/python[xml] dev-lang/python
+sys-apps/portage >=app-portage/gentoolkit-0.2.8 dev-python/argparse dev-python/setuptools dev-python/beautifulsoup:python-2 dev-lang/python[xml] dev-lang/python
0
http://dev.gentoo.org/~hwoarang/distfiles/euscan-0.1.1.tar.gz
diff --git a/metadata/cache/app-portage/euscan-9999 b/metadata/cache/app-portage/euscan-9999
index 35a1c156a7c5..25acd15d7b99 100644
--- a/metadata/cache/app-portage/euscan-9999
+++ b/metadata/cache/app-portage/euscan-9999
@@ -1,5 +1,5 @@
sys-apps/portage dev-lang/python[xml] dev-lang/python dev-vcs/git
-sys-apps/portage >=app-portage/gentoolkit-0.2.8 dev-python/argparse dev-python/setuptools dev-python/beautifulsoup dev-lang/python[xml] dev-lang/python
+sys-apps/portage >=app-portage/gentoolkit-0.2.8 dev-python/argparse dev-python/setuptools dev-python/beautifulsoup:python-2 dev-lang/python[xml] dev-lang/python
0
diff --git a/metadata/cache/app-text/libmspub-9999 b/metadata/cache/app-text/libmspub-9999
new file mode 100644
index 000000000000..b8f58a274c68
--- /dev/null
+++ b/metadata/cache/app-text/libmspub-9999
@@ -0,0 +1,22 @@
+app-text/libwpd:0.9 app-text/libwpg:0.2 sys-libs/zlib virtual/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+app-text/libwpd:0.9 app-text/libwpg:0.2 sys-libs/zlib
+0
+
+
+http://www.freedesktop.org/wiki/Software/libmspub
+LGPL-2.1
+Library parsing the Microsoft Publisher documents
+
+autotools base eutils git-2 libtool multilib multiprocessing toolchain-funcs user
+doc static-libs
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-db/pgadmin3-1.14.3 b/metadata/cache/dev-db/pgadmin3-1.14.3
new file mode 100644
index 000000000000..06b6fe3a860b
--- /dev/null
+++ b/metadata/cache/dev-db/pgadmin3-1.14.3
@@ -0,0 +1,22 @@
+x11-libs/wxGTK:2.8[X,debug=] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1
+x11-libs/wxGTK:2.8[X,debug=] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1
+0
+mirror://postgresql/pgadmin3/release/v1.14.3/src/pgadmin3-1.14.3.tar.gz
+
+http://www.pgadmin.org/
+POSTGRESQL
+wxWidgets GUI for PostgreSQL.
+~amd64 ~ppc ~x86 ~x86-fbsd
+eutils multilib toolchain-funcs user versionator wxwidgets
+debug
+
+
+
+4
+
+configure install setup
+
+
+
+
+
diff --git a/metadata/cache/dev-embedded/qvfb-4.6.3 b/metadata/cache/dev-embedded/qvfb-4.6.3
index 6834965dfc49..20012d6bdd21 100644
--- a/metadata/cache/dev-embedded/qvfb-4.6.3
+++ b/metadata/cache/dev-embedded/qvfb-4.6.3
@@ -1,5 +1,5 @@
~x11-libs/qt-gui-4.6.3 virtual/pkgconfig
-~x11-libs/qt-gui-4.6.3 !x11-libs/qt-assistant-4.6.3-r9999 !x11-libs/qt-bearer-4.6.3-r9999 !x11-libs/qt-core-4.6.3-r9999 !x11-libs/qt-dbus-4.6.3-r9999 !x11-libs/qt-declarative-4.6.3-r9999 !x11-libs/qt-demo-4.6.3-r9999 !x11-libs/qt-gui-4.6.3-r9999 !x11-libs/qt-multimedia-4.6.3-r9999 !x11-libs/qt-opengl-4.6.3-r9999 !x11-libs/qt-openvg-4.6.3-r9999 !x11-libs/qt-phonon-4.6.3-r9999 !x11-libs/qt-qt3support-4.6.3-r9999 !x11-libs/qt-script-4.6.3-r9999 !x11-libs/qt-sql-4.6.3-r9999 !x11-libs/qt-svg-4.6.3-r9999 !x11-libs/qt-test-4.6.3-r9999 !x11-libs/qt-webkit-4.6.3-r9999 !x11-libs/qt-xmlpatterns-4.6.3-r9999
+~x11-libs/qt-gui-4.6.3 !x11-libs/qt-assistant-4.6.3-r9999:4 !x11-libs/qt-bearer-4.6.3-r9999:4 !x11-libs/qt-core-4.6.3-r9999:4 !x11-libs/qt-dbus-4.6.3-r9999:4 !x11-libs/qt-declarative-4.6.3-r9999:4 !x11-libs/qt-demo-4.6.3-r9999:4 !x11-libs/qt-gui-4.6.3-r9999:4 !x11-libs/qt-multimedia-4.6.3-r9999:4 !x11-libs/qt-opengl-4.6.3-r9999:4 !x11-libs/qt-openvg-4.6.3-r9999:4 !x11-libs/qt-phonon-4.6.3-r9999:4 !x11-libs/qt-qt3support-4.6.3-r9999:4 !x11-libs/qt-script-4.6.3-r9999:4 !x11-libs/qt-sql-4.6.3-r9999:4 !x11-libs/qt-svg-4.6.3-r9999:4 !x11-libs/qt-test-4.6.3-r9999:4 !x11-libs/qt-webkit-4.6.3-r9999:4 !x11-libs/qt-xmlpatterns-4.6.3-r9999:4
4
http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
diff --git a/metadata/cache/dev-lang/squirrel-2.2.4-r2 b/metadata/cache/dev-lang/squirrel-2.2.4-r2
new file mode 100644
index 000000000000..d860d4e9a99a
--- /dev/null
+++ b/metadata/cache/dev-lang/squirrel-2.2.4-r2
@@ -0,0 +1,22 @@
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!app-text/ispell
+0
+mirror://sourceforge/squirrel/squirrel2/squirrel_2.2.4_stable/squirrel_2.2.4_stable.tar.gz
+
+http://squirrel-lang.org/
+ZLIB
+A interpreted language mainly used for games
+~amd64 ~x86
+autotools eutils libtool multilib multiprocessing toolchain-funcs user
+doc examples static-libs
+
+
+
+3
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/libtar-1.2.11-r5 b/metadata/cache/dev-libs/libtar-1.2.11-r5
new file mode 100644
index 000000000000..fbb8f9ae8e1d
--- /dev/null
+++ b/metadata/cache/dev-libs/libtar-1.2.11-r5
@@ -0,0 +1,22 @@
+zlib? ( sys-libs/zlib ) !zlib? ( app-arch/gzip ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+
+0
+ftp://ftp.feep.net/pub/software/libtar/libtar-1.2.11.tar.gz mirror://debian/pool/main/libt/libtar/libtar_1.2.11-8.debian.tar.gz
+
+http://www.feep.net/libtar/ http://packages.qa.debian.org/libt/libtar.html
+GPL-2
+C library for manipulating tar archives
+~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+autotools eutils libtool multilib multiprocessing toolchain-funcs user
+static-libs zlib
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/Color-Library-0.21.0 b/metadata/cache/dev-perl/Color-Library-0.21.0
index e5e34cb975fc..c68213a14d8c 100644
--- a/metadata/cache/dev-perl/Color-Library-0.21.0
+++ b/metadata/cache/dev-perl/Color-Library-0.21.0
@@ -1,4 +1,4 @@
-virtual/perl-Module-Pluggable dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable virtual/perl-Module-Build dev-lang/perl[-build]
+virtual/perl-Module-Pluggable dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable test? ( dev-perl/Test-Most ) dev-lang/perl[-build]
virtual/perl-Module-Pluggable dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-lang/perl[-build]
0
mirror://cpan/authors/id/R/RO/ROKR/Color-Library-0.021.tar.gz
@@ -8,7 +8,7 @@ http://search.cpan.org/dist/Color-Library/
An easy-to-use and comprehensive named-color library
~amd64 ~x86
base eutils multilib multiprocessing perl-module toolchain-funcs user
-
+test
diff --git a/metadata/cache/dev-util/itstool-1.1.1 b/metadata/cache/dev-util/itstool-1.1.3
similarity index 75%
rename from metadata/cache/dev-util/itstool-1.1.1
rename to metadata/cache/dev-util/itstool-1.1.3
index 74bf8bd4f30e..c3ed4bb8a951 100644
--- a/metadata/cache/dev-util/itstool-1.1.1
+++ b/metadata/cache/dev-util/itstool-1.1.3
@@ -1,20 +1,20 @@
dev-libs/libxml2[python] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
dev-libs/libxml2[python] || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
0
-http://files.itstool.org/itstool/itstool-1.1.1.tar.bz2
+http://files.itstool.org/itstool/itstool-1.1.3.tar.bz2
http://itstool.org/
GPL-3 as-is
Translation tool for XML documents that uses gettext files and ITS rules
-amd64 x86
-base eutils multilib python toolchain-funcs user
+~amd64 ~x86
+multilib python toolchain-funcs
-3
+4
-compile configure install prepare setup unpack
+prepare setup
diff --git a/metadata/cache/dev-util/strace-4.7 b/metadata/cache/dev-util/strace-4.7
index b153815a0c3a..2fe5c91e82e0 100644
--- a/metadata/cache/dev-util/strace-4.7
+++ b/metadata/cache/dev-util/strace-4.7
@@ -6,7 +6,7 @@ mirror://sourceforge/strace/strace-4.7.tar.xz
http://sourceforge.net/projects/strace/
BSD
A useful diagnostic, instructional, and debugging tool
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
+~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
eutils flag-o-matic multilib toolchain-funcs user
static aio
diff --git a/metadata/cache/gnustep-apps/aclock-0.4.0 b/metadata/cache/gnustep-apps/aclock-0.4.0
index 135c8b313c08..29a3c216cd48 100644
--- a/metadata/cache/gnustep-apps/aclock-0.4.0
+++ b/metadata/cache/gnustep-apps/aclock-0.4.0
@@ -1,12 +1,12 @@
>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
+>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=gnustep-libs/cenonlibrary-3.9.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
+>=gnustep-libs/cenonlibrary-3.9.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-cvs? ( dev-vcs/cvs ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
+cvs? ( dev-vcs/cvs ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
+>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
+>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
+>=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
+>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
+>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !=dev-libs/expat-2 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype] >=media-libs/libpng-1.2:0 virtual/jpeg virtual/libiconv X? ( x11-libs/libXaw x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) cairo? ( >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) devil? ( media-libs/devil[png,jpeg] ) gs? ( app-text/ghostscript-gpl ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) ruby? ( dev-lang/ruby ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3 ) virtual/pkgconfig sys-devel/flex java? ( dev-lang/swig ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
-sys-libs/zlib >=dev-libs/expat-2 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype] >=media-libs/libpng-1.2:0 virtual/jpeg virtual/libiconv X? ( x11-libs/libXaw x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) cairo? ( >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) devil? ( media-libs/devil[png,jpeg] ) gs? ( app-text/ghostscript-gpl ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) ruby? ( dev-lang/ruby ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3 ) python? ( =dev-lang/python-2* )
+sys-libs/zlib >=dev-libs/expat-2 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype] >=media-libs/libpng-1.2:0 !<=sci-chemistry/cluster-1.3.081231 virtual/jpeg virtual/libiconv X? ( x11-libs/libXaw x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) cairo? ( >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) devil? ( media-libs/devil[png,jpeg] ) gs? ( app-text/ghostscript-gpl ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) ruby? ( dev-lang/ruby ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3 ) virtual/pkgconfig sys-devel/flex java? ( dev-lang/swig ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+sys-libs/zlib >=dev-libs/expat-2 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype] >=media-libs/libpng-1.2:0 !<=sci-chemistry/cluster-1.3.081231 virtual/jpeg virtual/libiconv X? ( x11-libs/libXaw x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) cairo? ( >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) devil? ( media-libs/devil[png,jpeg] ) gs? ( app-text/ghostscript-gpl ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) ruby? ( dev-lang/ruby ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3 ) python? ( =dev-lang/python-2* )
0
http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.28.0.tar.gz
test
diff --git a/metadata/cache/media-libs/libtxc_dxtn-1.0.1 b/metadata/cache/media-libs/libtxc_dxtn-1.0.1
index 1a5817676d09..2c23bfa5b95b 100644
--- a/metadata/cache/media-libs/libtxc_dxtn-1.0.1
+++ b/metadata/cache/media-libs/libtxc_dxtn-1.0.1
@@ -1,5 +1,5 @@
-
-
+media-libs/mesa
+media-libs/mesa
0
http://people.freedesktop.org/~cbrill/libtxc_dxtn/libtxc_dxtn-1.0.1.tar.bz2
bindist
diff --git a/metadata/cache/media-libs/opengtl-0.9.17 b/metadata/cache/media-libs/opengtl-0.9.17
new file mode 100644
index 000000000000..5b24f38c6f33
--- /dev/null
+++ b/metadata/cache/media-libs/opengtl-0.9.17
@@ -0,0 +1,22 @@
+media-libs/libpng =sys-devel/llvm-3.1* test? ( dev-util/lcov ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+media-libs/libpng =sys-devel/llvm-3.1*
+0
+http://download.opengtl.org/OpenGTL-0.9.17.tar.bz2
+
+http://opengtl.org/
+LGPL-2
+Collection of libraries for graphics transformation algorithms
+~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/media-sound/kid3-2.0.1 b/metadata/cache/media-sound/kid3-2.0.1
index 000c99c80e53..3c600f59e1d6 100644
--- a/metadata/cache/media-sound/kid3-2.0.1
+++ b/metadata/cache/media-sound/kid3-2.0.1
@@ -6,7 +6,7 @@ mirror://sourceforge/kid3/kid3-2.0.1.tar.gz
http://kid3.sourceforge.net/
GPL-2
A simple tag editor for KDE
-~amd64 ~x86
+~amd64 x86
base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
flac mp3 mp4 +taglib vorbis linguas_cs linguas_de linguas_es linguas_et linguas_fi linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_tr linguas_zh_TW +handbook aqua
flac? ( vorbis )
diff --git a/metadata/cache/media-sound/kid3-2.1 b/metadata/cache/media-sound/kid3-2.1
new file mode 100644
index 000000000000..21952539a1d5
--- /dev/null
+++ b/metadata/cache/media-sound/kid3-2.1
@@ -0,0 +1,22 @@
+chroma? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( media-libs/taglib ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+chroma? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( media-libs/taglib ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+4
+mirror://sourceforge/kid3/kid3-2.1.tar.gz
+
+http://kid3.sourceforge.net/
+GPL-2
+A simple tag editor for KDE
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
+chroma flac mp3 mp4 +taglib vorbis linguas_cs linguas_de linguas_es linguas_et linguas_fi linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@Latn linguas_tr linguas_zh_TW +handbook aqua
+flac? ( vorbis )
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-irc/weechat-0.3.8 b/metadata/cache/net-irc/weechat-0.3.8
new file mode 100644
index 000000000000..590c7859c8a7
--- /dev/null
+++ b/metadata/cache/net-irc/weechat-0.3.8
@@ -0,0 +1,22 @@
+net-misc/curl[ssl] sys-libs/ncurses charset? ( virtual/libiconv ) guile? ( dev-scheme/guile ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.9 ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) nls? ( >=sys-devel/gettext-0.15 ) python? ( dev-lang/python ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+net-misc/curl[ssl] sys-libs/ncurses charset? ( virtual/libiconv ) guile? ( dev-scheme/guile ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.9 ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) python? ( dev-lang/python )
+0
+http://weechat.org/files/src/weechat-0.3.8.tar.bz2
+
+http://weechat.org/
+GPL-3
+Portable and multi-interface IRC client.
+~amd64 ~ppc ~x86 ~x86-fbsd ~x86-linux ~amd64-linux
+base cmake-utils eutils flag-o-matic multilib python toolchain-funcs user
+guile lua +perl +python ruby tcl +alias +charset +fifo +logger +relay +rmodifier +scripts +spell +xfer +irc +crypt doc nls +ssl linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru
+
+
+
+4
+
+compile configure install postinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-misc/vidalia-0.2.15 b/metadata/cache/net-misc/vidalia-0.2.15
deleted file mode 100644
index e59c590fe547..000000000000
--- a/metadata/cache/net-misc/vidalia-0.2.15
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/qt-gui:4[debug?] >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-x11-libs/qt-gui:4[debug?] tor? ( net-misc/tor )
-0
-https://www.torproject.org/dist/vidalia/vidalia-0.2.15.tar.gz
-
-https://www.torproject.org/projects/vidalia.html.en
-|| ( GPL-3 GPL-2 ) openssl
-Qt 4 front-end for Tor
-~amd64 ~ppc ~x86
-base cmake-utils eutils flag-o-matic multilib qt4-r2 toolchain-funcs user
-debug +tor
-
-
-
-4
-
-compile configure install postinst prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/net-misc/vidalia-0.2.17 b/metadata/cache/net-misc/vidalia-0.2.19
similarity index 87%
rename from metadata/cache/net-misc/vidalia-0.2.17
rename to metadata/cache/net-misc/vidalia-0.2.19
index 40b7b39a32e0..68ef8af00bcc 100644
--- a/metadata/cache/net-misc/vidalia-0.2.17
+++ b/metadata/cache/net-misc/vidalia-0.2.19
@@ -1,7 +1,7 @@
x11-libs/qt-gui:4[debug?] >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
x11-libs/qt-gui:4[debug?] tor? ( net-misc/tor )
0
-https://www.torproject.org/dist/vidalia/vidalia-0.2.17.tar.gz
+https://www.torproject.org/dist/vidalia/vidalia-0.2.19.tar.gz
https://www.torproject.org/projects/vidalia.html.en
|| ( GPL-3 GPL-2 ) openssl
diff --git a/metadata/cache/net-p2p/tribler-5.5.19 b/metadata/cache/net-p2p/tribler-5.5.19
deleted file mode 100644
index 0e7c197449c6..000000000000
--- a/metadata/cache/net-p2p/tribler-5.5.19
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/python-2.5[sqlite] >=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.0.1 ) app-arch/unzip || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=dev-lang/python-2.5[sqlite] >=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.0.1 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://dl.tribler.org/tribler_5.5.19-1ubuntu1_all.deb
-
-http://www.tribler.org/
-LGPL-2.1
-Bittorrent client that does not require a website to discover content
-~amd64 ~x86
-eutils multilib python toolchain-funcs user
-vlc
-
-
-
-4
-
-compile install postinst postrm prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-p2p/tribler-5.5.20 b/metadata/cache/net-p2p/tribler-5.5.20
deleted file mode 100644
index 7f3976708b9c..000000000000
--- a/metadata/cache/net-p2p/tribler-5.5.20
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/python-2.5[sqlite] >=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.0.1 ) app-arch/unzip || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=dev-lang/python-2.5[sqlite] >=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.0.1 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://dl.tribler.org/tribler_5.5.20-1ubuntu1_all.deb
-
-http://www.tribler.org/
-LGPL-2.1
-Bittorrent client that does not require a website to discover content
-~amd64 ~x86
-eutils multilib python toolchain-funcs user
-vlc
-
-
-
-4
-
-compile install postinst postrm prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-p2p/tribler-5.5.21 b/metadata/cache/net-p2p/tribler-5.5.21
deleted file mode 100644
index 2192b2e249c7..000000000000
--- a/metadata/cache/net-p2p/tribler-5.5.21
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/python-2.5[sqlite] >=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.0.1 ) app-arch/unzip || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=dev-lang/python-2.5[sqlite] >=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.0.1 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://dl.tribler.org/tribler_5.5.21-1ubuntu1_all.deb
-
-http://www.tribler.org/
-LGPL-2.1
-Bittorrent client that does not require a website to discover content
-~amd64 ~x86
-eutils multilib python toolchain-funcs user
-vlc
-
-
-
-4
-
-compile install postinst postrm prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-p2p/tribler-5.5.23 b/metadata/cache/net-p2p/tribler-5.5.23
deleted file mode 100644
index 3aebd9a45050..000000000000
--- a/metadata/cache/net-p2p/tribler-5.5.23
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/python-2.5[sqlite] >=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.0.1 ) app-arch/unzip || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=dev-lang/python-2.5[sqlite] >=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.0.1 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://dl.tribler.org/tribler_5.5.23-1ubuntu1_all.deb
-
-http://www.tribler.org/
-LGPL-2.1
-Bittorrent client that does not require a website to discover content
-~amd64 ~x86
-eutils multilib python toolchain-funcs user
-vlc
-
-
-
-4
-
-compile install postinst postrm prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-p2p/tribler-5.9.12 b/metadata/cache/net-p2p/tribler-5.9.14
similarity index 91%
rename from metadata/cache/net-p2p/tribler-5.9.12
rename to metadata/cache/net-p2p/tribler-5.9.14
index 82860342a32c..76529bb336d6 100644
--- a/metadata/cache/net-p2p/tribler-5.9.12
+++ b/metadata/cache/net-p2p/tribler-5.9.14
@@ -1,7 +1,7 @@
>=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.1.0 ) app-arch/unzip =dev-lang/python-2* =dev-lang/python-2*[sqlite]
>=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.1.0 ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
0
-http://dl.tribler.org/tribler_5.9.12-1ubuntu1_all.deb
+http://dl.tribler.org/tribler_5.9.14-1ubuntu1_all.deb
http://www.tribler.org/
LGPL-2.1
diff --git a/metadata/cache/sci-chemistry/clashlist-3.17 b/metadata/cache/sci-chemistry/clashlist-3.17
index 39c33d519629..f0f96152ade7 100644
--- a/metadata/cache/sci-chemistry/clashlist-3.17
+++ b/metadata/cache/sci-chemistry/clashlist-3.17
@@ -1,5 +1,5 @@
-sci-chemistry/cluster sci-chemistry/probe
-sci-chemistry/cluster sci-chemistry/probe
+<=sci-chemistry/cluster-1.3.081231 sci-chemistry/probe
+<=sci-chemistry/cluster-1.3.081231 sci-chemistry/probe
0
mirror://gentoo/molprobity-3.17.tgz
@@ -12,7 +12,7 @@ Build lists of van der Waals clashes from an input PDB file
-
+4
install
diff --git a/metadata/cache/sci-chemistry/clashlist-3.17-r1 b/metadata/cache/sci-chemistry/clashlist-3.17-r1
new file mode 100644
index 000000000000..e479282c1cb8
--- /dev/null
+++ b/metadata/cache/sci-chemistry/clashlist-3.17-r1
@@ -0,0 +1,22 @@
+>=sci-chemistry/cluster-1.3.081231-r1 sci-chemistry/probe
+>=sci-chemistry/cluster-1.3.081231-r1 sci-chemistry/probe
+0
+mirror://gentoo/molprobity-3.17.tgz
+
+http://kinemage.biochem.duke.edu/software/index.php
+richardson
+Build lists of van der Waals clashes from an input PDB file
+~amd64 ~x86 ~amd64-linux ~x86-linux
+
+
+
+
+
+4
+
+install prepare
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/cluster-1.3.081231-r1 b/metadata/cache/sci-chemistry/cluster-1.3.081231-r1
new file mode 100644
index 000000000000..33c5466742d5
--- /dev/null
+++ b/metadata/cache/sci-chemistry/cluster-1.3.081231-r1
@@ -0,0 +1,22 @@
+
+
+0
+http://kinemage.biochem.duke.edu/downloads/software/cluster/cluster.1.3.081231.src.tgz
+
+http://kinemage.biochem.duke.edu/software/index.php
+richardson
+Build lists of collections of interacting items
+~amd64 ~x86 ~amd64-linux ~x86-linux
+eutils multilib toolchain-funcs user
+
+
+
+
+4
+
+install prepare
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/scala-3.3.18-r1 b/metadata/cache/sci-chemistry/scala-3.3.18-r1
deleted file mode 100644
index 33dd6f33acd0..000000000000
--- a/metadata/cache/sci-chemistry/scala-3.3.18-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/fortran sci-libs/ccp4-libs virtual/lapack !=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-virtual/fortran sci-libs/ccp4-libs virtual/lapack !=sci-libs/libh2o-0.2
+>=sci-libs/libh2o-0.2
+0
+mirror://bitbucket/mgorny/libh2oxx/downloads/libh2oxx-0.2.tar.bz2
+
+https://bitbucket.org/mgorny/libh2oxx/
+BSD
+C++ bindings for libh2o
+~amd64 ~x86
+autotools autotools-utils eutils libtool multilib multiprocessing toolchain-funcs user
+debug static-libs
+
+
+
+4
+
+compile configure install prepare test
+
+
+
+
+
diff --git a/metadata/cache/sci-libs/vtk-5.10.0 b/metadata/cache/sci-libs/vtk-5.10.0
new file mode 100644
index 000000000000..9de6c7dc7fef
--- /dev/null
+++ b/metadata/cache/sci-libs/vtk-5.10.0
@@ -0,0 +1,22 @@
+dev-libs/expat dev-libs/libxml2:2 media-libs/freetype media-libs/libpng media-libs/mesa media-libs/tiff sci-libs/hdf5 sys-libs/zlib virtual/jpeg virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt cg? ( media-gfx/nvidia-cg-toolkit ) examples? ( x11-libs/qt-core:4[qt3support] x11-libs/qt-gui:4[qt3support] ) ffmpeg? ( virtual/ffmpeg ) java? ( >=virtual/jre-1.5 ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql-base ) python? ( dev-python/sip ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 python? ( dev-python/PyQt4 ) ) tk? ( dev-lang/tk ) theora? ( media-libs/libtheora ) tk? ( dev-lang/tk ) video_cards_nvidia? ( media-video/nvidia-settings ) R? ( dev-lang/R ) java? ( >=virtual/jdk-1.5 ) boost? ( >=dev-libs/boost-1.40.0[mpi?] ) dev-util/cmake java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+dev-libs/expat dev-libs/libxml2:2 media-libs/freetype media-libs/libpng media-libs/mesa media-libs/tiff sci-libs/hdf5 sys-libs/zlib virtual/jpeg virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt cg? ( media-gfx/nvidia-cg-toolkit ) examples? ( x11-libs/qt-core:4[qt3support] x11-libs/qt-gui:4[qt3support] ) ffmpeg? ( virtual/ffmpeg ) java? ( >=virtual/jre-1.5 ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql-base ) python? ( dev-python/sip ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 python? ( dev-python/PyQt4 ) ) tk? ( dev-lang/tk ) theora? ( media-libs/libtheora ) tk? ( dev-lang/tk ) video_cards_nvidia? ( media-video/nvidia-settings ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
+0
+http://www.vtk.org/files/release/5.10/vtk-5.10.0.tar.gz doc? ( http://www.vtk.org/files/release/5.10/vtkDocHtml-5.10.0.tar.gz ) examples? ( http://www.vtk.org/files/release/5.10/vtkdata-5.10.0.tar.gz )
+
+http://www.vtk.org/
+BSD LGPL-2
+The Visualization Toolkit
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic java-pkg-opt-2 java-utils-2 multilib python qt4-r2 toolchain-funcs user versionator
+boost chemistry cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 R theora threads tk video_cards_nvidia X elibc_FreeBSD java
+
+
+
+3
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-physics/h2o-gtk-0.1 b/metadata/cache/sci-physics/h2o-gtk-0.1
new file mode 100644
index 000000000000..d3be995f5f44
--- /dev/null
+++ b/metadata/cache/sci-physics/h2o-gtk-0.1
@@ -0,0 +1,22 @@
+dev-cpp/gtkmm >=sci-libs/libh2oxx-0.2 sci-libs/plotmm
+dev-cpp/gtkmm >=sci-libs/libh2oxx-0.2 sci-libs/plotmm
+0
+mirror://bitbucket/mgorny/h2o-gtk/downloads/h2o-gtk-0.1.tar.bz2
+
+https://bitbucket.org/mgorny/h2o-gtk/
+BSD
+GTK+ UI for libh2o -- water & steam properties
+~amd64 ~x86
+autotools autotools-utils eutils libtool multilib multiprocessing toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/fakeroot-1.18.4 b/metadata/cache/sys-apps/fakeroot-1.18.4
new file mode 100644
index 000000000000..a8683cc32851
--- /dev/null
+++ b/metadata/cache/sys-apps/fakeroot-1.18.4
@@ -0,0 +1,22 @@
+acl? ( sys-apps/acl ) test? ( app-arch/sharutils )
+
+0
+mirror://debian/pool/main/f/fakeroot/fakeroot_1.18.4.orig.tar.bz2
+
+http://packages.qa.debian.org/f/fakeroot.html
+GPL-3
+A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery
+~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+eutils multilib toolchain-funcs user
+acl static-libs test
+
+
+
+4
+
+configure install
+
+
+
+
+
diff --git a/metadata/cache/sys-fs/udisks-1.0.4-r1 b/metadata/cache/sys-fs/udisks-1.0.4-r1
index edea2eafaf42..b491ece010e5 100644
--- a/metadata/cache/sys-fs/udisks-1.0.4-r1
+++ b/metadata/cache/sys-fs/udisks-1.0.4-r1
@@ -1,5 +1,5 @@
-|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.16.1:2 >=sys-apps/dbus-1.4.0 >=dev-libs/dbus-glib-0.92 >=sys-auth/polkit-0.97 >=sys-block/parted-1.8.8 >=sys-fs/lvm2-2.02.66 >=dev-libs/libatasmart-0.14 >=sys-apps/sg3_utils-1.27.20090411 app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/intltool-0.40.0 virtual/pkgconfig doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 )
-|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.16.1:2 >=sys-apps/dbus-1.4.0 >=dev-libs/dbus-glib-0.92 >=sys-auth/polkit-0.97 >=sys-block/parted-1.8.8 >=sys-fs/lvm2-2.02.66 >=dev-libs/libatasmart-0.14 >=sys-apps/sg3_utils-1.27.20090411 virtual/eject remote-access? ( net-dns/avahi )
+|| ( >=sys-fs/udev-171-r5[gudev,hwdb] =dev-libs/glib-2.16.1:2 >=sys-apps/dbus-1.4.0 >=dev-libs/dbus-glib-0.92 >=sys-auth/polkit-0.97 >=sys-block/parted-1.8.8 >=sys-fs/lvm2-2.02.66 >=dev-libs/libatasmart-0.14 >=sys-apps/sg3_utils-1.27.20090411 app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/intltool-0.40.0 virtual/pkgconfig doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 )
+|| ( >=sys-fs/udev-171-r5[gudev,hwdb] =dev-libs/glib-2.16.1:2 >=sys-apps/dbus-1.4.0 >=dev-libs/dbus-glib-0.92 >=sys-auth/polkit-0.97 >=sys-block/parted-1.8.8 >=sys-fs/lvm2-2.02.66 >=dev-libs/libatasmart-0.14 >=sys-apps/sg3_utils-1.27.20090411 virtual/eject remote-access? ( net-dns/avahi )
0
http://hal.freedesktop.org/releases/udisks-1.0.4.tar.gz
test
diff --git a/metadata/cache/sys-fs/udisks-1.0.4-r2 b/metadata/cache/sys-fs/udisks-1.0.4-r2
index 5057cca10a0d..caedb220a0b7 100644
--- a/metadata/cache/sys-fs/udisks-1.0.4-r2
+++ b/metadata/cache/sys-fs/udisks-1.0.4-r2
@@ -1,5 +1,5 @@
->=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.20 >=dev-libs/libatasmart-0.18 >=sys-auth/polkit-0.104-r1 >=sys-apps/dbus-1.4.20 >=sys-apps/sg3_utils-1.27.20090411 >=sys-block/parted-3 || ( >=sys-fs/udev-171-r5[gudev] =sys-fs/lvm2-2.02.66 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/intltool virtual/pkgconfig
->=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.20 >=dev-libs/libatasmart-0.18 >=sys-auth/polkit-0.104-r1 >=sys-apps/dbus-1.4.20 >=sys-apps/sg3_utils-1.27.20090411 >=sys-block/parted-3 || ( >=sys-fs/udev-171-r5[gudev] =sys-fs/lvm2-2.02.66 >=sys-apps/util-linux-2.20.1-r2 virtual/eject remote-access? ( net-dns/avahi )
+>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.20 >=dev-libs/libatasmart-0.18 >=sys-auth/polkit-0.104-r1 >=sys-apps/dbus-1.4.20 >=sys-apps/sg3_utils-1.27.20090411 >=sys-block/parted-3 || ( >=sys-fs/udev-171-r6[gudev,hwdb] =sys-fs/lvm2-2.02.66 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/intltool virtual/pkgconfig
+>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.20 >=dev-libs/libatasmart-0.18 >=sys-auth/polkit-0.104-r1 >=sys-apps/dbus-1.4.20 >=sys-apps/sg3_utils-1.27.20090411 >=sys-block/parted-3 || ( >=sys-fs/udev-171-r6[gudev,hwdb] =sys-fs/lvm2-2.02.66 >=sys-apps/util-linux-2.20.1-r2 virtual/eject remote-access? ( net-dns/avahi )
0
http://hal.freedesktop.org/releases/udisks-1.0.4.tar.gz
diff --git a/metadata/cache/sys-fs/udisks-1.97.0-r1 b/metadata/cache/sys-fs/udisks-1.97.0-r1
index a0a8d38120ae..d896bd3d3282 100644
--- a/metadata/cache/sys-fs/udisks-1.97.0-r1
+++ b/metadata/cache/sys-fs/udisks-1.97.0-r1
@@ -1,5 +1,5 @@
->=dev-libs/glib-2.32 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r5[gudev] =dev-libs/gobject-introspection-1.30 ) systemd? ( >=sys-apps/systemd-44 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/gdbus-codegen-2.32 dev-util/intltool >=sys-kernel/linux-headers-3.1 virtual/pkgconfig doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) !=dev-libs/glib-2.32 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r5[gudev] =dev-libs/gobject-introspection-1.30 ) systemd? ( >=sys-apps/systemd-44 ) >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject crypt? ( sys-fs/cryptsetup ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
+>=dev-libs/glib-2.32 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r6[gudev,hwdb] =dev-libs/gobject-introspection-1.30 ) systemd? ( >=sys-apps/systemd-44 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/gdbus-codegen-2.32 dev-util/intltool >=sys-kernel/linux-headers-3.1 virtual/pkgconfig doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) !=dev-libs/glib-2.32 >=sys-auth/polkit-0.104-r1 >=dev-libs/libatasmart-0.18 || ( >=sys-fs/udev-171-r6[gudev,hwdb] =dev-libs/gobject-introspection-1.30 ) systemd? ( >=sys-apps/systemd-44 ) >=sys-apps/util-linux-2.20.1-r2 >=sys-block/parted-3 virtual/eject crypt? ( sys-fs/cryptsetup ) gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
2
http://udisks.freedesktop.org/releases/udisks-1.97.0.tar.bz2
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r105 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r105
deleted file mode 100644
index 46bcbbfc03b8..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r105
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-2.6.32-r105
-mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-107.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 2.6)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r104 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r108
similarity index 92%
rename from metadata/cache/sys-kernel/hardened-sources-2.6.32-r104
rename to metadata/cache/sys-kernel/hardened-sources-2.6.32-r108
index 73fe05bb427c..665e5b734e71 100644
--- a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r104
+++ b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r108
@@ -1,7 +1,7 @@
!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-2.6.32-r104
-mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-106.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
+2.6.32-r108
+mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-110.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.extras.tar.bz2
binchecks strip
http://www.gentoo.org/proj/en/hardened/
GPL-2 !deblob? ( freedist )
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.17-r1 b/metadata/cache/sys-kernel/hardened-sources-3.2.17-r1
deleted file mode 100644
index c117fe2ae845..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.17-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.2.17-r1
-mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.17-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-14.base.tar.bz2 mirror://gentoo/genpatches-3.2-14.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 3.2)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.2.17 b/metadata/cache/sys-kernel/hardened-sources-3.2.19
similarity index 83%
rename from metadata/cache/sys-kernel/hardened-sources-3.2.17
rename to metadata/cache/sys-kernel/hardened-sources-3.2.19
index cbb895012f56..cae80751114a 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.2.17
+++ b/metadata/cache/sys-kernel/hardened-sources-3.2.19
@@ -1,7 +1,7 @@
!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.2.17
-mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.17-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-14.base.tar.bz2 mirror://gentoo/genpatches-3.2-14.extras.tar.bz2
+3.2.19
+mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.19-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-15.base.tar.bz2 mirror://gentoo/genpatches-3.2-15.extras.tar.bz2
binchecks strip
http://www.gentoo.org/proj/en/hardened/
GPL-2 !deblob? ( freedist )
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.3.6-r1 b/metadata/cache/sys-kernel/hardened-sources-3.3.6-r1
deleted file mode 100644
index 63f509c2a131..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-3.3.6-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.3.6-r1
-mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.6-2.extras.tar.bz2 mirror://gentoo/genpatches-3.3-6.base.tar.bz2 mirror://gentoo/genpatches-3.3-6.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 3.3)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.3.6 b/metadata/cache/sys-kernel/hardened-sources-3.3.8
similarity index 83%
rename from metadata/cache/sys-kernel/hardened-sources-3.3.6
rename to metadata/cache/sys-kernel/hardened-sources-3.3.8
index b33c7aa9aebc..d14b13c9ef27 100644
--- a/metadata/cache/sys-kernel/hardened-sources-3.3.6
+++ b/metadata/cache/sys-kernel/hardened-sources-3.3.8
@@ -1,7 +1,7 @@
!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.3.6
-mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.6-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-6.base.tar.bz2 mirror://gentoo/genpatches-3.3-6.extras.tar.bz2
+3.3.8
+mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-3.3 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.3.N/deblob-check -> deblob-check-3.3 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.3.8-1.extras.tar.bz2 mirror://gentoo/genpatches-3.3-9.base.tar.bz2 mirror://gentoo/genpatches-3.3-9.extras.tar.bz2
binchecks strip
http://www.gentoo.org/proj/en/hardened/
GPL-2 !deblob? ( freedist )
diff --git a/metadata/cache/sys-process/psmisc-22.16 b/metadata/cache/sys-process/psmisc-22.16
index 14271955bc66..f3043166fc4c 100644
--- a/metadata/cache/sys-process/psmisc-22.16
+++ b/metadata/cache/sys-process/psmisc-22.16
@@ -6,7 +6,7 @@ mirror://sourceforge/psmisc/psmisc-22.16.tar.gz
http://psmisc.sourceforge.net/
GPL-2
A set of tools that use the proc filesystem
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
+~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
eutils multilib toolchain-funcs user
ipv6 nls selinux X
diff --git a/metadata/cache/sys-process/psmisc-22.17 b/metadata/cache/sys-process/psmisc-22.17
new file mode 100644
index 000000000000..9d586792bd87
--- /dev/null
+++ b/metadata/cache/sys-process/psmisc-22.17
@@ -0,0 +1,22 @@
+>=sys-libs/ncurses-5.7-r7 nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) >=sys-devel/libtool-2.2.6b nls? ( sys-devel/gettext )
+>=sys-libs/ncurses-5.7-r7 nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
+0
+mirror://sourceforge/psmisc/psmisc-22.17.tar.gz
+
+http://psmisc.sourceforge.net/
+GPL-2
+A set of tools that use the proc filesystem
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
+
+ipv6 nls selinux X
+
+
+
+4
+
+compile configure install
+
+
+
+
+
diff --git a/metadata/cache/virtual/gnustep-back-0.22.0 b/metadata/cache/virtual/gnustep-back-0.22.0
index 4e9e593e4002..e3791db31899 100644
--- a/metadata/cache/virtual/gnustep-back-0.22.0
+++ b/metadata/cache/virtual/gnustep-back-0.22.0
@@ -6,7 +6,7 @@
Virtual for back-end component for the GNUstep GUI Library
-~alpha amd64 ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+~alpha amd64 ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
diff --git a/metadata/cache/www-apache/mod_perl-2.0.7 b/metadata/cache/www-apache/mod_perl-2.0.7
index a6918c4a6cdb..0c7f0a592aba 100644
--- a/metadata/cache/www-apache/mod_perl-2.0.7
+++ b/metadata/cache/www-apache/mod_perl-2.0.7
@@ -1,5 +1,5 @@
->=dev-perl/Apache-Test-1.360 >=virtual/perl-CGI-3.08 dev-lang/perl www-servers/apache || ( www-servers/apache[-threads] dev-lang/perl[ithreads] ) =www-servers/apache-2* dev-lang/perl[-build]
->=dev-perl/Apache-Test-1.360 >=virtual/perl-CGI-3.08 dev-lang/perl www-servers/apache || ( www-servers/apache[-threads] dev-lang/perl[ithreads] ) =www-servers/apache-2* dev-lang/perl[-build]
+=dev-perl/Apache-Test-1.360 >=virtual/perl-CGI-3.08 dev-lang/perl www-servers/apache || ( www-servers/apache[-threads] dev-lang/perl[ithreads] ) =www-servers/apache-2* dev-lang/perl[-build]
+=dev-perl/Apache-Test-1.360 >=virtual/perl-CGI-3.08 dev-lang/perl www-servers/apache || ( www-servers/apache[-threads] dev-lang/perl[ithreads] ) =www-servers/apache-2* dev-lang/perl[-build]
1
mirror://apache/perl/mod_perl-2.0.7.tar.gz
diff --git a/metadata/cache/www-apps/viewvc-1.1.11 b/metadata/cache/www-apps/viewvc-1.1.11
deleted file mode 100644
index 593e1662b65b..000000000000
--- a/metadata/cache/www-apps/viewvc-1.1.11
+++ /dev/null
@@ -1,22 +0,0 @@
-=dev-lang/python-2* >=app-admin/webapp-config-1.50.15
-cvs? ( dev-vcs/rcs ) subversion? ( >=dev-vcs/subversion-1.3.1[python] ) mod_python? ( www-apache/mod_python ) mod_wsgi? ( www-apache/mod_wsgi ) !mod_python? ( !mod_wsgi? ( virtual/httpd-cgi ) ) cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 ) mysql? ( >=dev-python/mysql-python-0.9.0 ) pygments? ( dev-python/pygments ) =dev-lang/python-2* >=app-admin/webapp-config-1.50.15
-0
-http://viewvc.tigris.org/files/documents/3330/49022/viewvc-1.1.11.tar.gz
-
-http://viewvc.org/
-BSD-2
-ViewVC, a web interface to CVS and Subversion
-amd64 ~ppc x86
-confutils eutils multilib python toolchain-funcs user webapp
-cvs cvsgraph mod_python mod_wsgi mysql pygments +subversion vhosts
-
-
-
-3
-
-install postinst postrm prepare prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-apps/viewvc-1.1.12-r1 b/metadata/cache/www-apps/viewvc-1.1.12-r1
deleted file mode 100644
index ca36cfe08ef0..000000000000
--- a/metadata/cache/www-apps/viewvc-1.1.12-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-=dev-lang/python-2* >=app-admin/webapp-config-1.50.15
-cvs? ( dev-vcs/rcs ) subversion? ( >=dev-vcs/subversion-1.3.1[python] ) mod_python? ( www-apache/mod_python ) mod_wsgi? ( www-apache/mod_wsgi ) !mod_python? ( !mod_wsgi? ( virtual/httpd-cgi ) ) cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 ) mysql? ( >=dev-python/mysql-python-0.9.0 ) pygments? ( dev-python/pygments app-misc/mime-types ) =dev-lang/python-2* >=app-admin/webapp-config-1.50.15
-0
-http://viewvc.tigris.org/files/documents/3330/49132/viewvc-1.1.12.tar.gz
-
-http://viewvc.org/
-BSD-2
-ViewVC, a web interface to CVS and Subversion
-~amd64 ~ppc ~x86
-confutils eutils multilib python toolchain-funcs user webapp
-cvs cvsgraph mod_python mod_wsgi mysql pygments +subversion vhosts
-
-
-
-3
-
-install postinst postrm prepare prerm setup
-
-
-
-
-
diff --git a/metadata/cache/x11-base/nouveau-drm-20120605 b/metadata/cache/x11-base/nouveau-drm-20120605
new file mode 100644
index 000000000000..b426fc69e7e1
--- /dev/null
+++ b/metadata/cache/x11-base/nouveau-drm-20120605
@@ -0,0 +1,22 @@
+kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+kernel_linux? ( virtual/modutils )
+0
+mirror://gentoo/nouveau-drm-20120605.tar.gz
+
+http://nouveau.freedesktop.org/
+MIT
+Nouveau DRM Kernel Modules for X11
+~amd64 ~x86
+eutils linux-info linux-mod multilib toolchain-funcs user versionator
+kernel_linux
+
+
+
+2
+
+compile install postinst postrm preinst setup
+
+
+
+
+
diff --git a/metadata/cache/x11-libs/qt-assistant-4.6.3 b/metadata/cache/x11-libs/qt-assistant-4.6.3
index dfc8df22a6be..e4bb17e50bd4 100644
--- a/metadata/cache/x11-libs/qt-assistant-4.6.3
+++ b/metadata/cache/x11-libs/qt-assistant-4.6.3
@@ -1,5 +1,5 @@
~x11-libs/qt-gui-4.6.3[aqua=,debug=,trace?] ~x11-libs/qt-sql-4.6.3[aqua=,debug=,sqlite] ~x11-libs/qt-webkit-4.6.3[aqua=,debug=] virtual/pkgconfig
-~x11-libs/qt-gui-4.6.3[aqua=,debug=,trace?] ~x11-libs/qt-sql-4.6.3[aqua=,debug=,sqlite] ~x11-libs/qt-webkit-4.6.3[aqua=,debug=] !x11-libs/qt-assistant-4.6.3-r9999 !x11-libs/qt-bearer-4.6.3-r9999 !x11-libs/qt-core-4.6.3-r9999 !x11-libs/qt-dbus-4.6.3-r9999 !x11-libs/qt-declarative-4.6.3-r9999 !x11-libs/qt-demo-4.6.3-r9999 !x11-libs/qt-gui-4.6.3-r9999 !x11-libs/qt-multimedia-4.6.3-r9999 !x11-libs/qt-opengl-4.6.3-r9999 !x11-libs/qt-openvg-4.6.3-r9999 !x11-libs/qt-phonon-4.6.3-r9999 !x11-libs/qt-qt3support-4.6.3-r9999 !x11-libs/qt-script-4.6.3-r9999 !x11-libs/qt-sql-4.6.3-r9999 !x11-libs/qt-svg-4.6.3-r9999 !x11-libs/qt-test-4.6.3-r9999 !x11-libs/qt-webkit-4.6.3-r9999 !x11-libs/qt-xmlpatterns-4.6.3-r9999
+~x11-libs/qt-gui-4.6.3[aqua=,debug=,trace?] ~x11-libs/qt-sql-4.6.3[aqua=,debug=,sqlite] ~x11-libs/qt-webkit-4.6.3[aqua=,debug=] !x11-libs/qt-assistant-4.6.3-r9999:4 !x11-libs/qt-bearer-4.6.3-r9999:4 !x11-libs/qt-core-4.6.3-r9999:4 !x11-libs/qt-dbus-4.6.3-r9999:4 !x11-libs/qt-declarative-4.6.3-r9999:4 !x11-libs/qt-demo-4.6.3-r9999:4 !x11-libs/qt-gui-4.6.3-r9999:4 !x11-libs/qt-multimedia-4.6.3-r9999:4 !x11-libs/qt-opengl-4.6.3-r9999:4 !x11-libs/qt-openvg-4.6.3-r9999:4 !x11-libs/qt-phonon-4.6.3-r9999:4 !x11-libs/qt-qt3support-4.6.3-r9999:4 !x11-libs/qt-script-4.6.3-r9999:4 !x11-libs/qt-sql-4.6.3-r9999:4 !x11-libs/qt-svg-4.6.3-r9999:4 !x11-libs/qt-test-4.6.3-r9999:4 !x11-libs/qt-webkit-4.6.3-r9999:4 !x11-libs/qt-xmlpatterns-4.6.3-r9999:4
4
http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz
diff --git a/metadata/cache/x11-libs/qt-assistant-4.7.4 b/metadata/cache/x11-libs/qt-assistant-4.7.4
index 38f0e9d719ae..219c982386ff 100644
--- a/metadata/cache/x11-libs/qt-assistant-4.7.4
+++ b/metadata/cache/x11-libs/qt-assistant-4.7.4
@@ -1,5 +1,5 @@
~x11-libs/qt-gui-4.7.4[aqua=,debug=,glib=,qt3support=,trace?] ~x11-libs/qt-sql-4.7.4[aqua=,debug=,qt3support=,sqlite] ~x11-libs/qt-webkit-4.7.4[aqua=,debug=] ~x11-libs/qt-declarative-4.7.4[debug=,qt3support=] virtual/pkgconfig
-~x11-libs/qt-gui-4.7.4[aqua=,debug=,glib=,qt3support=,trace?] ~x11-libs/qt-sql-4.7.4[aqua=,debug=,qt3support=,sqlite] ~x11-libs/qt-webkit-4.7.4[aqua=,debug=] ~x11-libs/qt-declarative-4.7.4[debug=,qt3support=] !x11-libs/qt-assistant-4.7.4-r9999 !x11-libs/qt-bearer-4.7.4-r9999 !x11-libs/qt-core-4.7.4-r9999 !x11-libs/qt-dbus-4.7.4-r9999 !x11-libs/qt-declarative-4.7.4-r9999 !x11-libs/qt-demo-4.7.4-r9999 !x11-libs/qt-gui-4.7.4-r9999 !x11-libs/qt-multimedia-4.7.4-r9999 !x11-libs/qt-opengl-4.7.4-r9999 !x11-libs/qt-openvg-4.7.4-r9999 !x11-libs/qt-phonon-4.7.4-r9999 !x11-libs/qt-qt3support-4.7.4-r9999 !x11-libs/qt-script-4.7.4-r9999 !x11-libs/qt-sql-4.7.4-r9999 !x11-libs/qt-svg-4.7.4-r9999 !x11-libs/qt-test-4.7.4-r9999 !x11-libs/qt-webkit-4.7.4-r9999 !x11-libs/qt-xmlpatterns-4.7.4-r9999
+~x11-libs/qt-gui-4.7.4[aqua=,debug=,glib=,qt3support=,trace?] ~x11-libs/qt-sql-4.7.4[aqua=,debug=,qt3support=,sqlite] ~x11-libs/qt-webkit-4.7.4[aqua=,debug=] ~x11-libs/qt-declarative-4.7.4[debug=,qt3support=] !x11-libs/qt-assistant-4.7.4-r9999:4 !x11-libs/qt-bearer-4.7.4-r9999:4 !x11-libs/qt-core-4.7.4-r9999:4 !x11-libs/qt-dbus-4.7.4-r9999:4 !x11-libs/qt-declarative-4.7.4-r9999:4 !x11-libs/qt-demo-4.7.4-r9999:4 !x11-libs/qt-gui-4.7.4-r9999:4 !x11-libs/qt-multimedia-4.7.4-r9999:4 !x11-libs/qt-opengl-4.7.4-r9999:4 !x11-libs/qt-openvg-4.7.4-r9999:4 !x11-libs/qt-phonon-4.7.4-r9999:4 !x11-libs/qt-qt3support-4.7.4-r9999:4 !x11-libs/qt-script-4.7.4-r9999:4 !x11-libs/qt-sql-4.7.4-r9999:4 !x11-libs/qt-svg-4.7.4-r9999:4 !x11-libs/qt-test-4.7.4-r9999:4 !x11-libs/qt-webkit-4.7.4-r9999:4 !x11-libs/qt-xmlpatterns-4.7.4-r9999:4
4
http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
diff --git a/metadata/cache/x11-libs/qt-assistant-4.8.1-r1 b/metadata/cache/x11-libs/qt-assistant-4.8.1-r1
index 451b940ae304..ca350d3b9058 100644
--- a/metadata/cache/x11-libs/qt-assistant-4.8.1-r1
+++ b/metadata/cache/x11-libs/qt-assistant-4.8.1-r1
@@ -1,5 +1,5 @@
~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.1[aqua=,c++0x=,debug=,qpa=] ) virtual/pkgconfig
-~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.1[aqua=,c++0x=,debug=,qpa=] ) !x11-libs/qt-assistant-4.8.1-r9999 !x11-libs/qt-bearer-4.8.1-r9999 !x11-libs/qt-core-4.8.1-r9999 !x11-libs/qt-dbus-4.8.1-r9999 !x11-libs/qt-declarative-4.8.1-r9999 !x11-libs/qt-demo-4.8.1-r9999 !x11-libs/qt-gui-4.8.1-r9999 !x11-libs/qt-multimedia-4.8.1-r9999 !x11-libs/qt-opengl-4.8.1-r9999 !x11-libs/qt-openvg-4.8.1-r9999 !x11-libs/qt-phonon-4.8.1-r9999 !x11-libs/qt-qt3support-4.8.1-r9999 !x11-libs/qt-script-4.8.1-r9999 !x11-libs/qt-sql-4.8.1-r9999 !x11-libs/qt-svg-4.8.1-r9999 !x11-libs/qt-test-4.8.1-r9999 !x11-libs/qt-webkit-4.8.1-r9999 !x11-libs/qt-xmlpatterns-4.8.1-r9999
+~x11-libs/qt-gui-4.8.1[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.1[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.1[aqua=,c++0x=,debug=,qpa=] ) !x11-libs/qt-assistant-4.8.1-r9999:4 !x11-libs/qt-bearer-4.8.1-r9999:4 !x11-libs/qt-core-4.8.1-r9999:4 !x11-libs/qt-dbus-4.8.1-r9999:4 !x11-libs/qt-declarative-4.8.1-r9999:4 !x11-libs/qt-demo-4.8.1-r9999:4 !x11-libs/qt-gui-4.8.1-r9999:4 !x11-libs/qt-multimedia-4.8.1-r9999:4 !x11-libs/qt-opengl-4.8.1-r9999:4 !x11-libs/qt-openvg-4.8.1-r9999:4 !x11-libs/qt-phonon-4.8.1-r9999:4 !x11-libs/qt-qt3support-4.8.1-r9999:4 !x11-libs/qt-script-4.8.1-r9999:4 !x11-libs/qt-sql-4.8.1-r9999:4 !x11-libs/qt-svg-4.8.1-r9999:4 !x11-libs/qt-test-4.8.1-r9999:4 !x11-libs/qt-webkit-4.8.1-r9999:4 !x11-libs/qt-xmlpatterns-4.8.1-r9999:4
4
http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.1.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
diff --git a/metadata/cache/x11-libs/qt-assistant-4.8.2 b/metadata/cache/x11-libs/qt-assistant-4.8.2
index 5053fe3e719a..6131d118a354 100644
--- a/metadata/cache/x11-libs/qt-assistant-4.8.2
+++ b/metadata/cache/x11-libs/qt-assistant-4.8.2
@@ -1,5 +1,5 @@
~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.2[aqua=,c++0x=,debug=,qpa=] ) virtual/pkgconfig
-~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.2[aqua=,c++0x=,debug=,qpa=] ) !x11-libs/qt-assistant-4.8.2-r9999 !x11-libs/qt-bearer-4.8.2-r9999 !x11-libs/qt-core-4.8.2-r9999 !x11-libs/qt-dbus-4.8.2-r9999 !x11-libs/qt-declarative-4.8.2-r9999 !x11-libs/qt-demo-4.8.2-r9999 !x11-libs/qt-gui-4.8.2-r9999 !x11-libs/qt-multimedia-4.8.2-r9999 !x11-libs/qt-opengl-4.8.2-r9999 !x11-libs/qt-openvg-4.8.2-r9999 !x11-libs/qt-phonon-4.8.2-r9999 !x11-libs/qt-qt3support-4.8.2-r9999 !x11-libs/qt-script-4.8.2-r9999 !x11-libs/qt-sql-4.8.2-r9999 !x11-libs/qt-svg-4.8.2-r9999 !x11-libs/qt-test-4.8.2-r9999 !x11-libs/qt-webkit-4.8.2-r9999 !x11-libs/qt-xmlpatterns-4.8.2-r9999
+~x11-libs/qt-gui-4.8.2[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?] ~x11-libs/qt-sql-4.8.2[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite] webkit? ( ~x11-libs/qt-webkit-4.8.2[aqua=,c++0x=,debug=,qpa=] ) !x11-libs/qt-assistant-4.8.2-r9999:4 !x11-libs/qt-bearer-4.8.2-r9999:4 !x11-libs/qt-core-4.8.2-r9999:4 !x11-libs/qt-dbus-4.8.2-r9999:4 !x11-libs/qt-declarative-4.8.2-r9999:4 !x11-libs/qt-demo-4.8.2-r9999:4 !x11-libs/qt-gui-4.8.2-r9999:4 !x11-libs/qt-multimedia-4.8.2-r9999:4 !x11-libs/qt-opengl-4.8.2-r9999:4 !x11-libs/qt-openvg-4.8.2-r9999:4 !x11-libs/qt-phonon-4.8.2-r9999:4 !x11-libs/qt-qt3support-4.8.2-r9999:4 !x11-libs/qt-script-4.8.2-r9999:4 !x11-libs/qt-sql-4.8.2-r9999:4 !x11-libs/qt-svg-4.8.2-r9999:4 !x11-libs/qt-test-4.8.2-r9999:4 !x11-libs/qt-webkit-4.8.2-r9999:4 !x11-libs/qt-xmlpatterns-4.8.2-r9999:4
4
http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
diff --git a/metadata/cache/x11-libs/qt-bearer-4.8.1 b/metadata/cache/x11-libs/qt-bearer-4.8.1
index 9877e7e2f51f..54a4cd24d496 100644
--- a/metadata/cache/x11-libs/qt-bearer-4.8.1
+++ b/metadata/cache/x11-libs/qt-bearer-4.8.1
@@ -1,5 +1,5 @@
~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] connman? ( ~x11-libs/qt-dbus-4.8.1[aqua=,c++0x=,debug=,qpa=] ) networkmanager? ( ~x11-libs/qt-dbus-4.8.1[aqua=,c++0x=,debug=,qpa=] ) virtual/pkgconfig
-~x11-libs/qt-core-4.8.1[aqua=,c++0x=,debug=,qpa=] connman? ( ~x11-libs/qt-dbus-4.8.1[aqua=,c++0x=,debug=,qpa=] ) networkmanager? ( ~x11-libs/qt-dbus-4.8.1[aqua=,c++0x=,debug=,qpa=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) !x11-libs/qt-assistant-4.8.1-r9999 !x11-libs/qt-bearer-4.8.1-r9999 !x11-libs/qt-core-4.8.1-r9999 !x11-libs/qt-dbus-4.8.1-r9999 !x11-libs/qt-declarative-4.8.1-r9999 !x11-libs/qt-demo-4.8.1-r9999 !