diff --git a/app-admin/eselect-awk/eselect-awk-0.2.ebuild b/app-admin/eselect-awk/eselect-awk-0.2.ebuild
index ba18bb1a71be..e187c5535477 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.5 2012/07/06 02:45:43 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-awk/eselect-awk-0.2.ebuild,v 1.6 2012/07/09 08:28:22 naota 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 ~arm ~hppa ~x86 ~x86-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~x86-macos"
IUSE=""
src_install() {
diff --git a/app-arch/atool/atool-0.39.0.ebuild b/app-arch/atool/atool-0.39.0.ebuild
index 3151077981a3..2c61f4a2ff7b 100644
--- a/app-arch/atool/atool-0.39.0.ebuild
+++ b/app-arch/atool/atool-0.39.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/app-arch/atool/atool-0.39.0.ebuild,v 1.2 2012/07/08 23:29:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/atool/atool-0.39.0.ebuild,v 1.3 2012/07/09 11:51:58 ago Exp $
EAPI="4"
@@ -10,7 +10,7 @@ SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/app-crypt/md5deep/md5deep-4.0.1.ebuild b/app-crypt/md5deep/md5deep-4.0.1.ebuild
index c37e8c6b125b..84b0b0c9c130 100644
--- a/app-crypt/md5deep/md5deep-4.0.1.ebuild
+++ b/app-crypt/md5deep/md5deep-4.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/app-crypt/md5deep/md5deep-4.0.1.ebuild,v 1.3 2012/03/24 19:32:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/md5deep/md5deep-4.0.1.ebuild,v 1.4 2012/07/09 11:54:00 ago Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="public-domain GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
DOCS="AUTHORS ChangeLog FILEFORMAT NEWS README TODO"
diff --git a/app-doc/root-docs/root-docs-5.32.03.ebuild b/app-doc/root-docs/root-docs-5.32.03.ebuild
index c493b06c5f27..a494dd1b0462 100644
--- a/app-doc/root-docs/root-docs-5.32.03.ebuild
+++ b/app-doc/root-docs/root-docs-5.32.03.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-doc/root-docs/root-docs-5.32.03.ebuild,v 1.2 2012/07/06 15:31:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.32.03.ebuild,v 1.3 2012/07/09 11:46:01 ago Exp $
EAPI=4
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
KEYWORDS=""
else
SRC_URI="ftp://root.cern.ch/${ROOT_PN}/${ROOT_PN}_v${PV}.source.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
fi
inherit eutils multilib toolchain-funcs virtualx
diff --git a/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild b/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild
index d823c7751dbb..ac3e3af4ba18 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-1.1.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/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild,v 1.6 2012/07/08 22:57:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild,v 1.8 2012/07/09 07:33:24 cardoe Exp $
EAPI="4"
@@ -292,12 +292,12 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${ED}" install || die "make install failed"
+ emake DESTDIR="${ED}" install
if [[ -n ${softmmu_targets} ]]; then
if use kernel_linux; then
insinto /lib/udev/rules.d/
- doins "${FILESDIR}"/65-kvm.rules || die
+ doins "${FILESDIR}"/65-kvm.rules
fi
if use qemu_softmmu_targets_x86_64 ; then
@@ -311,14 +311,15 @@ src_install() {
fi
fi
- dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
- newdoc pc-bios/README README.pc-bios || die
- dohtml qemu-doc.html qemu-tech.html || die
+ dodoc Changelog MAINTAINERS TODO pci-ids.txt
+ newdoc pc-bios/README README.pc-bios
- if use python; then
- dobin scripts/kvm/kvm_stat || die
+ if use doc; then
+ dohtml qemu-doc.html qemu-tech.html || die
fi
+ use python & dobin scripts/kvm/kvm_stat
+
# FIXME: Need to come up with a solution for non-x86 based systems
if use x86 || use amd64; then
# Remove SeaBIOS since we're using the SeaBIOS packaged one
@@ -340,7 +341,6 @@ src_install() {
}
pkg_postinst() {
-
if [[ -n ${softmmu_targets} ]]; then
elog "If you don't have kvm compiled into the kernel, make sure you have"
elog "the kernel module loaded before running kvm. The easiest way to"
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 9fac21fb3b23..4a4d36ebf7bc 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.41 2012/07/08 22:57:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.42 2012/07/09 07:33:24 cardoe Exp $
EAPI="4"
@@ -313,7 +313,11 @@ src_install() {
dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
newdoc pc-bios/README README.pc-bios || die
- dohtml qemu-doc.html qemu-tech.html || die
+
+
+ if use doc; then
+ dohtml qemu-doc.html qemu-tech.html || die
+ fi
if use python; then
dobin scripts/kvm/kvm_stat || die
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 65ff4bde1368..51b9b5d74539 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -2,6 +2,4 @@ DIST libstemmer_c-20091122.tgz 129207 SHA256 ad4e152379214480d599c86dd19421a36fc
DIST libstemmer_c.tgz 129518 SHA256 ac2ef71ae205260fc229c8c33c1dd94e8ac8ad7ce0f767566ec9ebcf1c79df0f SHA512 a05070043cf07bf4e0b86c50d36463092d33864a693df1f00b955451e5267c09e7d62f686f940ec39a1c2f3c2b810788d2b931ba2fc2728455ee795a1c39e83e WHIRLPOOL eaa0e9994df06e4bd919874edadfaa5d14ae8417bb53db058dcb143a33ef7db139d5ad25ddc6720e4f0296bfffd93cb83dd8c9ac94318e98219eb0e6c5c3e48c
DIST sphinx-0.9.8.1.tar.gz 949660 SHA256 ef69b2b52381173da92bf2df79dfc8c5271c4b3f156c356bb4ef82ca035dc013 SHA512 dc2c2b1c85fe59ca03584fc25e8803bbd8bfb22a9f7e959474c9a09f2a2f50f36f45c168fd730c7d9e92f006cab3d67a0e433f490aa61c277729d2789be5f4e5 WHIRLPOOL 767cbe02dbe62af3b37cc0a30c2b7546ed64f629441cdfb757cab69901b0c6401c366b613d8d629a374143e96e1cb7aa4dc86bdafbb1ac5963020089cd524974
DIST sphinx-0.9.9.tar.gz 1218359 SHA256 bf8f55ffc095ff6b628f0cbc7eb54761811140140679a1c869cc1b17c42803e4 SHA512 bf1f6b3429beac9336ed975137b9cc582541357df487ae97f407589458fa4cc4f3a797c868fd505c6b4e97a73b30a0f7f9c7ab6b3d8685ba173fde6d1d5383c2 WHIRLPOOL 70a7db079e35671c17f1c29d71569c4b643462475b10dbed6342a74ed20304ea740e442fb97af874fb3acc3cb9eb8a07ff43aa90dc90c9cf477fb1d651ced021
-DIST sphinx-1.10-beta.tar.gz 1518778 SHA256 51b3e5f3254b4d93d6dce91a44451486e5b0f82a1e44799481158e1f95fc1c60 SHA512 9113bea27192125a7fa2c9396ff17e18599610ed8483f1275a53cbeddcf3b12686e2cf2a788372a6786ff9eabd9e6799e17daad7b2a58f165cdc57d2babc720c WHIRLPOOL d84fd25e9893afe777123cc3982412e09c783b772617ab88f55309d5bc6f201a30a639c8beceda4ec9daed187762d5e3b9a9f0128a50fe5e6eaf78eda6b5b9f5
-DIST sphinx-2.0.3-release.tar.gz 1923911 SHA256 875af63473875b7c7e152e85ed34bd1a92d09db062a289b594bf049b3a8c82dd SHA512 8e10d4e661da463eedc23011f4056a5094fe9408ede63229feab35202a2201ec38aea0ef6bb70bc20fea4b3e1c5e153495dcd0cfdddb5e817a5fec061db55513 WHIRLPOOL 6c0fc9da745b7049a0dacdb95ca9ff6be816736d260303909e60087331d1ea95e507a2877006ac17f48da25abe52c7af4952f0e7ae163ff50d3427960ab41de2
DIST sphinx-2.0.4-release.tar.gz 1938089 SHA256 43c4b62949d8fbd2b6ba93e20cb0f35c14f428be501af47e75a3ef713efa2886 SHA512 34bc6718328f9aad3ad8f081c67bee292af70827cc6d27e9f69198a5a5245fb2d5d76467c1bbea6ff1b4b45b249c302e844c7ce3c2976b103b80fc6a8013f567 WHIRLPOOL 79b564a5888fd7f485a8304b24ae38fdab6423fdec80355e8df5807d289de35b0b1b3aecf1f0ebd5a7c078111400a494ce736e29539f66ba2253911650fb6bfd
diff --git a/app-misc/sphinx/sphinx-0.9.9-r2.ebuild b/app-misc/sphinx/sphinx-0.9.9-r2.ebuild
deleted file mode 100644
index 50c201aebcdd..000000000000
--- a/app-misc/sphinx/sphinx-0.9.9-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.9-r2.ebuild,v 1.3 2010/12/21 19:09:12 graaff Exp $
-
-EAPI=3
-inherit eutils autotools
-
-MY_P=${P/_/-}
-
-# This has been added by Gentoo, to explicitly version libstemmer.
-# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
-# fetched.
-STEMMER_PV="20091122"
-DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
-HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/downloads/${MY_P}.tar.gz
- stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
-IUSE="debug id64 mysql postgres stemmer test"
-
-RDEPEND="mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql-base )
- virtual/libiconv"
-DEPEND="${RDEPEND}
- test? ( dev-lang/php )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
- if use stemmer; then
- cd "${S}"
- unpack libstemmer_c-${STEMMER_PV}.tgz
- fi
-}
-
-src_prepare() {
- # drop nasty hardcoded search path breaking Prefix
- sed -i -e '/\/usr\/local\//d' configure.ac || die
-
- # fix for upstream building bug #468
- sed -i -e '270,290s/void sock_close/static void sock_close/' \
- api/libsphinxclient/sphinxclient.c || die
-
- eautoreconf
-
- cd api/libsphinxclient || die
- eautoreconf
-}
-
-src_configure() {
- # fix libiconv detection
- use !elibc_glibc && export ac_cv_search_iconv=-liconv
-
- econf \
- --sysconfdir="${EPREFIX}/etc/${PN}" \
- $(use_enable id64) \
- $(use_with debug) \
- $(use_with mysql) \
- $(use_with postgres pgsql) \
- $(use_with stemmer libstemmer)
-
- cd api/libsphinxclient || die
- econf STRIP=:
-}
-
-src_compile() {
- emake || die "emake failed"
-
- emake -j1 -C api/libsphinxclient || die "emake libsphinxclient failed"
-}
-
-src_test() {
- elog "Tests require access to a live MySQL database and may require configuration."
- elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- emake -C api/libsphinxclient DESTDIR="${D}" install || die "install failed"
-
- dodoc doc/*
-
- dodir /var/lib/sphinx
- dodir /var/log/sphinx
- dodir /var/run/sphinx
-
- newinitd "${FILESDIR}"/searchd.rc searchd
-
- if use test; then
- insinto /usr/share/${PN}
- doins -r test || die "install of test files failed."
- fi
-}
diff --git a/app-misc/sphinx/sphinx-1.10_beta-r1.ebuild b/app-misc/sphinx/sphinx-1.10_beta-r1.ebuild
deleted file mode 100644
index e31962cd20f1..000000000000
--- a/app-misc/sphinx/sphinx-1.10_beta-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-1.10_beta-r1.ebuild,v 1.3 2010/12/21 19:09:12 graaff Exp $
-
-EAPI=3
-inherit eutils autotools
-
-MY_P=${P/_/-}
-
-# This has been added by Gentoo, to explicitly version libstemmer.
-# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
-# fetched.
-STEMMER_PV="20091122"
-DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
-HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/downloads/${MY_P}.tar.gz
- stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
-IUSE="debug id64 mysql odbc postgres stemmer test"
-
-RDEPEND="mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql-base )
- odbc? ( dev-db/unixODBC )
- virtual/libiconv"
-DEPEND="${RDEPEND}
- test? ( dev-lang/php )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
- if use stemmer; then
- cd "${S}"
- unpack libstemmer_c-${STEMMER_PV}.tgz
- fi
-}
-
-src_prepare() {
- # drop nasty hardcoded search path breaking Prefix
- sed -i -e '/\/usr\/local\//d' configure.ac || die
-
- epatch "${FILESDIR}"/${P}-nosigpipe.patch
- epatch "${FILESDIR}"/${P}-darwin8.patch
- epatch "${FILESDIR}"/${P}-libsphinxclient-darwin.patch
-
- eautoreconf
-
- cd api/libsphinxclient || die
- eautoreconf
-}
-
-src_configure() {
- # fix libiconv detection
- use !elibc_glibc && export ac_cv_search_iconv=-liconv
-
- econf \
- --sysconfdir="${EPREFIX}/etc/${PN}" \
- $(use_enable id64) \
- $(use_with debug) \
- $(use_with mysql) \
- $(use_with odbc unixodbc) \
- $(use_with postgres pgsql) \
- $(use_with stemmer libstemmer)
-
- cd api/libsphinxclient || die
- econf STRIP=:
-}
-
-src_compile() {
- emake || die "emake failed"
-
- emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
-}
-
-src_test() {
- elog "Tests require access to a live MySQL database and may require configuration."
- elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
-
- dodoc doc/*
-
- dodir /var/lib/sphinx
- dodir /var/log/sphinx
- dodir /var/run/sphinx
-
- newinitd "${FILESDIR}"/searchd.rc searchd
-
- if use test; then
- insinto /usr/share/${PN}
- doins -r test || die "install of test files failed."
- fi
-}
diff --git a/app-misc/sphinx/sphinx-2.0.3.ebuild b/app-misc/sphinx/sphinx-2.0.3.ebuild
deleted file mode 100644
index 31cdc2f294f5..000000000000
--- a/app-misc/sphinx/sphinx-2.0.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.0.3.ebuild,v 1.1 2011/12/30 07:08:56 graaff Exp $
-
-EAPI=4
-inherit eutils autotools
-
-#MY_P=${P/_/-}
-MY_P=${P}-release
-
-# This has been added by Gentoo, to explicitly version libstemmer.
-# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
-# fetched.
-STEMMER_PV="20091122"
-DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
-HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz
- stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug id64 mysql odbc postgres stemmer test"
-
-RDEPEND="mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql-base )
- odbc? ( dev-db/unixODBC )
- virtual/libiconv"
-DEPEND="${RDEPEND}
- test? ( dev-lang/php )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
- if use stemmer; then
- cd "${S}"
- unpack libstemmer_c-${STEMMER_PV}.tgz
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
-
- # drop nasty hardcoded search path breaking Prefix
- sed -i -e '/\/usr\/local\//d' configure.ac || die
-
- # Regenerate autoconf files in the api directory first to avoid
- # running elibtoolize twice, which results in a warning.
- pushd api/libsphinxclient || die
- eautoreconf
- popd || die
-
- eautoreconf
-}
-
-src_configure() {
- # fix libiconv detection
- use !elibc_glibc && export ac_cv_search_iconv=-liconv
-
- econf \
- --sysconfdir="${EPREFIX}/etc/${PN}" \
- $(use_enable id64) \
- $(use_with debug) \
- $(use_with mysql) \
- $(use_with odbc unixodbc) \
- $(use_with postgres pgsql) \
- $(use_with stemmer libstemmer)
-
- cd api/libsphinxclient || die
- econf STRIP=:
-}
-
-src_compile() {
- emake || die "emake failed"
-
- emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
-}
-
-src_test() {
- elog "Tests require access to a live MySQL database and may require configuration."
- elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
-
- dodoc doc/*
-
- dodir /var/lib/sphinx
- dodir /var/log/sphinx
- dodir /var/run/sphinx
-
- newinitd "${FILESDIR}"/searchd.rc searchd
-
- if use test; then
- insinto /usr/share/${PN}
- doins -r test
- fi
-}
diff --git a/dev-embedded/qvfb/Manifest b/dev-embedded/qvfb/Manifest
deleted file mode 100644
index 2745c7955280..000000000000
--- a/dev-embedded/qvfb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768 SHA512 1a9af3697a42d9f3da7f8ea538d9a4b66327b3ba3b6796ff099e076d5873d04ddef6c722609a6eb18444d38e97ed0b79f0bf6c20963bc2395a2541c7884cecf9 WHIRLPOOL 06f6dd32341d027cdbc964ff24aa3f1a35d5030b7040760cdf92c9d58b6a25fa03a53525eef615154067be60a018de4d370bf3a37877aa775d748711cf05b4ea
diff --git a/dev-embedded/qvfb/metadata.xml b/dev-embedded/qvfb/metadata.xml
deleted file mode 100644
index 3554c70b4e8d..000000000000
--- a/dev-embedded/qvfb/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-maintainer-needed@gentoo.org
-
-
-
-
-
-
diff --git a/dev-embedded/qvfb/qvfb-4.6.3.ebuild b/dev-embedded/qvfb/qvfb-4.6.3.ebuild
deleted file mode 100644
index 0f66db25cf43..000000000000
--- a/dev-embedded/qvfb/qvfb-4.6.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/qvfb/qvfb-4.6.3.ebuild,v 1.4 2012/04/02 20:33:44 pacho Exp $
-
-EAPI="2"
-inherit qt4-build
-
-DESCRIPTION="The Qt Embedded Virtual Framebuffer emulator."
-HOMEPAGE="http://www.trolltech.com/"
-SLOT="4"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND="~x11-libs/qt-gui-${PV}"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="tools/qvfb"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt/
- include/QtCore/
- include/QtGui/
- src/corelib/
- src/gui/
- tools/shared/"
-
-src_configure() {
- myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
- -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
- -no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
- -no-glib -no-qt3support -no-svg"
-
- qt4-build_src_configure
-}
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 01380a699ce5..f0d9f6cf5a25 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,8 +1,8 @@
-DIST j2sdk-1_4_2-doc.zip 34397778 RMD160 0c7646893ee73988327ebd97bf9ff6469c0bb7ff SHA1 498cbabb3cfa9e130dce1bed521effd7431ff3d7 SHA256 5d7ef04d1a9fa721f03eca7751f8eaaebd0de2d629ff90dc1a0d5628bc64ba58
-DIST jdk-1_5_0-doc-r1.zip 46191338 RMD160 d783f2175f84d76f867b7358705a2819be5afb68 SHA1 86e30770a4ecc395bf8fbaea1bdef4d2a81df877 SHA256 accb7b36442ac5bed7a3091abedf4e29ba06e23b541f4faa1d0632a3d02053cc
-DIST jdk-6u23-docs.zip 59091378 RMD160 53cc2df0421c4df8b255f554f6392e2fe73a2ea3 SHA1 a02d675d2b84071802e12c8c6a5fb660b4f46a91 SHA256 f984291527fbfd0776ee1fe81f8b1ad3887c54cd2c3118d5011a7a316b29eba0
-DIST jdk-6u25-fcs-bin-b04-apidocs-04_Apr_2011.zip 59089445 RMD160 6cb9ed6b279f8281a2e0b3b18aae410e7cb3dddd SHA1 315f451015f24ebe72eead9bb40ab78ee935dd58 SHA256 6e115142c3cf5627f9a378934bf3b807e72c2b979385019d5f23e79019727937
-DIST jdk-6u30-apidocs.zip 59086542 RMD160 3a3057cf0b9134863e5dc97f4a55616c826c5e31 SHA1 2bcfc13888a8a6183f7bc40068fa326ddb4a7f62 SHA256 92739c56e02fa6e7ac8d60a1f59a0ef4a59ac99ab2979d3cdc495bfecf1a50ab
-DIST jdk-7-fcs-bin-b147-apidocs-27_jun_2011.zip 60393207 RMD160 95036337f5639816b0480d6a2129efebefa537a5 SHA1 9e1ac9b48af57fd01eb627e5c8b5b96cc35f854c SHA256 2220fbe8399f851672d37cf1451400db137d9c27a4a02976df625de21a13cc4e
-DIST jdk-7u2-apidocs.zip 60351373 RMD160 fe2a3819a3dfb8f87380d1b561750e29fab15108 SHA1 1d009713386a88dc82cdbbc7a845d76f587f93de SHA256 85960d0d70ebf981bdb6e8e19b462821120f7d6735975b102c5d5bf26a9b3124
-DIST jdk-7u4-apidocs.zip 60313792 RMD160 23e8ca1905b0740e650f984618b31b63888db1fe SHA1 b816ec16e30f4c687c36480ace186856b059726e SHA256 52db8b927396582319019e1c02b254ea5c3a113b17aca49f2fad286d64c35a0c
+DIST j2sdk-1_4_2-doc.zip 34397778 SHA256 5d7ef04d1a9fa721f03eca7751f8eaaebd0de2d629ff90dc1a0d5628bc64ba58
+DIST jdk-1_5_0-doc-r1.zip 46191338 SHA256 accb7b36442ac5bed7a3091abedf4e29ba06e23b541f4faa1d0632a3d02053cc
+DIST jdk-6u23-docs.zip 59091378 SHA256 f984291527fbfd0776ee1fe81f8b1ad3887c54cd2c3118d5011a7a316b29eba0
+DIST jdk-6u25-fcs-bin-b04-apidocs-04_Apr_2011.zip 59089445 SHA256 6e115142c3cf5627f9a378934bf3b807e72c2b979385019d5f23e79019727937
+DIST jdk-6u30-apidocs.zip 59086542 SHA256 92739c56e02fa6e7ac8d60a1f59a0ef4a59ac99ab2979d3cdc495bfecf1a50ab SHA512 5139b1a65765f258f21c629a0cfbf07aed0c12b3eb08d4615b049e825abd90c5b3385af99dba3a4ac6e0a94a5ffaa32ee648fb3e7ac1815ec6b74fe0d8e9f0ee WHIRLPOOL 941236c68b189f9cd23f0e904cc01da9f87cc39967c84cddf4c20a04fa2872eb99af147a21bb770320cad28b2cd86205402a141f7217d5301fa9a6ea41c3a136
+DIST jdk-7-fcs-bin-b147-apidocs-27_jun_2011.zip 60393207 SHA256 2220fbe8399f851672d37cf1451400db137d9c27a4a02976df625de21a13cc4e
+DIST jdk-7u2-apidocs.zip 60351373 SHA256 85960d0d70ebf981bdb6e8e19b462821120f7d6735975b102c5d5bf26a9b3124
+DIST jdk-7u4-apidocs.zip 60313792 SHA256 52db8b927396582319019e1c02b254ea5c3a113b17aca49f2fad286d64c35a0c SHA512 30b0d527faf9d27b2c10796b1c20a4612a3eef42f93e89cedfbe8b70d8aeb62886801de2313369fedd4a5858ff69978f33633a033fef80edc96b1acc35f0666b WHIRLPOOL 7f8a5ba2ea3b39a06790778e708df3c6f49983e7e44af2d230b173154df3f8c81f29dbb529801102bbe3cba66dc91a77ae8795a2c486bb46c691c41f7a5f7b41
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.4.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.4.ebuild
index 59a5fc0db00b..fa9cc985b9f7 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.4.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.4.ebuild,v 1.1 2012/05/22 19:47:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.4.ebuild,v 1.2 2012/07/09 07:12:15 jdhore Exp $
ORIG_NAME="jdk-7u4-apidocs.zip"
SRC_URI="${ORIG_NAME}"
@@ -9,7 +9,7 @@ DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
HOMEPAGE="http://download.oracle.com/javase/7/docs/"
LICENSE="oracle-java-documentation-7"
SLOT="1.7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="app-arch/unzip"
RDEPEND=""
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 23a6025885be..6f12710664a2 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,37 +1,37 @@
-DIST UnlimitedJCEPolicyJDK7.zip 7426 RMD160 a4a6a284579f43d2df3532d279e143d2f03c2c3f SHA1 7d3c9ee89536b82cd21c680088b1bced16017253 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d
-DIST jdk-7u3-linux-i586-demos.tar.gz 13978883 RMD160 3ef1288f337196592f1a7759d559887197384b22 SHA1 82d6569369c972e4b2f5b9ecbc372a05317377ac SHA256 1a273f9da4f9a8f3cd44de5715cb2621e08688dadb9bd33449c26c7e1b438486
-DIST jdk-7u3-linux-i586.tar.gz 82477042 RMD160 f951b31d576008773e803b14187d306b5dfc85f5 SHA1 15c97191c8fd58d74f36e84eb4f65371be573cf3 SHA256 798a3ea1d390358bdc01911d9aab7da1ff887157b56becc0e07e6f2c031f9ded
-DIST jdk-7u3-linux-x64-demos.tar.gz 13981665 RMD160 f907fd60708af75a99a7da1e7ae1cbc52e0e4834 SHA1 7005ec0135c709a206afb2d7e3d52336a3db3a66 SHA256 127d92ffaaf4a006870ce7fab85f2f202fddc52222b75de805f7fc8bc0d3a6ea
-DIST jdk-7u3-linux-x64.tar.gz 81056556 RMD160 4019c85f4c1b056c937ded7e2140f94668a165ea SHA1 163fdfddfb7a4d6df1181acffed17aa7aab6835b SHA256 28ff4bc3194617e0f6144013b1ca391b279804170e297faa6879963424846c2d
-DIST jdk-7u3-solaris-i586-demos.tar.gz 14008396 RMD160 717d8c23f5dfd24772dbecd385e8cfdad21a76ab SHA1 4fcfa7c4ace8b99aa6141bcb3b6ac165cf63116d SHA256 ee0950b40880b20432721e240eb11614bf958d833c715d8bf479a21218c826db
-DIST jdk-7u3-solaris-i586.tar.gz 85353101 RMD160 8ffa7c0875640793a0c714206ecf04f645bb5cc4 SHA1 3652dc7ccdc33d5e976cd72cf64cbfa3cc6ff70e SHA256 6fef2459d8dc9ebf91cb461fd9009b40806e00a06f6755af163af3ec0b06bb7e
-DIST jdk-7u3-solaris-sparc-demos.tar.gz 14050356 RMD160 dace2fb1e8585d1c990acf4efd4bdbb91ef684bf SHA1 84c0a0b28b748d0bf71e3efe13a4611bda6438dc SHA256 45d34d6127c991928e342b90d38de9f6a552841f2e34a4c020a19039844d87e0
-DIST jdk-7u3-solaris-sparc.tar.gz 90248080 RMD160 c6576a1ac596d4acdeb534bfd467c2f7969b75ed SHA1 a93d24eba0b559f1de298402765b5013c7d3234c SHA256 73367138ea28ee3ba21b2f52c0c61a7f4aa0eb9d12042bf2c5788cc7e6e4b9d2
-DIST jdk-7u3-solaris-sparcv9-demos.tar.gz 199207 RMD160 9d5aceb3d9f7fa0135175e3521202fe8fe387126 SHA1 2b9384e53eb436bed083660c415d506e829548e3 SHA256 a0bb2483d65eae0faafb5ce61dc8ff5ec8e6fabb7c5a217c0c64822abed5b517
-DIST jdk-7u3-solaris-sparcv9.tar.gz 12904146 RMD160 cf8460e1ae7d2e66a59ac757501aaa4ec4c5389f SHA1 b87af612e7dc095445a33b6692501a2210be8e43 SHA256 04811e46ece37dd99c874b9998cbc9251dd886c5ffe1536548b396b8c51f5dc9
-DIST jdk-7u3-solaris-x64-demos.tar.gz 186051 RMD160 0003fcca02d1d6a8c2970941bea64ee9ab8f2d67 SHA1 8742a6cc3fc9a0989839da1a8b862730f9047361 SHA256 063cf73e7d5b366c8de33f8af7ad01895eabf9b146458cf497c0015f4bf9faa0
-DIST jdk-7u3-solaris-x64.tar.gz 9702437 RMD160 81427666473e5491fd64d8e539e2e4c1edba6cb2 SHA1 e5903a8afa28b1b25f9bd71e1463da57fc24c163 SHA256 1021b777004c0acc9e7e7dc1006afb46379daa79d88285f95b2ff096fa527ea2
-DIST jdk-7u4-linux-i586-demos.tar.gz 14041524 RMD160 9c897d50bab15dde6ffc38025ed087fcbdc4b138 SHA1 701487af50bb6014cd169b7a1e25ae9847c8f9da SHA256 36a712513fb7fef3df184ef7c082f9b29dac05181e3827312d088db80749dd9f
-DIST jdk-7u4-linux-i586.tar.gz 82927766 RMD160 22d388e29ab8eadaa7439d59fbb51d65a927e1bc SHA1 29deda921046b10865a3a0888576a51f212735a1 SHA256 023c288d33e15a5fd8ebccec9f3b82df5a32208dca96b85c80e64fd01357de28
-DIST jdk-7u4-linux-x64-demos.tar.gz 14027571 RMD160 ab1a5d19a086b419965f1e0c3ef89a6569590714 SHA1 b2e6800dbb4b517b1d1dd1c47628cb0115f763a8 SHA256 dca1b52f4a9728464b66ff12a7637a2db68574de8020f0c932f8df15550541e6
-DIST jdk-7u4-linux-x64.tar.gz 81439019 RMD160 1a17350732a1d037acf28b375f99ea12cb8d1781 SHA1 46998c8d8baf011ba19fe6a3c19b529e7189b8c7 SHA256 92fbec82f2a33126b323877d012239ce516518c59073416116799d26fc70307c
-DIST jdk-7u4-solaris-i586-demos.tar.gz 14087177 RMD160 03790371bb18ab461f2cb8c6593b40c330c6de6b SHA1 3cf6abf6a9dd757cdc1fc05e8ab761dedbdefd0b SHA256 d9c900d76143510ab6cd0940549ff2f5547efd91f050b43c6093e051d10f6d30
-DIST jdk-7u4-solaris-i586.tar.gz 85996816 RMD160 055d01056c1b74e52d558a43ef5b71e5002122e5 SHA1 f2599cb94be4643ac850fcde2906489c1ad140ef SHA256 8c3599e0524c7625587134701f706366786273d933dea2ce3e73a22b057c1f99
-DIST jdk-7u4-solaris-sparc-demos.tar.gz 14096804 RMD160 524e6732c2400e8be0b24cc06a2b53e4d1f728d8 SHA1 e033353469c798b1aef4624c99a35a72afd550dc SHA256 82555fc179fbeecee089ccd40fc187a2c123eef83c7581963154ee20af84e68f
-DIST jdk-7u4-solaris-sparc.tar.gz 90938808 RMD160 8d498e80c39fdfd27e3d235f858df3f810afa011 SHA1 021bdf843403b687e2f0aa32185049c861f04b27 SHA256 e79cd1b14d7d2b3a5a12b5ec49abb56288d3ca6a4d346fa214971b72abd07905
-DIST jdk-7u4-solaris-sparcv9-demos.tar.gz 199424 RMD160 41c25f25e4770b3bfd3578ffeb252217ad7de056 SHA1 97f1af8bb82c55a4e3ad2e36f2ae3639aeb8866d SHA256 8458e48971c6090bb9e0d2a7a74a861d66868443d6b0b9ec46559380bac37402
-DIST jdk-7u4-solaris-sparcv9.tar.gz 13159165 RMD160 dc1104ab5873fe342741543bcf86d0df0e7d31f5 SHA1 a00f5821bf764a0137b42fbc6d3be788ede42708 SHA256 1d4323fcbe8a8b17eab5f014b91a8c3b08d99cfed331e2cf1d80600a0b87efe0
-DIST jdk-7u4-solaris-x64-demos.tar.gz 186396 RMD160 8cc1cda0adaa6c484212941dfef6c98a8a3b22d1 SHA1 96732656d0ed2a8efcc1f752f1d687b6aa4248d0 SHA256 7913d1d1c256d842bc00cb987eb14140b77ba8376a6e84cc4c060e867550ffd0
-DIST jdk-7u4-solaris-x64.tar.gz 10004792 RMD160 849cf258c9a1a348185bc340c38d373c9488d302 SHA1 dc21913581ed5bfd006602e5507a5d4c7ef0441e SHA256 1d7bfeff432850c6f2df9bf4d69213e471430c6eb3cc08e73e4d09d1485761a2
-DIST jdk-7u5-linux-i586-demos.tar.gz 14027619 RMD160 8184ebdd841c7f4ef18a866613f016ffcfd95826 SHA1 fc22929e8357b3ecb0e337ee98b1eb7732b03d20 SHA256 b9aeb66d1fc5c3c8e0df83c752599f56b6b270c389ef6dbee5593d338be20551
-DIST jdk-7u5-linux-i586.tar.gz 82942256 RMD160 9e16982752a65ecc1479c774e333220325972905 SHA1 faf6753458e6baeefcad7d365ef07e35ceb6f2a4 SHA256 149a8fcaf9102964fdd43cdb25c23129ed5aa8c409d5d8b3cb621edc494d68bc
-DIST jdk-7u5-linux-x64-demos.tar.gz 14027439 RMD160 a83d33bca7cd8f4c661025aee398cd8016779525 SHA1 be0fd4c377a2893eed1dadfff6d7529a9b60ecb8 SHA256 56d0879eca219162b2d671efa9eb157ea34c8b538c3b8d3ce43e411dd0e343e3
-DIST jdk-7u5-linux-x64.tar.gz 81439763 RMD160 87e3f9dd5a09ff7368c30d7d4cb2b6ff23d6650f SHA1 4de692ac6fec1c97424b28f53ee8e2fdadfdb6a3 SHA256 2a118ce9350d0c0cbaaeef286d04980df664b215d6aaf7bc1d4469abf05711bf
-DIST jdk-7u5-solaris-i586-demos.tar.gz 14053500 RMD160 5cae68834563f8a5b007ab0d43e59a2998d12859 SHA1 36b1d5d71909cd10e2c0f30319ed6e2971bbfa71 SHA256 9ccdf00973d99e89edd8fcf2ee8b36589e72ee527014936aab09fc9b1940184c
-DIST jdk-7u5-solaris-i586.tar.gz 85992567 RMD160 7cac0cba34f422f4273bd9d74aadaf5189f1559e SHA1 6cce7d057463d659d29626213d9c2c2770218759 SHA256 6718c823db7085cd808089965f2aaf2e177a30b8c9b88d5bb0c9f51a9ad98991
-DIST jdk-7u5-solaris-sparc-demos.tar.gz 14065874 RMD160 fa582c999df9f07370de2a5dfb3ac91041afd91d SHA1 20fb6ce9185b7dc488f7f2c942374328eb0c3637 SHA256 a63b580162e2855b70e97c69a46375b0153b8c635dc514d9fb78b1114356caa2
-DIST jdk-7u5-solaris-sparc.tar.gz 90932975 RMD160 6a31566d706329f00a30ff1291db6eb4f707e3af SHA1 a47768747facd608eec72b92177f5c8b9f389761 SHA256 7f38621951100f7b5b946a37a17cb8a84725255702f2997871051831c25104c1
-DIST jdk-7u5-solaris-sparcv9-demos.tar.gz 199437 RMD160 a60b39e25227dfe24eda275b1431364c78fe366f SHA1 3df762a8f8c0ce80233969f4bd7b06093e331fa2 SHA256 e025cda586b20a0680a39a8ae55abe224201cee4fecf3e6bef96cd97826d4e89
-DIST jdk-7u5-solaris-sparcv9.tar.gz 13159046 RMD160 24ae0e55535ef138e5b48e293c224154893585d8 SHA1 c093186630d646fd1f675e5166f7ea65c51d8e3c SHA256 3dfd74c75817314c66090b1d26189dba096f7f09e3e85d738136d26c4e58f734
-DIST jdk-7u5-solaris-x64-demos.tar.gz 186394 RMD160 b30b2158d30118540e7441f51483fe8eb4c992cc SHA1 0218f2664e20cf425026962d0a1fe81cb810e02e SHA256 9f724409f1d97dfed074257e609423491df6cc62c34583446add120cea450df3
-DIST jdk-7u5-solaris-x64.tar.gz 10006615 RMD160 2a71bbbbaf0b1670e3c4ce6468daa9ce3055f061 SHA1 0234c42bfd964faeb64b6f5f13067c36600dab14 SHA256 a9fff7c44d1eb9aa0e3e8a8c2f7a74a19e500ecf1ab057036ad40e65923ced31
+DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
+DIST jdk-7u3-linux-i586-demos.tar.gz 13978883 SHA256 1a273f9da4f9a8f3cd44de5715cb2621e08688dadb9bd33449c26c7e1b438486
+DIST jdk-7u3-linux-i586.tar.gz 82477042 SHA256 798a3ea1d390358bdc01911d9aab7da1ff887157b56becc0e07e6f2c031f9ded
+DIST jdk-7u3-linux-x64-demos.tar.gz 13981665 SHA256 127d92ffaaf4a006870ce7fab85f2f202fddc52222b75de805f7fc8bc0d3a6ea
+DIST jdk-7u3-linux-x64.tar.gz 81056556 SHA256 28ff4bc3194617e0f6144013b1ca391b279804170e297faa6879963424846c2d
+DIST jdk-7u3-solaris-i586-demos.tar.gz 14008396 SHA256 ee0950b40880b20432721e240eb11614bf958d833c715d8bf479a21218c826db
+DIST jdk-7u3-solaris-i586.tar.gz 85353101 SHA256 6fef2459d8dc9ebf91cb461fd9009b40806e00a06f6755af163af3ec0b06bb7e
+DIST jdk-7u3-solaris-sparc-demos.tar.gz 14050356 SHA256 45d34d6127c991928e342b90d38de9f6a552841f2e34a4c020a19039844d87e0
+DIST jdk-7u3-solaris-sparc.tar.gz 90248080 SHA256 73367138ea28ee3ba21b2f52c0c61a7f4aa0eb9d12042bf2c5788cc7e6e4b9d2
+DIST jdk-7u3-solaris-sparcv9-demos.tar.gz 199207 SHA256 a0bb2483d65eae0faafb5ce61dc8ff5ec8e6fabb7c5a217c0c64822abed5b517
+DIST jdk-7u3-solaris-sparcv9.tar.gz 12904146 SHA256 04811e46ece37dd99c874b9998cbc9251dd886c5ffe1536548b396b8c51f5dc9
+DIST jdk-7u3-solaris-x64-demos.tar.gz 186051 SHA256 063cf73e7d5b366c8de33f8af7ad01895eabf9b146458cf497c0015f4bf9faa0
+DIST jdk-7u3-solaris-x64.tar.gz 9702437 SHA256 1021b777004c0acc9e7e7dc1006afb46379daa79d88285f95b2ff096fa527ea2
+DIST jdk-7u4-linux-i586-demos.tar.gz 14041524 SHA256 36a712513fb7fef3df184ef7c082f9b29dac05181e3827312d088db80749dd9f
+DIST jdk-7u4-linux-i586.tar.gz 82927766 SHA256 023c288d33e15a5fd8ebccec9f3b82df5a32208dca96b85c80e64fd01357de28
+DIST jdk-7u4-linux-x64-demos.tar.gz 14027571 SHA256 dca1b52f4a9728464b66ff12a7637a2db68574de8020f0c932f8df15550541e6
+DIST jdk-7u4-linux-x64.tar.gz 81439019 SHA256 92fbec82f2a33126b323877d012239ce516518c59073416116799d26fc70307c
+DIST jdk-7u4-solaris-i586-demos.tar.gz 14087177 SHA256 d9c900d76143510ab6cd0940549ff2f5547efd91f050b43c6093e051d10f6d30
+DIST jdk-7u4-solaris-i586.tar.gz 85996816 SHA256 8c3599e0524c7625587134701f706366786273d933dea2ce3e73a22b057c1f99
+DIST jdk-7u4-solaris-sparc-demos.tar.gz 14096804 SHA256 82555fc179fbeecee089ccd40fc187a2c123eef83c7581963154ee20af84e68f
+DIST jdk-7u4-solaris-sparc.tar.gz 90938808 SHA256 e79cd1b14d7d2b3a5a12b5ec49abb56288d3ca6a4d346fa214971b72abd07905
+DIST jdk-7u4-solaris-sparcv9-demos.tar.gz 199424 SHA256 8458e48971c6090bb9e0d2a7a74a861d66868443d6b0b9ec46559380bac37402
+DIST jdk-7u4-solaris-sparcv9.tar.gz 13159165 SHA256 1d4323fcbe8a8b17eab5f014b91a8c3b08d99cfed331e2cf1d80600a0b87efe0
+DIST jdk-7u4-solaris-x64-demos.tar.gz 186396 SHA256 7913d1d1c256d842bc00cb987eb14140b77ba8376a6e84cc4c060e867550ffd0
+DIST jdk-7u4-solaris-x64.tar.gz 10004792 SHA256 1d7bfeff432850c6f2df9bf4d69213e471430c6eb3cc08e73e4d09d1485761a2
+DIST jdk-7u5-linux-i586-demos.tar.gz 14027619 SHA256 b9aeb66d1fc5c3c8e0df83c752599f56b6b270c389ef6dbee5593d338be20551 SHA512 4f62a071d33940a9ebec0cfd13a37fd2204a67ff669951e42c5261887146746fa3bac55dac8db7d6f2a0d534807a12857d384698e39d3e51f70d74f91053daff WHIRLPOOL 410e6368b41283c17f98e9a4b4c42287249c30eb11531569f01a0b668d01309b184e1c820bd7f73b5db895e3a108a09edd8133036bc3cb485a986b75e45c7d82
+DIST jdk-7u5-linux-i586.tar.gz 82942256 SHA256 149a8fcaf9102964fdd43cdb25c23129ed5aa8c409d5d8b3cb621edc494d68bc SHA512 a30318a39b99c07671cdaf6ff51d85f0ac5d08d0003dba92174928bb501cf24ff8ed1c87d6fcd7e4b0768b4d3224c0fce6e4654fd735d359cc587fa85c95c609 WHIRLPOOL eb1c847cc6b844ad11c0d7b6008ddc2babc297c3e4b90e9ea5a17d54319074b4f7e81628968c3926944fbfafa3eec0c3bfbbad3b93adcf8c7369e0967b5e4810
+DIST jdk-7u5-linux-x64-demos.tar.gz 14027439 SHA256 56d0879eca219162b2d671efa9eb157ea34c8b538c3b8d3ce43e411dd0e343e3
+DIST jdk-7u5-linux-x64.tar.gz 81439763 SHA256 2a118ce9350d0c0cbaaeef286d04980df664b215d6aaf7bc1d4469abf05711bf
+DIST jdk-7u5-solaris-i586-demos.tar.gz 14053500 SHA256 9ccdf00973d99e89edd8fcf2ee8b36589e72ee527014936aab09fc9b1940184c
+DIST jdk-7u5-solaris-i586.tar.gz 85992567 SHA256 6718c823db7085cd808089965f2aaf2e177a30b8c9b88d5bb0c9f51a9ad98991
+DIST jdk-7u5-solaris-sparc-demos.tar.gz 14065874 SHA256 a63b580162e2855b70e97c69a46375b0153b8c635dc514d9fb78b1114356caa2
+DIST jdk-7u5-solaris-sparc.tar.gz 90932975 SHA256 7f38621951100f7b5b946a37a17cb8a84725255702f2997871051831c25104c1
+DIST jdk-7u5-solaris-sparcv9-demos.tar.gz 199437 SHA256 e025cda586b20a0680a39a8ae55abe224201cee4fecf3e6bef96cd97826d4e89
+DIST jdk-7u5-solaris-sparcv9.tar.gz 13159046 SHA256 3dfd74c75817314c66090b1d26189dba096f7f09e3e85d738136d26c4e58f734
+DIST jdk-7u5-solaris-x64-demos.tar.gz 186394 SHA256 9f724409f1d97dfed074257e609423491df6cc62c34583446add120cea450df3
+DIST jdk-7u5-solaris-x64.tar.gz 10006615 SHA256 a9fff7c44d1eb9aa0e3e8a8c2f7a74a19e500ecf1ab057036ad40e65923ced31
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.5.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.5.ebuild
index efd37bdf977f..b333a79f9e41 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.5.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.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/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.5.ebuild,v 1.1 2012/06/14 09:58:30 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.5.ebuild,v 1.2 2012/07/09 07:14:37 jdhore Exp $
EAPI="4"
@@ -50,7 +50,7 @@ SRC_URI="
LICENSE="Oracle-BCLA-JavaSE"
SLOT="1.7"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="X alsa derby doc examples jce nsplugin +source"
RESTRICT="fetch strip"
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 625537c661c4..4f1e454b08ec 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,7 +1,7 @@
-DIST UnlimitedJCEPolicyJDK7.zip 7426 RMD160 a4a6a284579f43d2df3532d279e143d2f03c2c3f SHA1 7d3c9ee89536b82cd21c680088b1bced16017253 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d
-DIST jre-7u3-linux-i586.tar.gz 33853947 RMD160 b7f2feaa4a4a66625bdb357fc2f14c0868954618 SHA1 40496eea225fd89eb719563e3001b7561d8efb37 SHA256 814bbbdb4c73b11c213de9543c821854b1ff18d2d8d45ae8d8cbeacab9b03c70
-DIST jre-7u3-linux-x64.tar.gz 32432120 RMD160 467517186b0bbf038982653ff9cf3446130eed9e SHA1 8a7f5280392b442c6c930058b71fc6ba7692e9f2 SHA256 eb06eab781be0c1dfaae2e5ef3afff5267e24e77f62401b09777673508b8d68c
-DIST jre-7u4-linux-i586.tar.gz 34361614 RMD160 b3fe7e489400c28511a8de6a590e2202b67a5b0a SHA1 3b57a2ca8ba561fde4a71ce9e7bb540c595d5f2b SHA256 e3514815588df66c26297a2dffa64ed90c383f273735700460b9f572c8d0cf8a
-DIST jre-7u4-linux-x64.tar.gz 32881501 RMD160 7b3bd29c9c11c1c8f8cd16448851e1ca56c33586 SHA1 7b928735d9b47d5c4c7120640b193220109f62e2 SHA256 04b6529fb500b1f1ee6d1ab8d4eb6611f0a9031258ea6ea0bc300499d86eb148
-DIST jre-7u5-linux-i586.tar.gz 34374207 RMD160 a9fbb755fdeb6ec0de314793736f89198175901e SHA1 ab4974bfdf417bab0d88483fa5d813f0eb6fbc7b SHA256 61e23f37f2fcdbc0f28755dc4692a810bbd10c67794145f37dfedf658afc9e29
-DIST jre-7u5-linux-x64.tar.gz 32876408 RMD160 68a28d4c40e105c5fda0d985d8a2148d55f18f25 SHA1 e363591ad93762a4f09fa73689d881b8a868556e SHA256 22b10ab1be0937218f1697a1a1a48e55eabd11453f5220a910da6d9179e9f579
+DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac
+DIST jre-7u3-linux-i586.tar.gz 33853947 SHA256 814bbbdb4c73b11c213de9543c821854b1ff18d2d8d45ae8d8cbeacab9b03c70
+DIST jre-7u3-linux-x64.tar.gz 32432120 SHA256 eb06eab781be0c1dfaae2e5ef3afff5267e24e77f62401b09777673508b8d68c
+DIST jre-7u4-linux-i586.tar.gz 34361614 SHA256 e3514815588df66c26297a2dffa64ed90c383f273735700460b9f572c8d0cf8a
+DIST jre-7u4-linux-x64.tar.gz 32881501 SHA256 04b6529fb500b1f1ee6d1ab8d4eb6611f0a9031258ea6ea0bc300499d86eb148
+DIST jre-7u5-linux-i586.tar.gz 34374207 SHA256 61e23f37f2fcdbc0f28755dc4692a810bbd10c67794145f37dfedf658afc9e29 SHA512 ca7a1227ea26232ae6277693cee9879f41792ea831bd8492770fbeb1112e205f4cc195e7b682758e0899fe829c4fe1e70ce3d756589bef7b86a977cd442130d4 WHIRLPOOL f3d8f801c98bfe470ef0d7ef9ccd82f7fcf301037d9a106ec3c09b52d16cb54417fd9dfb9c2efd2a405b88321d3a5088d0c7c08147f3d27481fa31304485616a
+DIST jre-7u5-linux-x64.tar.gz 32876408 SHA256 22b10ab1be0937218f1697a1a1a48e55eabd11453f5220a910da6d9179e9f579
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.5.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.5.ebuild
index 0f25c76d4df8..89621ece5345 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.5.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.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/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.5.ebuild,v 1.1 2012/06/14 09:33:22 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.5.ebuild,v 1.2 2012/07/09 07:15:58 jdhore Exp $
EAPI="4"
@@ -29,7 +29,7 @@ SRC_URI="
LICENSE="Oracle-BCLA-JavaSE"
SLOT="1.7"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="X alsa jce nsplugin"
RESTRICT="fetch strip"
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 1fdddad33123..f6de20b753ad 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,33 +1,33 @@
-DIST jdk-6u31-linux-i586.bin 85292206 RMD160 a917f6233912b84e3c904220fcb0cf49399486d8 SHA1 8e404a292d85bddb1b39d63f4248094ca05ef0da SHA256 60fdd4083373db919334500b8050b326d45d78703aa2d403eda48cfa5621702b
-DIST jdk-6u31-linux-ia64.bin 71220085 RMD160 4919626f9a515cd4900f2e350ea7cc071e0aeed0 SHA1 d586aea51a04b99999cf038e2c2fcd3aded21b96 SHA256 53ed873098c0dcdf94e3d74ff074005ae1d8aa94c2b75c530df6272a76a3adc9
-DIST jdk-6u31-linux-x64.bin 85581913 RMD160 c96b98671572efcde96512649f62162d46489402 SHA1 51cc34977aef629897dda480558fc78b10166cae SHA256 0219d4feeedb186e5081ab092dfcda20c290fde5463f9a707e12fd63897fd342
-DIST jdk-6u31-solaris-i586.sh 85175121 RMD160 0eacd571f5033527e02444f4ca44feb8dd09f319 SHA1 40b65bded1bbc4088fdf140955378f5fd42e6e69 SHA256 997f9934dd1b32b206c1798824a4bd9e0606bb51f149264bf28d46853f3fe069
-DIST jdk-6u31-solaris-sparc.sh 90382665 RMD160 c138a584946c5aa7ed5f631ca6fac96c4eee8ce1 SHA1 aacac3b11e4a06580e40f406b4573ea0ceec69f0 SHA256 98994aee1009f6fc3364c904bb478816be6454c9296ba4f9f95f350b5871df4a
-DIST jdk-6u31-solaris-sparcv9.sh 12835228 RMD160 74700d0737328862cd509cbcd0cd49461d19e276 SHA1 8e418cf6981f7ac221b80e91ec4faac60edff244 SHA256 67c0ba60eb37cbe8fabf4f1eb64117d82d32772fcce19b77039b8fcf9176df59
-DIST jdk-6u31-solaris-x64.sh 8911566 RMD160 b6c022bff489735747b180ac89899a5c14111b97 SHA1 47151342a06817d69262dd5ff90603b722126e6a SHA256 fbedc2e46f9e2260d876107cb6bbac08378e824f07c34966ab5a14e11f44e9ed
-DIST jdk-6u32-linux-i586-demos.tar.gz 12074528 RMD160 489e754549d2889b0393a92980d00579fc800a64 SHA1 3867dd4abc6c2c403823da72cdd6ca81fffd885a SHA256 aa62b23fd886b22a4af51ade8eb42f97f2f143b96a1b2418413764e95e298328
-DIST jdk-6u32-linux-i586.bin 71746385 RMD160 c0b39543c0b4d526dc314a7fe7fbb652572f610f SHA1 558ba711622df8964e321f45b76a398840721c2b SHA256 ab840c7de8f452b09d53ebe9477ffdb4622fa8cabbf962474d1914fde9a20f19
-DIST jdk-6u32-linux-x64-demos.tar.gz 12134648 RMD160 5db795b0ca951ce350cb8161818122cc5684d05c SHA1 c06a8998d300994cf29a41eb9e1d34d2a0065b9b SHA256 99257a5984094f8ae0592cd06e380dd7aefc410f46013bc23b9bc3156d4c8d1e
-DIST jdk-6u32-linux-x64.bin 72033964 RMD160 cf142dbafcb1a25bde84973b631a28bb134a5421 SHA1 bf60e6bf9271966403cbdfe0ca81627515fd7cdc SHA256 269d05b8d88e583e4e66141514d8294e636f537f55eb50962233c9e33d8f8f49
-DIST jdk-6u32-solaris-i586-demos.tar.Z 17934628 RMD160 666a38159c0c6edd0d05d9f9312fd0b3e68d9819 SHA1 5eab33c085d3db03a989e2088d392b2867266ca3 SHA256 c9423970f73cf2b3115e16234d1848d92519809c0cea9a873f6f91c6fc7bccc5
-DIST jdk-6u32-solaris-i586.sh 71653841 RMD160 8deefd125957bce6056bcc9a27875f153ad1924d SHA1 8809f1dc009ad2eca8d8afec16f67accf9a9ab78 SHA256 0634b567bfe8ffe1576492ecb08c28174354dae91bcf5bd2c1484e1a34ee94e7
-DIST jdk-6u32-solaris-sparc-demos.tar.Z 17943477 RMD160 c45f32f0a973b0e32cdcfed11dd0c1e62c430dee SHA1 13f22af4b93eb7a88e23e85a7fe2bee2052c8f8f SHA256 25d435521bf481ed770f6b07b2320669b1964967afb6770048ff2598db817da1
-DIST jdk-6u32-solaris-sparc.sh 76857741 RMD160 c5819e8cd952b17cca4714167bebcc2cde5d9ef2 SHA1 da331790e983906f94e471508c2d8436806ef1d5 SHA256 8a4d5ad0310aca103c5e649958f7d8291f974c7c0bd9c77fb7b8020c162fad29
-DIST jdk-6u32-solaris-sparcv9-demos.tar.Z 67919 RMD160 6206dd3766bb7dd566e5c4e4ded2a438c7356ecf SHA1 757290371f74e446e766d20b376f948092e49390 SHA256 05a887127d38732b3ba5e7d1096455e685f7add7f7cb24d96f9dadff3d2bde78
-DIST jdk-6u32-solaris-sparcv9.sh 12774004 RMD160 b2d2fdf06b1212c90d6dc23e1389ed2548fd0558 SHA1 9aef83dae8360c75848762b6c76ddf823f2600f3 SHA256 23a049e3c716309b5c1aa6bc1e96b6503f501a47250a7d1c45a02cbbc80b9fab
-DIST jdk-6u32-solaris-x64-demos.tar.Z 72693 RMD160 11814c204170c7df0d453d76e8d6730a4b27066f SHA1 48655684d76528f227d12516381154feb733bc13 SHA256 b139ac8b8a03d6e7652b11643883ce69fe365c61d3e9fa3c06d4ca9a003aa35b
-DIST jdk-6u32-solaris-x64.sh 8846042 RMD160 1a59a0537b17a1a2e145c48b832cc5500a2a8e2e SHA1 a55f94a26619228b6dadb6c25eb8c5fff29ffcfb SHA256 10f13c08e0571472dc0fb99ec10314c0083ae675ce6bc041c7a5a653d63522f0
-DIST jdk-6u33-linux-i586-demos.tar.gz 12074428 RMD160 55bb28c16290b558f237fee34ad47cf7e89a8a58 SHA1 286fedbb0ee78349596d62d3b853beada88ed7bf SHA256 5b3b4e8f005c6d1339fe4f692080246ba2a4ff90a89dd985679ad5b364bd48bc
-DIST jdk-6u33-linux-i586.bin 71748499 RMD160 d52ca094683408acc6f62ee1770ce07ed9cfe7d4 SHA1 a525dd379f577d34628b89beb3ba7c1c935c9f94 SHA256 2acb931d0cb455dbae3f6b11d394dd7e5758e6499abc1a7c50909e72cfb67fa7
-DIST jdk-6u33-linux-ia64-demos.tar.gz 6858807 RMD160 4fdcfae3c6468fa6a7d8fbd2ad2a6d013f993166 SHA1 93d79254f1e9d09bb28c7c9c11f8ab85fe7a2925 SHA256 8e51d3f9be6c0b9921f9534bc20fe25b023281fce8d2ecd9310c12bb3e72e55c
-DIST jdk-6u33-linux-ia64.bin 63591748 RMD160 832bac3e17ad0f2828de39928da62fa653871d4b SHA1 d02f009726add52944acc342820e059b3bf152bb SHA256 020a5ca1c666e7a57c6ab5bad4d1f42657a9b2d7478665f8933aa5b1f0e0c4f7
-DIST jdk-6u33-linux-x64-demos.tar.gz 12134002 RMD160 93295cd78a3d35953833c968699b88e7c92ee6fd SHA1 79c6e6a918d7f6f690da90724c77563d3d9418f6 SHA256 056a59c944d1e1e1eb7b0be90e48d591cd4d2ddf165e376519dccdbd70547a3a
-DIST jdk-6u33-linux-x64.bin 72029591 RMD160 58fe852835e11743b1c2389c741deead87401cf8 SHA1 eee126305d836533894be41cc5eb1eca7cdf5831 SHA256 978daf43e7fc302220174a16aecaf54d5e9b72f1cd1681f36ab14a2b4bad5fd4
-DIST jdk-6u33-solaris-i586-demos.tar.Z 17950479 RMD160 f904f4f8f858dbff3d8e866b917befa95feebc14 SHA1 ddb34dd9e3043306d24128005927dfa13fa448c4 SHA256 4d77b49413054a9ed1755bfb229ab50b21301d9fc50f0a30dcddf5b6fcf0c420
-DIST jdk-6u33-solaris-i586.sh 71648957 RMD160 84f72539e29603f1786bb5f8a054480228dced0a SHA1 814b78349dfb8fd9c312272304fa9e984be4b2a8 SHA256 9b7a0f2ff0b269086c51d316b36cb85b106bf1f259c56defe58ce9fbf327826c
-DIST jdk-6u33-solaris-sparc-demos.tar.Z 17943081 RMD160 15571478f19009a6ccde0a241ef522148e67750d SHA1 d1a7a19725ee6a41c055ad4f905cff604269d226 SHA256 92e39fc49ace8d4b9f7babfad33e3a4f1cabc79145ff01964007a5d69823cb63
-DIST jdk-6u33-solaris-sparc.sh 76857363 RMD160 a381d06f9c21a8922a1845b6f49a4ef58e96449d SHA1 025dbfe3bd989253cf9d3f4dfed2bbbd5061b7e0 SHA256 c76e8e40d34e4d4aed00ca1ee202c89e3545782f1785956ebaf22a12ad768622
-DIST jdk-6u33-solaris-sparcv9-demos.tar.Z 66663 RMD160 d4c3a95c1ea84473d2553ada9cc6f16d77b67073 SHA1 6ca86c48a694ca04db2caa84536b12cb7f0301d1 SHA256 4f5f702c16cdfb35be00fed90a8d93299b7e10bc125c0f4b74fa47ee71ddb98f
-DIST jdk-6u33-solaris-sparcv9.sh 12775348 RMD160 77437a24f7f21095a3735f2fabcc379557f2cc7f SHA1 32926ee2c1bc0dd3e1878c2ba0aeed366d3d365a SHA256 fa42d6974d88c0c69fa827c1106c577f95687f19004bcca541db32ae19f9d1c5
-DIST jdk-6u33-solaris-x64-demos.tar.Z 71875 RMD160 ff23afdc2352c70abfaff0eaec14401c32e56042 SHA1 e0d8e0d275f0db95b4be70081ab839fb10a7ad97 SHA256 6712cbf1d8067e32bd430c74bbbb958ce91d21fc16d7147ec890a967b932c357
-DIST jdk-6u33-solaris-x64.sh 8847662 RMD160 391a92773eab6a4ca78125a276b6a1bb12185b36 SHA1 8aa6a3777af2dbcef396e575d96664fff600ebd4 SHA256 07e23931631c68120dd3c17d857982a1547937cc096f5f9d372029442ad5656c
+DIST jdk-6u31-linux-i586.bin 85292206 SHA256 60fdd4083373db919334500b8050b326d45d78703aa2d403eda48cfa5621702b
+DIST jdk-6u31-linux-ia64.bin 71220085 SHA256 53ed873098c0dcdf94e3d74ff074005ae1d8aa94c2b75c530df6272a76a3adc9
+DIST jdk-6u31-linux-x64.bin 85581913 SHA256 0219d4feeedb186e5081ab092dfcda20c290fde5463f9a707e12fd63897fd342
+DIST jdk-6u31-solaris-i586.sh 85175121 SHA256 997f9934dd1b32b206c1798824a4bd9e0606bb51f149264bf28d46853f3fe069
+DIST jdk-6u31-solaris-sparc.sh 90382665 SHA256 98994aee1009f6fc3364c904bb478816be6454c9296ba4f9f95f350b5871df4a
+DIST jdk-6u31-solaris-sparcv9.sh 12835228 SHA256 67c0ba60eb37cbe8fabf4f1eb64117d82d32772fcce19b77039b8fcf9176df59
+DIST jdk-6u31-solaris-x64.sh 8911566 SHA256 fbedc2e46f9e2260d876107cb6bbac08378e824f07c34966ab5a14e11f44e9ed
+DIST jdk-6u32-linux-i586-demos.tar.gz 12074528 SHA256 aa62b23fd886b22a4af51ade8eb42f97f2f143b96a1b2418413764e95e298328
+DIST jdk-6u32-linux-i586.bin 71746385 SHA256 ab840c7de8f452b09d53ebe9477ffdb4622fa8cabbf962474d1914fde9a20f19
+DIST jdk-6u32-linux-x64-demos.tar.gz 12134648 SHA256 99257a5984094f8ae0592cd06e380dd7aefc410f46013bc23b9bc3156d4c8d1e
+DIST jdk-6u32-linux-x64.bin 72033964 SHA256 269d05b8d88e583e4e66141514d8294e636f537f55eb50962233c9e33d8f8f49
+DIST jdk-6u32-solaris-i586-demos.tar.Z 17934628 SHA256 c9423970f73cf2b3115e16234d1848d92519809c0cea9a873f6f91c6fc7bccc5
+DIST jdk-6u32-solaris-i586.sh 71653841 SHA256 0634b567bfe8ffe1576492ecb08c28174354dae91bcf5bd2c1484e1a34ee94e7
+DIST jdk-6u32-solaris-sparc-demos.tar.Z 17943477 SHA256 25d435521bf481ed770f6b07b2320669b1964967afb6770048ff2598db817da1
+DIST jdk-6u32-solaris-sparc.sh 76857741 SHA256 8a4d5ad0310aca103c5e649958f7d8291f974c7c0bd9c77fb7b8020c162fad29
+DIST jdk-6u32-solaris-sparcv9-demos.tar.Z 67919 SHA256 05a887127d38732b3ba5e7d1096455e685f7add7f7cb24d96f9dadff3d2bde78
+DIST jdk-6u32-solaris-sparcv9.sh 12774004 SHA256 23a049e3c716309b5c1aa6bc1e96b6503f501a47250a7d1c45a02cbbc80b9fab
+DIST jdk-6u32-solaris-x64-demos.tar.Z 72693 SHA256 b139ac8b8a03d6e7652b11643883ce69fe365c61d3e9fa3c06d4ca9a003aa35b
+DIST jdk-6u32-solaris-x64.sh 8846042 SHA256 10f13c08e0571472dc0fb99ec10314c0083ae675ce6bc041c7a5a653d63522f0
+DIST jdk-6u33-linux-i586-demos.tar.gz 12074428 SHA256 5b3b4e8f005c6d1339fe4f692080246ba2a4ff90a89dd985679ad5b364bd48bc SHA512 c5bd3e3f4d657174c5743988a5b6e49bcf256990d9a77376bcde6e21eb2247d3748f5c6aeb203a5af22818e5db8e7706315d2e6a1d877cdcd9b22da5cc286353 WHIRLPOOL 484eb86a0034582bf3f7315fbb393af8fd9d0dea16848c6387fb22b3c9edea39268e7f5b2eaa18d22f91f6935b7bd28ea41e8e1448390a688865a306d65568f9
+DIST jdk-6u33-linux-i586.bin 71748499 SHA256 2acb931d0cb455dbae3f6b11d394dd7e5758e6499abc1a7c50909e72cfb67fa7 SHA512 e0ebf4c9b3e774e1f66cdef956c9fdcce6d8e2061cd9dcbe242a5e6f44cd266870c405ce6821075c97cd0fb8a23069f042bdfc465077c7334c6a578ea0f477e3 WHIRLPOOL 6c356ec2f06637a04a8ab22489ee50c159bd783b0d3651f00aab35450fe336caf574749f29716d41ec97f1f0da3f65112ac5c6d5ef4dbc0000ef19cf20403f5e
+DIST jdk-6u33-linux-ia64-demos.tar.gz 6858807 SHA256 8e51d3f9be6c0b9921f9534bc20fe25b023281fce8d2ecd9310c12bb3e72e55c
+DIST jdk-6u33-linux-ia64.bin 63591748 SHA256 020a5ca1c666e7a57c6ab5bad4d1f42657a9b2d7478665f8933aa5b1f0e0c4f7
+DIST jdk-6u33-linux-x64-demos.tar.gz 12134002 SHA256 056a59c944d1e1e1eb7b0be90e48d591cd4d2ddf165e376519dccdbd70547a3a
+DIST jdk-6u33-linux-x64.bin 72029591 SHA256 978daf43e7fc302220174a16aecaf54d5e9b72f1cd1681f36ab14a2b4bad5fd4
+DIST jdk-6u33-solaris-i586-demos.tar.Z 17950479 SHA256 4d77b49413054a9ed1755bfb229ab50b21301d9fc50f0a30dcddf5b6fcf0c420
+DIST jdk-6u33-solaris-i586.sh 71648957 SHA256 9b7a0f2ff0b269086c51d316b36cb85b106bf1f259c56defe58ce9fbf327826c
+DIST jdk-6u33-solaris-sparc-demos.tar.Z 17943081 SHA256 92e39fc49ace8d4b9f7babfad33e3a4f1cabc79145ff01964007a5d69823cb63
+DIST jdk-6u33-solaris-sparc.sh 76857363 SHA256 c76e8e40d34e4d4aed00ca1ee202c89e3545782f1785956ebaf22a12ad768622
+DIST jdk-6u33-solaris-sparcv9-demos.tar.Z 66663 SHA256 4f5f702c16cdfb35be00fed90a8d93299b7e10bc125c0f4b74fa47ee71ddb98f
+DIST jdk-6u33-solaris-sparcv9.sh 12775348 SHA256 fa42d6974d88c0c69fa827c1106c577f95687f19004bcca541db32ae19f9d1c5
+DIST jdk-6u33-solaris-x64-demos.tar.Z 71875 SHA256 6712cbf1d8067e32bd430c74bbbb958ce91d21fc16d7147ec890a967b932c357
+DIST jdk-6u33-solaris-x64.sh 8847662 SHA256 07e23931631c68120dd3c17d857982a1547937cc096f5f9d372029442ad5656c
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.33.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.33.ebuild
index c140d62b648e..98c140fd9803 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.33.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.33.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.33.ebuild,v 1.2 2012/06/15 09:58:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.33.ebuild,v 1.3 2012/07/09 07:16:41 jdhore Exp $
EAPI="4"
@@ -48,7 +48,7 @@ SRC_URI="
LICENSE="Oracle-BCLA-JavaSE"
SLOT="1.6"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="X alsa derby doc examples jce kernel_SunOS nsplugin +source"
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index bee95c307d47..b028fac3a8cd 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -1,7 +1,7 @@
-DIST jre-6u31-linux-i586.bin 21699103 RMD160 45252ef657d84abeaa1f22d8e3cfc7906a726645 SHA1 7fff7f6f99282ea3adc718c1f449df9107a8ad0c SHA256 c7c6882b8018e95ded4d145ae28692e2a0a4c13e66c5310d8f5c42b90b5b4dd0
-DIST jre-6u31-linux-x64.bin 21312981 RMD160 a3c51e57681a86960313f6007c63311d029de395 SHA1 0b20b1290e7c7ee3cf4ec7e99ae794fada6053af SHA256 3af56f72a76ad48940b45726f94770f12285c21b5f3194fc56cd63c3d4ed3329
-DIST jre-6u32-linux-i586.bin 21694324 RMD160 0cdb922b5eede22ef36a4f4e1ebb33fc24963a8f SHA1 d5206bb9d1d657a17a09ff59ea061664cd0c5a0c SHA256 2261ef71f3fa889e34cf304200561488d4f921b3de93eaa1fe5688d4e3672611
-DIST jre-6u32-linux-x64.bin 21305045 RMD160 dcf9ba6df757b56debd21d40b5c6efacc277e80a SHA1 a52c2b5fc2f5b17a5f225172d222141993d66c48 SHA256 1b72f2d71717ffa98e1f0002485d6691ad53fc63e9088f96deeecd77acbba88f
-DIST jre-6u33-linux-i586.bin 21693745 RMD160 c395a2a780a3714673e4acd4a835e1ece1abd9bb SHA1 0eb29f15703fdcb567d64e15ed41a31a5a6ab66f SHA256 6e406b3552f276238141e40c65f83928df0bf93af5f11c74ac6970cde6758f0e
-DIST jre-6u33-linux-ia64.bin 22876388 RMD160 e054daedb1cba7f0b535d280c46df2c4e86f4284 SHA1 050bdefe23ef8510b8d1365da938fe288adbc8da SHA256 d39f06a0f6a18e94cc1d884f8d1c9d695ef002a9453efd087dbdf23f1ac83ed3
-DIST jre-6u33-linux-x64.bin 21301090 RMD160 fc73909219502f216acff53e0d41e35e0039617b SHA1 2cf25614681fa5b3ee4c06612fb5ce91de6edb74 SHA256 2ea0e55cf517e07ed752fb33957c7aa6d4427558f13bd223765870919a4d2817
+DIST jre-6u31-linux-i586.bin 21699103 SHA256 c7c6882b8018e95ded4d145ae28692e2a0a4c13e66c5310d8f5c42b90b5b4dd0
+DIST jre-6u31-linux-x64.bin 21312981 SHA256 3af56f72a76ad48940b45726f94770f12285c21b5f3194fc56cd63c3d4ed3329
+DIST jre-6u32-linux-i586.bin 21694324 SHA256 2261ef71f3fa889e34cf304200561488d4f921b3de93eaa1fe5688d4e3672611
+DIST jre-6u32-linux-x64.bin 21305045 SHA256 1b72f2d71717ffa98e1f0002485d6691ad53fc63e9088f96deeecd77acbba88f
+DIST jre-6u33-linux-i586.bin 21693745 SHA256 6e406b3552f276238141e40c65f83928df0bf93af5f11c74ac6970cde6758f0e SHA512 00f6fe61b20c907ff589aaad47d2e8c9f9e420cc1d904b85ca65c2ab3f40f36057a34838fea5a46413c3a703f1b7645a6e944498f45843bf5107fdda70ce46cf WHIRLPOOL a3c450785cbe1b3a90eea1898613335d63ca8cef20ee1e453df8a9ca5ba52b90e9322a2eefecf6d9c287e612362730db69b4a46406736a4bf402008b346914b4
+DIST jre-6u33-linux-ia64.bin 22876388 SHA256 d39f06a0f6a18e94cc1d884f8d1c9d695ef002a9453efd087dbdf23f1ac83ed3
+DIST jre-6u33-linux-x64.bin 21301090 SHA256 2ea0e55cf517e07ed752fb33957c7aa6d4427558f13bd223765870919a4d2817
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33.ebuild
index f8574306703e..f4e9feb2301f 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33.ebuild,v 1.2 2012/06/15 09:58:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33.ebuild,v 1.3 2012/07/09 07:15:18 jdhore Exp $
EAPI="4"
@@ -25,7 +25,7 @@ SRC_URI="
LICENSE="Oracle-BCLA-JavaSE"
SLOT="1.6"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="X alsa jce nsplugin"
diff --git a/dev-lang/vala/vala-0.16.1-r1.ebuild b/dev-lang/vala/vala-0.16.1-r1.ebuild
index c0fb460fe1ea..566e2c6185d6 100644
--- a/dev-lang/vala/vala-0.16.1-r1.ebuild
+++ b/dev-lang/vala/vala-0.16.1-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/dev-lang/vala/vala-0.16.1-r1.ebuild,v 1.3 2012/07/05 21:45:49 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.16.1-r1.ebuild,v 1.4 2012/07/09 11:48:10 jer Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Vala"
LICENSE="LGPL-2.1"
SLOT="0.16"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
IUSE="test +vapigen"
RDEPEND=">=dev-libs/glib-2.16:2"
diff --git a/dev-perl/Alien-SDL/Alien-SDL-1.434.ebuild b/dev-perl/Alien-SDL/Alien-SDL-1.434.ebuild
index d26f17d9c5e8..48d29962c450 100644
--- a/dev-perl/Alien-SDL/Alien-SDL-1.434.ebuild
+++ b/dev-perl/Alien-SDL/Alien-SDL-1.434.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-perl/Alien-SDL/Alien-SDL-1.434.ebuild,v 1.3 2012/07/03 11:15:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-SDL/Alien-SDL-1.434.ebuild,v 1.4 2012/07/09 11:53:28 jer Exp $
EAPI=4
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="building, finding and using SDL binaries"
SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 hppa x86"
IUSE=""
# Archive::Extract, File::Fetch, File::Find, Test::More -> dev-lang/perl
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index 32f2268d3970..53adac513c2a 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -4,3 +4,4 @@ DIST BeautifulSoup-3.2.1.tar.gz 31224 SHA256 f5ba85e907e7dfd78e44e4000b3eaef3a65
DIST beautifulsoup4-4.0.4.tar.gz 120837 SHA256 38c0b6d9cf9cee271bb27da9e5c1f19f7ff527750bbe7e0cbd75cc18fbbaee6a SHA512 3f069e38632ca7ad516f82a27220a56a13c438b59f4ecc015a1950c5a00f1d4c1b1fab3b5bf346f2768bddbf879dc95582418b026967eab412365f80957672ab WHIRLPOOL 1977dd28fbd4c89b3e1e5e52832f002b57b8c881f83a228cc65bbf5abc9fbc4d6c6367fb6ba220481abfaafac86a741add8fedbdc3fb29a4b805a61d1428a823
DIST beautifulsoup4-4.0.5.tar.gz 123569 SHA256 c29865bd59457afac69ae269083d750797305b4ba886688b2fcdb74476fc56ec SHA512 0564a186641049fd28f8518ac8b64b49b3bc9d31da7c8c52a28fcb8efbcaaebcf7e6dee7d669186c414fc666dd852bb48f45b7942320d068ad36d02316b75ae9 WHIRLPOOL b3ea06763d7ce1d470545174063d8f5af5957a304c68256c5507bdd19f6208f3bfd2f060a08a01ea0692bc6830ade2d52f6a15a9d71883da13a17f18035bfe25
DIST beautifulsoup4-4.1.0.tar.gz 128946 SHA256 6fddf996369597920e531a4ff9f3491a1ab588f59fcbb0061fdce5af8b474f11 SHA512 b5af56e74677a1ae3761644651d7c1eafb9f34b495581ffb7cb840691150dad971ca3033fe6489eef936ccd3f99567f80b0dcf14d0421b18d52528e25c7401e5 WHIRLPOOL db5f062349ddfd8073e22a570526e55dcb404f8d063c66565794ed10ac289ea74423d0d67f112e80a62e21262be12003c03ab4d21c4f41f4f5363ad601c25d37
+DIST beautifulsoup4-4.1.1.tar.gz 129632 SHA256 a8b1b59a105c07cf5a4912efd77294b3f86c4e3623fee773c8ca764c29d507ed SHA512 d5d75e162ec81a31c9ef42e5dd6aa195d9f360aaf0fe67a788e97090c446f394485183af6dc95c3d6d669d82d3ec9da509fd310309fac789802f4fb38dd0cb7e WHIRLPOOL bc40a8aa7e904dab017ba45862536b2217c889c6d63e4bd101960d1e652ed183c2e074b0cd773e8aed636ba038bc0359f249986b68eb6f6fd4d1ab5b9704857b
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.1.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.1.1.ebuild
new file mode 100644
index 000000000000..2b28a5615ce0
--- /dev/null
+++ b/dev-python/beautifulsoup/beautifulsoup-4.1.1.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-python/beautifulsoup/beautifulsoup-4.1.1.ebuild,v 1.1 2012/07/09 08:46:17 radhermit Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="*:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5"
+PYTHON_TESTS_RESTRICTED_ABIS="*-pypy-*"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils
+
+MY_PN="${PN}4"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
+HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/
+ http://pypi.python.org/pypi/beautifulsoup4"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc test"
+
+DEPEND="doc? ( dev-python/sphinx )
+ test? ( dev-python/lxml )"
+RDEPEND=""
+
+PYTHON_MODNAME="bs4"
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ distutils_src_compile
+ if use doc; then
+ emake -C doc html
+ fi
+}
+
+src_test() {
+ testing() {
+ cd "build-${PYTHON_ABI}/lib"
+ nosetests --verbosity="${PYTHON_TEST_VERBOSITY}"
+ }
+ python_execute_function testing
+}
+
+src_install() {
+ distutils_src_install
+ if use doc; then
+ dohtml -r doc/build/html/*
+ fi
+}
diff --git a/dev-python/coverage/coverage-3.5.2.ebuild b/dev-python/coverage/coverage-3.5.2.ebuild
index 707ee16127c4..e80793c935d3 100644
--- a/dev-python/coverage/coverage-3.5.2.ebuild
+++ b/dev-python/coverage/coverage-3.5.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/dev-python/coverage/coverage-3.5.2.ebuild,v 1.7 2012/07/03 16:25:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.5.2.ebuild,v 1.8 2012/07/09 11:55:41 jer Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
DEPEND="dev-python/setuptools"
diff --git a/dev-python/pycups/pycups-1.9.61.ebuild b/dev-python/pycups/pycups-1.9.61.ebuild
index c94cd49030ce..c804a5cbe6a3 100644
--- a/dev-python/pycups/pycups-1.9.61.ebuild
+++ b/dev-python/pycups/pycups-1.9.61.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-python/pycups/pycups-1.9.61.ebuild,v 1.7 2012/07/08 15:13:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.61.ebuild,v 1.8 2012/07/09 11:54:46 jer Exp $
EAPI="3"
@@ -13,7 +13,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
SRC_URI="http://cyberelk.net/tim/data/pycups/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
SLOT="0"
IUSE="doc examples"
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 84f4cd174d24..b977c2e7dff7 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,3 +1,3 @@
-DIST pymongo-2.1.1.tar.gz 199974 SHA256 7dd891ce2088a2d21f172102be530cc3083571a0f1eecfa0aff612da8076c37b SHA512 64190944348dafa0eecc61d40f44b65c6767ea1be29e66e78709da3590b834579bca655cc96da82b8b73724b207c86362e3e235129ebee809ef3a5fedc134db6 WHIRLPOOL 7440c7a40e2f1169b6d776f73b37605e3e2785ddee87f6733955bafaa839dae4bf0b4d78657e4fb294f4729c5506c2be898f589cc73850aa0e0935e18d3b2b34
-DIST pymongo-2.1.tar.gz 197271 SHA256 49dbefef8d37fc0b09c0383b71ac9eab23c05170ea95f51a86bd8ffd20dd5bee SHA512 0eccf9e21d9dae127250692058282265b478017bfb3519feb6428f950cd5466ef1627002953e90dba395c5f6fb0aa0031723fe37faa2f1d26fe1dd9e76fc2a57 WHIRLPOOL 0a36cabd5c23de2ea4b093539fd5037737dbeaab361301d1c458914eaea0704ae8623ba3bb3141be702380c230b6c2d14ad710b7c2e41a69e518145f80c73da7
+DIST pymongo-2.1.1.tar.gz 199974 RMD160 e114d9e95d3e2512e054552571eb66b93229e1e0 SHA1 f6d479ce863cf202aaa687d9f7739ffb47b4f421 SHA256 7dd891ce2088a2d21f172102be530cc3083571a0f1eecfa0aff612da8076c37b SHA512 64190944348dafa0eecc61d40f44b65c6767ea1be29e66e78709da3590b834579bca655cc96da82b8b73724b207c86362e3e235129ebee809ef3a5fedc134db6 WHIRLPOOL 7440c7a40e2f1169b6d776f73b37605e3e2785ddee87f6733955bafaa839dae4bf0b4d78657e4fb294f4729c5506c2be898f589cc73850aa0e0935e18d3b2b34
+DIST pymongo-2.2.1.tar.gz 230880 SHA256 0a6251742736dd3c80025e701ec97ea1540bc97df26ada7b3bf40ff01daa7032 SHA512 093014671240ff43174b33ded43041d640818c37a2e25ee18c3cee2bb8a51e9edc49e04ed434806dfe2729c0f83294e108496f6fb23931fa16a2bebe3528fc85 WHIRLPOOL 27996bc9bd3406ab8c40e25eee0307c2a932e67a292d5c2d27da1149e32f7be236a8fc721c0cb7e6933d0409a3a3100dce7a2125bb74de92cf660430633e58a3
DIST pymongo-2.2.tar.gz 228794 SHA256 ac7952896ecfd5d9b4b9d8bb0077c95a0296ea21374df85e2ca32c237c0be57f SHA512 0683bbaaef081d9a3af4ccec932920bae0c8f843498a4726af93dde4747d65b86adf01c6d501e78a4607ca024fde5a372a7003de0e0e66bd71d927676f4fde4b WHIRLPOOL f0a00a5536d7cf40b2a3f9d8b62031bdb7787903db05d85eabb52233d051837806b328b25dc455869e873e78df61733782a0a69fb981ff93962afedbe06c229e
diff --git a/dev-python/pymongo/pymongo-2.1.ebuild b/dev-python/pymongo/pymongo-2.2.1.ebuild
similarity index 92%
rename from dev-python/pymongo/pymongo-2.1.ebuild
rename to dev-python/pymongo/pymongo-2.2.1.ebuild
index 2779e89e9b01..3d93cf8c5a7a 100644
--- a/dev-python/pymongo/pymongo-2.1.ebuild
+++ b/dev-python/pymongo/pymongo-2.2.1.ebuild
@@ -1,11 +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/dev-python/pymongo/pymongo-2.1.ebuild,v 1.1 2011/12/13 17:47:42 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-2.2.1.ebuild,v 1.1 2012/07/09 11:07:12 ultrabug Exp $
EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
DISTUTILS_SRC_TEST="nosetests"
diff --git a/dev-ruby/fxruby/fxruby-1.6.25.ebuild b/dev-ruby/fxruby/fxruby-1.6.25.ebuild
index 8107b39933bb..da0588a734aa 100644
--- a/dev-ruby/fxruby/fxruby-1.6.25.ebuild
+++ b/dev-ruby/fxruby/fxruby-1.6.25.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-ruby/fxruby/fxruby-1.6.25.ebuild,v 1.2 2012/07/01 18:31:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fxruby/fxruby-1.6.25.ebuild,v 1.3 2012/07/09 12:05:49 jer Exp $
EAPI=4
USE_RUBY="ruby18 ruby19"
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.fxruby.org/"
LICENSE="LGPL-2.1"
SLOT="1.6"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
IUSE="examples doc"
CDEPEND="x11-libs/fox:1.6 >=x11-libs/fxscintilla-1.62-r1"
diff --git a/dev-ruby/jruby-openssl/metadata.xml b/dev-ruby/jruby-openssl/metadata.xml
index 604e0a4238bb..b59348736ba6 100644
--- a/dev-ruby/jruby-openssl/metadata.xml
+++ b/dev-ruby/jruby-openssl/metadata.xml
@@ -1,6 +1,7 @@
+ ruby
java
diff --git a/dev-ruby/mkrf/mkrf-0.2.3-r2.ebuild b/dev-ruby/mkrf/mkrf-0.2.3-r2.ebuild
index 08b16e6aa49e..cfe79edf0b6b 100644
--- a/dev-ruby/mkrf/mkrf-0.2.3-r2.ebuild
+++ b/dev-ruby/mkrf/mkrf-0.2.3-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/dev-ruby/mkrf/mkrf-0.2.3-r2.ebuild,v 1.4 2012/07/01 18:31:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mkrf/mkrf-0.2.3-r2.ebuild,v 1.5 2012/07/09 12:04:51 jer Exp $
EAPI="2"
USE_RUBY="ruby18 ruby19"
@@ -20,7 +20,7 @@ HOMEPAGE="http://mkrf.rubyforge.org/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE=""
diff --git a/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r2.ebuild b/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r2.ebuild
index 5697ec7169bb..68f119f9127a 100644
--- a/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r2.ebuild
+++ b/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-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/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r2.ebuild,v 1.3 2012/07/01 18:31:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r2.ebuild,v 1.4 2012/07/09 12:05:17 jer Exp $
EAPI="4"
USE_RUBY="ruby18 ruby19"
@@ -19,7 +19,7 @@ HOMEPAGE="http://ruby-opengl.rubyforge.org/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE=""
diff --git a/dev-tex/latex-beamer/latex-beamer-3.20.ebuild b/dev-tex/latex-beamer/latex-beamer-3.20.ebuild
index 313b48d7e307..78751496dffd 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.20.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.20.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-tex/latex-beamer/latex-beamer-3.20.ebuild,v 1.2 2012/07/08 23:30:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex-beamer/latex-beamer-3.20.ebuild,v 1.4 2012/07/09 11:59:33 jer Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.zip"
LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples lyx"
DEPEND="app-arch/unzip
diff --git a/dev-util/debhelper/debhelper-9.20120608.ebuild b/dev-util/debhelper/debhelper-9.20120608.ebuild
index 70df7e9b228b..6e869889c0a9 100644
--- a/dev-util/debhelper/debhelper-9.20120608.ebuild
+++ b/dev-util/debhelper/debhelper-9.20120608.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/debhelper/debhelper-9.20120608.ebuild,v 1.3 2012/07/08 23:51:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20120608.ebuild,v 1.5 2012/07/09 11:50:14 jer Exp $
EAPI=4
inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc x86"
IUSE="nls linguas_de linguas_es linguas_fr test"
RDEPEND="app-arch/dpkg
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 322767b39971..a23f5df01a65 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,4 +1,2 @@
-DIST google-perftools-1.10.tar.gz 1257663 SHA256 bc458dfb65a2b1ba6ac0ee2f81705d6224c5aeeced7262cd15f6c84066ab2090 SHA512 ba95b319476c55eee87f882e0c1a091ed03f2fb34eae92c6a69e992c9b69d5ece347617a739150006ea833ca12ff39bda2b563534517ad391925b9d056435454 WHIRLPOOL 2078fdaf7dbe78946a7d32a6d94cac0268c82f1315a93e0d1212d665ef6dff600086f51994344f1ee714a9a398d39b5ba0c7fcc04262710c3dc5f731b711bdf0
DIST google-perftools-1.8.3.tar.gz 1265062 SHA256 6ad744b34abb24312631740d9912f4667993b02e5f59b91246c31a2a911a9d59 SHA512 c6938391d182982ba6a87cd3d023e5fdf3501c42aecb951504e2fc97ce9e5bb2a6e6a577504ddbe89220b45ae47e58ce3e68f84aa45ff238d949dee4fc765b51 WHIRLPOOL 70ef15f25451a0f3eddb92e948e6d7d2e46a7ee8684636ddff312d5f0dda1429a7fe3f1f6756f0a979e4957b09c47513ddad9504415795e9e82ba51188672fdc
-DIST google-perftools-1.9.tar.gz 1245683 SHA256 e56e6b46781ad0fb87f225dc06e0b5634a7ee526bce72d0e7ab9cd704939733b SHA512 5361b875b2800445d16065127d3fb9fef77f738f634634e4f63b71141ec9ab5bace20875601f255e604d9d0d6dfd404a3c2a9501b2e98002f7918d5fa6e49b51 WHIRLPOOL 6a0a0bc87c5693e3e3a9e4f17a4a85a2e7ae1053d0a745ce1875ceb7877c57f2b250371e58cbe1ccd971911fceec34702b9d084bec67a60e0d34a98279002d94
DIST gperftools-2.0.tar.gz 1261243 SHA256 7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080 SHA512 61bf7a26974058912a4165cbc363351bc735599d36ab569dc7e84a75a690adbc17a4178512a57469fc7c17befaad2a271ef4ea5c29a36b664153938939269926 WHIRLPOOL 4f49a7da976040cacdecb8e18294b09fbfe276422ba35058476a14a3c1df072f8748d70f738adafa03a3a445701ed32b6232f13962d8ec8c5a968652414797a6
diff --git a/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch b/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
new file mode 100644
index 000000000000..b17e0d57f5fb
--- /dev/null
+++ b/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
@@ -0,0 +1,13 @@
+Index: gperftools-2.0/src/base/linuxthreads.cc
+===================================================================
+--- gperftools-2.0.orig/src/base/linuxthreads.cc
++++ gperftools-2.0/src/base/linuxthreads.cc
+@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t
+ /* Signal handler to help us recover from dying while we are attached to
+ * other threads.
+ */
+-static void SignalHandler(int signum, siginfo_t *si, void *data) {
++static void SignalHandler(int signum, struct siginfo *si, void *data) {
+ if (sig_pids != NULL) {
+ if (signum == SIGABRT) {
+ while (sig_num_threads-- > 0) {
diff --git a/dev-util/google-perftools/google-perftools-1.10.ebuild b/dev-util/google-perftools/google-perftools-1.10.ebuild
deleted file mode 100644
index 8d102c4ba6a7..000000000000
--- a/dev-util/google-perftools/google-perftools-1.10.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-1.10.ebuild,v 1.1 2012/07/06 00:57:34 flameeyes Exp $
-
-EAPI=4
-
-inherit toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="http://code.google.com/p/gperftools/"
-SRC_URI="http://gperftools.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="largepages +debug minimal test"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- # set up the make options in here so that we can actually make use
- # of them on both compile and install.
-
- # Avoid building the unit testing if we're not going to execute
- # tests; this trick here allows us to ignore the tests without
- # touching the build system (and thus without rebuilding
- # autotools). Keep commented as long as it's restricted.
- use test || \
- makeopts="${makeopts} noinst_PROGRAMS= "
-
- # don't install _anything_ from the documentation, since it would
- # install it in non-standard locations, and would just waste time.
- makeopts="${makeopts} dist_doc_DATA= "
-}
-
-src_configure() {
- use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-
- append-flags -fno-strict-aliasing
-
- econf \
- --disable-static \
- --disable-dependency-tracking \
- --enable-fast-install \
- $(use_enable debug debugalloc) \
- $(use_enable minimal)
-}
-
-src_compile() {
- emake ${makeopts}
-}
-
-src_test() {
- case "${LD_PRELOAD}" in
- *libsandbox*)
- ewarn "Unable to run tests when sanbox is enabled."
- ewarn "See http://bugs.gentoo.org/290249"
- return 0
- ;;
- esac
-
- emake check
-}
-
-src_install() {
- emake DESTDIR="${D}" install ${makeopts}
-
- # Remove libtool files since we dropped the static libraries
- find "${D}" -name '*.la' -delete
-
- dodoc README AUTHORS ChangeLog TODO NEWS
- pushd doc
- dohtml -r *
- popd
-}
diff --git a/dev-util/google-perftools/google-perftools-1.9.ebuild b/dev-util/google-perftools/google-perftools-1.9.ebuild
deleted file mode 100644
index 81a00e9bf4b9..000000000000
--- a/dev-util/google-perftools/google-perftools-1.9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-1.9.ebuild,v 1.1 2011/12/24 15:11:26 flameeyes Exp $
-
-EAPI=4
-
-inherit toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="http://code.google.com/p/google-perftools/"
-SRC_URI="http://google-perftools.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="largepages +debug minimal test"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- # set up the make options in here so that we can actually make use
- # of them on both compile and install.
-
- # Avoid building the unit testing if we're not going to execute
- # tests; this trick here allows us to ignore the tests without
- # touching the build system (and thus without rebuilding
- # autotools). Keep commented as long as it's restricted.
- use test || \
- makeopts="${makeopts} noinst_PROGRAMS= "
-
- # don't install _anything_ from the documentation, since it would
- # install it in non-standard locations, and would just waste time.
- makeopts="${makeopts} dist_doc_DATA= "
-}
-
-src_configure() {
- use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-
- append-flags -fno-strict-aliasing
-
- econf \
- --disable-static \
- --disable-dependency-tracking \
- --enable-fast-install \
- $(use_enable debug debugalloc) \
- $(use_enable minimal)
-}
-
-src_compile() {
- emake ${makeopts}
-}
-
-src_test() {
- case "${LD_PRELOAD}" in
- *libsandbox*)
- ewarn "Unable to run tests when sanbox is enabled."
- ewarn "See http://bugs.gentoo.org/290249"
- return 0
- ;;
- esac
-
- emake check
-}
-
-src_install() {
- emake DESTDIR="${D}" install ${makeopts}
-
- # Remove libtool files since we dropped the static libraries
- find "${D}" -name '*.la' -delete
-
- dodoc README AUTHORS ChangeLog TODO NEWS
- pushd doc
- dohtml -r *
- popd
-}
diff --git a/dev-util/google-perftools/google-perftools-2.0.ebuild b/dev-util/google-perftools/google-perftools-2.0.ebuild
index 8b17ece415ef..c76592c54777 100644
--- a/dev-util/google-perftools/google-perftools-2.0.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-2.0.ebuild,v 1.1 2012/07/06 00:57:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-2.0.ebuild,v 1.2 2012/07/09 10:49:06 flameeyes Exp $
EAPI=4
@@ -38,10 +38,14 @@ pkg_setup() {
makeopts="${makeopts} dist_doc_DATA= "
}
+src_prepare() {
+ epatch "${FILESDIR}/${MY_P}+glibc-2.16.patch"
+}
+
src_configure() {
use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
- append-flags -fno-strict-aliasing
+ append-flags -fno-strict-aliasing -fno-omit-frame-pointer
econf \
--disable-static \
diff --git a/dev-util/gource/metadata.xml b/dev-util/gource/metadata.xml
index e5899c3cfa8d..5b4b53782a96 100644
--- a/dev-util/gource/metadata.xml
+++ b/dev-util/gource/metadata.xml
@@ -1,14 +1,14 @@
-
- flameeyes@gentoo.org
-
enrico.tagliavini@gmail.com
Enrico Tagliavini
Proxied co-maintainer
+
+ flameeyes@gentoo.org
+
gource
diff --git a/games-fps/urbanterror/urbanterror-4.1.1.ebuild b/games-fps/urbanterror/urbanterror-4.1.1.ebuild
index a32883972c49..a5847cfdac33 100644
--- a/games-fps/urbanterror/urbanterror-4.1.1.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.1.1.ebuild,v 1.5 2012/07/08 16:01:07 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.1.1.ebuild,v 1.6 2012/07/09 11:42:12 ago Exp $
EAPI=4
@@ -19,7 +19,7 @@ SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/ioquake3-${IOQ3_SVN}.tar.bz2
LICENSE="GPL-2 Q3AEULA"
SLOT="0"
-KEYWORDS="~amd64 ~x86 -*"
+KEYWORDS="-* amd64 ~x86"
IUSE="+curl dedicated openal server speex vorbis"
RDEPEND="
diff --git a/gnustep-apps/keyarcher/Manifest b/gnustep-apps/keyarcher/Manifest
deleted file mode 100644
index 76843dfce301..000000000000
--- a/gnustep-apps/keyarcher/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KeyArcher-0.1.tar.bz2 35468 RMD160 9b53321cfaaacff4eb53c41b17e57f6344313118 SHA1 fc28d83898e9e14066075a6daae1c0ed532c4d85 SHA256 536c84d70c7c2ad30f12b672db620c8b5183e549b9fa3c07d2583956ddf118e7
diff --git a/gnustep-apps/keyarcher/keyarcher-0.1.ebuild b/gnustep-apps/keyarcher/keyarcher-0.1.ebuild
deleted file mode 100644
index f20edd7555d5..000000000000
--- a/gnustep-apps/keyarcher/keyarcher-0.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/keyarcher/keyarcher-0.1.ebuild,v 1.4 2008/03/08 13:34:44 coldwind Exp $
-
-inherit gnustep-2
-
-MY_PN="KeyArcher"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DESCRIPTION="Reads keyed archives content"
-HOMEPAGE="http://home.gna.org/pmanager/"
-SRC_URI="http://download.gna.org/pmanager/0.2/${MY_PN}-${PV}.tar.bz2"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
diff --git a/gnustep-apps/keyarcher/metadata.xml b/gnustep-apps/keyarcher/metadata.xml
deleted file mode 100644
index e3c763b2073d..000000000000
--- a/gnustep-apps/keyarcher/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
- gnustep
- Reads keyed archives content
-
diff --git a/gnustep-apps/plconv/Manifest b/gnustep-apps/plconv/Manifest
deleted file mode 100644
index 34b4650bb8e9..000000000000
--- a/gnustep-apps/plconv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST plconv-0.1.tar.bz2 8295 RMD160 193a1465d7cc4dfc325a6e7d4a0404da857db1e8 SHA1 d6a7e3fe83ae16953362c9d2dd2572f295f909a0 SHA256 6bfacfe18c4f1764c3640473e2153325ef13a8c25d90426943884e7ea5125117
diff --git a/gnustep-apps/plconv/metadata.xml b/gnustep-apps/plconv/metadata.xml
deleted file mode 100644
index ae91e01816e9..000000000000
--- a/gnustep-apps/plconv/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
- gnustep
- Command-line tool for converting between different property-list formats
-
diff --git a/gnustep-apps/plconv/plconv-0.1.ebuild b/gnustep-apps/plconv/plconv-0.1.ebuild
deleted file mode 100644
index 828c8d146877..000000000000
--- a/gnustep-apps/plconv/plconv-0.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/plconv/plconv-0.1.ebuild,v 1.4 2008/03/08 13:35:59 coldwind Exp $
-
-inherit gnustep-2
-
-DESCRIPTION="Command-line tool for converting between different property-list formats"
-HOMEPAGE="http://home.gna.org/pmanager/"
-SRC_URI="http://download.gna.org/pmanager/0.2/${P}.tar.bz2"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
diff --git a/gnustep-apps/projectmanager/Manifest b/gnustep-apps/projectmanager/Manifest
deleted file mode 100644
index fc5d1d6d69fd..000000000000
--- a/gnustep-apps/projectmanager/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ProjectManager-0.2.tar.bz2 378748 RMD160 5e33cbc2a28d5d22adee8b3ec8a54667deccefc8 SHA1 c48e0e465c7c603c4da09f9765d92903834496a1 SHA256 4a8f6b77d4e621ce58cf433828b8f28aaf99cdf7a685362990ab4f42106d0fea
diff --git a/gnustep-apps/projectmanager/files/projectmanager-0.2-missing_includes.patch b/gnustep-apps/projectmanager/files/projectmanager-0.2-missing_includes.patch
deleted file mode 100644
index e6e8d864ccc5..000000000000
--- a/gnustep-apps/projectmanager/files/projectmanager-0.2-missing_includes.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_missing_includes.dpatch by Yavor Doganov
-##
-## DP: Fixes to build with recent GNUstep Base and GNUstep Make.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/Controller.m projectmanager.app-0.2/ProjectManager-0.2/Controller.m
---- projectmanager.app-0.2~/ProjectManager-0.2/Controller.m 2010-05-21 12:25:06.000000000 +0300
-+++ projectmanager.app-0.2/ProjectManager-0.2/Controller.m 2010-05-21 12:25:18.000000000 +0300
-@@ -23,21 +23,7 @@
-
- #import "Controller.h"
-
--#import
--#import
--#import
--#import
--#import
--#import
--
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
-+#import
-
- #import "Preferences.h"
- #import "ProjectCreator.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/EditorRulerView.m projectmanager.app-0.2/ProjectManager-0.2/EditorRulerView.m
---- projectmanager.app-0.2~/ProjectManager-0.2/EditorRulerView.m 2010-05-21 12:25:06.000000000 +0300
-+++ projectmanager.app-0.2/ProjectManager-0.2/EditorRulerView.m 2010-05-21 12:25:18.000000000 +0300
-@@ -23,17 +23,7 @@
-
- #import "EditorRulerView.h"
-
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--
--#import
--#import
-+#import
-
- #import "EditorTextView.h"
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/Preferences.m projectmanager.app-0.2/ProjectManager-0.2/Preferences.m
---- projectmanager.app-0.2~/ProjectManager-0.2/Preferences.m 2010-05-21 12:25:06.000000000 +0300
-+++ projectmanager.app-0.2/ProjectManager-0.2/Preferences.m 2010-05-21 12:25:18.000000000 +0300
-@@ -22,15 +22,7 @@
-
- #import "Preferences.h"
-
--#import
--#import
--#import
--#import
--
--#import
--#import
--#import
--#import
-+#import
-
- #import "PreferencesModule.h"
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectCreator.m projectmanager.app-0.2/ProjectManager-0.2/ProjectCreator.m
---- projectmanager.app-0.2~/ProjectManager-0.2/ProjectCreator.m 2010-05-21 12:25:17.000000000 +0300
-+++ projectmanager.app-0.2/ProjectManager-0.2/ProjectCreator.m 2010-05-21 12:25:18.000000000 +0300
-@@ -20,27 +20,7 @@
-
- #import "ProjectCreator.h"
-
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
-+#import
-
- #import <../WizardKit-0.1/WizardKit.h>
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectDocument.m projectmanager.app-0.2/ProjectManager-0.2/ProjectDocument.m
---- projectmanager.app-0.2~/ProjectManager-0.2/ProjectDocument.m 2010-05-21 12:25:06.000000000 +0300
-+++ projectmanager.app-0.2/ProjectManager-0.2/ProjectDocument.m 2010-05-21 12:25:18.000000000 +0300
-@@ -23,18 +23,7 @@
-
- #import "ProjectDocument.h"
-
--#import
--#import
--#import
--#import
--#import
--
--#import
--#import
--#import
--#import
--#import
--#import
-+#import
-
- #import "SourceEditorDocument.h"
- #import "ProjectWindowController.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/FileManager/ProjectImageView.m projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/FileManager/ProjectImageView.m
---- projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/FileManager/ProjectImageView.m 2010-05-21 12:25:06.000000000 +0300
-+++ projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/FileManager/ProjectImageView.m 2010-05-21 12:25:18.000000000 +0300
-@@ -23,13 +23,7 @@
-
- #import "ProjectImageView.h"
-
--#import
--
--#import
--#import
--#import
--#import
--#import
-+#import
-
- #import "FileManager.h"
- #import "FileManagerDelegate.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/GNUstepAppLauncher/GNUstepAppLauncher.m projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/GNUstepAppLauncher/GNUstepAppLauncher.m
---- projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/GNUstepAppLauncher/GNUstepAppLauncher.m 2010-05-21 12:25:06.000000000 +0300
-+++ projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/GNUstepAppLauncher/GNUstepAppLauncher.m 2010-05-21 12:25:18.000000000 +0300
-@@ -23,30 +23,7 @@
-
- #import "GNUstepAppLauncher.h"
-
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
-+#import
-
- #import "GNUstepAppLauncherDelegate.h"
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/MakeBuilder/MakeBuilder.m projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/MakeBuilder/MakeBuilder.m
---- projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/MakeBuilder/MakeBuilder.m 2010-05-21 12:25:06.000000000 +0300
-+++ projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/MakeBuilder/MakeBuilder.m 2010-05-21 12:25:18.000000000 +0300
-@@ -22,31 +22,7 @@
-
- #import "MakeBuilder.h"
-
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
-+#import
-
- #import "MakeBuilderDelegate.h"
- #import "../../ProjectDocument.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/SubprojectsManager/SubprojectsManager.m projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/SubprojectsManager/SubprojectsManager.m
---- projectmanager.app-0.2~/ProjectManager-0.2/ProjectModules/SubprojectsManager/SubprojectsManager.m 2006-07-09 17:11:42.000000000 +0300
-+++ projectmanager.app-0.2/ProjectManager-0.2/ProjectModules/SubprojectsManager/SubprojectsManager.m 2010-05-21 12:27:49.000000000 +0300
-@@ -23,22 +23,7 @@
-
- #import "SubprojectsManager.h"
-
--#import
--#import
--#import
--#import
--#import
--#import
--
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
-+#import
-
- #import "../../NSImageAdditions.h"
- #import "../../ProjectDocument.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectTypes/Application/ApplicationTypeAttributes.m projectmanager.app-0.2/ProjectManager-0.2/ProjectTypes/Application/ApplicationTypeAttributes.m
---- projectmanager.app-0.2~/ProjectManager-0.2/ProjectTypes/Application/ApplicationTypeAttributes.m 2006-07-09 17:11:43.000000000 +0300
-+++ projectmanager.app-0.2/ProjectManager-0.2/ProjectTypes/Application/ApplicationTypeAttributes.m 2010-05-21 12:26:59.000000000 +0300
-@@ -23,12 +23,7 @@
-
- #import "ApplicationTypeAttributes.h"
-
--#import
--
--#import
--#import
--#import
--#import
-+#import
-
- #import "../../ProjectDocument.h"
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/ProjectWindowController.m projectmanager.app-0.2/ProjectManager-0.2/ProjectWindowController.m
---- projectmanager.app-0.2~/ProjectManager-0.2/ProjectWindowController.m 2010-05-21 12:25:06.000000000 +0300
-+++ projectmanager.app-0.2/ProjectManager-0.2/ProjectWindowController.m 2010-05-21 12:25:18.000000000 +0300
-@@ -23,20 +23,7 @@
-
- #import "ProjectWindowController.h"
-
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--
--#import
--#import
--#import
-+#import
-
- #import "ProjectDocument.h"
- #import "ProjectModule.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' projectmanager.app-0.2~/ProjectManager-0.2/SourceEditorDocument.m projectmanager.app-0.2/ProjectManager-0.2/SourceEditorDocument.m
---- projectmanager.app-0.2~/ProjectManager-0.2/SourceEditorDocument.m 2010-05-21 12:25:17.000000000 +0300
-+++ projectmanager.app-0.2/ProjectManager-0.2/SourceEditorDocument.m 2010-05-21 12:25:18.000000000 +0300
-@@ -23,25 +23,7 @@
-
- #import "SourceEditorDocument.h"
-
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
--#import
-+#import
-
- #import <../HighlighterKit-0.1/HighlighterKit.h>
-
diff --git a/gnustep-apps/projectmanager/files/projectmanager-0.2-pathdomainmask.patch b/gnustep-apps/projectmanager/files/projectmanager-0.2-pathdomainmask.patch
deleted file mode 100644
index 7e4ab1955490..000000000000
--- a/gnustep-apps/projectmanager/files/projectmanager-0.2-pathdomainmask.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ProjectManager-0.2/BundleExtensionLoader.m 2006-07-09 16:11:43.000000000 +0200
-+++ trunk/BundleExtensionLoader.m 2007-07-23 23:46:17.000000000 +0200
-@@ -46,7 +46,7 @@
- defaultsKey
- {
- NSUserDefaults * df = [NSUserDefaults standardUserDefaults];
-- NSSearchPathDomainMask mask = NSAllDomainsMask;
-+ NSSearchPathDomainMask mask = 0xffffffff;
-
- if (defaultsKey == nil)
- {
diff --git a/gnustep-apps/projectmanager/metadata.xml b/gnustep-apps/projectmanager/metadata.xml
deleted file mode 100644
index ca61663683a2..000000000000
--- a/gnustep-apps/projectmanager/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- gnustep
-
- ProjectManager is the alternative Integrated Development
- Environment (IDE) for GNUstep. ProjectManager aims to provide a
- simple, but very usable development environment for all a
- programmer's everyday needs.
-
-
diff --git a/gnustep-apps/projectmanager/projectmanager-0.2.ebuild b/gnustep-apps/projectmanager/projectmanager-0.2.ebuild
deleted file mode 100644
index 58e36ba75066..000000000000
--- a/gnustep-apps/projectmanager/projectmanager-0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/projectmanager/projectmanager-0.2.ebuild,v 1.7 2012/02/09 21:22:23 voyageur Exp $
-
-inherit gnustep-2
-
-MY_PN="ProjectManager"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DESCRIPTION="ProjectManager is another IDE for GNUstep"
-HOMEPAGE="http://home.gna.org/pmanager/"
-SRC_URI="http://download.gna.org/pmanager/${PV}/${MY_PN}-${PV}.tar.bz2"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="gnustep-apps/keyarcher
- gnustep-apps/plconv
- gnustep-libs/highlighterkit
- gnustep-libs/wizardkit"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${P}-missing_includes.patch
- epatch "${FILESDIR}"/${P}-pathdomainmask.patch
-
- rm GNUmakefile.common.preamble || die
-}
diff --git a/gnustep-apps/sudoku/Manifest b/gnustep-apps/sudoku/Manifest
index faf1724e4da7..4f33e3ee9e3f 100644
--- a/gnustep-apps/sudoku/Manifest
+++ b/gnustep-apps/sudoku/Manifest
@@ -1,2 +1,2 @@
-DIST Sudoku-0.7.tar.gz 20979 RMD160 e2407e515aa0f69812b18f5f6c7db022e497a5da SHA1 5880108284bdd10a2e1e676523f86e40bdc0d1e9 SHA256 168606ddedbcea05c97311dbeabafced524fa15cca5943c7d3c7f1b0d1e93a07
-DIST Sudoku6.tgz 14977 RMD160 07b012ad1aaf77e17c5360c92340b216095cb951 SHA1 f489c8f7a0fd36a63a4bca0670db2d4736b09c4f SHA256 3e99d274bd17f8707ad6cc3fa9f8a689387208efdd7c6cbbc417d62d631ca551
+DIST Sudoku-0.7.tar.gz 20979 SHA256 168606ddedbcea05c97311dbeabafced524fa15cca5943c7d3c7f1b0d1e93a07
+DIST Sudoku6.tgz 14977 SHA256 3e99d274bd17f8707ad6cc3fa9f8a689387208efdd7c6cbbc417d62d631ca551
diff --git a/gnustep-apps/sudoku/sudoku-0.7.ebuild b/gnustep-apps/sudoku/sudoku-0.7.ebuild
index 8ef75b1f2581..64a678854f5f 100644
--- a/gnustep-apps/sudoku/sudoku-0.7.ebuild
+++ b/gnustep-apps/sudoku/sudoku-0.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/sudoku/sudoku-0.7.ebuild,v 1.3 2012/06/19 13:10:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/sudoku/sudoku-0.7.ebuild,v 1.4 2012/07/09 05:49:50 xmw Exp $
inherit gnustep-2
@@ -12,6 +12,6 @@ HOMEPAGE="http://gap.nongnu.org/sudoku/"
SRC_URI="http://savannah.nongnu.org/download/gap/${MY_PN}-${PV}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
SLOT="0"
IUSE=""
diff --git a/gnustep-libs/wizardkit/Manifest b/gnustep-libs/wizardkit/Manifest
deleted file mode 100644
index 1523ad3e3bad..000000000000
--- a/gnustep-libs/wizardkit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST WizardKit-0.1.tar.bz2 38291 RMD160 0f212033d28b9524c2379c94cef37f9877e1b071 SHA1 5c5664a9a7bf4bd9cf5515c4955ba03b26299b93 SHA256 1579e8192b4a283d5d8f4aa5c486441fe0f11b67edb9911cb410ee8280e38d07
diff --git a/gnustep-libs/wizardkit/metadata.xml b/gnustep-libs/wizardkit/metadata.xml
deleted file mode 100644
index 53b0638d7d20..000000000000
--- a/gnustep-libs/wizardkit/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
- gnustep
- Wizard support framework
-
diff --git a/gnustep-libs/wizardkit/wizardkit-0.1.ebuild b/gnustep-libs/wizardkit/wizardkit-0.1.ebuild
deleted file mode 100644
index 1b1ac4d34145..000000000000
--- a/gnustep-libs/wizardkit/wizardkit-0.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/wizardkit/wizardkit-0.1.ebuild,v 1.4 2008/03/08 13:23:33 coldwind Exp $
-
-inherit gnustep-2
-
-MY_PN="WizardKit"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DESCRIPTION="Wizard support framework"
-HOMEPAGE="http://home.gna.org/pmanager/"
-SRC_URI="http://download.gna.org/pmanager/0.2/${MY_PN}-${PV}.tar.bz2"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 11178e489bd3..10c4979ec160 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -1,3 +1,3 @@
-DIST luminance-hdr-2.2.1.tar.bz2 3942721 RMD160 fe3c47d13ef3cc5c652209bf55f8b67976d0ac24 SHA1 da6cc78d597c0a2a10ad723dc0a561263c956ecf SHA256 e6f8439eb03455676eaebfe7b41bfcc3d3ac61d1fb296f12b28783292e75a903
-DIST luminance-hdr-2.3.0.beta1.tar.bz2 4941042 RMD160 b838e7f2f07393f4edb397d9607eade94c309621 SHA1 26a940d79bc6056077579fb3e8021c8bd12395e8 SHA256 a1b2318e8093b6e1a7d498c863c6d32b7eb19dafa869f4077adc100b609bec63
-DIST luminance-hdr_2.0.0.tar.gz 2450689 RMD160 679ada53c67c4c37853ac0153e8acb6fe0ed2df7 SHA1 7981cd1ac8b7e29343ce26288796ddc74cf23ca9 SHA256 6e6f6dadbe54d2c14e1c98c2dba928b3bc09ba4dbe5c63a071a32f5c372e16e8
+DIST luminance-hdr-2.2.1.tar.bz2 3942721 SHA256 e6f8439eb03455676eaebfe7b41bfcc3d3ac61d1fb296f12b28783292e75a903 SHA512 78e98d7b5c46c81f3b84cc19337d2f860f88eb6d3626a8d33122137cde6d269d06b2f33cc5cf9541a28d5d760685637915e9a850f486e93e023fc8faadb4f94d WHIRLPOOL 7910961fff636cb48e309ba29758a4a6e17b4fc6b42db06602a6c5fda4a1b97ccb225247ffe5a354145c2f37f0e20af47b149b3cacb822d13edbd4cd129035ad
+DIST luminance-hdr-2.3.0.tar.bz2 5398576 SHA256 dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676 SHA512 6806782bec25cde92eeafc1e6a6aeb801226c0db27bd9163829b4556209267a9f5f0ecaae934fbb42a25a780cd131bc34880bc48d6d68867fe1ab117bb4cde08 WHIRLPOOL 8f1430b0e46d53e79e7ba565b73e190b0ad6efb9f2937f8612b0ddda4d442fbc4c31b055a4904c48338e00dc8719cefb94b7f43fff040255f403ebeb4e8aac95
+DIST luminance-hdr_2.0.0.tar.gz 2450689 SHA256 6e6f6dadbe54d2c14e1c98c2dba928b3bc09ba4dbe5c63a071a32f5c372e16e8
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.3.0_beta1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild
similarity index 82%
rename from media-gfx/luminance-hdr/luminance-hdr-2.3.0_beta1.ebuild
rename to media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild
index 2b2110f56aba..1aa5c8abce80 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.3.0_beta1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-2.3.0_beta1.ebuild,v 1.1 2012/06/30 16:45:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-2.3.0.ebuild,v 1.1 2012/07/09 09:51:30 radhermit Exp $
EAPI="4"
@@ -14,12 +14,12 @@ SRC_URI="mirror://sourceforge/qtpfsgui/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-LANGS=" cs de es fi fr hu id it pl ro ru tr"
+LANGS=" cs de es fi fr hi hu id it pl ro ru sk tr zh"
IUSE="${LANGS// / linguas_} openmp"
DEPEND="
>=media-gfx/exiv2-0.14
- media-libs/lcms:0
+ media-libs/lcms:2
media-libs/libpng
>=media-libs/libraw-0.13.4
>=media-libs/openexr-1.2.2-r2
@@ -45,7 +45,7 @@ pkg_setup() {
src_prepare() {
# Don't try to define the git version of the release
- epatch "${FILESDIR}"/${P}-no-git.patch
+ epatch "${FILESDIR}"/${PN}-2.3.0_beta1-no-git.patch
# Don't install extra docs and fix install dir
epatch "${FILESDIR}"/${PN}-2.2.1-docs.patch
@@ -65,6 +65,8 @@ src_install() {
cmake-utils_src_install
for lang in ${LANGS} ; do
- use linguas_${lang} || { rm "${D}"/usr/share/${PN}/i18n/lang_${lang}.qm || die ; }
+ if ! use linguas_${lang} ; then
+ rm -f "${D}"/usr/share/${PN}/i18n/{lang,qt}_${lang}.qm || die
+ fi
done
}
diff --git a/media-sound/mac/mac-3.99.4.5.7-r1.ebuild b/media-sound/mac/mac-3.99.4.5.7-r1.ebuild
index 7e33f0549c10..8dc4a199d3df 100644
--- a/media-sound/mac/mac-3.99.4.5.7-r1.ebuild
+++ b/media-sound/mac/mac-3.99.4.5.7-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/media-sound/mac/mac-3.99.4.5.7-r1.ebuild,v 1.2 2012/07/08 23:29:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mac/mac-3.99.4.5.7-r1.ebuild,v 1.3 2012/07/09 11:48:04 ago Exp $
EAPI=4
inherit flag-o-matic versionator
@@ -15,7 +15,7 @@ SRC_URI="http://etree.org/shnutils/shntool/support/formats/ape/unix/${MY_PV}-${P
LICENSE="mac"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc x86"
+KEYWORDS="~alpha amd64 ~ppc x86"
IUSE="mmx static-libs"
RDEPEND=""
diff --git a/media-sound/podcatcher/Manifest b/media-sound/podcatcher/Manifest
index 109f1d12837e..f1a2f3e2b643 100644
--- a/media-sound/podcatcher/Manifest
+++ b/media-sound/podcatcher/Manifest
@@ -1 +1,2 @@
-DIST podcatcher-3.1.4.tar.gz 23840 RMD160 aa9e5d078274e9da894c479dd146cc7ff0f5741d SHA1 51fa0d5f4565c84ab9a2dd4dbf44d56cba2fb05f SHA256 96cdbc0e2922417d128e0504288262324c0e8e2330ae205a183a1e458a62a470
+DIST podcatcher-3.1.4.tar.gz 23840 SHA256 96cdbc0e2922417d128e0504288262324c0e8e2330ae205a183a1e458a62a470
+DIST podcatcher-3.1.6.tar.gz 22260 SHA256 0672fd11c3aefde8d28f2539bd3f8d1f47a3acb1b0bb8120ed028d4dfbd365db SHA512 5e1ac6771a4d81d2bfbc77c4a89861a976329a77144b630aaa7f6a1663a0dd9021acc71cfd44e6373bdaf4562718bbb3c19ff7cda56be1c7624cf389ff293599 WHIRLPOOL 03f081fd2aa2a81cfdfb6d3b402fd4013dcf4d5a8725a07e1c1e73117b57cb62d6ec24a5d58d8ac2f81a6475795ae375de33e1781f10fd8c9756b3546abfcf42
diff --git a/media-sound/podcatcher/podcatcher-3.1.6.ebuild b/media-sound/podcatcher/podcatcher-3.1.6.ebuild
new file mode 100644
index 000000000000..e6953c6fb87c
--- /dev/null
+++ b/media-sound/podcatcher/podcatcher-3.1.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/podcatcher/podcatcher-3.1.6.ebuild,v 1.1 2012/07/09 06:31:13 yngwin Exp $
+
+EAPI=4
+
+DESCRIPTION="Podcast client for the command-line written in Ruby"
+HOMEPAGE="http://podcatcher.rubyforge.org/"
+SRC_URI="http://rubyforge.org/frs/download.php/76053/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bittorrent"
+
+RDEPEND=">=dev-lang/ruby-1.8.2
+ bittorrent? ( dev-ruby/rubytorrent )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+ dobin bin/podcatcher
+ dodoc demo/*
+}
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 4e2408372eaa..3bbf4c2c2910 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1,2 +1,2 @@
-DIST xwax-1.0.tar.gz 54094 SHA256 8d5617bb11c964e9ec5b85ed9a3f004d4f0728ca0ae65b238443404c5bc0358d
-DIST xwax-1.2.tar.gz 64910 SHA256 2e35aafb2a08d29c611e19a54b3e45b5c7243cf53b2aec1634c87f01fb35e6a9
+DIST xwax-1.0.tar.gz 54094 SHA256 8d5617bb11c964e9ec5b85ed9a3f004d4f0728ca0ae65b238443404c5bc0358d SHA512 85b136a51a3fbff18840b084d54a2555997c8c1a6c7ac112c78b5c83d1f9ecd3243c9ae86b78155af2624e16dd22ce508d2897c4dca287292d9fb21fe71a5bfd WHIRLPOOL 5523d27febdc4f821c8c6c95d77949ffe37e828664c02b9b401b14a83ff3b3048e49479db524da473babc78226016d7a717089b757b18cf78048d2924e030ddc
+DIST xwax-1.2.tar.gz 64910 SHA256 2e35aafb2a08d29c611e19a54b3e45b5c7243cf53b2aec1634c87f01fb35e6a9 SHA512 a36ce3f950df5f19e64c70325d507a95880b3c8e22eaed592bdf9545989632badfde87ed89c4129dc1e26266980ebdb6c15255edd2bc2aac9ff5c3d8fc88287d WHIRLPOOL 7d608bee6b808d779865ce5ae9d1c1402d4b409cb2fd20bda959bbbddf0ca1f9a7981e9f271a3f1a0e9b4972108a153e6b16cd181294a0acb9d2b4af85ddd5ad
diff --git a/media-sound/xwax/xwax-1.2.ebuild b/media-sound/xwax/xwax-1.2.ebuild
index 7b9497832c1f..50252e1f4db3 100644
--- a/media-sound/xwax/xwax-1.2.ebuild
+++ b/media-sound/xwax/xwax-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/media-sound/xwax/xwax-1.2.ebuild,v 1.2 2012/07/08 10:36:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.2.ebuild,v 1.3 2012/07/09 11:43:08 ago Exp $
EAPI=4
inherit toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://www.xwax.co.uk/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="alsa jack oss cdda mp3 +fallback"
REQUIRED_USE="|| ( cdda mp3 fallback )
|| ( alsa jack oss )"
diff --git a/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild b/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild
index d91dd1f61c49..ffae0b50d8bd 100644
--- a/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild
+++ b/media-tv/mythtv/mythtv-0.25.1_p20120708.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-tv/mythtv/mythtv-0.25.1_p20120708.ebuild,v 1.1 2012/07/08 23:26:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild,v 1.2 2012/07/09 07:41:26 cardoe Exp $
EAPI=4
@@ -91,6 +91,8 @@ DEPEND="${SDEPEND}
x11-proto/xf86vidmodeproto
"
+S="${WORKDIR}/${PN}-${MY_P}"
+
MYTHTV_GROUPS="video,audio,tty,uucp"
pkg_setup() {
diff --git a/media-video/mjpegtools/mjpegtools-2.0.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.0.0-r2.ebuild
index 0a51ba53f623..e008d6efb117 100644
--- a/media-video/mjpegtools/mjpegtools-2.0.0-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.0.0-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/media-video/mjpegtools/mjpegtools-2.0.0-r2.ebuild,v 1.5 2012/07/08 23:28:55 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.0.0-r2.ebuild,v 1.6 2012/07/09 11:58:17 jer Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE="dga dv gtk mmx png quicktime sdl sdlgfx static-libs v4l"
REQUIRED_USE="sdlgfx? ( sdl )"
diff --git a/metadata/cache/app-admin/eselect-awk-0.2 b/metadata/cache/app-admin/eselect-awk-0.2
index 98da2adab318..2a4df0e803ee 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 ~arm ~hppa ~x86 ~x86-macos
+~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~x86-macos
diff --git a/metadata/cache/app-arch/atool-0.39.0 b/metadata/cache/app-arch/atool-0.39.0
index 5d1b8b143319..dce6ad15899b 100644
--- a/metadata/cache/app-arch/atool-0.39.0
+++ b/metadata/cache/app-arch/atool-0.39.0
@@ -6,7 +6,7 @@ http://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz
http://www.nongnu.org/atool/
GPL-2
a script for managing file archives of various types
-~amd64 ~ppc x86
+amd64 ~ppc x86
diff --git a/metadata/cache/app-crypt/md5deep-4.0.1 b/metadata/cache/app-crypt/md5deep-4.0.1
index e187912559cf..4c8cb0ba3517 100644
--- a/metadata/cache/app-crypt/md5deep-4.0.1
+++ b/metadata/cache/app-crypt/md5deep-4.0.1
@@ -6,7 +6,7 @@ mirror://sourceforge/md5deep/md5deep-4.0.1.tar.gz
http://md5deep.sourceforge.net/
public-domain GPL-2
Expanded md5sum program with recursive and comparison options
-~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
diff --git a/metadata/cache/app-doc/root-docs-5.32.03 b/metadata/cache/app-doc/root-docs-5.32.03
index cb3102b12724..97f2ee14ca54 100644
--- a/metadata/cache/app-doc/root-docs-5.32.03
+++ b/metadata/cache/app-doc/root-docs-5.32.03
@@ -6,7 +6,7 @@ ftp://root.cern.ch/root/root_v5.32.03.source.tar.gz
http://root.cern.ch/
LGPL-2.1
API documentation for ROOT (An Object-Oriented Data Analysis Framework)
-~amd64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~x86 ~amd64-linux ~x86-linux
eutils multilib toolchain-funcs user virtualx
test
diff --git a/metadata/cache/app-misc/sphinx-0.9.9-r2 b/metadata/cache/app-misc/sphinx-0.9.9-r2
deleted file mode 100644
index dddd8890250a..000000000000
--- a/metadata/cache/app-misc/sphinx-0.9.9-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) virtual/libiconv
-0
-http://sphinxsearch.com/downloads/sphinx-0.9.9.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
-
-http://www.sphinxsearch.com/
-GPL-2
-Full-text search engine with support for MySQL and PostgreSQL
-~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos
-autotools eutils libtool multilib multiprocessing toolchain-funcs user
-debug id64 mysql postgres stemmer test
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-misc/sphinx-1.10_beta-r1 b/metadata/cache/app-misc/sphinx-1.10_beta-r1
deleted file mode 100644
index e427750932d9..000000000000
--- a/metadata/cache/app-misc/sphinx-1.10_beta-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv
-0
-http://sphinxsearch.com/downloads/sphinx-1.10-beta.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
-
-http://www.sphinxsearch.com/
-GPL-2
-Full-text search engine with support for MySQL and PostgreSQL
-~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos
-autotools eutils libtool multilib multiprocessing toolchain-funcs user
-debug id64 mysql odbc postgres stemmer test
-
-
-
-3
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-misc/sphinx-2.0.3 b/metadata/cache/app-misc/sphinx-2.0.3
deleted file mode 100644
index c4050190e7d7..000000000000
--- a/metadata/cache/app-misc/sphinx-2.0.3
+++ /dev/null
@@ -1,22 +0,0 @@
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv
-0
-http://sphinxsearch.com/files/sphinx-2.0.3-release.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
-
-http://www.sphinxsearch.com/
-GPL-2
-Full-text search engine with support for MySQL and PostgreSQL
-~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
-autotools eutils libtool multilib multiprocessing toolchain-funcs user
-debug id64 mysql odbc postgres stemmer test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-embedded/qvfb-4.6.3 b/metadata/cache/dev-embedded/qvfb-4.6.3
deleted file mode 100644
index 20012d6bdd21..000000000000
--- a/metadata/cache/dev-embedded/qvfb-4.6.3
+++ /dev/null
@@ -1,22 +0,0 @@
-~x11-libs/qt-gui-4.6.3 virtual/pkgconfig
-~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
-
-http://www.trolltech.com/
-|| ( LGPL-2.1 GPL-3 )
-The Qt Embedded Virtual Framebuffer emulator.
-~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-base eutils flag-o-matic multilib qt4-build toolchain-funcs user versionator
-aqua debug pch +exceptions
-
-
-
-2
-
-compile configure install postinst postrm prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-java/java-sdk-docs-1.7.0.4 b/metadata/cache/dev-java/java-sdk-docs-1.7.0.4
index 2f77e705baa6..733e09476978 100644
--- a/metadata/cache/dev-java/java-sdk-docs-1.7.0.4
+++ b/metadata/cache/dev-java/java-sdk-docs-1.7.0.4
@@ -6,7 +6,7 @@ fetch
http://download.oracle.com/javase/7/docs/
oracle-java-documentation-7
Oracle's documentation bundle (including API) for Java SE
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
diff --git a/metadata/cache/dev-java/oracle-jdk-bin-1.7.0.5 b/metadata/cache/dev-java/oracle-jdk-bin-1.7.0.5
index ab62fe7c636d..8e1966f1d769 100644
--- a/metadata/cache/dev-java/oracle-jdk-bin-1.7.0.5
+++ b/metadata/cache/dev-java/oracle-jdk-bin-1.7.0.5
@@ -6,7 +6,7 @@ fetch strip
http://www.oracle.com/technetwork/java/javase/
Oracle-BCLA-JavaSE
Oracle's Java SE Development Kit
-~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
eutils fdo-mime java-vm-2 multilib pax-utils prefix toolchain-funcs user versionator
X alsa derby doc examples jce nsplugin +source
diff --git a/metadata/cache/dev-java/oracle-jre-bin-1.7.0.5 b/metadata/cache/dev-java/oracle-jre-bin-1.7.0.5
index 280378d8221e..b30b5c27168f 100644
--- a/metadata/cache/dev-java/oracle-jre-bin-1.7.0.5
+++ b/metadata/cache/dev-java/oracle-jre-bin-1.7.0.5
@@ -6,7 +6,7 @@ fetch strip
http://www.oracle.com/technetwork/java/javase/
Oracle-BCLA-JavaSE
Oracle's Java SE Runtime Environment
-~amd64 ~x86
+~amd64 x86
eutils fdo-mime java-vm-2 multilib pax-utils prefix toolchain-funcs user versionator
X alsa jce nsplugin
diff --git a/metadata/cache/dev-java/sun-jdk-1.6.0.33 b/metadata/cache/dev-java/sun-jdk-1.6.0.33
index 9599c19cd726..f251f1ecb702 100644
--- a/metadata/cache/dev-java/sun-jdk-1.6.0.33
+++ b/metadata/cache/dev-java/sun-jdk-1.6.0.33
@@ -6,7 +6,7 @@ fetch strip
http://www.oracle.com/technetwork/java/javase/
Oracle-BCLA-JavaSE
Oracle's Java SE Development Kit
-amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
eutils fdo-mime java-vm-2 multilib pax-utils prefix toolchain-funcs user versionator
X alsa derby doc examples jce kernel_SunOS nsplugin +source
diff --git a/metadata/cache/dev-java/sun-jre-bin-1.6.0.33 b/metadata/cache/dev-java/sun-jre-bin-1.6.0.33
index 27d844ab3a3c..64095e467a3e 100644
--- a/metadata/cache/dev-java/sun-jre-bin-1.6.0.33
+++ b/metadata/cache/dev-java/sun-jre-bin-1.6.0.33
@@ -6,7 +6,7 @@ fetch strip
http://www.oracle.com/technetwork/java/javase/
Oracle-BCLA-JavaSE
Oracle's Java SE Runtime Environment
-amd64 ~x86
+amd64 x86
eutils fdo-mime java-vm-2 multilib pax-utils prefix toolchain-funcs user versionator
X alsa jce nsplugin
diff --git a/metadata/cache/dev-lang/vala-0.16.1-r1 b/metadata/cache/dev-lang/vala-0.16.1-r1
index c7337ec50008..f50a6ebadf29 100644
--- a/metadata/cache/dev-lang/vala-0.16.1-r1
+++ b/metadata/cache/dev-lang/vala-0.16.1-r1
@@ -6,7 +6,7 @@ mirror://gnome/sources/vala/0.16/vala-0.16.1.tar.xz
http://live.gnome.org/Vala
LGPL-2.1
Vala - Compiler for the GObject type system
-~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
alternatives eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
test +vapigen
diff --git a/metadata/cache/dev-perl/Alien-SDL-1.434 b/metadata/cache/dev-perl/Alien-SDL-1.434
index aac99904b24e..cd6e6a90427f 100644
--- a/metadata/cache/dev-perl/Alien-SDL-1.434
+++ b/metadata/cache/dev-perl/Alien-SDL-1.434
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/F/FR/FROGGS/Alien-SDL-1.434.tar.gz
http://search.cpan.org/dist/Alien-SDL/
|| ( Artistic GPL-1 GPL-2 GPL-3 )
building, finding and using SDL binaries
-amd64 ~hppa x86
+amd64 hppa x86
base eutils multilib multiprocessing perl-module toolchain-funcs user
diff --git a/metadata/cache/dev-python/beautifulsoup-4.1.1 b/metadata/cache/dev-python/beautifulsoup-4.1.1
new file mode 100644
index 000000000000..ae0c0f09751c
--- /dev/null
+++ b/metadata/cache/dev-python/beautifulsoup-4.1.1
@@ -0,0 +1,22 @@
+doc? ( dev-python/sphinx ) test? ( dev-python/lxml ) || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/nose )
+|| ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+4
+mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.1.1.tar.gz
+
+http://www.crummy.com/software/BeautifulSoup/ http://pypi.python.org/pypi/beautifulsoup4
+MIT
+Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+distutils multilib python toolchain-funcs
+doc test test
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/coverage-3.5.2 b/metadata/cache/dev-python/coverage-3.5.2
index b86f7dddddf2..81a6d8a04042 100644
--- a/metadata/cache/dev-python/coverage-3.5.2
+++ b/metadata/cache/dev-python/coverage-3.5.2
@@ -6,7 +6,7 @@ mirror://pypi/c/coverage/coverage-3.5.2.tar.gz
http://nedbatchelder.com/code/coverage/ http://pypi.python.org/pypi/coverage
BSD
Code coverage measurement for Python
-~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
distutils multilib python toolchain-funcs
diff --git a/metadata/cache/dev-python/pycups-1.9.61 b/metadata/cache/dev-python/pycups-1.9.61
index 1d704359ff8b..83e47a020ded 100644
--- a/metadata/cache/dev-python/pycups-1.9.61
+++ b/metadata/cache/dev-python/pycups-1.9.61
@@ -6,7 +6,7 @@ http://cyberelk.net/tim/data/pycups/pycups-1.9.61.tar.bz2
http://cyberelk.net/tim/data/pycups/
GPL-2
Python bindings for the CUPS API
-alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86
+alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86
distutils eutils flag-o-matic multilib python toolchain-funcs user
doc examples
diff --git a/metadata/cache/dev-python/pymongo-2.1 b/metadata/cache/dev-python/pymongo-2.2.1
similarity index 89%
rename from metadata/cache/dev-python/pymongo-2.1
rename to metadata/cache/dev-python/pymongo-2.2.1
index 465f61b18717..27a5bb690246 100644
--- a/metadata/cache/dev-python/pymongo-2.1
+++ b/metadata/cache/dev-python/pymongo-2.2.1
@@ -1,7 +1,7 @@
dev-db/mongodb dev-python/setuptools doc? ( dev-python/sphinx ) =dev-lang/python-2* test? ( dev-python/nose )
dev-db/mongodb =dev-lang/python-2*
0
-mirror://pypi/p/pymongo/pymongo-2.1.tar.gz
+mirror://pypi/p/pymongo/pymongo-2.2.1.tar.gz
http://github.com/mongodb/mongo-python-driver http://pypi.python.org/pypi/pymongo
Apache-2.0
diff --git a/metadata/cache/dev-ruby/fxruby-1.6.25 b/metadata/cache/dev-ruby/fxruby-1.6.25
index f1173b7a8684..798f1fe74b2b 100644
--- a/metadata/cache/dev-ruby/fxruby-1.6.25
+++ b/metadata/cache/dev-ruby/fxruby-1.6.25
@@ -6,7 +6,7 @@ mirror://rubygems/fxruby-1.6.25.gem
http://www.fxruby.org/
LGPL-2.1
Ruby language binding to the FOX GUI toolkit
-~amd64 ~ppc ~x86 ~x86-fbsd
+~amd64 ~hppa ~ppc ~x86 ~x86-fbsd
eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
examples doc elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
diff --git a/metadata/cache/dev-ruby/mkrf-0.2.3-r2 b/metadata/cache/dev-ruby/mkrf-0.2.3-r2
index 682b54dd618a..f258984ffa38 100644
--- a/metadata/cache/dev-ruby/mkrf-0.2.3-r2
+++ b/metadata/cache/dev-ruby/mkrf-0.2.3-r2
@@ -6,7 +6,7 @@ mirror://rubygems/mkrf-0.2.3.gem
http://mkrf.rubyforge.org/
MIT
mkrf is a library for generating Rakefiles, primarily intended for building C extentions for Ruby.
-~amd64 ~ppc ~x86
+~amd64 ~hppa ~ppc ~x86
eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc doc test test
diff --git a/metadata/cache/dev-ruby/ruby-opengl-0.60.1-r2 b/metadata/cache/dev-ruby/ruby-opengl-0.60.1-r2
index 4244a6f6af37..d7710af50997 100644
--- a/metadata/cache/dev-ruby/ruby-opengl-0.60.1-r2
+++ b/metadata/cache/dev-ruby/ruby-opengl-0.60.1-r2
@@ -6,7 +6,7 @@ mirror://rubygems/ruby-opengl-0.60.1.gem
http://ruby-opengl.rubyforge.org/
MIT
OpenGL / GLUT bindings for ruby
-~amd64 ~ppc ~x86
+~amd64 ~hppa ~ppc ~x86
eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
diff --git a/metadata/cache/dev-tex/latex-beamer-3.20 b/metadata/cache/dev-tex/latex-beamer-3.20
index 8f59239b5994..082cd3346974 100644
--- a/metadata/cache/dev-tex/latex-beamer-3.20
+++ b/metadata/cache/dev-tex/latex-beamer-3.20
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~radhermit/dist/latex-beamer-3.20.zip
http://bitbucket.org/rivanvx/beamer/wiki/Home
GPL-2 FDL-1.2 LPPL-1.3c
LaTeX class for creating presentations using a video projector
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
base eutils latex-package multilib toolchain-funcs user
doc examples lyx
diff --git a/metadata/cache/dev-util/debhelper-9.20120608 b/metadata/cache/dev-util/debhelper-9.20120608
index 5f2448918029..e0ae8846cc7b 100644
--- a/metadata/cache/dev-util/debhelper-9.20120608
+++ b/metadata/cache/dev-util/debhelper-9.20120608
@@ -6,7 +6,7 @@ mirror://debian/pool/main/d/debhelper/debhelper_9.20120608.tar.gz
http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/
GPL-2
Collection of programs that can be used to automate common tasks in debian/rules
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc x86
+~alpha amd64 ~arm hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc x86
eutils multilib toolchain-funcs user
nls linguas_de linguas_es linguas_fr test
diff --git a/metadata/cache/dev-util/google-perftools-1.10 b/metadata/cache/dev-util/google-perftools-1.10
deleted file mode 100644
index cfc00fc5e1b9..000000000000
--- a/metadata/cache/dev-util/google-perftools-1.10
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/libunwind
-sys-libs/libunwind
-0
-http://gperftools.googlecode.com/files/google-perftools-1.10.tar.gz
-
-http://code.google.com/p/gperftools/
-MIT
-Fast, multi-threaded malloc() and nifty performance analysis tools
-~amd64 ~x86 ~x86-fbsd
-eutils flag-o-matic multilib toolchain-funcs user
-largepages +debug minimal test
-
-
-
-4
-
-compile configure install setup test
-
-
-
-
-
diff --git a/metadata/cache/dev-util/google-perftools-1.9 b/metadata/cache/dev-util/google-perftools-1.9
deleted file mode 100644
index b0d934bf1225..000000000000
--- a/metadata/cache/dev-util/google-perftools-1.9
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/libunwind
-sys-libs/libunwind
-0
-http://google-perftools.googlecode.com/files/google-perftools-1.9.tar.gz
-
-http://code.google.com/p/google-perftools/
-MIT
-Fast, multi-threaded malloc() and nifty performance analysis tools
-~amd64 ~x86 ~x86-fbsd
-eutils flag-o-matic multilib toolchain-funcs user
-largepages +debug minimal test
-
-
-
-4
-
-compile configure install setup test
-
-
-
-
-
diff --git a/metadata/cache/dev-util/google-perftools-2.0 b/metadata/cache/dev-util/google-perftools-2.0
index 20409da1fe6b..ec2554070b7c 100644
--- a/metadata/cache/dev-util/google-perftools-2.0
+++ b/metadata/cache/dev-util/google-perftools-2.0
@@ -14,7 +14,7 @@ largepages +debug minimal test
4
-compile configure install setup test
+compile configure install prepare setup test
diff --git a/metadata/cache/games-fps/urbanterror-4.1.1 b/metadata/cache/games-fps/urbanterror-4.1.1
index 238d53d0e7e3..fd0b575cd626 100644
--- a/metadata/cache/games-fps/urbanterror-4.1.1
+++ b/metadata/cache/games-fps/urbanterror-4.1.1
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~hasufell/distfiles/ioquake3-1807.tar.bz2 http://dev.gento
http://www.urbanterror.info/home/
GPL-2 Q3AEULA
Hollywood tactical shooter based on the ioquake3 engine
-~amd64 ~x86 -*
+-* amd64 ~x86
base eutils games gnome2-utils multilib toolchain-funcs user
+curl dedicated openal server speex vorbis
diff --git a/metadata/cache/gnustep-apps/keyarcher-0.1 b/metadata/cache/gnustep-apps/keyarcher-0.1
deleted file mode 100644
index 4e8338f6048d..000000000000
--- a/metadata/cache/gnustep-apps/keyarcher-0.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
-0
-http://download.gna.org/pmanager/0.2/KeyArcher-0.1.tar.bz2
-
-http://home.gna.org/pmanager/
-GPL-2
-Reads keyed archives content
-amd64 ppc x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
-debug doc
-
-
-
-
-
-compile install postinst setup unpack
-
-
-
-
-
diff --git a/metadata/cache/gnustep-apps/plconv-0.1 b/metadata/cache/gnustep-apps/plconv-0.1
deleted file mode 100644
index c63d00da7181..000000000000
--- a/metadata/cache/gnustep-apps/plconv-0.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
-0
-http://download.gna.org/pmanager/0.2/plconv-0.1.tar.bz2
-
-http://home.gna.org/pmanager/
-GPL-2
-Command-line tool for converting between different property-list formats
-amd64 ppc x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
-debug doc
-
-
-
-
-
-compile install postinst setup unpack
-
-
-
-
-
diff --git a/metadata/cache/gnustep-apps/projectmanager-0.2 b/metadata/cache/gnustep-apps/projectmanager-0.2
deleted file mode 100644
index 6eeaed8b82b6..000000000000
--- a/metadata/cache/gnustep-apps/projectmanager-0.2
+++ /dev/null
@@ -1,22 +0,0 @@
-gnustep-apps/keyarcher gnustep-apps/plconv gnustep-libs/highlighterkit gnustep-libs/wizardkit >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-gnustep-apps/keyarcher gnustep-apps/plconv gnustep-libs/highlighterkit gnustep-libs/wizardkit >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
-0
-http://download.gna.org/pmanager/0.2/ProjectManager-0.2.tar.bz2
-
-http://home.gna.org/pmanager/
-GPL-2
-ProjectManager is another IDE for GNUstep
-amd64 ppc x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
-debug doc
-
-
-
-
-
-compile install postinst setup unpack
-
-
-
-
-
diff --git a/metadata/cache/gnustep-apps/sudoku-0.7 b/metadata/cache/gnustep-apps/sudoku-0.7
index 3a27ba2b3e36..e45a396fe8b8 100644
--- a/metadata/cache/gnustep-apps/sudoku-0.7
+++ b/metadata/cache/gnustep-apps/sudoku-0.7
@@ -6,7 +6,7 @@ http://savannah.nongnu.org/download/gap/Sudoku-0.7.tar.gz
http://gap.nongnu.org/sudoku/
GPL-2
Sudoku generator for GNUstep
-amd64 ~ppc x86
+amd64 ppc x86
eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
debug doc
diff --git a/metadata/cache/gnustep-libs/wizardkit-0.1 b/metadata/cache/gnustep-libs/wizardkit-0.1
deleted file mode 100644
index 4787c3eb3e22..000000000000
--- a/metadata/cache/gnustep-libs/wizardkit-0.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
->=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
-0
-http://download.gna.org/pmanager/0.2/WizardKit-0.1.tar.bz2
-
-http://home.gna.org/pmanager/
-GPL-2
-Wizard support framework
-amd64 ppc x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib toolchain-funcs user
-debug doc
-
-
-
-
-
-compile install postinst setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-gfx/luminance-hdr-2.3.0_beta1 b/metadata/cache/media-gfx/luminance-hdr-2.3.0
similarity index 73%
rename from metadata/cache/media-gfx/luminance-hdr-2.3.0_beta1
rename to metadata/cache/media-gfx/luminance-hdr-2.3.0
index fdcb7c4caa16..d512f3484fa0 100644
--- a/metadata/cache/media-gfx/luminance-hdr-2.3.0_beta1
+++ b/metadata/cache/media-gfx/luminance-hdr-2.3.0
@@ -1,14 +1,14 @@
->=media-gfx/exiv2-0.14 media-libs/lcms:0 media-libs/libpng >=media-libs/libraw-0.13.4 >=media-libs/openexr-1.2.2-r2 >=media-libs/tiff-3.8.2-r2 sci-libs/fftw:3.0 sci-libs/gsl virtual/jpeg x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
->=media-gfx/exiv2-0.14 media-libs/lcms:0 media-libs/libpng >=media-libs/libraw-0.13.4 >=media-libs/openexr-1.2.2-r2 >=media-libs/tiff-3.8.2-r2 sci-libs/fftw:3.0 sci-libs/gsl virtual/jpeg x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4
+>=media-gfx/exiv2-0.14 media-libs/lcms:2 media-libs/libpng >=media-libs/libraw-0.13.4 >=media-libs/openexr-1.2.2-r2 >=media-libs/tiff-3.8.2-r2 sci-libs/fftw:3.0 sci-libs/gsl virtual/jpeg x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+>=media-gfx/exiv2-0.14 media-libs/lcms:2 media-libs/libpng >=media-libs/libraw-0.13.4 >=media-libs/openexr-1.2.2-r2 >=media-libs/tiff-3.8.2-r2 sci-libs/fftw:3.0 sci-libs/gsl virtual/jpeg x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-sql:4 x11-libs/qt-webkit:4
0
-mirror://sourceforge/qtpfsgui/luminance-hdr-2.3.0.beta1.tar.bz2
+mirror://sourceforge/qtpfsgui/luminance-hdr-2.3.0.tar.bz2
http://qtpfsgui.sourceforge.net
GPL-2
Luminance HDR is a graphical user interface that provides a workflow for HDR imaging.
~amd64 ~x86
base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
-linguas_cs linguas_de linguas_es linguas_fi linguas_fr linguas_hu linguas_id linguas_it linguas_pl linguas_ro linguas_ru linguas_tr openmp
+linguas_cs linguas_de linguas_es linguas_fi linguas_fr linguas_hi linguas_hu linguas_id linguas_it linguas_pl linguas_ro linguas_ru linguas_sk linguas_tr linguas_zh openmp
diff --git a/metadata/cache/media-sound/mac-3.99.4.5.7-r1 b/metadata/cache/media-sound/mac-3.99.4.5.7-r1
index 6bccbc196b92..8a4ba8786278 100644
--- a/metadata/cache/media-sound/mac-3.99.4.5.7-r1
+++ b/metadata/cache/media-sound/mac-3.99.4.5.7-r1
@@ -6,7 +6,7 @@ mirror
http://etree.org/shnutils/shntool/
mac
Monkey's Audio Codecs
-~alpha ~amd64 ~ppc x86
+~alpha amd64 ~ppc x86
eutils flag-o-matic multilib toolchain-funcs user versionator
mmx static-libs
diff --git a/metadata/cache/media-sound/podcatcher-3.1.6 b/metadata/cache/media-sound/podcatcher-3.1.6
new file mode 100644
index 000000000000..68e3b8d84092
--- /dev/null
+++ b/metadata/cache/media-sound/podcatcher-3.1.6
@@ -0,0 +1,22 @@
+>=dev-lang/ruby-1.8.2 bittorrent? ( dev-ruby/rubytorrent )
+>=dev-lang/ruby-1.8.2 bittorrent? ( dev-ruby/rubytorrent )
+0
+http://rubyforge.org/frs/download.php/76053/podcatcher-3.1.6.tar.gz
+
+http://podcatcher.rubyforge.org/
+GPL-2
+Podcast client for the command-line written in Ruby
+~amd64 ~ppc ~x86
+
+bittorrent
+
+
+
+4
+
+install
+
+
+
+
+
diff --git a/metadata/cache/media-sound/xwax-1.2 b/metadata/cache/media-sound/xwax-1.2
index 5d34872cb749..268d361f0324 100644
--- a/metadata/cache/media-sound/xwax-1.2
+++ b/metadata/cache/media-sound/xwax-1.2
@@ -6,7 +6,7 @@ http://www.xwax.co.uk/releases/xwax-1.2.tar.gz
http://www.xwax.co.uk/
GPL-2
Digital vinyl emulation software
-~amd64 ~ppc ~ppc64 x86
+amd64 ~ppc ~ppc64 x86
multilib toolchain-funcs
alsa jack oss cdda mp3 +fallback
|| ( cdda mp3 fallback ) || ( alsa jack oss )
diff --git a/metadata/cache/media-video/mjpegtools-2.0.0-r2 b/metadata/cache/media-video/mjpegtools-2.0.0-r2
index 96d379002cae..5ebbdb0878a7 100644
--- a/metadata/cache/media-video/mjpegtools-2.0.0-r2
+++ b/metadata/cache/media-video/mjpegtools-2.0.0-r2
@@ -6,7 +6,7 @@ mirror://sourceforge/mjpeg/mjpegtools-2.0.0.tar.gz
http://mjpeg.sourceforge.net/
GPL-2
Tools for MJPEG video
-~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
autotools eutils flag-o-matic libtool multilib multiprocessing toolchain-funcs user
dga dv gtk mmx png quicktime sdl sdlgfx static-libs v4l
sdlgfx? ( sdl )
diff --git a/metadata/cache/net-analyzer/thc-ipv6-1.6 b/metadata/cache/net-analyzer/thc-ipv6-1.6
deleted file mode 100644
index 1a373ca7d0af..000000000000
--- a/metadata/cache/net-analyzer/thc-ipv6-1.6
+++ /dev/null
@@ -1,22 +0,0 @@
-net-libs/libpcap dev-libs/openssl
-net-libs/libpcap dev-libs/openssl
-0
-http://freeworld.thc.org/releases/thc-ipv6-1.6.tar.gz
-
-http://freeworld.thc.org/thc-ipv6/
-GPL-3
-complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6
-~amd64 ~x86
-eutils multilib toolchain-funcs user
-
-
-
-
-2
-
-compile install prepare
-
-
-
-
-
diff --git a/metadata/cache/net-analyzer/thc-ipv6-1.4 b/metadata/cache/net-analyzer/thc-ipv6-1.9
similarity index 75%
rename from metadata/cache/net-analyzer/thc-ipv6-1.4
rename to metadata/cache/net-analyzer/thc-ipv6-1.9
index fd48e50f2a25..9cc1d3135b03 100644
--- a/metadata/cache/net-analyzer/thc-ipv6-1.4
+++ b/metadata/cache/net-analyzer/thc-ipv6-1.9
@@ -1,7 +1,7 @@
net-libs/libpcap dev-libs/openssl
net-libs/libpcap dev-libs/openssl
0
-http://freeworld.thc.org/releases/thc-ipv6-1.4.tar.gz
+http://freeworld.thc.org/releases/thc-ipv6-1.9.tar.gz
http://freeworld.thc.org/thc-ipv6/
GPL-3
@@ -12,9 +12,9 @@ eutils multilib toolchain-funcs user
-2
+4
-compile install prepare
+install prepare
diff --git a/metadata/cache/net-dialup/freeradius-2.1.11 b/metadata/cache/net-dialup/freeradius-2.1.11-r1
similarity index 100%
rename from metadata/cache/net-dialup/freeradius-2.1.11
rename to metadata/cache/net-dialup/freeradius-2.1.11-r1
diff --git a/metadata/cache/net-dns/dnssec-check-1.12.3-r1 b/metadata/cache/net-dns/dnssec-check-1.12.3-r1
deleted file mode 100644
index 2788d8a2b273..000000000000
--- a/metadata/cache/net-dns/dnssec-check-1.12.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-net-dns/dnssec-tools[threads] x11-libs/qt-declarative:4
-net-dns/dnssec-tools[threads] x11-libs/qt-declarative:4
-0
-http://www.dnssec-tools.org/download/dnssec-check-1.12.3.tar.gz
-
-http://www.dnssec-tools.org
-BSD
-tests local resolver for support of DNSSEC validation
-~amd64 ~x86
-base eutils multilib qt4-r2 toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/net-dns/dnssec-lookup-1.12 b/metadata/cache/net-dns/dnssec-lookup-1.12
deleted file mode 100644
index 2f50ab999911..000000000000
--- a/metadata/cache/net-dns/dnssec-lookup-1.12
+++ /dev/null
@@ -1,22 +0,0 @@
-net-dns/dnssec-tools x11-libs/qt-gui
-net-dns/dnssec-tools x11-libs/qt-gui
-0
-http://www.dnssec-tools.org/download/lookup-1.12.tar.gz
-
-http://www.dnssec-tools.org
-BSD
-DNS lookup utility that supports DNSSEC validation
-~amd64
-base eutils multilib qt4-r2 toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/net-dns/dnssec-nodes-1.12-r1 b/metadata/cache/net-dns/dnssec-nodes-1.12-r1
deleted file mode 100644
index 45792b2e8aae..000000000000
--- a/metadata/cache/net-dns/dnssec-nodes-1.12-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-net-dns/dnssec-tools[threads]
-net-dns/dnssec-tools[threads]
-0
-http://www.dnssec-tools.org/download/dnssec-nodes-1.12.tar.gz
-
-http://www.dnssec-tools.org
-GPL-2
-graphically depicts the DNSSEC results from a lookup from logfiles
-~amd64 ~x86
-base eutils multilib qt4-r2 toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/net-dns/dnssec-system-tray-1.12 b/metadata/cache/net-dns/dnssec-system-tray-1.12
deleted file mode 100644
index a59e79726086..000000000000
--- a/metadata/cache/net-dns/dnssec-system-tray-1.12
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/qt-gui
-x11-libs/qt-gui
-0
-http://www.dnssec-tools.org/download/dnssec-system-tray-1.12.tar.gz
-
-http://www.dnssec-tools.org
-BSD
-display DNSSEC resolver logs in system tray
-~amd64 ~x86
-base eutils multilib qt4-r2 toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/net-libs/libtirpc-0.2.2 b/metadata/cache/net-libs/libtirpc-0.2.2
deleted file mode 100644
index 8bc625f19165..000000000000
--- a/metadata/cache/net-libs/libtirpc-0.2.2
+++ /dev/null
@@ -1,22 +0,0 @@
-kerberos? ( net-libs/libgssglue ) virtual/pkgconfig
-kerberos? ( net-libs/libgssglue )
-0
-mirror://sourceforge/libtirpc/libtirpc-0.2.2.tar.bz2
-
-http://libtirpc.sourceforge.net/
-GPL-2
-Transport Independent RPC library (SunRPC replacement)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-eutils multilib toolchain-funcs user
-kerberos
-
-
-
-2
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/net-libs/xrootd-3.1.0 b/metadata/cache/net-libs/xrootd-3.1.0
deleted file mode 100644
index 2ba6d5102ac4..000000000000
--- a/metadata/cache/net-libs/xrootd-3.1.0
+++ /dev/null
@@ -1,22 +0,0 @@
-!=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-!=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-! hotot-0.9.8.7.tar.gz
http://hotot.org
LGPL-3
lightweight & open source microblogging client
-~amd64 x86
+amd64 x86
base cmake-utils eutils flag-o-matic multilib python toolchain-funcs user vcs-snapshot
chrome gtk kde qt4
|| ( chrome gtk qt4 )
diff --git a/metadata/cache/net-print/gutenprint-5.2.9 b/metadata/cache/net-print/gutenprint-5.2.9
new file mode 100644
index 000000000000..be0d70300c62
--- /dev/null
+++ b/metadata/cache/net-print/gutenprint-5.2.9
@@ -0,0 +1,22 @@
+app-text/ghostscript-gpl dev-lang/perl readline? ( sys-libs/readline ) cups? ( >=net-print/cups-1.1.14 ) foomaticdb? ( net-print/foomatic-db-engine ) gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) gtk? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/ghostscript-gpl dev-lang/perl readline? ( sys-libs/readline ) cups? ( >=net-print/cups-1.1.14 ) foomaticdb? ( net-print/foomatic-db-engine ) gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl )
+0
+mirror://sourceforge/gimp-print/gutenprint-5.2.9.tar.bz2
+test
+http://gutenprint.sourceforge.net
+GPL-2
+Ghostscript and cups printer drivers
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+autotools eutils libtool multilib multiprocessing toolchain-funcs user
+cups foomaticdb gimp gtk nls readline ppds static-libs
+gimp? ( gtk )
+
+
+4
+
+configure install postinst prepare
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/ccpn-2.2.2_p120709 b/metadata/cache/sci-chemistry/ccpn-2.2.2_p120709
new file mode 100644
index 000000000000..2a3b7edc6892
--- /dev/null
+++ b/metadata/cache/sci-chemistry/ccpn-2.2.2_p120709
@@ -0,0 +1,22 @@
+dev-lang/tk[threads] dev-python/numpy dev-tcltk/tix =sci-libs/ccpn-data-2.2.2* sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
+dev-lang/tk[threads] dev-python/numpy dev-tcltk/tix =sci-libs/ccpn-data-2.2.2* sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
+0
+http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.2.2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.2-120709.patch.xz
+mirror
+http://www.ccpn.ac.uk/ccpn
+|| ( CCPN LGPL-2.1 )
+The Collaborative Computing Project for NMR
+~amd64 ~x86 ~amd64-linux ~x86-linux
+eutils multilib portability python toolchain-funcs user versionator
+extendnmr +opengl
+
+extendnmr? ( >=sci-chemistry/aria-2.3.2-r1 sci-chemistry/prodecomp )
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sci-physics/root-5.32.03-r2 b/metadata/cache/sci-physics/root-5.32.03-r2
index 4df0118ab01e..83c47e5351d6 100644
--- a/metadata/cache/sci-physics/root-5.32.03-r2
+++ b/metadata/cache/sci-physics/root-5.32.03-r2
@@ -6,7 +6,7 @@ ftp://root.cern.ch/root/root_v5.32.03.source.tar.gz doc? ( ftp://root.cern.ch/ro
http://root.cern.ch/
LGPL-2.1
C++ data analysis framework and interpreter from CERN
-~amd64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~x86 ~amd64-linux ~x86-linux
elisp-common eutils fdo-mime fortran-2 multilib python toolchain-funcs user
+X afs avahi clarens doc emacs examples fits fftw graphviz htmldoc kerberos ldap +math mpi mysql odbc +opengl openmp oracle postgres prefix pythia6 pythia8 python qt4 +reflex ruby ssl xft xinetd xml xrootd
!X? ( !opengl !qt4 !xft ) mpi? ( math !openmp ) openmp? ( math !mpi )
diff --git a/metadata/cache/sys-apps/gradm-2.2.2.201202161905-r1 b/metadata/cache/sys-apps/gradm-2.2.2.201202161905-r1
new file mode 100644
index 000000000000..fba15e5054d0
--- /dev/null
+++ b/metadata/cache/sys-apps/gradm-2.2.2.201202161905-r1
@@ -0,0 +1,22 @@
+sys-fs/udev sys-devel/bison sys-devel/flex pam? ( virtual/pam ) sys-apps/paxctl
+sys-fs/udev
+0
+http://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-2.2.2-201202161905.tar.gz
+
+http://www.grsecurity.net/
+GPL-2
+Administrative interface for the grsecurity Role Based Access Control system
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+eutils flag-o-matic multilib toolchain-funcs user versionator
+pam
+
+
+
+4
+
+compile install postinst prepare
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/gradm-2.9.0.201202232055-r1 b/metadata/cache/sys-apps/gradm-2.9.0.201202232055-r1
new file mode 100644
index 000000000000..3127e7b552fd
--- /dev/null
+++ b/metadata/cache/sys-apps/gradm-2.9.0.201202232055-r1
@@ -0,0 +1,22 @@
+sys-fs/udev sys-devel/bison sys-devel/flex pam? ( virtual/pam ) sys-apps/paxctl
+sys-fs/udev
+0
+http://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-2.9-201202232055.tar.gz
+
+http://www.grsecurity.net/
+GPL-2
+Administrative interface for the grsecurity Role Based Access Control system
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+eutils flag-o-matic multilib toolchain-funcs user versionator
+pam
+
+
+
+4
+
+compile install postinst prepare
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/gradm-2.9.1.201206091838-r1 b/metadata/cache/sys-apps/gradm-2.9.1.201206091838-r1
new file mode 100644
index 000000000000..21a7947b996d
--- /dev/null
+++ b/metadata/cache/sys-apps/gradm-2.9.1.201206091838-r1
@@ -0,0 +1,22 @@
+sys-fs/udev sys-devel/bison sys-devel/flex pam? ( virtual/pam ) sys-apps/paxctl
+sys-fs/udev
+0
+http://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-2.9.1-201206091838.tar.gz
+
+http://www.grsecurity.net/
+GPL-2
+Administrative interface for the grsecurity Role Based Access Control system
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+eutils flag-o-matic multilib toolchain-funcs user versionator
+pam
+
+
+
+4
+
+compile install postinst prepare
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/usbutils-006 b/metadata/cache/sys-apps/usbutils-006
new file mode 100644
index 000000000000..10fdc6e4b6b9
--- /dev/null
+++ b/metadata/cache/sys-apps/usbutils-006
@@ -0,0 +1,22 @@
+virtual/libusb:1 zlib? ( sys-libs/zlib ) app-arch/xz-utils virtual/pkgconfig python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+virtual/libusb:1 zlib? ( sys-libs/zlib ) sys-apps/hwids python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+0
+mirror://kernel/linux/utils/usb/usbutils/usbutils-006.tar.xz
+
+http://linux-usb.sourceforge.net/
+GPL-2
+USB enumeration utilities
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+multilib python toolchain-funcs
+python zlib
+
+
+
+4
+
+configure install postinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sys-auth/fingerprint-gui-1.04 b/metadata/cache/sys-auth/fingerprint-gui-1.04
index 4f7a326afc2b..96e1394fe5f8 100644
--- a/metadata/cache/sys-auth/fingerprint-gui-1.04
+++ b/metadata/cache/sys-auth/fingerprint-gui-1.04
@@ -1,5 +1,5 @@
-app-crypt/qca app-crypt/qca-ossl sys-auth/libfprint sys-auth/polkit-qt x11-libs/libfakekey x11-libs/qt-core:4 !sys-auth/thinkfinger
-app-crypt/qca app-crypt/qca-ossl sys-auth/libfprint sys-auth/polkit-qt x11-libs/libfakekey x11-libs/qt-core:4 !sys-auth/thinkfinger
+app-crypt/qca app-crypt/qca-ossl sys-auth/libfprint sys-auth/polkit-qt sys-libs/pam x11-libs/libfakekey x11-libs/qt-core:4 !sys-auth/thinkfinger
+app-crypt/qca app-crypt/qca-ossl sys-auth/libfprint sys-auth/polkit-qt sys-libs/pam x11-libs/libfakekey x11-libs/qt-core:4 !sys-auth/thinkfinger
0
http://www.n-view.net/Appliance/fingerprint/download/fingerprint-gui-1.04.tar.gz
diff --git a/metadata/cache/www-servers/spawn-fcgi-1.6.3-r1 b/metadata/cache/www-servers/spawn-fcgi-1.6.3-r1
index 001b100d7db1..38b4910d332c 100644
--- a/metadata/cache/www-servers/spawn-fcgi-1.6.3-r1
+++ b/metadata/cache/www-servers/spawn-fcgi-1.6.3-r1
@@ -6,7 +6,7 @@ http://www.lighttpd.net/download/spawn-fcgi-1.6.3.tar.bz2
http://redmine.lighttpd.net/projects/spawn-fcgi
BSD
A FCGI spawner for lighttpd and cherokee and other webservers
-alpha amd64 arm ~hppa ia64 ppc ~ppc64 sh sparc x86
+alpha amd64 arm hppa ia64 ppc ~ppc64 sh sparc x86
ipv6
diff --git a/metadata/cache/www-servers/uwsgi-1.2.3-r2 b/metadata/cache/www-servers/uwsgi-1.2.3-r2
deleted file mode 100644
index 4b325c31c2e7..000000000000
--- a/metadata/cache/www-servers/uwsgi-1.2.3-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
-caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) php? ( || ( =www-servers/uwsgi-1.2.3-r2[php_targets_php5-3] =www-servers/uwsgi-1.2.3-r2[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
-0
-http://projects.unbit.it/downloads/uwsgi-1.2.3.tar.gz
-
-http://projects.unbit.it/uwsgi/
-GPL-2
-uWSGI server for Python web applications
-~amd64 ~x86
-apache-module autotools depend.apache eutils flag-o-matic java-utils-2 libtool multilib multiprocessing pax-utils php-ext-source-r2 python ruby-ng toolchain-funcs user versionator
-apache2 +caps +carbon cgi debug erlang graylog2 json ldap lua +nagios perl +pcre php python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq apache2 php_targets_php5-3 php_targets_php5-4 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19
-|| ( cgi erlang lua perl php python ruby )
-
-
-4
-
-compile configure install postinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/www-servers/uwsgi-1.2.4 b/metadata/cache/www-servers/uwsgi-1.2.4
new file mode 100644
index 000000000000..388361244ded
--- /dev/null
+++ b/metadata/cache/www-servers/uwsgi-1.2.4
@@ -0,0 +1,22 @@
+caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
+caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) php? ( || ( =www-servers/uwsgi-1.2.4[php_targets_php5-3] =www-servers/uwsgi-1.2.4[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
+0
+http://projects.unbit.it/downloads/uwsgi-1.2.4.tar.gz
+
+http://projects.unbit.it/uwsgi/
+GPL-2
+uWSGI server for Python web applications
+~amd64 ~x86
+apache-module autotools depend.apache eutils flag-o-matic java-utils-2 libtool multilib multiprocessing pax-utils php-ext-source-r2 python ruby-ng toolchain-funcs user versionator
+apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios perl +pcre php python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq apache2 php_targets_php5-3 php_targets_php5-4 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19
+|| ( cgi erlang lua perl php python ruby )
+
+
+4
+
+compile configure install postinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-libs/qt-assistant-4.6.3 b/metadata/cache/x11-libs/qt-assistant-4.6.3
deleted file mode 100644
index e4bb17e50bd4..000000000000
--- a/metadata/cache/x11-libs/qt-assistant-4.6.3
+++ /dev/null
@@ -1,22 +0,0 @@
-~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: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
-
-http://qt-project.org/ http://qt.nokia.com/
-|| ( LGPL-2.1 GPL-3 )
-The assistant help module for the Qt toolkit
-alpha amd64 arm ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-base eutils flag-o-matic multilib qt4-build toolchain-funcs user versionator
-trace aqua debug pch +exceptions
-
-
-
-2
-
-compile configure install postinst postrm prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-libs/qt-core-4.6.3-r1 b/metadata/cache/x11-libs/qt-core-4.6.3-r1
deleted file mode 100644
index af6d7601ab0c..000000000000
--- a/metadata/cache/x11-libs/qt-core-4.6.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/zlib glib? ( dev-libs/glib ) ssl? ( dev-libs/openssl ) !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
-
-http://qt-project.org/ http://qt.nokia.com/
-|| ( LGPL-2.1 GPL-3 )
-The Qt toolkit is a comprehensive C++ application development framework
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-base eutils flag-o-matic multilib qt4-build toolchain-funcs user versionator
-doc +glib iconv optimized-qmake qt3support ssl aqua debug pch +exceptions
-
-qt3support? ( ~x11-libs/qt-gui-4.6.3[aqua=,qt3support] )
-
-2
-
-compile configure install postinst postrm prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/x11-libs/qt-dbus-4.6.3 b/metadata/cache/x11-libs/qt-dbus-4.6.3
deleted file mode 100644
index a50c5f78fac8..000000000000
--- a/metadata/cache/x11-libs/qt-dbus-4.6.3
+++ /dev/null
@@ -1,22 +0,0 @@
-~x11-libs/qt-core-4.6.3[aqua=,debug=] >=sys-apps/dbus-1.0.2 virtual/pkgconfig
-~x11-libs/qt-core-4.6.3[aqua=,debug=] >=sys-apps/dbus-1.0.2 !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 !